Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1061675/?format=api
{ "id": 1061675, "url": "http://patchwork.ozlabs.org/api/patches/1061675/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190322211638.28545-2-jeffrey.t.kirsher@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": "<20190322211638.28545-2-jeffrey.t.kirsher@intel.com>", "list_archive_url": null, "date": "2019-03-22T21:16:38", "name": "[v2,2/2] ixgbe: remove umem from adapter", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4a1faa184a74b07eb34fe2c5a1ca3075caeb10ee", "submitter": { "id": 473, "url": "http://patchwork.ozlabs.org/api/people/473/?format=api", "name": "Kirsher, Jeffrey T", "email": "jeffrey.t.kirsher@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/20190322211638.28545-2-jeffrey.t.kirsher@intel.com/mbox/", "series": [ { "id": 98767, "url": "http://patchwork.ozlabs.org/api/series/98767/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=98767", "date": "2019-03-22T21:16:37", "name": "[v2,1/2] ixgbe: add tracking of AF_XDP zero-copy state for each queue pair", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/98767/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1061675/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1061675/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=intel.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 44QxJ35pytz9sNq\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 23 Mar 2019 08:14:59 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id DDF0F2379C;\n\tFri, 22 Mar 2019 21:14:57 +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 vDGJjIdaMxkm; Fri, 22 Mar 2019 21:14:55 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 2CFAA2291C;\n\tFri, 22 Mar 2019 21:14:55 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 5ADEE1BF393\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 22 Mar 2019 21:14:54 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 5831D22056\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 22 Mar 2019 21:14:54 +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 cIt3vaa8doHR for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 22 Mar 2019 21:14:52 +0000 (UTC)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 47DFF2291C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 22 Mar 2019 21:14:52 +0000 (UTC)", "from orsmga005.jf.intel.com ([10.7.209.41])\n\tby fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t22 Mar 2019 14:14:51 -0700", "from jtkirshe-desk1.jf.intel.com ([134.134.177.96])\n\tby orsmga005.jf.intel.com with ESMTP; 22 Mar 2019 14:14:51 -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.60,256,1549958400\"; d=\"scan'208\";a=\"309595888\"", "From": "Jeff Kirsher <jeffrey.t.kirsher@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 22 Mar 2019 14:16:38 -0700", "Message-Id": "<20190322211638.28545-2-jeffrey.t.kirsher@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190322211638.28545-1-jeffrey.t.kirsher@intel.com>", "References": "<20190322211638.28545-1-jeffrey.t.kirsher@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH v2 2/2] ixgbe: remove umem from adapter", "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>", "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": "From: Jan Sokolowski <jan.sokolowski@intel.com>\n\nAs current implementation of netdev already contains and provides\numems for us, we no longer have the need to contain these\nstructures in ixgbe_adapter.\n\nRefactor the code to operate on netdev-provided umems.\n\nSigned-off-by: Jan Sokolowski <jan.sokolowski@intel.com>\n---\nv2: fixed merge issues with the current next-queue tree\n\n drivers/net/ethernet/intel/ixgbe/ixgbe.h | 11 +--\n drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 79 ++++----------------\n 2 files changed, 19 insertions(+), 71 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h\nindex 5f5db6eb261e..aa923d6d596b 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h\n@@ -775,11 +775,6 @@ struct ixgbe_adapter {\n #ifdef CONFIG_IXGBE_IPSEC\n \tstruct ixgbe_ipsec *ipsec;\n #endif /* CONFIG_IXGBE_IPSEC */\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 };\n \n static inline u8 ixgbe_max_rss_indices(struct ixgbe_adapter *adapter)\n@@ -1040,4 +1035,10 @@ static inline int ixgbe_ipsec_vf_add_sa(struct ixgbe_adapter *adapter,\n static inline int ixgbe_ipsec_vf_del_sa(struct ixgbe_adapter *adapter,\n \t\t\t\t\tu32 *mbuf, u32 vf) { return -EACCES; }\n #endif /* CONFIG_IXGBE_IPSEC */\n+\n+static inline bool ixgbe_enabled_xdp_adapter(struct ixgbe_adapter *adapter)\n+{\n+\treturn !!adapter->xdp_prog;\n+}\n+\n #endif /* _IXGBE_H_ */\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c\nindex b9f05fbdbf67..f7cc13d7eb2c 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c\n@@ -14,58 +14,10 @@ struct xdp_umem *ixgbe_xsk_umem(struct ixgbe_adapter *adapter,\n \tbool xdp_on = READ_ONCE(adapter->xdp_prog);\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 !test_bit(qid, adapter->af_xdp_zc_qps))\n+\tif (!xdp_on || !test_bit(qid, adapter->af_xdp_zc_qps))\n \t\treturn NULL;\n \n-\treturn adapter->xsk_umems[qid];\n-}\n-\n-static int ixgbe_alloc_xsk_umems(struct ixgbe_adapter *adapter)\n-{\n-\tif (adapter->xsk_umems)\n-\t\treturn 0;\n-\n-\tadapter->num_xsk_umems_used = 0;\n-\tadapter->num_xsk_umems = adapter->num_rx_queues;\n-\tadapter->xsk_umems = kcalloc(adapter->num_xsk_umems,\n-\t\t\t\t sizeof(*adapter->xsk_umems),\n-\t\t\t\t GFP_KERNEL);\n-\tif (!adapter->xsk_umems) {\n-\t\tadapter->num_xsk_umems = 0;\n-\t\treturn -ENOMEM;\n-\t}\n-\n-\treturn 0;\n-}\n-\n-static int ixgbe_add_xsk_umem(struct ixgbe_adapter *adapter,\n-\t\t\t struct xdp_umem *umem,\n-\t\t\t u16 qid)\n-{\n-\tint err;\n-\n-\terr = ixgbe_alloc_xsk_umems(adapter);\n-\tif (err)\n-\t\treturn err;\n-\n-\tadapter->xsk_umems[qid] = umem;\n-\tadapter->num_xsk_umems_used++;\n-\n-\treturn 0;\n-}\n-\n-static void ixgbe_remove_xsk_umem(struct ixgbe_adapter *adapter, u16 qid)\n-{\n-\tadapter->xsk_umems[qid] = NULL;\n-\tadapter->num_xsk_umems_used--;\n-\n-\tif (adapter->num_xsk_umems == 0) {\n-\t\tkfree(adapter->xsk_umems);\n-\t\tadapter->xsk_umems = NULL;\n-\t\tadapter->num_xsk_umems = 0;\n-\t}\n+\treturn xdp_get_umem_from_qid(adapter->netdev, qid);\n }\n \n static int ixgbe_xsk_umem_dma_map(struct ixgbe_adapter *adapter,\n@@ -114,6 +66,7 @@ static int ixgbe_xsk_umem_enable(struct ixgbe_adapter *adapter,\n \t\t\t\t struct xdp_umem *umem,\n \t\t\t\t u16 qid)\n {\n+\tstruct net_device *netdev = adapter->netdev;\n \tstruct xdp_umem_fq_reuse *reuseq;\n \tbool if_running;\n \tint err;\n@@ -121,12 +74,9 @@ static int ixgbe_xsk_umem_enable(struct ixgbe_adapter *adapter,\n \tif (qid >= adapter->num_rx_queues)\n \t\treturn -EINVAL;\n \n-\tif (adapter->xsk_umems) {\n-\t\tif (qid >= adapter->num_xsk_umems)\n-\t\t\treturn -EINVAL;\n-\t\tif (adapter->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(adapter->rx_ring[0]->count);\n \tif (!reuseq)\n@@ -139,15 +89,12 @@ static int ixgbe_xsk_umem_enable(struct ixgbe_adapter *adapter,\n \t\treturn err;\n \n \tif_running = netif_running(adapter->netdev) &&\n-\t\t READ_ONCE(adapter->xdp_prog);\n+\t\t ixgbe_enabled_xdp_adapter(adapter);\n \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-\tif (err)\n-\t\treturn err;\n \n \tif (if_running) {\n \t\tixgbe_txrx_ring_enable(adapter, qid);\n@@ -163,21 +110,21 @@ static int ixgbe_xsk_umem_enable(struct ixgbe_adapter *adapter,\n \n static int ixgbe_xsk_umem_disable(struct ixgbe_adapter *adapter, u16 qid)\n {\n+\tstruct xdp_umem *umem;\n \tbool if_running;\n \n-\tif (!adapter->xsk_umems || qid >= adapter->num_xsk_umems ||\n-\t !adapter->xsk_umems[qid])\n+\tumem = xdp_get_umem_from_qid(adapter->netdev, qid);\n+\tif (!umem)\n \t\treturn -EINVAL;\n \n \tif_running = netif_running(adapter->netdev) &&\n-\t\t READ_ONCE(adapter->xdp_prog);\n+\t\t ixgbe_enabled_xdp_adapter(adapter);\n \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+\tixgbe_xsk_umem_dma_unmap(adapter, umem);\n \n \tif (if_running)\n \t\tixgbe_txrx_ring_enable(adapter, qid);\n@@ -756,7 +703,7 @@ int ixgbe_xsk_async_xmit(struct net_device *dev, u32 qid)\n \tif (qid >= adapter->num_xdp_queues)\n \t\treturn -ENXIO;\n \n-\tif (!adapter->xsk_umems || !adapter->xsk_umems[qid])\n+\tif (!adapter->xdp_ring[qid]->xsk_umem)\n \t\treturn -ENXIO;\n \n \tring = adapter->xdp_ring[qid];\n", "prefixes": [ "v2", "2/2" ] }