{"id":1375807,"url":"http://patchwork.ozlabs.org/api/patches/1375807/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/deb81e4cf02db9a1da2b4088a49afd7acf8b82b6.1601648734.git.lorenzo@kernel.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","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":"","list_archive_url":null,"date":"2020-10-02T14:42:04","name":"[v4,bpf-next,06/13] bpf: introduce bpf_xdp_get_frags_{count, total_size} helpers","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"6f64e4e5e9e26f3dccb25b0ea0e420f5fe065519","submitter":{"id":76007,"url":"http://patchwork.ozlabs.org/api/people/76007/?format=json","name":"Lorenzo Bianconi","email":"lorenzo@kernel.org"},"delegate":{"id":77147,"url":"http://patchwork.ozlabs.org/api/users/77147/?format=json","username":"bpf","first_name":"BPF","last_name":"Maintainers","email":"bpf@iogearbox.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/deb81e4cf02db9a1da2b4088a49afd7acf8b82b6.1601648734.git.lorenzo@kernel.org/mbox/","series":[{"id":205635,"url":"http://patchwork.ozlabs.org/api/series/205635/?format=json","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/1375807/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1375807/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","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=ObQmjaDm;\n\tdkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [23.128.96.18])\n\tby ozlabs.org (Postfix) with ESMTP id 4C2t5822njz9sSC\n\tfor ;\n Sat, 3 Oct 2020 00:42:52 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n id S2388208AbgJBOmv (ORCPT\n );\n Fri, 2 Oct 2020 10:42:51 -0400","from mail.kernel.org ([198.145.29.99]:60902 \"EHLO mail.kernel.org\"\n rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n id S1726017AbgJBOmv (ORCPT );\n Fri, 2 Oct 2020 10:42:51 -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 6CCE6206FA;\n Fri, 2 Oct 2020 14:42:48 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n s=default; t=1601649770;\n bh=MeoOo4bg3O/0X0i354wiVWGpLoopVwV3Irb8n4wowas=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=ObQmjaDmcbhtZX+9SYFt1aWtGUSr5nUostE1DcAL0hD4TkguOd31v4pKQAfw1vRBw\n Sq+9fZtxdWFFHhV5TFEHEU5qES+RsAgiFrHk1ORA8xFPTPoseiOeKlI2EHNoRql207\n 85JGkzBi1esE6qR1aTit5WMw7KxEFaLX8UJMgYfI=","From":"Lorenzo Bianconi ","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 06/13] bpf: introduce bpf_xdp_get_frags_{count,\n total_size} helpers","Date":"Fri, 2 Oct 2020 16:42:04 +0200","Message-Id":"\n ","X-Mailer":"git-send-email 2.26.2","In-Reply-To":"","References":"","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Sameeh Jubran \n\nIntroduce the two following bpf helpers in order to provide some\nmetadata about a xdp multi-buff fame to bpf layer:\n\n- bpf_xdp_get_frags_count()\n get the number of fragments for a given xdp multi-buffer.\n\n* bpf_xdp_get_frags_total_size()\n get the total size of fragments for a given xdp multi-buffer.\n\nSigned-off-by: Sameeh Jubran \nCo-developed-by: Lorenzo Bianconi \nSigned-off-by: Lorenzo Bianconi \n---\n include/uapi/linux/bpf.h | 14 ++++++++++++\n net/core/filter.c | 42 ++++++++++++++++++++++++++++++++++\n tools/include/uapi/linux/bpf.h | 14 ++++++++++++\n 3 files changed, 70 insertions(+)","diff":"diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h\nindex 4f556cfcbfbe..0715995eb18c 100644\n--- a/include/uapi/linux/bpf.h\n+++ b/include/uapi/linux/bpf.h\n@@ -3668,6 +3668,18 @@ union bpf_attr {\n * \tReturn\n * \t\tThe helper returns **TC_ACT_REDIRECT** on success or\n * \t\t**TC_ACT_SHOT** on error.\n+ *\n+ * int bpf_xdp_get_frags_count(struct xdp_buff *xdp_md)\n+ *\tDescription\n+ *\t\tGet the number of fragments for a given xdp multi-buffer.\n+ *\tReturn\n+ *\t\tThe number of fragments\n+ *\n+ * int bpf_xdp_get_frags_total_size(struct xdp_buff *xdp_md)\n+ *\tDescription\n+ *\t\tGet the total size of fragments for a given xdp multi-buffer.\n+ *\tReturn\n+ *\t\tThe total size of fragments for a given xdp multi-buffer.\n */\n #define __BPF_FUNC_MAPPER(FN)\t\t\\\n \tFN(unspec),\t\t\t\\\n@@ -3823,6 +3835,8 @@ union bpf_attr {\n \tFN(seq_printf_btf),\t\t\\\n \tFN(skb_cgroup_classid),\t\t\\\n \tFN(redirect_neigh),\t\t\\\n+\tFN(xdp_get_frags_count),\t\\\n+\tFN(xdp_get_frags_total_size),\t\\\n \t/* */\n \n /* integer value in 'imm' field of BPF_CALL instruction selects which helper\ndiff --git a/net/core/filter.c b/net/core/filter.c\nindex 3fb6adad1957..4c55b788c4c5 100644\n--- a/net/core/filter.c\n+++ b/net/core/filter.c\n@@ -3739,6 +3739,44 @@ static const struct bpf_func_proto bpf_xdp_adjust_head_proto = {\n \t.arg2_type\t= ARG_ANYTHING,\n };\n \n+BPF_CALL_1(bpf_xdp_get_frags_count, struct xdp_buff*, xdp)\n+{\n+\tstruct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(xdp);\n+\n+\treturn xdp->mb ? sinfo->nr_frags : 0;\n+}\n+\n+const struct bpf_func_proto bpf_xdp_get_frags_count_proto = {\n+\t.func\t\t= bpf_xdp_get_frags_count,\n+\t.gpl_only\t= false,\n+\t.ret_type\t= RET_INTEGER,\n+\t.arg1_type\t= ARG_PTR_TO_CTX,\n+};\n+\n+BPF_CALL_1(bpf_xdp_get_frags_total_size, struct xdp_buff*, xdp)\n+{\n+\tstruct skb_shared_info *sinfo;\n+\tint nfrags, i, size = 0;\n+\n+\tif (likely(!xdp->mb))\n+\t\treturn 0;\n+\n+\tsinfo = xdp_get_shared_info_from_buff(xdp);\n+\tnfrags = min_t(u8, sinfo->nr_frags, MAX_SKB_FRAGS);\n+\n+\tfor (i = 0; i < nfrags; i++)\n+\t\tsize += skb_frag_size(&sinfo->frags[i]);\n+\n+\treturn size;\n+}\n+\n+const struct bpf_func_proto bpf_xdp_get_frags_total_size_proto = {\n+\t.func\t\t= bpf_xdp_get_frags_total_size,\n+\t.gpl_only\t= false,\n+\t.ret_type\t= RET_INTEGER,\n+\t.arg1_type\t= ARG_PTR_TO_CTX,\n+};\n+\n BPF_CALL_2(bpf_xdp_adjust_tail, struct xdp_buff *, xdp, int, offset)\n {\n \tvoid *data_hard_end = xdp_data_hard_end(xdp); /* use xdp->frame_sz */\n@@ -7092,6 +7130,10 @@ xdp_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)\n \t\treturn &bpf_xdp_redirect_map_proto;\n \tcase BPF_FUNC_xdp_adjust_tail:\n \t\treturn &bpf_xdp_adjust_tail_proto;\n+\tcase BPF_FUNC_xdp_get_frags_count:\n+\t\treturn &bpf_xdp_get_frags_count_proto;\n+\tcase BPF_FUNC_xdp_get_frags_total_size:\n+\t\treturn &bpf_xdp_get_frags_total_size_proto;\n \tcase BPF_FUNC_fib_lookup:\n \t\treturn &bpf_xdp_fib_lookup_proto;\n #ifdef CONFIG_INET\ndiff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h\nindex 4f556cfcbfbe..0715995eb18c 100644\n--- a/tools/include/uapi/linux/bpf.h\n+++ b/tools/include/uapi/linux/bpf.h\n@@ -3668,6 +3668,18 @@ union bpf_attr {\n * \tReturn\n * \t\tThe helper returns **TC_ACT_REDIRECT** on success or\n * \t\t**TC_ACT_SHOT** on error.\n+ *\n+ * int bpf_xdp_get_frags_count(struct xdp_buff *xdp_md)\n+ *\tDescription\n+ *\t\tGet the number of fragments for a given xdp multi-buffer.\n+ *\tReturn\n+ *\t\tThe number of fragments\n+ *\n+ * int bpf_xdp_get_frags_total_size(struct xdp_buff *xdp_md)\n+ *\tDescription\n+ *\t\tGet the total size of fragments for a given xdp multi-buffer.\n+ *\tReturn\n+ *\t\tThe total size of fragments for a given xdp multi-buffer.\n */\n #define __BPF_FUNC_MAPPER(FN)\t\t\\\n \tFN(unspec),\t\t\t\\\n@@ -3823,6 +3835,8 @@ union bpf_attr {\n \tFN(seq_printf_btf),\t\t\\\n \tFN(skb_cgroup_classid),\t\t\\\n \tFN(redirect_neigh),\t\t\\\n+\tFN(xdp_get_frags_count),\t\\\n+\tFN(xdp_get_frags_total_size),\t\\\n \t/* */\n \n /* integer value in 'imm' field of BPF_CALL instruction selects which helper\n","prefixes":["v4","bpf-next","06/13"]}