Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1041460/?format=api
{ "id": 1041460, "url": "http://patchwork.ozlabs.org/api/patches/1041460/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190213170729.13845-1-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": "<20190213170729.13845-1-bjorn.topel@gmail.com>", "list_archive_url": null, "date": "2019-02-13T17:07:29", "name": "[bpf-next] net: bpf: remove XDP_QUERY_XSK_UMEM enumerator", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "85889deeb69cb63055803abaab76536f2a19a1c1", "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/20190213170729.13845-1-bjorn.topel@gmail.com/mbox/", "series": [ { "id": 91765, "url": "http://patchwork.ozlabs.org/api/series/91765/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=91765", "date": "2019-02-13T17:07:29", "name": "[bpf-next] net: bpf: remove XDP_QUERY_XSK_UMEM enumerator", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/91765/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1041460/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1041460/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.133; helo=hemlock.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", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"MP3hYJLX\"; dkim-atps=neutral" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 4405Z85SVWz9s3l\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 14 Feb 2019 04:08:00 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id D63CF865B8;\n\tWed, 13 Feb 2019 17:07:58 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id BhtZzowDJO02; Wed, 13 Feb 2019 17:07:52 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 15D3985F38;\n\tWed, 13 Feb 2019 17:07:52 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id BAF4F1BF95A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Feb 2019 17:07:50 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id B518822829\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Feb 2019 17:07:50 +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 WzcGmy6Z01sI for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Feb 2019 17:07:50 +0000 (UTC)", "from mail-pf1-f196.google.com (mail-pf1-f196.google.com\n\t[209.85.210.196])\n\tby silver.osuosl.org (Postfix) with ESMTPS id E7969221A9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Feb 2019 17:07:49 +0000 (UTC)", "by mail-pf1-f196.google.com with SMTP id b7so1422739pfi.8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Feb 2019 09:07:49 -0800 (PST)", "from btopel-mobl.ger.intel.com ([192.55.54.44])\n\tby smtp.gmail.com with ESMTPSA id\n\t63sm36019022pfy.110.2019.02.13.09.07.45\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 13 Feb 2019 09:07:48 -0800 (PST)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=tL3CZH+mgYG109X+wGH0ysaUjUCGln93NYVPP+XOFdY=;\n\tb=MP3hYJLXQmXZQvviL71ENXgxu0q1d4jy8jDrDjW4qHDcxroHx/td+Xiq3f2Di9bgNG\n\tbDQJNrlyUoJcFpIqwC+oq3A1MIXi+4r+jMCrftWXcm8UjQkA3+hExuT3MieROogzJHhs\n\t+r139B6JVi87BknI6aUXmpbVuFNgbCviAUGgFG01yWhMe4sdL/bU37yRKNRRAgzHsBXv\n\tLwUDXBcx+TQ6wJqsH5DCROdRgQDY9SXGHz8Q0ErM1raPyYfIGu2+w9+tAOTy6s9/ZrdI\n\tOZGJTgttJZEMbZHW+6l/YC9JLXNKRdz3FN/+EIBjArwtF+0RUqvgbl6ZB21FoKtg/FCo\n\trEPA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=tL3CZH+mgYG109X+wGH0ysaUjUCGln93NYVPP+XOFdY=;\n\tb=fQKEsrAiweURELCsmeW3T3G3swRWINIY79lZVFpplmO0bRzMAg/zJSSDtE6Xgvvl52\n\twxQTE4VqNOQ+WbXO0yUETKbFQ43G8zdOHFeJkR5S7/ttSAq1vuG20Qo0s49tE7tHsRVH\n\tW7y4qcKLMHqHMAwzUAlzZ/de/bhA+C8S+NyJmhRRN8z8VKtsSVvhy8xlsR3pTM4rGCpT\n\thLVhxfwa4cH0KixvoKcM7cj1+AuqwYCpVaQY8Okal7J5m96z4MZnsK3BJj/+6+rsgl8z\n\tln2T2WztLffKS8ltwKHFk5mPXeY1QEloJO995yO4+nQtwr8dP3VLsUCc98v2vWNcOd0a\n\t1hqQ==", "X-Gm-Message-State": "AHQUAuaUMA6bl7L1NPF/9aqRle7VAzhTPr3U9kzIfKhP5Z3VM6d/d0X7\n\toJgZ0n3iCD3QW7FkKszjzyA=", "X-Google-Smtp-Source": "AHgI3IY/cnNBCHnOqusZDg0NS3Mx+iSr/TpJd0p5Gyg6zuYDJ7DtzZ6dY9UawDLUtXGaVQUWL/KiTQ==", "X-Received": "by 2002:a65:62ca:: with SMTP id m10mr1372868pgv.6.1550077669303; \n\tWed, 13 Feb 2019 09:07:49 -0800 (PST)", "From": "=?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@gmail.com>", "To": "ast@kernel.org,\n\tdaniel@iogearbox.net,\n\tnetdev@vger.kernel.org", "Date": "Wed, 13 Feb 2019 18:07:29 +0100", "Message-Id": "<20190213170729.13845-1-bjorn.topel@gmail.com>", "X-Mailer": "git-send-email 2.19.1", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH bpf-next] net: bpf: remove\n\tXDP_QUERY_XSK_UMEM enumerator", "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": "intel-wired-lan@lists.osuosl.org, magnus.karlsson@intel.com", "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\nCommit c9b47cc1fabc (\"xsk: fix bug when trying to use both copy and\nzero-copy on one queue id\") moved the umem query code to the AF_XDP\ncore, and therefore removed the need to query the netdevice for a\numem.\n\nThis patch removes XDP_QUERY_XSK_UMEM and all code that implement that\nbehavior, which is just dead code.\n\nSigned-off-by: Jan Sokolowski <jan.sokolowski@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 3 --\n drivers/net/ethernet/intel/i40e/i40e_xsk.c | 28 -------------------\n drivers/net/ethernet/intel/i40e/i40e_xsk.h | 2 --\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 --\n .../ethernet/intel/ixgbe/ixgbe_txrx_common.h | 2 --\n drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 17 -----------\n include/linux/netdevice.h | 7 ++---\n 7 files changed, 3 insertions(+), 59 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 44856a84738d..5e74a5127849 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -12128,9 +12128,6 @@ static int i40e_xdp(struct net_device *dev,\n \tcase XDP_QUERY_PROG:\n \t\txdp->prog_id = vsi->xdp_prog ? vsi->xdp_prog->aux->id : 0;\n \t\treturn 0;\n-\tcase XDP_QUERY_XSK_UMEM:\n-\t\treturn i40e_xsk_umem_query(vsi, &xdp->xsk.umem,\n-\t\t\t\t\t xdp->xsk.queue_id);\n \tcase XDP_SETUP_XSK_UMEM:\n \t\treturn i40e_xsk_umem_setup(vsi, xdp->xsk.umem,\n \t\t\t\t\t xdp->xsk.queue_id);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c\nindex 96d849460d9b..e190a2c2b9ff 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c\n@@ -154,34 +154,6 @@ static int i40e_xsk_umem_disable(struct i40e_vsi *vsi, u16 qid)\n \treturn 0;\n }\n \n-/**\n- * i40e_xsk_umem_query - Queries a certain ring/qid for its UMEM\n- * @vsi: Current VSI\n- * @umem: UMEM associated to the ring, if any\n- * @qid: Rx ring to associate UMEM to\n- *\n- * This function will store, if any, the UMEM associated to certain ring.\n- *\n- * Returns 0 on success, <0 on failure\n- **/\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-\tqueried_umem = xdp_get_umem_from_qid(netdev, qid);\n-\n-\tif (!queried_umem)\n-\t\treturn -EINVAL;\n-\n-\t*umem = queried_umem;\n-\treturn 0;\n-}\n-\n /**\n * i40e_xsk_umem_setup - Enable/disassociate a UMEM to/from a ring/qid\n * @vsi: Current VSI\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.h b/drivers/net/ethernet/intel/i40e/i40e_xsk.h\nindex 9038c5d5cf08..8cc0a2e7d9a2 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.h\n@@ -10,8 +10,6 @@ struct zero_copy_allocator;\n \n int i40e_queue_pair_disable(struct i40e_vsi *vsi, int queue_pair);\n int i40e_queue_pair_enable(struct i40e_vsi *vsi, int queue_pair);\n-int i40e_xsk_umem_query(struct i40e_vsi *vsi, struct xdp_umem **umem,\n-\t\t\tu16 qid);\n int i40e_xsk_umem_setup(struct i40e_vsi *vsi, struct xdp_umem *umem,\n \t\t\tu16 qid);\n void i40e_zca_free(struct zero_copy_allocator *alloc, unsigned long handle);\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex b53087a980ef..38c430b94ae3 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -10280,9 +10280,6 @@ static int ixgbe_xdp(struct net_device *dev, struct netdev_bpf *xdp)\n \t\txdp->prog_id = adapter->xdp_prog ?\n \t\t\tadapter->xdp_prog->aux->id : 0;\n \t\treturn 0;\n-\tcase XDP_QUERY_XSK_UMEM:\n-\t\treturn ixgbe_xsk_umem_query(adapter, &xdp->xsk.umem,\n-\t\t\t\t\t xdp->xsk.queue_id);\n \tcase XDP_SETUP_XSK_UMEM:\n \t\treturn ixgbe_xsk_umem_setup(adapter, xdp->xsk.umem,\n \t\t\t\t\t xdp->xsk.queue_id);\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h\nindex 53d4089f5644..d93a690aff74 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h\n@@ -30,8 +30,6 @@ void ixgbe_txrx_ring_enable(struct ixgbe_adapter *adapter, int ring);\n \n struct xdp_umem *ixgbe_xsk_umem(struct ixgbe_adapter *adapter,\n \t\t\t\tstruct ixgbe_ring *ring);\n-int ixgbe_xsk_umem_query(struct ixgbe_adapter *adapter, struct xdp_umem **umem,\n-\t\t\t u16 qid);\n int ixgbe_xsk_umem_setup(struct ixgbe_adapter *adapter, struct xdp_umem *umem,\n \t\t\t u16 qid);\n \ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c\nindex 65c3e2c979d4..98870707b51a 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c\n@@ -174,23 +174,6 @@ static int ixgbe_xsk_umem_disable(struct ixgbe_adapter *adapter, u16 qid)\n \treturn 0;\n }\n \n-int ixgbe_xsk_umem_query(struct ixgbe_adapter *adapter, struct xdp_umem **umem,\n-\t\t\t u16 qid)\n-{\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\t*umem = adapter->xsk_umems[qid];\n-\t\treturn 0;\n-\t}\n-\n-\t*umem = NULL;\n-\treturn 0;\n-}\n-\n int ixgbe_xsk_umem_setup(struct ixgbe_adapter *adapter, struct xdp_umem *umem,\n \t\t\t u16 qid)\n {\ndiff --git a/include/linux/netdevice.h b/include/linux/netdevice.h\nindex 1d95e634f3fe..6aedaf1e9a25 100644\n--- a/include/linux/netdevice.h\n+++ b/include/linux/netdevice.h\n@@ -868,7 +868,6 @@ enum bpf_netdev_command {\n \t/* BPF program for offload callbacks, invoked at program load time. */\n \tBPF_OFFLOAD_MAP_ALLOC,\n \tBPF_OFFLOAD_MAP_FREE,\n-\tXDP_QUERY_XSK_UMEM,\n \tXDP_SETUP_XSK_UMEM,\n };\n \n@@ -895,10 +894,10 @@ struct netdev_bpf {\n \t\tstruct {\n \t\t\tstruct bpf_offloaded_map *offmap;\n \t\t};\n-\t\t/* XDP_QUERY_XSK_UMEM, XDP_SETUP_XSK_UMEM */\n+\t\t/* XDP_SETUP_XSK_UMEM */\n \t\tstruct {\n-\t\t\tstruct xdp_umem *umem; /* out for query*/\n-\t\t\tu16 queue_id; /* in for query */\n+\t\t\tstruct xdp_umem *umem;\n+\t\t\tu16 queue_id;\n \t\t} xsk;\n \t};\n };\n", "prefixes": [ "bpf-next" ] }