Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31a38a90 authored by Haiyang Zhang's avatar Haiyang Zhang Committed by Greg Kroah-Hartman
Browse files

hv_netvsc: Fix VF namespace also in synthetic NIC NETDEV_REGISTER event 



commit 4c262801ea60c518b5bebc22a09f5b78b3147da2 upstream.

The existing code moves VF to the same namespace as the synthetic NIC
during netvsc_register_vf(). But, if the synthetic device is moved to a
new namespace after the VF registration, the VF won't be moved together.

To make the behavior more consistent, add a namespace check for synthetic
NIC's NETDEV_REGISTER event (generated during its move), and move the VF
if it is not in the same namespace.

Cc: stable@vger.kernel.org
Fixes: c0a41b88 ("hv_netvsc: move VF to same namespace as netvsc device")
Suggested-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/1729275922-17595-1-git-send-email-haiyangz@microsoft.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ae95e023

drivers/net/hyperv/netvsc_drv.c

+30 −0
Original line number Diff line number Diff line
@@ -2540,6 +2540,31 @@ static struct hv_driver netvsc_drv = { 
	},

};



/* Set VF's namespace same as the synthetic NIC */

static void netvsc_event_set_vf_ns(struct net_device *ndev)

{

	struct net_device_context *ndev_ctx = netdev_priv(ndev);

	struct net_device *vf_netdev;

	int ret;



	vf_netdev = rtnl_dereference(ndev_ctx->vf_netdev);

	if (!vf_netdev)

		return;



	if (!net_eq(dev_net(ndev), dev_net(vf_netdev))) {

		ret = dev_change_net_namespace(vf_netdev, dev_net(ndev),

					       "eth%d");

		if (ret)

			netdev_err(vf_netdev,

				   "Cannot move to same namespace as %s: %d\n",

				   ndev->name, ret);

		else

			netdev_info(vf_netdev,

				    "Moved VF to namespace with: %s\n",

				    ndev->name);

	}

}



/*

 * On Hyper-V, every VF interface is matched with a corresponding

 * synthetic interface. The synthetic interface is presented first
@@ -2552,6 +2577,11 @@ static int netvsc_netdev_event(struct notifier_block *this, 
	struct net_device *event_dev = netdev_notifier_info_to_dev(ptr);

	int ret = 0;



	if (event_dev->netdev_ops == &device_ops && event == NETDEV_REGISTER) {

		netvsc_event_set_vf_ns(event_dev);

		return NOTIFY_DONE;

	}



	ret = check_dev_is_matching_vf(event_dev);

	if (ret != 0)

		return NOTIFY_DONE;