{"id":808455,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808455/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20170831231613.15805-2-sthemmin@microsoft.com>","date":"2017-08-31T23:16:12","name":"[net-next,1/2] netvsc: cleanup datapath switch","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"dfbd035eb1a6062f2dc824531b435694ea10e054","submitter":{"id":21389,"url":"http://patchwork.ozlabs.org/api/1.0/people/21389/?format=json","name":"Stephen Hemminger","email":"stephen@networkplumber.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170831231613.15805-2-sthemmin@microsoft.com/mbox/","series":[{"id":918,"url":"http://patchwork.ozlabs.org/api/1.0/series/918/?format=json","date":"2017-08-31T23:16:11","name":"netvsc: transparent VF related cleanups","version":1,"mbox":"http://patchwork.ozlabs.org/series/918/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808455/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=networkplumber-org.20150623.gappssmtp.com\n\theader.i=@networkplumber-org.20150623.gappssmtp.com\n\theader.b=\"UqqLubzo\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xjytD1sgQz9s83\n\tfor ;\n\tFri, 1 Sep 2017 09:16:20 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751825AbdHaXQS (ORCPT );\n\tThu, 31 Aug 2017 19:16:18 -0400","from mail-pg0-f46.google.com ([74.125.83.46]:38659 \"EHLO\n\tmail-pg0-f46.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751205AbdHaXQR (ORCPT\n\t); Thu, 31 Aug 2017 19:16:17 -0400","by mail-pg0-f46.google.com with SMTP id b8so2991708pgn.5\n\tfor ; Thu, 31 Aug 2017 16:16:16 -0700 (PDT)","from xeon-e3.lan (76-14-207-240.or.wavecable.com. [76.14.207.240])\n\tby smtp.gmail.com with ESMTPSA id\n\tz127sm872163pfb.64.2017.08.31.16.16.15\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 31 Aug 2017 16:16:15 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=networkplumber-org.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=vAptRDU8Vt9QyIUWhBy0hbr0m+uBc83FJLY3rdmE8Ts=;\n\tb=UqqLubzowjsHoUO8ZBUEV5MjhlcSOj7qO2D/dkpiRilm/PrGqCsQJuqRPakW03//yu\n\tJ74XOfMJXg7dYfYi3nKBW/BshBnD0IjFv0BCSfhlRdRMDDHnMTZrzcKdFNGNQLw/cPxE\n\taCe6HbK5GW0jX2leExiLU3q39IQmXWC/xPFw3Vf3EhIM+nEi8QV+SlSWeLg+X7k5A2oo\n\tDgDXawKfzAVBjhdkL48dVdNbF4d1USKUVAIWIB+lVA8sb/4WK8Li5Iq05qjWfefhvWFf\n\tiQ/4Zl/UbEFfmzN6AnAG9Sy7ohrm+k/ghWm8xfcIowuvtxWd525VY8UCf+Vt2K84Ebfo\n\t5D8A==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=vAptRDU8Vt9QyIUWhBy0hbr0m+uBc83FJLY3rdmE8Ts=;\n\tb=ecpttNR2KJ+ECso3QVAuYDtOHWjsbjTx+bTFvWfLYnmryJeS/QwWHbbM+ox+oqygMK\n\teBA00Eh8pydNIqCwuEDvzr/Cyg1BQSxdvwUdjEosXYmxDsNWmnHYVkB1e1tuw42AIWNi\n\tikTIGi+YXhd8G3TyXIBIv8XyiRqAXG46Rpkr2sV4m1cl6oi3GTNJGvLCy2mpaIVo267O\n\taqndoP92MUtUy1iq+5Q6Ad0rd0AyF9dEzkeYkJ16vkI8oCQu3KzOo/D/eZJFlTjTSMaH\n\tghhndyXVGX1l72rWOAiLmEOb0PTl8cDNs6tHkPUz2gSg6bf4xcbF+BaqFXSGHpxVVc1x\n\taYIw==","X-Gm-Message-State":"AHPjjUgBSgeJJp40WmbBEwItg8lBbD4TJJusvvzN3g2ND53rz4YnJuFf\n\tAOnt16pkUONBjayv","X-Google-Smtp-Source":"ADKCNb4wINUk3yc7W0eNCxkWn7tJEWw5ar6+2tWGbWrRzFKzsNMlQDc6NXB0w2UXVSSshaFeWsdOjg==","X-Received":"by 10.101.70.207 with SMTP id n15mr88934pgr.203.1504221376634;\n\tThu, 31 Aug 2017 16:16:16 -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","Subject":"[PATCH net-next 1/2] netvsc: cleanup datapath switch","Date":"Thu, 31 Aug 2017 16:16:12 -0700","Message-Id":"<20170831231613.15805-2-sthemmin@microsoft.com>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170831231613.15805-1-sthemmin@microsoft.com>","References":"<20170831231613.15805-1-sthemmin@microsoft.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Use one routine for datapath up/down. Don't need to reopen\nthe rndis layer.\n\nSigned-off-by: Stephen Hemminger \n---\n drivers/net/hyperv/netvsc_drv.c | 38 +++++++-------------------------------\n 1 file changed, 7 insertions(+), 31 deletions(-)","diff":"diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c\nindex fac44c5c8d0d..128165e49c9a 100644\n--- a/drivers/net/hyperv/netvsc_drv.c\n+++ b/drivers/net/hyperv/netvsc_drv.c\n@@ -1842,11 +1842,13 @@ static int netvsc_register_vf(struct net_device *vf_netdev)\n \treturn NOTIFY_OK;\n }\n \n-static int netvsc_vf_up(struct net_device *vf_netdev)\n+/* VF up/down change detected, schedule to change data path */\n+static int netvsc_vf_changed(struct net_device *vf_netdev)\n {\n \tstruct net_device_context *net_device_ctx;\n \tstruct netvsc_device *netvsc_dev;\n \tstruct net_device *ndev;\n+\tbool vf_is_up = netif_running(vf_netdev);\n \n \tndev = get_netvsc_byref(vf_netdev);\n \tif (!ndev)\n@@ -1857,34 +1859,9 @@ static int netvsc_vf_up(struct net_device *vf_netdev)\n \tif (!netvsc_dev)\n \t\treturn NOTIFY_DONE;\n \n-\t/* Bump refcount when datapath is acvive - Why? */\n-\trndis_filter_open(netvsc_dev);\n-\n-\t/* notify the host to switch the data path. */\n-\tnetvsc_switch_datapath(ndev, true);\n-\tnetdev_info(ndev, \"Data path switched to VF: %s\\n\", vf_netdev->name);\n-\n-\treturn NOTIFY_OK;\n-}\n-\n-static int netvsc_vf_down(struct net_device *vf_netdev)\n-{\n-\tstruct net_device_context *net_device_ctx;\n-\tstruct netvsc_device *netvsc_dev;\n-\tstruct net_device *ndev;\n-\n-\tndev = get_netvsc_byref(vf_netdev);\n-\tif (!ndev)\n-\t\treturn NOTIFY_DONE;\n-\n-\tnet_device_ctx = netdev_priv(ndev);\n-\tnetvsc_dev = rtnl_dereference(net_device_ctx->nvdev);\n-\tif (!netvsc_dev)\n-\t\treturn NOTIFY_DONE;\n-\n-\tnetvsc_switch_datapath(ndev, false);\n-\tnetdev_info(ndev, \"Data path switched from VF: %s\\n\", vf_netdev->name);\n-\trndis_filter_close(netvsc_dev);\n+\tnetvsc_switch_datapath(ndev, vf_is_up);\n+\tnetdev_info(ndev, \"Data path switched %s VF: %s\\n\",\n+\t\t vf_is_up ? \"to\" : \"from\", vf_netdev->name);\n \n \treturn NOTIFY_OK;\n }\n@@ -2094,9 +2071,8 @@ static int netvsc_netdev_event(struct notifier_block *this,\n \tcase NETDEV_UNREGISTER:\n \t\treturn netvsc_unregister_vf(event_dev);\n \tcase NETDEV_UP:\n-\t\treturn netvsc_vf_up(event_dev);\n \tcase NETDEV_DOWN:\n-\t\treturn netvsc_vf_down(event_dev);\n+\t\treturn netvsc_vf_changed(event_dev);\n \tdefault:\n \t\treturn NOTIFY_DONE;\n \t}\n","prefixes":["net-next","1/2"]}