From patchwork Fri Sep 14 19:54:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 970074 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=networkplumber.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="GMwIFx98"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42BmTF5FX7z9s4V for ; Sat, 15 Sep 2018 05:55:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728031AbeIOBLG (ORCPT ); Fri, 14 Sep 2018 21:11:06 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:39941 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728050AbeIOBLF (ORCPT ); Fri, 14 Sep 2018 21:11:05 -0400 Received: by mail-pg1-f194.google.com with SMTP id l63-v6so4865409pga.7 for ; Fri, 14 Sep 2018 12:55:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XD4JFU/JN8L52NBKfPrl7RuuqU+ICMRPUxzBZLAGHfg=; b=GMwIFx98zgeahH1YndExLDANxEJkJ4f4bzJgF7gZ/D4fkppH2hv3OflPZWeGBJYRJG fS+zl5VNekFH/Jn7+zxuCAnswfgZb5t8AS2668rkX2/qEnViLIYs40hD48TP39+b0iZB TBiOfPE+G6/T/SNil8rf0tIm5sg/1jkPXmz3TmXbMZc3aaxY5pS4sRk5etV8RoDK5eJ+ c8N+cIT+5lochhEOMg9aLNH2jTnwwFd7KeEDZzP/M8KY2zFqQr/QuM4l1HBE/5GW4/SH H/WYrDuOTuWZh6B/UvMk+mXAtFF0zOJM+SNIeo7XBOHaxfAMiSmWNlROxz6fojB7nheR 3uZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XD4JFU/JN8L52NBKfPrl7RuuqU+ICMRPUxzBZLAGHfg=; b=K9VWzzp9QD/8DEBUg4DdcjZjF3BgAoq1WDoqWo1mwoLRRhuNhbZSiBTSoiBXeW1nIo W3td5HLGb45RVAi5z/bgZ7GMa8YjsFMjYMU+CgegKPCIhClf37wrZDIifJdcvmGDpnJ7 LEOTcQYI9C8yWkFYYQFHFrGN3O/Mkbr5NS63DAgnVeGm6jtviDYYFWtaJel1rYgkKQ7O z09ThfJMkIlUSpLwIBNZV/jpokc06scKyNuyTopz2k9ZgM3TYMkJ2emwGfRK46X/OcmE dCgJOpcp1kQkw0kkya6edpu8AaoX04wkiog3P5X54Sk3H+bpGFyWsqQZnO5372GDmyM/ zWlQ== X-Gm-Message-State: APzg51DAVp9QntuSAao7+qXeIpCr9j7ICD4fashVfR9V96YE/WzI89ls XYqmItnEvU6ISrx0CbdS23G37Q== X-Google-Smtp-Source: ANB0Vdb9l4wlVXbBKZeWSQC9fANVeRdm3ejCmFa4DIjvGWX4GaOMftgRl+m3/R+Gj0JzVFd7Hoodew== X-Received: by 2002:a63:fc55:: with SMTP id r21-v6mr11544816pgk.377.1536954907751; Fri, 14 Sep 2018 12:55:07 -0700 (PDT) Received: from xeon-e3.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z8-v6sm9394338pfe.163.2018.09.14.12.55.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Sep 2018 12:55:06 -0700 (PDT) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com Cc: devel@linuxdriverproject.org, netdev@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v2 2/2] hv_netvsc: pair VF based on serial number Date: Fri, 14 Sep 2018 12:54:57 -0700 Message-Id: <20180914195457.20433-3-sthemmin@microsoft.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180914195457.20433-1-sthemmin@microsoft.com> References: <20180914195457.20433-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Matching network device based on MAC address is problematic since a non VF network device can be creted with a duplicate MAC address causing confusion and problems. The VMBus API does provide a serial number that is a better matching method. Signed-off-by: Stephen Hemminger --- drivers/net/hyperv/netvsc.c | 3 ++ drivers/net/hyperv/netvsc_drv.c | 58 +++++++++++++++++++-------------- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 31c3d77b4733..fe01e141c8f8 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -1203,6 +1203,9 @@ static void netvsc_send_vf(struct net_device *ndev, net_device_ctx->vf_alloc = nvmsg->msg.v4_msg.vf_assoc.allocated; net_device_ctx->vf_serial = nvmsg->msg.v4_msg.vf_assoc.serial; + netdev_info(ndev, "VF slot %u %s\n", + net_device_ctx->vf_serial, + net_device_ctx->vf_alloc ? "added" : "removed"); } static void netvsc_receive_inband(struct net_device *ndev, diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 1121a1ec407c..9dedc1463e88 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -1894,20 +1894,6 @@ static void netvsc_link_change(struct work_struct *w) rtnl_unlock(); } -static struct net_device *get_netvsc_bymac(const u8 *mac) -{ - struct net_device_context *ndev_ctx; - - list_for_each_entry(ndev_ctx, &netvsc_dev_list, list) { - struct net_device *dev = hv_get_drvdata(ndev_ctx->device_ctx); - - if (ether_addr_equal(mac, dev->perm_addr)) - return dev; - } - - return NULL; -} - static struct net_device *get_netvsc_byref(struct net_device *vf_netdev) { struct net_device_context *net_device_ctx; @@ -2036,26 +2022,48 @@ static void netvsc_vf_setup(struct work_struct *w) rtnl_unlock(); } +/* Find netvsc by VMBus serial number. + * The PCI hyperv controller records the serial number as the slot. + */ +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 pci_dev *pdev; + + if (!parent || !dev_is_pci(parent)) + return NULL; /* not a PCI device */ + + pdev = to_pci_dev(parent); + if (!pdev->slot) { + netdev_notice(vf_netdev, "no PCI slot information\n"); + return NULL; + } + + list_for_each_entry(ndev_ctx, &netvsc_dev_list, list) { + if (!ndev_ctx->vf_alloc) + continue; + + if (ndev_ctx->vf_serial == pdev->slot->number) + return hv_get_drvdata(ndev_ctx->device_ctx); + } + + netdev_notice(vf_netdev, + "no netdev found for slot %u\n", pdev->slot->number); + return NULL; +} + static int netvsc_register_vf(struct net_device *vf_netdev) { - struct net_device *ndev; struct net_device_context *net_device_ctx; - struct device *pdev = vf_netdev->dev.parent; struct netvsc_device *netvsc_dev; + struct net_device *ndev; int ret; if (vf_netdev->addr_len != ETH_ALEN) return NOTIFY_DONE; - if (!pdev || !dev_is_pci(pdev) || dev_is_pf(pdev)) - return NOTIFY_DONE; - - /* - * We will use the MAC address to locate the synthetic interface to - * associate with the VF interface. If we don't find a matching - * synthetic interface, move on. - */ - ndev = get_netvsc_bymac(vf_netdev->perm_addr); + ndev = get_netvsc_byslot(vf_netdev); if (!ndev) return NOTIFY_DONE;