Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/894791/?format=api
{ "id": 894791, "url": "http://patchwork.ozlabs.org/api/patches/894791/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180403211603.7880.2593.stgit@ahduyck-green-test.jf.intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20180403211603.7880.2593.stgit@ahduyck-green-test.jf.intel.com>", "list_archive_url": null, "date": "2018-04-03T21:16:03", "name": "[iwl,next-queue,02/10] macvlan: Rename fwd_priv to accel_priv and add accessor function", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d977574bcd0860bcd3624f165e843335884aebf8", "submitter": { "id": 251, "url": "http://patchwork.ozlabs.org/api/people/251/?format=api", "name": "Duyck, Alexander H", "email": "alexander.h.duyck@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180403211603.7880.2593.stgit@ahduyck-green-test.jf.intel.com/mbox/", "series": [ { "id": 37262, "url": "http://patchwork.ozlabs.org/api/series/37262/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=37262", "date": "2018-04-03T21:15:53", "name": "Clean-up macvlan offloading", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/37262/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/894791/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/894791/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.138; helo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=intel.com" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 40G29w2TMsz9s1b\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 4 Apr 2018 07:22:44 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E6A538A56E;\n\tTue, 3 Apr 2018 21:22:42 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 5FZJvtHs4caB; Tue, 3 Apr 2018 21:22:41 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id ED0448A578;\n\tTue, 3 Apr 2018 21:22:41 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id F33DE1C039A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 3 Apr 2018 21:22:40 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id F0723896D3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 3 Apr 2018 21:22:40 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id EP1BEEIuAioc for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 3 Apr 2018 21:22:40 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 05103896D4\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 3 Apr 2018 21:22:39 +0000 (UTC)", "from orsmga007.jf.intel.com ([10.7.209.58])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t03 Apr 2018 14:22:39 -0700", "from ahduyck-green-test.jf.intel.com ([10.166.244.179])\n\tby orsmga007.jf.intel.com with ESMTP; 03 Apr 2018 14:22:39 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.48,402,1517904000\"; d=\"scan'208\";a=\"30456714\"", "From": "Alexander Duyck <alexander.h.duyck@intel.com>", "To": "intel-wired-lan@lists.osuosl.org, jeffrey.t.kirsher@intel.com", "Date": "Tue, 03 Apr 2018 17:16:03 -0400", "Message-ID": "<20180403211603.7880.2593.stgit@ahduyck-green-test.jf.intel.com>", "In-Reply-To": "<20180403211519.7880.70243.stgit@ahduyck-green-test.jf.intel.com>", "References": "<20180403211519.7880.70243.stgit@ahduyck-green-test.jf.intel.com>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [iwl next-queue PATCH 02/10] macvlan: Rename\n\tfwd_priv to accel_priv and add accessor function", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "netdev@vger.kernel.org", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "This change renames the fwd_priv member to accel_priv as this more\naccurately reflects the actual purpose of this value. In addition I am\nadding an accessor which will allow us to further abstract this in the\nfuture if needed.\n\nSigned-off-by: Alexander Duyck <alexander.h.duyck@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 10 +++-----\n drivers/net/macvlan.c | 31 +++++++++++++++----------\n include/linux/if_macvlan.h | 8 ++++++\n 3 files changed, 30 insertions(+), 19 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 4d2c0ed..c08e6b5 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -5390,10 +5390,9 @@ static int ixgbe_fwd_ring_up(struct net_device *vdev,\n static int ixgbe_upper_dev_walk(struct net_device *upper, void *data)\n {\n \tif (netif_is_macvlan(upper)) {\n-\t\tstruct macvlan_dev *dfwd = netdev_priv(upper);\n-\t\tstruct ixgbe_fwd_adapter *vadapter = dfwd->fwd_priv;\n+\t\tstruct ixgbe_fwd_adapter *vadapter = macvlan_accel_priv(upper);\n \n-\t\tif (dfwd->fwd_priv)\n+\t\tif (vadapter)\n \t\t\tixgbe_fwd_ring_up(upper, vadapter);\n \t}\n \n@@ -8967,13 +8966,12 @@ struct upper_walk_data {\n static int get_macvlan_queue(struct net_device *upper, void *_data)\n {\n \tif (netif_is_macvlan(upper)) {\n-\t\tstruct macvlan_dev *dfwd = netdev_priv(upper);\n-\t\tstruct ixgbe_fwd_adapter *vadapter = dfwd->fwd_priv;\n+\t\tstruct ixgbe_fwd_adapter *vadapter = macvlan_accel_priv(upper);\n \t\tstruct upper_walk_data *data = _data;\n \t\tstruct ixgbe_adapter *adapter = data->adapter;\n \t\tint ifindex = data->ifindex;\n \n-\t\tif (vadapter && vadapter->netdev->ifindex == ifindex) {\n+\t\tif (vadapter && upper->ifindex == ifindex) {\n \t\t\tdata->queue = adapter->rx_ring[vadapter->rx_base_queue]->reg_idx;\n \t\t\tdata->action = data->queue;\n \t\t\treturn 1;\ndiff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c\nindex 725f4b4..7ddc94f 100644\n--- a/drivers/net/macvlan.c\n+++ b/drivers/net/macvlan.c\n@@ -559,9 +559,9 @@ static netdev_tx_t macvlan_start_xmit(struct sk_buff *skb,\n \tif (unlikely(netpoll_tx_running(dev)))\n \t\treturn macvlan_netpoll_send_skb(vlan, skb);\n \n-\tif (vlan->fwd_priv) {\n+\tif (vlan->accel_priv) {\n \t\tskb->dev = vlan->lowerdev;\n-\t\tret = dev_queue_xmit_accel(skb, vlan->fwd_priv);\n+\t\tret = dev_queue_xmit_accel(skb, vlan->accel_priv);\n \t} else {\n \t\tret = macvlan_queue_xmit(skb, dev);\n \t}\n@@ -613,16 +613,23 @@ static int macvlan_open(struct net_device *dev)\n \t\tgoto hash_add;\n \t}\n \n+\terr = -EBUSY;\n+\tif (macvlan_addr_busy(vlan->port, dev->dev_addr))\n+\t\tgoto out;\n+\n+\t/* Attempt to populate accel_priv which is used to offload the L2\n+\t * forwarding requests for unicast packets.\n+\t */\n \tif (lowerdev->features & NETIF_F_HW_L2FW_DOFFLOAD) {\n-\t\tvlan->fwd_priv =\n+\t\tvlan->accel_priv =\n \t\t lowerdev->netdev_ops->ndo_dfwd_add_station(lowerdev, dev);\n \n \t\t/* If we get a NULL pointer back, or if we get an error\n \t\t * then we should just fall through to the non accelerated path\n \t\t */\n-\t\tif (IS_ERR_OR_NULL(vlan->fwd_priv)) {\n-\t\t\tvlan->fwd_priv = NULL;\n-\t\t} else\n+\t\tif (IS_ERR_OR_NULL(vlan->accel_priv))\n+\t\t\tvlan->accel_priv = NULL;\n+\t\telse\n \t\t\treturn 0;\n \t}\n \n@@ -655,10 +662,10 @@ static int macvlan_open(struct net_device *dev)\n del_unicast:\n \tdev_uc_del(lowerdev, dev->dev_addr);\n out:\n-\tif (vlan->fwd_priv) {\n+\tif (vlan->accel_priv) {\n \t\tlowerdev->netdev_ops->ndo_dfwd_del_station(lowerdev,\n-\t\t\t\t\t\t\t vlan->fwd_priv);\n-\t\tvlan->fwd_priv = NULL;\n+\t\t\t\t\t\t\t vlan->accel_priv);\n+\t\tvlan->accel_priv = NULL;\n \t}\n \treturn err;\n }\n@@ -668,10 +675,10 @@ static int macvlan_stop(struct net_device *dev)\n \tstruct macvlan_dev *vlan = netdev_priv(dev);\n \tstruct net_device *lowerdev = vlan->lowerdev;\n \n-\tif (vlan->fwd_priv) {\n+\tif (vlan->accel_priv) {\n \t\tlowerdev->netdev_ops->ndo_dfwd_del_station(lowerdev,\n-\t\t\t\t\t\t\t vlan->fwd_priv);\n-\t\tvlan->fwd_priv = NULL;\n+\t\t\t\t\t\t\t vlan->accel_priv);\n+\t\tvlan->accel_priv = NULL;\n \t\treturn 0;\n \t}\n \ndiff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h\nindex 4cb7aee..c5106ce 100644\n--- a/include/linux/if_macvlan.h\n+++ b/include/linux/if_macvlan.h\n@@ -21,7 +21,7 @@ struct macvlan_dev {\n \tstruct hlist_node\thlist;\n \tstruct macvlan_port\t*port;\n \tstruct net_device\t*lowerdev;\n-\tvoid\t\t\t*fwd_priv;\n+\tvoid\t\t\t*accel_priv;\n \tstruct vlan_pcpu_stats __percpu *pcpu_stats;\n \n \tDECLARE_BITMAP(mc_filter, MACVLAN_MC_FILTER_SZ);\n@@ -86,4 +86,10 @@ extern void macvlan_count_rx(const struct macvlan_dev *vlan,\n }\n #endif\n \n+static inline void *macvlan_accel_priv(struct net_device *dev)\n+{\n+\tstruct macvlan_dev *macvlan = netdev_priv(dev);\n+\n+\treturn macvlan->accel_priv;\n+}\n #endif /* _LINUX_IF_MACVLAN_H */\n", "prefixes": [ "iwl", "next-queue", "02/10" ] }