{"id":1375811,"url":"http://patchwork.ozlabs.org/api/patches/1375811/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/25a087aee8345fd87244d2e860e6636db36af01a.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":"<25a087aee8345fd87244d2e860e6636db36af01a.1601648734.git.lorenzo@kernel.org>","list_archive_url":null,"date":"2020-10-02T14:42:08","name":"[v4,bpf-next,10/13] bpf: test_run: add skb_shared_info pointer in bpf_test_finish signature","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"37648430f834f8531ea138f08060a0f17fc10bb6","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/25a087aee8345fd87244d2e860e6636db36af01a.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/1375811/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1375811/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=Ux2FDOoM;\n\tdkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [23.128.96.18])\n\tby ozlabs.org (Postfix) with ESMTP id 4C2t5V4Yj6z9sSC\n\tfor ;\n Sat, 3 Oct 2020 00:43:10 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n id S2388178AbgJBOnK (ORCPT\n );\n Fri, 2 Oct 2020 10:43:10 -0400","from mail.kernel.org ([198.145.29.99]:32808 \"EHLO mail.kernel.org\"\n rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n id S1726017AbgJBOnI (ORCPT );\n Fri, 2 Oct 2020 10:43:08 -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 10620206FA;\n Fri, 2 Oct 2020 14:43:04 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n s=default; t=1601649787;\n bh=nTkR6CoGaIVQB6iOYx0cq2wjexcHkxglFc3NY+26Wsw=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=Ux2FDOoM8BjL412Vr1UJU5hLGWpEa17G0a1LiL+kj5JCLk2juJr37L64GaJv3iSmt\n xGfecMnzxslUMZAm4XO5tLy4fEZB2fDDTN+dCqzDUvtu4BKAJPqTWETbadlsvJkGu8\n D+SE2TFTsp87i5mSN++6nP+eS51p+SeY/TDTIG50=","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 10/13] bpf: test_run: add skb_shared_info pointer\n in bpf_test_finish signature","Date":"Fri, 2 Oct 2020 16:42:08 +0200","Message-Id":"\n <25a087aee8345fd87244d2e860e6636db36af01a.1601648734.git.lorenzo@kernel.org>","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":"introduce skb_shared_info pointer in bpf_test_finish signature in order\nto copy back paged data from a xdp multi-buff frame to userspace buffer\n\nTested-by: Eelco Chaudron \nSigned-off-by: Lorenzo Bianconi \n---\n net/bpf/test_run.c | 58 ++++++++++++++++++++++++++++++++++++++++------\n 1 file changed, 51 insertions(+), 7 deletions(-)","diff":"diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c\nindex ec7286cd051b..7e33181f88ee 100644\n--- a/net/bpf/test_run.c\n+++ b/net/bpf/test_run.c\n@@ -79,9 +79,23 @@ static int bpf_test_run(struct bpf_prog *prog, void *ctx, u32 repeat,\n \treturn ret;\n }\n \n+static int bpf_test_get_buff_data_len(struct skb_shared_info *sinfo)\n+{\n+\tint i, size = 0;\n+\n+\tif (likely(!sinfo))\n+\t\treturn 0;\n+\n+\tfor (i = 0; i < sinfo->nr_frags; i++)\n+\t\tsize += skb_frag_size(&sinfo->frags[i]);\n+\n+\treturn size;\n+}\n+\n static int bpf_test_finish(const union bpf_attr *kattr,\n \t\t\t union bpf_attr __user *uattr, const void *data,\n-\t\t\t u32 size, u32 retval, u32 duration)\n+\t\t\t struct skb_shared_info *sinfo, u32 size,\n+\t\t\t u32 retval, u32 duration)\n {\n \tvoid __user *data_out = u64_to_user_ptr(kattr->test.data_out);\n \tint err = -EFAULT;\n@@ -96,8 +110,35 @@ static int bpf_test_finish(const union bpf_attr *kattr,\n \t\terr = -ENOSPC;\n \t}\n \n-\tif (data_out && copy_to_user(data_out, data, copy_size))\n-\t\tgoto out;\n+\tif (data_out) {\n+\t\tint len = copy_size - bpf_test_get_buff_data_len(sinfo);\n+\n+\t\tif (copy_to_user(data_out, data, len))\n+\t\t\tgoto out;\n+\n+\t\tif (sinfo) {\n+\t\t\tint i, offset = len, data_len;\n+\n+\t\t\tfor (i = 0; i < sinfo->nr_frags; i++) {\n+\t\t\t\tskb_frag_t *frag = &sinfo->frags[i];\n+\n+\t\t\t\tif (offset >= copy_size) {\n+\t\t\t\t\terr = -ENOSPC;\n+\t\t\t\t\tbreak;\n+\t\t\t\t}\n+\n+\t\t\t\tdata_len = min_t(int, copy_size - offset,\n+\t\t\t\t\t\t skb_frag_size(frag));\n+\t\t\t\tif (copy_to_user(data_out + offset,\n+\t\t\t\t\t\t skb_frag_address(frag),\n+\t\t\t\t\t\t data_len))\n+\t\t\t\t\tgoto out;\n+\n+\t\t\t\toffset += data_len;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n \tif (copy_to_user(&uattr->test.data_size_out, &size, sizeof(size)))\n \t\tgoto out;\n \tif (copy_to_user(&uattr->test.retval, &retval, sizeof(retval)))\n@@ -598,7 +639,8 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,\n \t/* bpf program can never convert linear skb to non-linear */\n \tif (WARN_ON_ONCE(skb_is_nonlinear(skb)))\n \t\tsize = skb_headlen(skb);\n-\tret = bpf_test_finish(kattr, uattr, skb->data, size, retval, duration);\n+\tret = bpf_test_finish(kattr, uattr, skb->data, NULL, size, retval,\n+\t\t\t duration);\n \tif (!ret)\n \t\tret = bpf_ctx_finish(kattr, uattr, ctx,\n \t\t\t\t sizeof(struct __sk_buff));\n@@ -683,7 +725,9 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr,\n \tif (xdp.data != data + headroom || xdp.data_end != xdp.data + size)\n \t\tsize += xdp.data_end - xdp.data - data_len;\n \n-\tret = bpf_test_finish(kattr, uattr, xdp.data, size, retval, duration);\n+\tret = bpf_test_finish(kattr, uattr, xdp.data, sinfo, size, retval,\n+\t\t\t duration);\n+\n out:\n \tbpf_prog_change_xdp(prog, NULL);\n \tfor (i = 0; i < sinfo->nr_frags; i++)\n@@ -793,8 +837,8 @@ int bpf_prog_test_run_flow_dissector(struct bpf_prog *prog,\n \tdo_div(time_spent, repeat);\n \tduration = time_spent > U32_MAX ? U32_MAX : (u32)time_spent;\n \n-\tret = bpf_test_finish(kattr, uattr, &flow_keys, sizeof(flow_keys),\n-\t\t\t retval, duration);\n+\tret = bpf_test_finish(kattr, uattr, &flow_keys, NULL,\n+\t\t\t sizeof(flow_keys), retval, duration);\n \tif (!ret)\n \t\tret = bpf_ctx_finish(kattr, uattr, user_ctx,\n \t\t\t\t sizeof(struct bpf_flow_keys));\n","prefixes":["v4","bpf-next","10/13"]}