Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/967280/?format=api
{ "id": 967280, "url": "http://patchwork.ozlabs.org/api/patches/967280/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180907081848.5438-2-bjorn.topel@gmail.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": "<20180907081848.5438-2-bjorn.topel@gmail.com>", "list_archive_url": null, "date": "2018-09-07T08:18:45", "name": "[v2,1/4] i40e: clean zero-copy XDP Tx ring on shutdown/reset", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "a37dcab3c41e7965a9546b72f70a973a3426c0c8", "submitter": { "id": 70569, "url": "http://patchwork.ozlabs.org/api/people/70569/?format=api", "name": "Björn Töpel", "email": "bjorn.topel@gmail.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/20180907081848.5438-2-bjorn.topel@gmail.com/mbox/", "series": [ { "id": 64562, "url": "http://patchwork.ozlabs.org/api/series/64562/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=64562", "date": "2018-09-07T08:18:44", "name": "i40e AF_XDP zero-copy buffer leak fixes", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/64562/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/967280/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/967280/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=fail (p=none dis=none) header.from=gmail.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 4269b02MtPz9s47\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 7 Sep 2018 18:29:16 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id A24DB2EE62;\n\tFri, 7 Sep 2018 08:29:13 +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 bpHAzg+tVuHD; Fri, 7 Sep 2018 08:29:09 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id B225E2EE2B;\n\tFri, 7 Sep 2018 08:29:09 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id C591B1C0180\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 7 Sep 2018 08:29:07 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 3156887FC4\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 7 Sep 2018 08:29:07 +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 jPFSWo5F0XU3 for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 7 Sep 2018 08:29:04 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 00CC4872A1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 7 Sep 2018 08:29:01 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t07 Sep 2018 01:19:34 -0700", "from btopel-mobl1.isw.intel.com ([10.103.211.147])\n\tby orsmga001.jf.intel.com with ESMTP; 07 Sep 2018 01:19:19 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "delayed 00:09:26 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.53,341,1531810800\"; d=\"scan'208\";a=\"88438109\"", "From": "=?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@gmail.com>", "To": "ast@kernel.org, daniel@iogearbox.net, jeffrey.t.kirsher@intel.com,\n\tintel-wired-lan@lists.osuosl.org, jakub.kicinski@netronome.com", "Date": "Fri, 7 Sep 2018 10:18:45 +0200", "Message-Id": "<20180907081848.5438-2-bjorn.topel@gmail.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20180907081848.5438-1-bjorn.topel@gmail.com>", "References": "<20180907081848.5438-1-bjorn.topel@gmail.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH v2 1/4] i40e: clean zero-copy XDP Tx ring\n\ton shutdown/reset", "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, =?utf-8?b?QmrDtnJuIFTDtnBlbA==?=\n\t<bjorn.topel@intel.com>, magnus.karlsson@gmail.com,\n\tmagnus.karlsson@intel.com", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Björn Töpel <bjorn.topel@intel.com>\n\nWhen the zero-copy enabled XDP Tx ring is torn down, due to\nconfiguration changes, outstandning frames on the hardware descriptor\nring are queued on the completion ring.\n\nThe completion ring has a back-pressure mechanism that will guarantee\nthat there is sufficient space on the ring.\n\nSigned-off-by: Björn Töpel <bjorn.topel@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 17 +++++++----\n .../ethernet/intel/i40e/i40e_txrx_common.h | 2 ++\n drivers/net/ethernet/intel/i40e/i40e_xsk.c | 30 +++++++++++++++++++\n 3 files changed, 43 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex 37bd4e50ccde..7f85d4ba8b54 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -636,13 +636,18 @@ void i40e_clean_tx_ring(struct i40e_ring *tx_ring)\n \tunsigned long bi_size;\n \tu16 i;\n \n-\t/* ring already cleared, nothing to do */\n-\tif (!tx_ring->tx_bi)\n-\t\treturn;\n+\tif (ring_is_xdp(tx_ring) && tx_ring->xsk_umem) {\n+\t\ti40e_xsk_clean_tx_ring(tx_ring);\n+\t} else {\n+\t\t/* ring already cleared, nothing to do */\n+\t\tif (!tx_ring->tx_bi)\n+\t\t\treturn;\n \n-\t/* Free all the Tx ring sk_buffs */\n-\tfor (i = 0; i < tx_ring->count; i++)\n-\t\ti40e_unmap_and_free_tx_resource(tx_ring, &tx_ring->tx_bi[i]);\n+\t\t/* Free all the Tx ring sk_buffs */\n+\t\tfor (i = 0; i < tx_ring->count; i++)\n+\t\t\ti40e_unmap_and_free_tx_resource(tx_ring,\n+\t\t\t\t\t\t\t&tx_ring->tx_bi[i]);\n+\t}\n \n \tbi_size = sizeof(struct i40e_tx_buffer) * tx_ring->count;\n \tmemset(tx_ring->tx_bi, 0, bi_size);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h b/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h\nindex b5afd479a9c5..29c68b29d36f 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h\n@@ -87,4 +87,6 @@ static inline void i40e_arm_wb(struct i40e_ring *tx_ring,\n \t}\n }\n \n+void i40e_xsk_clean_tx_ring(struct i40e_ring *tx_ring);\n+\n #endif /* I40E_TXRX_COMMON_ */\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c\nindex 2ebfc78bbd09..99116277c4d2 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c\n@@ -830,3 +830,33 @@ int i40e_xsk_async_xmit(struct net_device *dev, u32 queue_id)\n \n \treturn 0;\n }\n+\n+/**\n+ * i40e_xsk_clean_xdp_ring - Clean the XDP Tx ring on shutdown\n+ * @xdp_ring: XDP Tx ring\n+ **/\n+void i40e_xsk_clean_tx_ring(struct i40e_ring *tx_ring)\n+{\n+\tu16 ntc = tx_ring->next_to_clean, ntu = tx_ring->next_to_use;\n+\tstruct xdp_umem *umem = tx_ring->xsk_umem;\n+\tstruct i40e_tx_buffer *tx_bi;\n+\tu32 xsk_frames = 0;\n+\n+\twhile (ntc != ntu) {\n+\t\ttx_bi = &tx_ring->tx_bi[ntc];\n+\n+\t\tif (tx_bi->xdpf)\n+\t\t\ti40e_clean_xdp_tx_buffer(tx_ring, tx_bi);\n+\t\telse\n+\t\t\txsk_frames++;\n+\n+\t\ttx_bi->xdpf = NULL;\n+\n+\t\tntc++;\n+\t\tif (ntc > tx_ring->count)\n+\t\t\tntc = 0;\n+\t}\n+\n+\tif (xsk_frames)\n+\t\txsk_umem_complete_tx(umem, xsk_frames);\n+}\n", "prefixes": [ "v2", "1/4" ] }