Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1015365/?format=api
{ "id": 1015365, "url": "http://patchwork.ozlabs.org/api/patches/1015365/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20181218134514.6388-2-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": "<20181218134514.6388-2-jan.sokolowski@intel.com>", "list_archive_url": null, "date": "2018-12-18T13:45:14", "name": "[2/2] i40e: Remove umem from VSI", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f2c082df5afe944bc1ec8d6170076412dee4a01e", "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/20181218134514.6388-2-jan.sokolowski@intel.com/mbox/", "series": [ { "id": 82608, "url": "http://patchwork.ozlabs.org/api/series/82608/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=82608", "date": "2018-12-18T13:45:13", "name": "[1/2] xsk: export xdp_get_umem_from_qid", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/82608/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1015365/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1015365/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=fail (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 ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 43JzrQ64wSz9s2P\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 19 Dec 2018 00:48:38 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 0368486517;\n\tTue, 18 Dec 2018 13:48:37 +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 S73BK8CtaU45; Tue, 18 Dec 2018 13:48:33 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D5445864B8;\n\tTue, 18 Dec 2018 13:48:33 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id E66D11C2967\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 18 Dec 2018 13:48:31 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id E3C7822D33\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 18 Dec 2018 13:48:31 +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 PvT+BezuyO7u for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 18 Dec 2018 13:48:31 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 22B0022098\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 18 Dec 2018 13:48:31 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t18 Dec 2018 05:48:30 -0800", "from gklab-18-202.igk.intel.com (HELO u2032.nql.local)\n\t([10.102.18.202])\n\tby orsmga003.jf.intel.com with ESMTP; 18 Dec 2018 05:48:30 -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.56,368,1539673200\"; d=\"scan'208\";a=\"111510271\"", "From": "Jan Sokolowski <jan.sokolowski@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 18 Dec 2018 13:45:14 +0000", "Message-Id": "<20181218134514.6388-2-jan.sokolowski@intel.com>", "X-Mailer": "git-send-email 2.18.1", "In-Reply-To": "<20181218134514.6388-1-jan.sokolowski@intel.com>", "References": "<20181218134514.6388-1-jan.sokolowski@intel.com>", "Subject": "[Intel-wired-lan] [PATCH 2/2] i40e: Remove umem from VSI", "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>", "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": "As current implementation of netdev already contains and provides\numems for us, we no longer have the need to contain these\nstructures in i40e_vsi.\n\nRefactor the code to operate on netdev-provided umems.\n\nSigned-off-by: Jan Sokolowski <jan.sokolowski@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 10 +-\n drivers/net/ethernet/intel/i40e/i40e_xsk.c | 110 ++++-----------------\n 2 files changed, 21 insertions(+), 99 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 876cac317e79..c24163ac41da 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -34,6 +34,7 @@\n #include <net/pkt_cls.h>\n #include <net/tc_act/tc_gact.h>\n #include <net/tc_act/tc_mirred.h>\n+#include <net/xdp_sock.h>\n #include \"i40e_type.h\"\n #include \"i40e_prototype.h\"\n #include \"i40e_client.h\"\n@@ -786,11 +787,6 @@ struct i40e_vsi {\n \n \t/* VSI specific handlers */\n \tirqreturn_t (*irq_handler)(int irq, void *data);\n-\n-\t/* AF_XDP zero-copy */\n-\tstruct xdp_umem **xsk_umems;\n-\tu16 num_xsk_umems_used;\n-\tu16 num_xsk_umems;\n } ____cacheline_internodealigned_in_smp;\n \n struct i40e_netdev_priv {\n@@ -1103,10 +1099,10 @@ static inline struct xdp_umem *i40e_xsk_umem(struct i40e_ring *ring)\n \tif (ring_is_xdp(ring))\n \t\tqid -= ring->vsi->alloc_queue_pairs;\n \n-\tif (!ring->vsi->xsk_umems || !ring->vsi->xsk_umems[qid] || !xdp_on)\n+\tif (!xdp_on)\n \t\treturn NULL;\n \n-\treturn ring->vsi->xsk_umems[qid];\n+\treturn xdp_get_umem_from_qid(ring->vsi->netdev, qid);\n }\n \n int i40e_create_queue_channel(struct i40e_vsi *vsi, struct i40e_channel *ch);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c\nindex 433c8e688c78..2980997e74b5 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c\n@@ -9,69 +9,6 @@\n #include \"i40e_txrx_common.h\"\n #include \"i40e_xsk.h\"\n \n-/**\n- * i40e_alloc_xsk_umems - Allocate an array to store per ring UMEMs\n- * @vsi: Current VSI\n- *\n- * Returns 0 on success, <0 on failure\n- **/\n-static int i40e_alloc_xsk_umems(struct i40e_vsi *vsi)\n-{\n-\tif (vsi->xsk_umems)\n-\t\treturn 0;\n-\n-\tvsi->num_xsk_umems_used = 0;\n-\tvsi->num_xsk_umems = vsi->alloc_queue_pairs;\n-\tvsi->xsk_umems = kcalloc(vsi->num_xsk_umems, sizeof(*vsi->xsk_umems),\n-\t\t\t\t GFP_KERNEL);\n-\tif (!vsi->xsk_umems) {\n-\t\tvsi->num_xsk_umems = 0;\n-\t\treturn -ENOMEM;\n-\t}\n-\n-\treturn 0;\n-}\n-\n-/**\n- * i40e_add_xsk_umem - Store a UMEM for a certain ring/qid\n- * @vsi: Current VSI\n- * @umem: UMEM to store\n- * @qid: Ring/qid to associate with the UMEM\n- *\n- * Returns 0 on success, <0 on failure\n- **/\n-static int i40e_add_xsk_umem(struct i40e_vsi *vsi, struct xdp_umem *umem,\n-\t\t\t u16 qid)\n-{\n-\tint err;\n-\n-\terr = i40e_alloc_xsk_umems(vsi);\n-\tif (err)\n-\t\treturn err;\n-\n-\tvsi->xsk_umems[qid] = umem;\n-\tvsi->num_xsk_umems_used++;\n-\n-\treturn 0;\n-}\n-\n-/**\n- * i40e_remove_xsk_umem - Remove a UMEM for a certain ring/qid\n- * @vsi: Current VSI\n- * @qid: Ring/qid associated with the UMEM\n- **/\n-static void i40e_remove_xsk_umem(struct i40e_vsi *vsi, u16 qid)\n-{\n-\tvsi->xsk_umems[qid] = NULL;\n-\tvsi->num_xsk_umems_used--;\n-\n-\tif (vsi->num_xsk_umems == 0) {\n-\t\tkfree(vsi->xsk_umems);\n-\t\tvsi->xsk_umems = NULL;\n-\t\tvsi->num_xsk_umems = 0;\n-\t}\n-}\n-\n /**\n * i40e_xsk_umem_dma_map - DMA maps all UMEM memory for the netdev\n * @vsi: Current VSI\n@@ -140,6 +77,7 @@ static void i40e_xsk_umem_dma_unmap(struct i40e_vsi *vsi, struct xdp_umem *umem)\n static int i40e_xsk_umem_enable(struct i40e_vsi *vsi, struct xdp_umem *umem,\n \t\t\t\tu16 qid)\n {\n+\tstruct net_device *netdev = vsi->netdev;\n \tstruct xdp_umem_fq_reuse *reuseq;\n \tbool if_running;\n \tint err;\n@@ -150,12 +88,9 @@ static int i40e_xsk_umem_enable(struct i40e_vsi *vsi, struct xdp_umem *umem,\n \tif (qid >= vsi->num_queue_pairs)\n \t\treturn -EINVAL;\n \n-\tif (vsi->xsk_umems) {\n-\t\tif (qid >= vsi->num_xsk_umems)\n-\t\t\treturn -EINVAL;\n-\t\tif (vsi->xsk_umems[qid])\n-\t\t\treturn -EBUSY;\n-\t}\n+\tif (qid >= netdev->real_num_rx_queues ||\n+\t qid >= netdev->real_num_tx_queues)\n+\t\treturn -EINVAL;\n \n \treuseq = xsk_reuseq_prepare(vsi->rx_rings[0]->count);\n \tif (!reuseq)\n@@ -173,13 +108,7 @@ static int i40e_xsk_umem_enable(struct i40e_vsi *vsi, struct xdp_umem *umem,\n \t\terr = i40e_queue_pair_disable(vsi, qid);\n \t\tif (err)\n \t\t\treturn err;\n-\t}\n-\n-\terr = i40e_add_xsk_umem(vsi, umem, qid);\n-\tif (err)\n-\t\treturn err;\n \n-\tif (if_running) {\n \t\terr = i40e_queue_pair_enable(vsi, qid);\n \t\tif (err)\n \t\t\treturn err;\n@@ -197,11 +126,13 @@ static int i40e_xsk_umem_enable(struct i40e_vsi *vsi, struct xdp_umem *umem,\n **/\n static int i40e_xsk_umem_disable(struct i40e_vsi *vsi, u16 qid)\n {\n+\tstruct net_device *netdev = vsi->netdev;\n+\tstruct xdp_umem *umem;\n \tbool if_running;\n \tint err;\n \n-\tif (!vsi->xsk_umems || qid >= vsi->num_xsk_umems ||\n-\t !vsi->xsk_umems[qid])\n+\tumem = xdp_get_umem_from_qid(netdev, qid);\n+\tif (!umem)\n \t\treturn -EINVAL;\n \n \tif_running = netif_running(vsi->netdev) && i40e_enabled_xdp_vsi(vsi);\n@@ -212,8 +143,7 @@ static int i40e_xsk_umem_disable(struct i40e_vsi *vsi, u16 qid)\n \t\t\treturn err;\n \t}\n \n-\ti40e_xsk_umem_dma_unmap(vsi, vsi->xsk_umems[qid]);\n-\ti40e_remove_xsk_umem(vsi, qid);\n+\ti40e_xsk_umem_dma_unmap(vsi, umem);\n \n \tif (if_running) {\n \t\terr = i40e_queue_pair_enable(vsi, qid);\n@@ -237,20 +167,18 @@ static int i40e_xsk_umem_disable(struct i40e_vsi *vsi, u16 qid)\n int i40e_xsk_umem_query(struct i40e_vsi *vsi, struct xdp_umem **umem,\n \t\t\tu16 qid)\n {\n+\tstruct net_device *netdev = vsi->netdev;\n+\tstruct xdp_umem *queried_umem;\n+\n \tif (vsi->type != I40E_VSI_MAIN)\n \t\treturn -EINVAL;\n \n-\tif (qid >= vsi->num_queue_pairs)\n-\t\treturn -EINVAL;\n+\tqueried_umem = xdp_get_umem_from_qid(netdev, qid);\n \n-\tif (vsi->xsk_umems) {\n-\t\tif (qid >= vsi->num_xsk_umems)\n-\t\t\treturn -EINVAL;\n-\t\t*umem = vsi->xsk_umems[qid];\n-\t\treturn 0;\n-\t}\n+\tif (!queried_umem)\n+\t\treturn -EINVAL;\n \n-\t*umem = NULL;\n+\t*umem = queried_umem;\n \treturn 0;\n }\n \n@@ -953,13 +881,11 @@ void i40e_xsk_clean_tx_ring(struct i40e_ring *tx_ring)\n **/\n bool i40e_xsk_any_rx_ring_enabled(struct i40e_vsi *vsi)\n {\n+\tstruct net_device *netdev = vsi->netdev;\n \tint i;\n \n-\tif (!vsi->xsk_umems)\n-\t\treturn false;\n-\n \tfor (i = 0; i < vsi->num_queue_pairs; i++) {\n-\t\tif (vsi->xsk_umems[i])\n+\t\tif (xdp_get_umem_from_qid(netdev, i))\n \t\t\treturn true;\n \t}\n \n", "prefixes": [ "2/2" ] }