2021-04-16 20:17:32

by Dexuan Cui

Subject: [PATCH v8 net-next 1/2] hv_netvsc: Make netvsc/VF binding check both MAC and serial number

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 <[email protected]>
Signed-off-by: Haiyang Zhang <[email protected]>
Co-developed-by: Shachar Raindel <[email protected]>
Signed-off-by: Shachar Raindel <[email protected]>
Signed-off-by: Dexuan Cui <[email protected]>
---
drivers/net/hyperv/netvsc_drv.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)

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,
--
2.25.1

2021-04-19 19:37:12

by Stephen Hemminger

Subject: Re: [PATCH v8 net-next 1/2] hv_netvsc: Make netvsc/VF binding check both MAC and serial number

On Fri, 16 Apr 2021 13:11:58 -0700
Dexuan Cui <[email protected]> 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 <[email protected]>
> Signed-off-by: Haiyang Zhang <[email protected]>
> Co-developed-by: Shachar Raindel <[email protected]>
> Signed-off-by: Shachar Raindel <[email protected]>
> Signed-off-by: Dexuan Cui <[email protected]>

Acked-by: Stephen Hemminger <[email protected]>

2021-04-22 01:30:55

by Dexuan Cui

Subject: RE: [PATCH v8 net-next 1/2] hv_netvsc: Make netvsc/VF binding check both MAC and serial number

> From: Stephen Hemminger <[email protected]>
> Sent: Monday, April 19, 2021 8:54 AM
> To: Dexuan Cui <[email protected]>
> ...
> On Fri, 16 Apr 2021 13:11:58 -0700
> Dexuan Cui <[email protected]> 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 <[email protected]>
> > Signed-off-by: Haiyang Zhang <[email protected]>
> > Co-developed-by: Shachar Raindel <[email protected]>
> > Signed-off-by: Shachar Raindel <[email protected]>
> > Signed-off-by: Dexuan Cui <[email protected]>
>
> Acked-by: Stephen Hemminger <[email protected]>

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