Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1045394/?format=api
{ "id": 1045394, "url": "http://patchwork.ozlabs.org/api/patches/1045394/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190220152826.14083-1-jan.sokolowski@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": "<20190220152826.14083-1-jan.sokolowski@intel.com>", "list_archive_url": null, "date": "2019-02-20T15:28:25", "name": "[net-next,1/2] ixgbe: add tracking of AF_XDP zero-copy state for each queue pair", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "f297678e63b6268f616e1aff4b7ae7411d2d97e3", "submitter": { "id": 75418, "url": "http://patchwork.ozlabs.org/api/people/75418/?format=api", "name": "Jan Sokolowski", "email": "jan.sokolowski@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/20190220152826.14083-1-jan.sokolowski@intel.com/mbox/", "series": [ { "id": 93183, "url": "http://patchwork.ozlabs.org/api/series/93183/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=93183", "date": "2019-02-20T15:28:25", "name": "[net-next,1/2] ixgbe: add tracking of AF_XDP zero-copy state for each queue pair", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/93183/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1045394/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1045394/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.137; helo=fraxinus.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 444M2J5lRNz9s5R\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 21 Feb 2019 02:28:40 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9D92A85A97;\n\tWed, 20 Feb 2019 15:28:38 +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 RC4nMoK1FE90; Wed, 20 Feb 2019 15:28:37 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id E81AD85AA1;\n\tWed, 20 Feb 2019 15:28:37 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id EAA391BF42D\n\tfor <intel-wired-lan@osuosl.org>;\n\tWed, 20 Feb 2019 15:28:36 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E46F686840\n\tfor <intel-wired-lan@osuosl.org>;\n\tWed, 20 Feb 2019 15:28:36 +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 WVbNPHqxVWpz for <intel-wired-lan@osuosl.org>;\n\tWed, 20 Feb 2019 15:28:36 +0000 (UTC)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 2C8448683C\n\tfor <intel-wired-lan@osuosl.org>;\n\tWed, 20 Feb 2019 15:28:36 +0000 (UTC)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t20 Feb 2019 07:28:35 -0800", "from gklab-18-202.igk.intel.com (HELO u2032.nql.local)\n\t([10.102.18.202])\n\tby fmsmga005.fm.intel.com with ESMTP; 20 Feb 2019 07:28:34 -0800" ], "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.58,391,1544515200\"; d=\"scan'208\";a=\"321925899\"", "From": "Jan Sokolowski <jan.sokolowski@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 20 Feb 2019 15:28:25 +0000", "Message-Id": "<20190220152826.14083-1-jan.sokolowski@intel.com>", "X-Mailer": "git-send-email 2.18.1", "Subject": "[Intel-wired-lan] [PATCH net-next 1/2] ixgbe: add tracking of\n\tAF_XDP zero-copy state for each queue pair", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "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, intel-wired-lan@osuosl.org", "MIME-Version": "1.0", "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": "Here, we add a bitmap to the ixgbe_adapter that tracks if a\ncertain queue pair has been \"zero-copy enabled\" via the ndo_bpf.\nThe bitmap is used in ixgbe_xsk_umem, and enables zero-copy if\nand only if XDP is enabled, the corresponding qid in the bitmap\nis set, and the umem is non-NULL;\n\nSigned-off-by: Jan Sokolowski <jan.sokolowski@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 +\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 ++++++\n drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 5 ++++-\n 3 files changed, 11 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h\nindex 08d85e336bd4..5f5db6eb261e 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h\n@@ -635,6 +635,7 @@ struct ixgbe_adapter {\n \t/* XDP */\n \tint num_xdp_queues;\n \tstruct ixgbe_ring *xdp_ring[MAX_XDP_QUEUES];\n+\tunsigned long *af_xdp_zc_qps; /* tracks AF_XDP ZC enabled rings */\n \n \t/* TX */\n \tstruct ixgbe_ring *tx_ring[MAX_TX_QUEUES] ____cacheline_aligned_in_smp;\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 38c430b94ae3..46fc6fb8bb1b 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -6284,6 +6284,10 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter,\n \tif (ixgbe_init_rss_key(adapter))\n \t\treturn -ENOMEM;\n \n+\tadapter->af_xdp_zc_qps = bitmap_zalloc(MAX_XDP_QUEUES, GFP_KERNEL);\n+\tif (!adapter->af_xdp_zc_qps)\n+\t\treturn -ENOMEM;\n+\n \t/* Set MAC specific capability flags and exceptions */\n \tswitch (hw->mac.type) {\n \tcase ixgbe_mac_82598EB:\n@@ -11153,6 +11157,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \tkfree(adapter->jump_tables[0]);\n \tkfree(adapter->mac_table);\n \tkfree(adapter->rss_key);\n+\tbitmap_free(adapter->af_xdp_zc_qps);\n err_ioremap:\n \tdisable_dev = !test_and_set_bit(__IXGBE_DISABLED, &adapter->state);\n \tfree_netdev(netdev);\n@@ -11241,6 +11246,7 @@ static void ixgbe_remove(struct pci_dev *pdev)\n \n \tkfree(adapter->mac_table);\n \tkfree(adapter->rss_key);\n+\tbitmap_free(adapter->af_xdp_zc_qps);\n \tdisable_dev = !test_and_set_bit(__IXGBE_DISABLED, &adapter->state);\n \tfree_netdev(netdev);\n \ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c\nindex 51c29358c2a9..fccfb422e45c 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c\n@@ -15,7 +15,8 @@ struct xdp_umem *ixgbe_xsk_umem(struct ixgbe_adapter *adapter,\n \tint qid = ring->ring_idx;\n \n \tif (!adapter->xsk_umems || !adapter->xsk_umems[qid] ||\n-\t qid >= adapter->num_xsk_umems || !xdp_on)\n+\t qid >= adapter->num_xsk_umems || !xdp_on ||\n+\t !test_bit(qid, adapter->af_xdp_zc_qps))\n \t\treturn NULL;\n \n \treturn adapter->xsk_umems[qid];\n@@ -143,6 +144,7 @@ static int ixgbe_xsk_umem_enable(struct ixgbe_adapter *adapter,\n \tif (if_running)\n \t\tixgbe_txrx_ring_disable(adapter, qid);\n \n+\tset_bit(qid, adapter->af_xdp_zc_qps);\n \terr = ixgbe_add_xsk_umem(adapter, umem, qid);\n \n \tif (if_running)\n@@ -165,6 +167,7 @@ static int ixgbe_xsk_umem_disable(struct ixgbe_adapter *adapter, u16 qid)\n \tif (if_running)\n \t\tixgbe_txrx_ring_disable(adapter, qid);\n \n+\tclear_bit(qid, adapter->af_xdp_zc_qps);\n \tixgbe_xsk_umem_dma_unmap(adapter, adapter->xsk_umems[qid]);\n \tixgbe_remove_xsk_umem(adapter, qid);\n \n", "prefixes": [ "net-next", "1/2" ] }