Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1375805/?format=api
{ "id": 1375805, "url": "http://patchwork.ozlabs.org/api/patches/1375805/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/e9eea8664769bd6d27e12574580655845de2d1eb.1601648734.git.lorenzo@kernel.org/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<e9eea8664769bd6d27e12574580655845de2d1eb.1601648734.git.lorenzo@kernel.org>", "list_archive_url": null, "date": "2020-10-02T14:42:02", "name": "[v4,bpf-next,04/13] xdp: add multi-buff support to xdp_return_{buff/frame}", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "43d8d20acd8c4b98d2de8dfa158891904768d1e9", "submitter": { "id": 76007, "url": "http://patchwork.ozlabs.org/api/people/76007/?format=api", "name": "Lorenzo Bianconi", "email": "lorenzo@kernel.org" }, "delegate": { "id": 77147, "url": "http://patchwork.ozlabs.org/api/users/77147/?format=api", "username": "bpf", "first_name": "BPF", "last_name": "Maintainers", "email": "bpf@iogearbox.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/e9eea8664769bd6d27e12574580655845de2d1eb.1601648734.git.lorenzo@kernel.org/mbox/", "series": [ { "id": 205635, "url": "http://patchwork.ozlabs.org/api/series/205635/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=205635", "date": "2020-10-02T14:41:58", "name": "mvneta: introduce XDP multi-buffer support", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/205635/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1375805/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1375805/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming-netdev@ozlabs.org", "Delivered-To": "patchwork-incoming-netdev@ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=23.128.96.18; helo=vger.kernel.org;\n envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=pass (p=none dis=none) header.from=kernel.org", "ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=default header.b=a4MToq/Y;\n\tdkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [23.128.96.18])\n\tby ozlabs.org (Postfix) with ESMTP id 4C2t4x67rZz9s1t\n\tfor <patchwork-incoming-netdev@ozlabs.org>;\n Sat, 3 Oct 2020 00:42:41 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n id S2388197AbgJBOml (ORCPT\n <rfc822;patchwork-incoming-netdev@ozlabs.org>);\n Fri, 2 Oct 2020 10:42:41 -0400", "from mail.kernel.org ([198.145.29.99]:60808 \"EHLO mail.kernel.org\"\n rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n id S1726017AbgJBOmi (ORCPT <rfc822;netdev@vger.kernel.org>);\n Fri, 2 Oct 2020 10:42:38 -0400", "from lore-desk.redhat.com (unknown [176.207.245.61])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by mail.kernel.org (Postfix) with ESMTPSA id 08E20206FA;\n Fri, 2 Oct 2020 14:42:34 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n s=default; t=1601649757;\n bh=S/93yEwe9N0oMZRZSBWUZ2mWvYgyKCZBmf9CGEZiUhk=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=a4MToq/YVevcVPqy4LCiSEW3uaTD5SzGqeEQC6c1hAAqRZ/MGxMn3etpST9q6ePg7\n GuGjfwrmPi1C1muSaTcVAJGqauXWzkJOonzEuIHHdwCsVy6vnl+MJhsTs3X0xhaFFu\n l92cEYL5ejr51oLYOhQEj2o9ij609G8BHMS1kEzA=", "From": "Lorenzo Bianconi <lorenzo@kernel.org>", "To": "bpf@vger.kernel.org, netdev@vger.kernel.org", "Cc": "davem@davemloft.net, kuba@kernel.org, ast@kernel.org,\n daniel@iogearbox.net, shayagr@amazon.com, sameehj@amazon.com,\n john.fastabend@gmail.com, dsahern@kernel.org, brouer@redhat.com,\n lorenzo.bianconi@redhat.com, echaudro@redhat.com", "Subject": "[PATCH v4 bpf-next 04/13] xdp: add multi-buff support to\n xdp_return_{buff/frame}", "Date": "Fri, 2 Oct 2020 16:42:02 +0200", "Message-Id": "\n <e9eea8664769bd6d27e12574580655845de2d1eb.1601648734.git.lorenzo@kernel.org>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<cover.1601648734.git.lorenzo@kernel.org>", "References": "<cover.1601648734.git.lorenzo@kernel.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "Take into account if the received xdp_buff/xdp_frame is non-linear\nrecycling/returning the frame memory to the allocator\n\nSigned-off-by: Lorenzo Bianconi <lorenzo@kernel.org>\n---\n include/net/xdp.h | 18 ++++++++++++++++--\n net/core/xdp.c | 39 +++++++++++++++++++++++++++++++++++++++\n 2 files changed, 55 insertions(+), 2 deletions(-)", "diff": "diff --git a/include/net/xdp.h b/include/net/xdp.h\nindex 42f439f9fcda..4d47076546ff 100644\n--- a/include/net/xdp.h\n+++ b/include/net/xdp.h\n@@ -208,10 +208,24 @@ void __xdp_release_frame(void *data, struct xdp_mem_info *mem);\n static inline void xdp_release_frame(struct xdp_frame *xdpf)\n {\n \tstruct xdp_mem_info *mem = &xdpf->mem;\n+\tstruct skb_shared_info *sinfo;\n+\tint i;\n \n \t/* Curr only page_pool needs this */\n-\tif (mem->type == MEM_TYPE_PAGE_POOL)\n-\t\t__xdp_release_frame(xdpf->data, mem);\n+\tif (mem->type != MEM_TYPE_PAGE_POOL)\n+\t\treturn;\n+\n+\tif (likely(!xdpf->mb))\n+\t\tgoto out;\n+\n+\tsinfo = xdp_get_shared_info_from_frame(xdpf);\n+\tfor (i = 0; i < sinfo->nr_frags; i++) {\n+\t\tstruct page *page = skb_frag_page(&sinfo->frags[i]);\n+\n+\t\t__xdp_release_frame(page_address(page), mem);\n+\t}\n+out:\n+\t__xdp_release_frame(xdpf->data, mem);\n }\n \n int xdp_rxq_info_reg(struct xdp_rxq_info *xdp_rxq,\ndiff --git a/net/core/xdp.c b/net/core/xdp.c\nindex 884f140fc3be..6d4fd4dddb00 100644\n--- a/net/core/xdp.c\n+++ b/net/core/xdp.c\n@@ -370,18 +370,57 @@ static void __xdp_return(void *data, struct xdp_mem_info *mem, bool napi_direct)\n \n void xdp_return_frame(struct xdp_frame *xdpf)\n {\n+\tstruct skb_shared_info *sinfo;\n+\tint i;\n+\n+\tif (likely(!xdpf->mb))\n+\t\tgoto out;\n+\n+\tsinfo = xdp_get_shared_info_from_frame(xdpf);\n+\tfor (i = 0; i < sinfo->nr_frags; i++) {\n+\t\tstruct page *page = skb_frag_page(&sinfo->frags[i]);\n+\n+\t\t__xdp_return(page_address(page), &xdpf->mem, false);\n+\t}\n+out:\n \t__xdp_return(xdpf->data, &xdpf->mem, false);\n }\n EXPORT_SYMBOL_GPL(xdp_return_frame);\n \n void xdp_return_frame_rx_napi(struct xdp_frame *xdpf)\n {\n+\tstruct skb_shared_info *sinfo;\n+\tint i;\n+\n+\tif (likely(!xdpf->mb))\n+\t\tgoto out;\n+\n+\tsinfo = xdp_get_shared_info_from_frame(xdpf);\n+\tfor (i = 0; i < sinfo->nr_frags; i++) {\n+\t\tstruct page *page = skb_frag_page(&sinfo->frags[i]);\n+\n+\t\t__xdp_return(page_address(page), &xdpf->mem, true);\n+\t}\n+out:\n \t__xdp_return(xdpf->data, &xdpf->mem, true);\n }\n EXPORT_SYMBOL_GPL(xdp_return_frame_rx_napi);\n \n void xdp_return_buff(struct xdp_buff *xdp)\n {\n+\tstruct skb_shared_info *sinfo;\n+\tint i;\n+\n+\tif (likely(!xdp->mb))\n+\t\tgoto out;\n+\n+\tsinfo = xdp_get_shared_info_from_buff(xdp);\n+\tfor (i = 0; i < sinfo->nr_frags; i++) {\n+\t\tstruct page *page = skb_frag_page(&sinfo->frags[i]);\n+\n+\t\t__xdp_return(page_address(page), &xdp->rxq->mem, true);\n+\t}\n+out:\n \t__xdp_return(xdp->data, &xdp->rxq->mem, true);\n }\n \n", "prefixes": [ "v4", "bpf-next", "04/13" ] }