Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/894806/?format=api
{ "id": 894806, "url": "http://patchwork.ozlabs.org/api/patches/894806/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180403211640.7880.19722.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": "<20180403211640.7880.19722.stgit@ahduyck-green-test.jf.intel.com>", "list_archive_url": null, "date": "2018-04-03T21:16:40", "name": "[iwl,next-queue,09/10] ixgbe: Drop real_adapter from l2 fwd acceleration structure", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "09c95f42ed08ab8156d0eabe88c14565ea7d7ef6", "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/20180403211640.7880.19722.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/894806/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/894806/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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 40G2Bd1L65z9s0y\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 4 Apr 2018 07:23:21 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id C8FBA306A8;\n\tTue, 3 Apr 2018 21:23:19 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id HvkgvbkdRpgd; Tue, 3 Apr 2018 21:23:17 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id BC7672E78D;\n\tTue, 3 Apr 2018 21:23:17 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id DD92A1C039A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 3 Apr 2018 21:23:16 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id DB054847D4\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 3 Apr 2018 21:23:16 +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 E4SxtcloYYTR for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 3 Apr 2018 21:23:16 +0000 (UTC)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 593EF84779\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 3 Apr 2018 21:23:16 +0000 (UTC)", "from orsmga005.jf.intel.com ([10.7.209.41])\n\tby orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t03 Apr 2018 14:23:16 -0700", "from ahduyck-green-test.jf.intel.com ([10.166.244.179])\n\tby orsmga005.jf.intel.com with ESMTP; 03 Apr 2018 14:23:16 -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=\"213672718\"", "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:40 -0400", "Message-ID": "<20180403211640.7880.19722.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 09/10] ixgbe: Drop\n\treal_adapter from l2 fwd acceleration structure", "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 patch drops the real_adapter member from the fwd_adapter structure.\nThe general idea behind the change is that the real_adapter is carrying\nunnecessary data since we could always just grab the adapter structure\nfrom netdev_priv(macvlan->lowerdev) if we really needed to get at it.\n\nSigned-off-by: Alexander Duyck <alexander.h.duyck@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 -\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 28 ++++++++++++++-----------\n 2 files changed, 16 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h\nindex 4f08c71..238137c 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h\n@@ -306,7 +306,6 @@ enum ixgbe_ring_state_t {\n struct ixgbe_fwd_adapter {\n \tunsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];\n \tstruct net_device *netdev;\n-\tstruct ixgbe_adapter *real_adapter;\n \tunsigned int tx_base_queue;\n \tunsigned int rx_base_queue;\n \tint pool;\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 7c0f310..56772d6 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -5330,10 +5330,10 @@ static void ixgbe_clean_rx_ring(struct ixgbe_ring *rx_ring)\n \trx_ring->next_to_use = 0;\n }\n \n-static int ixgbe_fwd_ring_up(struct net_device *vdev,\n+static int ixgbe_fwd_ring_up(struct ixgbe_adapter *adapter,\n \t\t\t struct ixgbe_fwd_adapter *accel)\n {\n-\tstruct ixgbe_adapter *adapter = accel->real_adapter;\n+\tstruct net_device *vdev = accel->netdev;\n \tint i, baseq, err;\n \n \tif (!test_bit(accel->pool, adapter->fwd_bitmask))\n@@ -5370,14 +5370,19 @@ static int ixgbe_fwd_ring_up(struct net_device *vdev,\n \treturn err;\n }\n \n-static int ixgbe_upper_dev_walk(struct net_device *upper, void *data)\n+static int ixgbe_macvlan_up(struct net_device *vdev, void *data)\n {\n-\tif (netif_is_macvlan(upper)) {\n-\t\tstruct ixgbe_fwd_adapter *vadapter = macvlan_accel_priv(upper);\n+\tstruct ixgbe_adapter *adapter = data;\n+\tstruct ixgbe_fwd_adapter *accel;\n \n-\t\tif (vadapter)\n-\t\t\tixgbe_fwd_ring_up(upper, vadapter);\n-\t}\n+\tif (!netif_is_macvlan(vdev))\n+\t\treturn 0;\n+\n+\taccel = macvlan_accel_priv(vdev);\n+\tif (!accel)\n+\t\treturn 0;\n+\n+\tixgbe_fwd_ring_up(adapter, accel);\n \n \treturn 0;\n }\n@@ -5385,7 +5390,7 @@ static int ixgbe_upper_dev_walk(struct net_device *upper, void *data)\n static void ixgbe_configure_dfwd(struct ixgbe_adapter *adapter)\n {\n \tnetdev_walk_all_upper_dev_rcu(adapter->netdev,\n-\t\t\t\t ixgbe_upper_dev_walk, NULL);\n+\t\t\t\t ixgbe_macvlan_up, adapter);\n }\n \n static void ixgbe_configure(struct ixgbe_adapter *adapter)\n@@ -9776,13 +9781,12 @@ static void *ixgbe_fwd_add(struct net_device *pdev, struct net_device *vdev)\n \tadapter->ring_feature[RING_F_VMDQ].limit = limit + 1;\n \n \tfwd_adapter->pool = pool;\n-\tfwd_adapter->real_adapter = adapter;\n \n \t/* Force reinit of ring allocation with VMDQ enabled */\n \terr = ixgbe_setup_tc(pdev, adapter->hw_tcs);\n \n \tif (!err && netif_running(pdev))\n-\t\terr = ixgbe_fwd_ring_up(vdev, fwd_adapter);\n+\t\terr = ixgbe_fwd_ring_up(adapter, fwd_adapter);\n \n \tif (!err)\n \t\treturn fwd_adapter;\n@@ -9798,7 +9802,7 @@ static void *ixgbe_fwd_add(struct net_device *pdev, struct net_device *vdev)\n static void ixgbe_fwd_del(struct net_device *pdev, void *priv)\n {\n \tstruct ixgbe_fwd_adapter *accel = priv;\n-\tstruct ixgbe_adapter *adapter = accel->real_adapter;\n+\tstruct ixgbe_adapter *adapter = netdev_priv(pdev);\n \tunsigned int rxbase = accel->rx_base_queue;\n \tunsigned int limit, i;\n \n", "prefixes": [ "iwl", "next-queue", "09/10" ] }