{"id":1375810,"url":"http://patchwork.ozlabs.org/api/patches/1375810/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/d6ed575afaf89fc35e233af5ccd063da944b4a3a.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:07","name":"[v4,bpf-next,09/13] bpf: introduce multibuff support to bpf_prog_test_run_xdp()","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"1ab5e4799d9d39d94c6bfb297435e6774af4fd70","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/d6ed575afaf89fc35e233af5ccd063da944b4a3a.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/1375810/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1375810/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=H/LHN+Xq;\n\tdkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [23.128.96.18])\n\tby ozlabs.org (Postfix) with ESMTP id 4C2t5Q1XqMz9sSC\n\tfor ;\n Sat, 3 Oct 2020 00:43:06 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n id S2388230AbgJBOnF (ORCPT\n );\n Fri, 2 Oct 2020 10:43:05 -0400","from mail.kernel.org ([198.145.29.99]:32770 \"EHLO mail.kernel.org\"\n rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n id S1726017AbgJBOnE (ORCPT );\n Fri, 2 Oct 2020 10:43:04 -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 A2ED72085B;\n Fri, 2 Oct 2020 14:43:01 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n s=default; t=1601649784;\n bh=f8ZZJ5+Q+i60RqTkYKstoG1GgUDRCcWa4fDxO6qFmUE=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=H/LHN+Xq6SI/snyEz261dAtXpELklHCRaH/kT6MggUrm+gKBHwKu8MuwfzeEwRxih\n Kxf6v9nvIc8ufBYjwoFXUiGQhkMVbWGAtokWsfc5pfQnRa39lM1HM12DNCd4X3flTH\n g7BbOvkPNcAMEW1fmUmHSDqnmfgKA7KaE8rQN3iE=","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 09/13] bpf: introduce multibuff support to\n bpf_prog_test_run_xdp()","Date":"Fri, 2 Oct 2020 16:42:07 +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":"Introduce the capability to allocate a xdp multi-buff in\nbpf_prog_test_run_xdp routine. This is a preliminary patch to introduce\nthe selftests for new xdp multi-buff ebpf helpers\n\nSigned-off-by: Lorenzo Bianconi \n---\n net/bpf/test_run.c | 51 ++++++++++++++++++++++++++++++++++++++--------\n 1 file changed, 43 insertions(+), 8 deletions(-)","diff":"diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c\nindex bd291f5f539c..ec7286cd051b 100644\n--- a/net/bpf/test_run.c\n+++ b/net/bpf/test_run.c\n@@ -617,44 +617,79 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr,\n {\n \tu32 tailroom = SKB_DATA_ALIGN(sizeof(struct skb_shared_info));\n \tu32 headroom = XDP_PACKET_HEADROOM;\n-\tu32 size = kattr->test.data_size_in;\n \tu32 repeat = kattr->test.repeat;\n \tstruct netdev_rx_queue *rxqueue;\n+\tstruct skb_shared_info *sinfo;\n \tstruct xdp_buff xdp = {};\n+\tu32 max_data_sz, size;\n \tu32 retval, duration;\n-\tu32 max_data_sz;\n+\tint i, ret, data_len;\n \tvoid *data;\n-\tint ret;\n \n \tif (kattr->test.ctx_in || kattr->test.ctx_out)\n \t\treturn -EINVAL;\n \n-\t/* XDP have extra tailroom as (most) drivers use full page */\n \tmax_data_sz = 4096 - headroom - tailroom;\n+\tsize = min_t(u32, kattr->test.data_size_in, max_data_sz);\n+\tdata_len = size;\n \n-\tdata = bpf_test_init(kattr, kattr->test.data_size_in,\n-\t\t\t max_data_sz, headroom, tailroom);\n+\tdata = bpf_test_init(kattr, size, max_data_sz, headroom, tailroom);\n \tif (IS_ERR(data))\n \t\treturn PTR_ERR(data);\n \n \txdp.data_hard_start = data;\n \txdp.data = data + headroom;\n \txdp.data_meta = xdp.data;\n-\txdp.data_end = xdp.data + size;\n+\txdp.data_end = xdp.data + data_len;\n \txdp.frame_sz = headroom + max_data_sz + tailroom;\n \n+\tsinfo = xdp_get_shared_info_from_buff(&xdp);\n+\tif (unlikely(kattr->test.data_size_in > size)) {\n+\t\tvoid __user *data_in = u64_to_user_ptr(kattr->test.data_in);\n+\n+\t\twhile (size < kattr->test.data_size_in) {\n+\t\t\tskb_frag_t *frag = &sinfo->frags[sinfo->nr_frags];\n+\t\t\tstruct page *page;\n+\t\t\tint data_len;\n+\n+\t\t\tpage = alloc_page(GFP_KERNEL);\n+\t\t\tif (!page) {\n+\t\t\t\tret = -ENOMEM;\n+\t\t\t\tgoto out;\n+\t\t\t}\n+\n+\t\t\t__skb_frag_set_page(frag, page);\n+\t\t\tdata_len = min_t(int, kattr->test.data_size_in - size,\n+\t\t\t\t\t PAGE_SIZE);\n+\t\t\tskb_frag_size_set(frag, data_len);\n+\t\t\tif (copy_from_user(page_address(page), data_in + size,\n+\t\t\t\t\t data_len)) {\n+\t\t\t\tret = -EFAULT;\n+\t\t\t\tgoto out;\n+\t\t\t}\n+\t\t\tsinfo->nr_frags++;\n+\t\t\tsize += data_len;\n+\t\t}\n+\t\txdp.mb = 1;\n+\t}\n+\n \trxqueue = __netif_get_rx_queue(current->nsproxy->net_ns->loopback_dev, 0);\n \txdp.rxq = &rxqueue->xdp_rxq;\n \tbpf_prog_change_xdp(NULL, prog);\n \tret = bpf_test_run(prog, &xdp, repeat, &retval, &duration, true);\n \tif (ret)\n \t\tgoto out;\n+\n \tif (xdp.data != data + headroom || xdp.data_end != xdp.data + size)\n-\t\tsize = xdp.data_end - xdp.data;\n+\t\tsize += xdp.data_end - xdp.data - data_len;\n+\n \tret = bpf_test_finish(kattr, uattr, xdp.data, size, retval, duration);\n out:\n \tbpf_prog_change_xdp(prog, NULL);\n+\tfor (i = 0; i < sinfo->nr_frags; i++)\n+\t\t__free_page(skb_frag_page(&sinfo->frags[i]));\n \tkfree(data);\n+\n \treturn ret;\n }\n \n","prefixes":["v4","bpf-next","09/13"]}