From patchwork Wed Aug 29 16:24:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 963568 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.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=linux-pci-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="OMNK42t5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 420rZB1Jm5z9s1x for ; Thu, 30 Aug 2018 02:25:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729263AbeH2UWo (ORCPT ); Wed, 29 Aug 2018 16:22:44 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:34540 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729262AbeH2UWo (ORCPT ); Wed, 29 Aug 2018 16:22:44 -0400 Received: by mail-pl1-f195.google.com with SMTP id f6-v6so2532025plo.1 for ; Wed, 29 Aug 2018 09:25:03 -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=INcqbEG9mxxjTSWMc59XzO8oSUVX2NeKV4ogYcYOXBU=; b=OMNK42t5EhJz0zAUEZDmBO5uhXyCXlzHhogeHewZPVKSh50uQtBYSRE1Ne8cu4N9JG 85dR/USn5Y//gJbUEy/MR/rp0FJR5wGgVceiRSZLR0LH8wWQhOzm05ckgFIojWJ3y9Rc GjNVPllzwl8boTIuEcPX8f++i51JSRrNlJTBTgyy7LvxZonHjxYSkoFOQl3iUg1hoNvG LMr15ZFZzO2me3oN82GYOXMk4Xo3QjBmQNAIf9pRuOjrd6CuRKkEIewgIT7WbXz0m3IA UBlvCcJWLvigfK6lMbRzE80TGsYbUioc3l2dUwCx04w9EjCJf/Sny5WhUHNrMeH/paVp CUcQ== 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=INcqbEG9mxxjTSWMc59XzO8oSUVX2NeKV4ogYcYOXBU=; b=uX7Q3k6kwhtDdhsLEj3Pj8lfJLkGSvaG4XElyh/WWEB962nl5aT3oPIN7J4kNM0BcQ HISpNeSUcuS2ocscWkp22xAMzr9tatUCUBPoyFolUGp60+rBZgRnW2Oz9Ov/2z18ivh+ fty0zCVa4iFrgllQdm0x3ym8S7gYGc5aWBEvOb5+XkXp6vG2HajrKXWpJh+CYceELuKO vouhb4LkEkSFZRd4fWoXiEqCK/VllDVoLuGjbdOgTz5QPZArSNXDrIhrKdBdG8a6C3og luuxSHu+YMHweoUNKb74/K1sjZ806/QsQERIFb70yk4sDdl6TFgXhe89/sWPRi5Gp9Gg Ok2A== X-Gm-Message-State: APzg51D5gPDOeOrLiG6bljj3mNwkcyrqK1/6JOpp1fg2LSYKMOgMAjGB qJAtDymWi2E8CE6ZIS1JraNnaA== X-Google-Smtp-Source: ANB0Vdb3WM6gGxXzItpcCyJJF4DKBVgIdzhn2bqDkjtabf/m0UDLe5EyU43CSICZ0QHfPq//oyxpzw== X-Received: by 2002:a17:902:c6:: with SMTP id a64-v6mr6710562pla.180.1535559903399; Wed, 29 Aug 2018 09:25:03 -0700 (PDT) Received: from xeon-e3.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id y18-v6sm5742943pfl.90.2018.08.29.09.25.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Aug 2018 09:25:02 -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 net-next 2/2] hv_netvsc: pair VF based on serial number Date: Wed, 29 Aug 2018 09:24:52 -0700 Message-Id: <20180829162452.25805-3-sthemmin@microsoft.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180829162452.25805-1-sthemmin@microsoft.com> References: <20180829162452.25805-1-sthemmin@microsoft.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Matching network device based on MAC address is problematic since a non-VF network device can be created with a duplicate MAC address causing confusion and problems. The VMBus API provides 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;