Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/925067/?format=api
{ "id": 925067, "url": "http://patchwork.ozlabs.org/api/patches/925067/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180604120601.18123-3-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": "<20180604120601.18123-3-bjorn.topel@gmail.com>", "list_archive_url": null, "date": "2018-06-04T12:05:52", "name": "[bpf-next,02/11] xsk: introduce xdp_umem_page", "commit_ref": null, "pull_url": null, "state": "awaiting-upstream", "archived": false, "hash": "56fc101278c0a788d17c7d6f1b783e91c1eeaecd", "submitter": { "id": 70569, "url": "http://patchwork.ozlabs.org/api/people/70569/?format=api", "name": "Björn Töpel", "email": "bjorn.topel@gmail.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180604120601.18123-3-bjorn.topel@gmail.com/mbox/", "series": [ { "id": 48416, "url": "http://patchwork.ozlabs.org/api/series/48416/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=48416", "date": "2018-06-04T12:05:50", "name": "AF_XDP: introducing zero-copy support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/48416/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/925067/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/925067/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 AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 40zyry0QpBz9s08\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 5 Jun 2018 01:04:33 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 1A3D928BFA;\n\tMon, 4 Jun 2018 15:04:32 +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 DBSGNByJQoDJ; Mon, 4 Jun 2018 15:04:29 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id EB8DB26B6D;\n\tMon, 4 Jun 2018 15:04:27 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 22AFA1BFFD0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 4 Jun 2018 12:06:26 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 1F26C2CC8B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 4 Jun 2018 12:06:26 +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 Lg24aCcxyn7O for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 4 Jun 2018 12:06:25 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 8316726E12\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 4 Jun 2018 12:06:25 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t04 Jun 2018 05:06:24 -0700", "from btopel-mobl1.isw.intel.com (HELO\n\tbtopel-mobl1.hil-pdxphhh.sea.wayport.net) ([10.103.211.148])\n\tby fmsmga004.fm.intel.com with ESMTP; 04 Jun 2018 05:06:18 -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.49,476,1520924400\"; d=\"scan'208\";a=\"60197159\"", "From": "=?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@gmail.com>", "To": "bjorn.topel@gmail.com, magnus.karlsson@intel.com,\n\tmagnus.karlsson@gmail.com, alexander.h.duyck@intel.com,\n\talexander.duyck@gmail.com, ast@fb.com, brouer@redhat.com,\n\tdaniel@iogearbox.net, netdev@vger.kernel.org, mykyta.iziumtsev@linaro.org", "Date": "Mon, 4 Jun 2018 14:05:52 +0200", "Message-Id": "<20180604120601.18123-3-bjorn.topel@gmail.com>", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<20180604120601.18123-1-bjorn.topel@gmail.com>", "References": "<20180604120601.18123-1-bjorn.topel@gmail.com>", "MIME-Version": "1.0", "X-Mailman-Approved-At": "Mon, 04 Jun 2018 15:04:25 +0000", "Subject": "[Intel-wired-lan] [PATCH bpf-next 02/11] xsk: introduce\n\txdp_umem_page", "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": "francois.ozog@linaro.org, willemdebruijn.kernel@gmail.com, mst@redhat.com,\n\tilias.apalodimas@linaro.org, michael.lundkvist@ericsson.com,\n\tbrian.brooks@linaro.org, intel-wired-lan@lists.osuosl.org, \n\tqi.z.zhang@intel.com, michael.chan@broadcom.com, =?utf-8?b?QmrDtnJu?=\n\t=?utf-8?q?_T=C3=B6pel?= <bjorn.topel@intel.com>, andy@greyhouse.net", "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\nThe xdp_umem_page holds the address for a page. Trade memory for\nfaster lookup. Later, we'll add DMA address here as well.\n\nSigned-off-by: Björn Töpel <bjorn.topel@intel.com>\n---\n include/net/xdp_sock.h | 7 ++++++-\n net/xdp/xdp_umem.c | 15 ++++++++++++++-\n net/xdp/xdp_umem.h | 3 +--\n 3 files changed, 21 insertions(+), 4 deletions(-)", "diff": "diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h\nindex 3a6cd88f179d..caf343a7e224 100644\n--- a/include/net/xdp_sock.h\n+++ b/include/net/xdp_sock.h\n@@ -20,10 +20,14 @@ struct xdp_umem_props {\n \tu64 size;\n };\n \n+struct xdp_umem_page {\n+\tvoid *addr;\n+};\n+\n struct xdp_umem {\n \tstruct xsk_queue *fq;\n \tstruct xsk_queue *cq;\n-\tstruct page **pgs;\n+\tstruct xdp_umem_page *pages;\n \tstruct xdp_umem_props props;\n \tu32 headroom;\n \tu32 chunk_size_nohr;\n@@ -32,6 +36,7 @@ struct xdp_umem {\n \tunsigned long address;\n \trefcount_t users;\n \tstruct work_struct work;\n+\tstruct page **pgs;\n \tu32 npgs;\n };\n \ndiff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c\nindex 2793a503223e..aca826011f6c 100644\n--- a/net/xdp/xdp_umem.c\n+++ b/net/xdp/xdp_umem.c\n@@ -65,6 +65,9 @@ static void xdp_umem_release(struct xdp_umem *umem)\n \t\tgoto out;\n \n \tmmput(mm);\n+\tkfree(umem->pages);\n+\tumem->pages = NULL;\n+\n \txdp_umem_unaccount_pages(umem);\n out:\n \tkfree(umem);\n@@ -155,7 +158,7 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr)\n \tu32 chunk_size = mr->chunk_size, headroom = mr->headroom;\n \tunsigned int chunks, chunks_per_page;\n \tu64 addr = mr->addr, size = mr->len;\n-\tint size_chk, err;\n+\tint size_chk, err, i;\n \n \tif (chunk_size < XDP_UMEM_MIN_CHUNK_SIZE || chunk_size > PAGE_SIZE) {\n \t\t/* Strictly speaking we could support this, if:\n@@ -213,6 +216,16 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr)\n \terr = xdp_umem_pin_pages(umem);\n \tif (err)\n \t\tgoto out_account;\n+\n+\tumem->pages = kcalloc(umem->npgs, sizeof(*umem->pages), GFP_KERNEL);\n+\tif (!umem->pages) {\n+\t\terr = -ENOMEM;\n+\t\tgoto out_account;\n+\t}\n+\n+\tfor (i = 0; i < umem->npgs; i++)\n+\t\tumem->pages[i].addr = page_address(umem->pgs[i]);\n+\n \treturn 0;\n \n out_account:\ndiff --git a/net/xdp/xdp_umem.h b/net/xdp/xdp_umem.h\nindex 9433e8af650a..40e8fa4a92af 100644\n--- a/net/xdp/xdp_umem.h\n+++ b/net/xdp/xdp_umem.h\n@@ -10,8 +10,7 @@\n \n static inline char *xdp_umem_get_data(struct xdp_umem *umem, u64 addr)\n {\n-\treturn page_address(umem->pgs[addr >> PAGE_SHIFT]) +\n-\t\t(addr & (PAGE_SIZE - 1));\n+\treturn umem->pages[addr >> PAGE_SHIFT].addr + (addr & (PAGE_SIZE - 1));\n }\n \n bool xdp_umem_validate_queues(struct xdp_umem *umem);\n", "prefixes": [ "bpf-next", "02/11" ] }