Skip to contentSkip to conversation

FAILED: patch "[PATCH] hv_netvsc: Fix race of register_netdevice_notifier and VF" failed to apply to 4.14-stable tree

PATCH [email protected] 1 participant 1 message Nov 30, 2023

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y
git checkout FETCH_HEAD
git cherry-pick -x 85520856466ed6bc3b1ccb013cddac70ceb437db
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023113039-aged-crook-4078@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^..

Possible dependencies:

85520856466e ("hv_netvsc: Fix race of register_netdevice_notifier and VF register") a7f99d0f2bbf ("hv_netvsc: use reciprocal divide to speed up percent calculation") 6b0cbe315868 ("hv_netvsc: Add initialization of tx_table in netvsc_device_add()")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 85520856466ed6bc3b1ccb013cddac70ceb437db Mon Sep 17 00:00:00 2001
From: Haiyang Zhang <[email protected]>
Date: Sun, 19 Nov 2023 08:23:42 -0800
Subject: [PATCH] hv_netvsc: Fix race of register_netdevice_notifier and VF
register

If VF NIC is registered earlier, NETDEV_REGISTER event is replayed, but NETDEV_POST_INIT is not.

Move register_netdevice_notifier() earlier, so the call back function is set before probing.

Fixes e04e7a7bbd4b ("hv_netvsc: Fix a deadlock by getting rtnl lock earlier in netvsc_probe()")
drivers/net/hyperv/netvsc_drv.c +7 -2
index 5e528a76f5f5..b7dfd51f09e6 100644
@@ -2793,12 +2793,17 @@ static int __init netvsc_drv_init(void)
 	}
 	netvsc_ring_bytes = ring_size * PAGE_SIZE;
 
+	register_netdevice_notifier(&netvsc_netdev_notifier);
+
 	ret = vmbus_driver_register(&netvsc_drv);
 	if (ret)
-		return ret;
+		goto err_vmbus_reg;
 
-	register_netdevice_notifier(&netvsc_netdev_notifier);
 	return 0;
+
+err_vmbus_reg:
+	unregister_netdevice_notifier(&netvsc_netdev_notifier);
+	return ret;
 }
 
 MODULE_LICENSE("GPL");