[v8,net-next,1/2] hv_netvsc: Make netvsc/VF binding check both MAC and serial number
diff mbox series

Message ID 20210416201159.25807-2-decui@microsoft.com
State Accepted
Commit 64ff412ad41fe3a5bf759ff4844dc1382176485c
Headers show
Series
  • net: mana: Add a driver for Microsoft Azure Network Adapter (MANA)
Related show

Commit Message

Dexuan Cui April 16, 2021, 8:11 p.m. UTC
Currently the netvsc/VF binding logic only checks the PCI serial number.

The upcoming Microsoft Azure Network Adapter (MANA) supports multiple
net_device interfaces (each such interface is called a "vPort", and has
its unique MAC address) which are backed by the same VF PCI device, so
the binding logic should check both the MAC address and the PCI serial
number.

The change should not break any other existing VF drivers, because
Hyper-V NIC SR-IOV implementation requires the netvsc network
interface and the VF network interface have the same MAC address.

Co-developed-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Co-developed-by: Shachar Raindel <shacharr@microsoft.com>
Signed-off-by: Shachar Raindel <shacharr@microsoft.com>
Signed-off-by: Dexuan Cui <decui@microsoft.com>
---
 drivers/net/hyperv/netvsc_drv.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

Comments

Stephen Hemminger April 19, 2021, 3:53 p.m. UTC | #1
On Fri, 16 Apr 2021 13:11:58 -0700
Dexuan Cui <decui@microsoft.com> wrote:

> Currently the netvsc/VF binding logic only checks the PCI serial number.
> 
> The upcoming Microsoft Azure Network Adapter (MANA) supports multiple
> net_device interfaces (each such interface is called a "vPort", and has
> its unique MAC address) which are backed by the same VF PCI device, so
> the binding logic should check both the MAC address and the PCI serial
> number.
> 
> The change should not break any other existing VF drivers, because
> Hyper-V NIC SR-IOV implementation requires the netvsc network
> interface and the VF network interface have the same MAC address.
> 
> Co-developed-by: Haiyang Zhang <haiyangz@microsoft.com>
> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
> Co-developed-by: Shachar Raindel <shacharr@microsoft.com>
> Signed-off-by: Shachar Raindel <shacharr@microsoft.com>
> Signed-off-by: Dexuan Cui <decui@microsoft.com>

Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Dexuan Cui April 22, 2021, 12:18 a.m. UTC | #2
> From: Stephen Hemminger <stephen@networkplumber.org>
> Sent: Monday, April 19, 2021 8:54 AM
> To: Dexuan Cui <decui@microsoft.com>
>  ...
> On Fri, 16 Apr 2021 13:11:58 -0700
> Dexuan Cui <decui@microsoft.com> wrote:
> 
> > Currently the netvsc/VF binding logic only checks the PCI serial number.
> >
> > The upcoming Microsoft Azure Network Adapter (MANA) supports multiple
> > net_device interfaces (each such interface is called a "vPort", and has
> > its unique MAC address) which are backed by the same VF PCI device, so
> > the binding logic should check both the MAC address and the PCI serial
> > number.
> >
> > The change should not break any other existing VF drivers, because
> > Hyper-V NIC SR-IOV implementation requires the netvsc network
> > interface and the VF network interface have the same MAC address.
> >
> > Co-developed-by: Haiyang Zhang <haiyangz@microsoft.com>
> > Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
> > Co-developed-by: Shachar Raindel <shacharr@microsoft.com>
> > Signed-off-by: Shachar Raindel <shacharr@microsoft.com>
> > Signed-off-by: Dexuan Cui <decui@microsoft.com>
> 
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>

Hi David, Jakub,
The "2/2" patch has been in the net-next tree since Monday, but this
"1/2" patch is not in -- can you please pick up this patch as well? This
patch is needed by the "2/2" patch.

Thanks,
-- Dexuan

Patch
diff mbox series

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 7349a70af083..f682a5572d84 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -2297,6 +2297,7 @@  static struct net_device *get_netvsc_byslot(const struct net_device *vf_netdev)
 {
 	struct device *parent = vf_netdev->dev.parent;
 	struct net_device_context *ndev_ctx;
+	struct net_device *ndev;
 	struct pci_dev *pdev;
 	u32 serial;
 
@@ -2319,8 +2320,17 @@  static struct net_device *get_netvsc_byslot(const struct net_device *vf_netdev)
 		if (!ndev_ctx->vf_alloc)
 			continue;
 
-		if (ndev_ctx->vf_serial == serial)
-			return hv_get_drvdata(ndev_ctx->device_ctx);
+		if (ndev_ctx->vf_serial != serial)
+			continue;
+
+		ndev = hv_get_drvdata(ndev_ctx->device_ctx);
+		if (ndev->addr_len != vf_netdev->addr_len ||
+		    memcmp(ndev->perm_addr, vf_netdev->perm_addr,
+			   ndev->addr_len) != 0)
+			continue;
+
+		return ndev;
+
 	}
 
 	netdev_notice(vf_netdev,