From patchwork Fri Jun 4 22:02:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zvi Effron X-Patchwork-Id: 12300851 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F840C4743E for ; Fri, 4 Jun 2021 22:04:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2D5EC61405 for ; Fri, 4 Jun 2021 22:04:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230403AbhFDWGB (ORCPT ); Fri, 4 Jun 2021 18:06:01 -0400 Received: from mail-pl1-f172.google.com ([209.85.214.172]:33737 "EHLO mail-pl1-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229746AbhFDWGA (ORCPT ); Fri, 4 Jun 2021 18:06:00 -0400 Received: by mail-pl1-f172.google.com with SMTP id c13so5384074plz.0 for ; Fri, 04 Jun 2021 15:03:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riotgames.com; s=riotgames; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q8QuzYpV7HBVWhenhITBsvNqnVypxG8h6rQTuyk2e6Q=; b=Xr6LctfbkYwpaTGqiAKsGRefPP7DPoyhOvU4MI5C5zApD1cuPH87yp6agDaAoMzcpV Xds77vCE8KO8mmkuotcY5MZ2KMMLhTN7gS1glbiiHo/ipOImVV85dc5b3RdASsghb9UQ sT2Et7+bEb4Z4BNYbBeYsGWq00R3aOpgDl0Cg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q8QuzYpV7HBVWhenhITBsvNqnVypxG8h6rQTuyk2e6Q=; b=bwHkv2wzavMkiaceQyVXt+Cb43sQNdgqQBB8W1r9wxnL04CjKqNCcEYyb/qnDw3vdm SsYN+6aMsHsfoSaoe2l+v7AMq9GPTHS8pgqivsjRngZBOsRtYJJu8RHGCAA7Vg5DEKY2 7V4lYJm2Fwm7CNIu385JUeXzH1Y1P3EFB+MOeUzhcaY11LNvWV791Ag/zpcaZ/OeipP3 r3hri/MAwdkft4QQK1WmFDEUcLfzqgQL3FWlA6fqtgxeFch6QHl7hUq2WppqPAMs2G5w QDBlGuGIiQ5YRmaAOWHtb8a9uaMDzNc8K0KRWwsfbSezJQtbEJucPd3+bsVWwKZChAYR 9EBQ== X-Gm-Message-State: AOAM533TvFVxexzR++FolJ4czQ1uIMSr6mR66qyCd/55+SwdScG39wSB cIxarEtBJUA+ZobyWTVTBYwb5a22iEEGGg== X-Google-Smtp-Source: ABdhPJzBTSqubyWkq4F3d9dMK6w9U5geTIxeX43yekJi+mxg1BZFdWwIJgJXDUUrWZgM9dpPnzaMeA== X-Received: by 2002:a17:902:bd0b:b029:ef:8970:281c with SMTP id p11-20020a170902bd0bb02900ef8970281cmr6358800pls.35.1622844179289; Fri, 04 Jun 2021 15:02:59 -0700 (PDT) Received: from ip-10-184-182-114.us-west-2.compute.internal (ec2-54-191-147-77.us-west-2.compute.amazonaws.com. [54.191.147.77]) by smtp.gmail.com with ESMTPSA id bo14sm5435374pjb.40.2021.06.04.15.02.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Jun 2021 15:02:58 -0700 (PDT) From: Zvi Effron To: bpf@vger.kernel.org Cc: Alexei Starovoitov , "David S. Miller" , Daniel Borkmann , Jesper Dangaard Brouer , Andrii Nakryiko , Maciej Fijalkowski , Martin KaFai Lau , Zvi Effron , Cody Haas , Lisa Watanabe Subject: [PATCH bpf-next v4 1/3] bpf: support input xdp_md context in BPF_PROG_TEST_RUN Date: Fri, 4 Jun 2021 22:02:33 +0000 Message-Id: <20210604220235.6758-2-zeffron@riotgames.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210604220235.6758-1-zeffron@riotgames.com> References: <20210604220235.6758-1-zeffron@riotgames.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Support passing a xdp_md via ctx_in/ctx_out in bpf_attr for BPF_PROG_TEST_RUN. The intended use case is to pass some XDP meta data to the test runs of XDP programs that are used as tail calls. For programs that use bpf_prog_test_run_xdp, support xdp_md input and output. Unlike with an actual xdp_md during a non-test run, data_meta must be 0 because it must point to the start of the provided user data. From the initial xdp_md, use data and data_end to adjust the pointers in the generated xdp_buff. All other non-zero fields are prohibited (with EINVAL). If the user has set ctx_out/ctx_size_out, copy the (potentially different) xdp_md back to the userspace. We require all fields of input xdp_md except the ones we explicitly support to be set to zero. The expectation is that in the future we might add support for more fields and we want to fail explicitly if the user runs the program on the kernel where we don't yet support them. Co-developed-by: Cody Haas Signed-off-by: Cody Haas Co-developed-by: Lisa Watanabe Signed-off-by: Lisa Watanabe Signed-off-by: Zvi Effron --- include/uapi/linux/bpf.h | 3 -- net/bpf/test_run.c | 77 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 70 insertions(+), 10 deletions(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 2c1ba70abbf1..a9dcf3d8c85a 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -324,9 +324,6 @@ union bpf_iter_link_info { * **BPF_PROG_TYPE_SK_LOOKUP** * *data_in* and *data_out* must be NULL. * - * **BPF_PROG_TYPE_XDP** - * *ctx_in* and *ctx_out* must be NULL. - * * **BPF_PROG_TYPE_RAW_TRACEPOINT**, * **BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE** * diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index aa47af349ba8..698618f2b27e 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -687,6 +687,38 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, return ret; } +static int xdp_convert_md_to_buff(struct xdp_buff *xdp, struct xdp_md *xdp_md) +{ + void *data; + + if (!xdp_md) + return 0; + + if (xdp_md->egress_ifindex != 0) + return -EINVAL; + + if (xdp_md->data > xdp_md->data_end) + return -EINVAL; + + xdp->data = xdp->data_meta + xdp_md->data; + + if (xdp_md->ingress_ifindex != 0 || xdp_md->rx_queue_index != 0) + return -EINVAL; + + return 0; +} + +static void xdp_convert_buff_to_md(struct xdp_buff *xdp, struct xdp_md *xdp_md) +{ + if (!xdp_md) + return; + + /* xdp_md->data_meta must always point to the start of the out buffer */ + xdp_md->data_meta = 0; + xdp_md->data = xdp->data - xdp->data_meta; + xdp_md->data_end = xdp->data_end - xdp->data_meta; +} + int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, union bpf_attr __user *uattr) { @@ -696,36 +728,68 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, u32 repeat = kattr->test.repeat; struct netdev_rx_queue *rxqueue; struct xdp_buff xdp = {}; + struct xdp_md *ctx; u32 retval, duration; u32 max_data_sz; void *data; int ret; - if (kattr->test.ctx_in || kattr->test.ctx_out) - return -EINVAL; + ctx = bpf_ctx_init(kattr, sizeof(struct xdp_md)); + if (IS_ERR(ctx)) + return PTR_ERR(ctx); + + /* There can't be user provided data before the metadata */ + if (ctx) { + if (ctx->data_meta) + return -EINVAL; + if (ctx->data_end != size) + return -EINVAL; + if (unlikely((ctx->data & (sizeof(__u32) - 1)) || + ctx->data > 32)) + return -EINVAL; + /* Metadata is allocated from the headroom */ + headroom -= ctx->data; + } /* XDP have extra tailroom as (most) drivers use full page */ max_data_sz = 4096 - headroom - tailroom; data = bpf_test_init(kattr, max_data_sz, headroom, tailroom); - if (IS_ERR(data)) + if (IS_ERR(data)) { + kfree(ctx); return PTR_ERR(data); + } rxqueue = __netif_get_rx_queue(current->nsproxy->net_ns->loopback_dev, 0); xdp_init_buff(&xdp, headroom + max_data_sz + tailroom, &rxqueue->xdp_rxq); xdp_prepare_buff(&xdp, data, headroom, size, true); + ret = xdp_convert_md_to_buff(&xdp, ctx); + if (ret) { + kfree(data); + kfree(ctx); + return ret; + } + bpf_prog_change_xdp(NULL, prog); ret = bpf_test_run(prog, &xdp, repeat, &retval, &duration, true); if (ret) goto out; - if (xdp.data != data + headroom || xdp.data_end != xdp.data + size) - size = xdp.data_end - xdp.data; - ret = bpf_test_finish(kattr, uattr, xdp.data, size, retval, duration); + + if (xdp.data_meta != data + headroom || xdp.data_end != xdp.data_meta + size) + size = xdp.data_end - xdp.data_meta; + + xdp_convert_buff_to_md(&xdp, ctx); + + ret = bpf_test_finish(kattr, uattr, xdp.data_meta, size, retval, duration); + if (!ret) + ret = bpf_ctx_finish(kattr, uattr, ctx, + sizeof(struct xdp_md)); out: bpf_prog_change_xdp(prog, NULL); kfree(data); + kfree(ctx); return ret; } @@ -809,7 +873,6 @@ int bpf_prog_test_run_flow_dissector(struct bpf_prog *prog, if (!ret) ret = bpf_ctx_finish(kattr, uattr, user_ctx, sizeof(struct bpf_flow_keys)); - out: kfree(user_ctx); kfree(data); From patchwork Fri Jun 4 22:02:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zvi Effron X-Patchwork-Id: 12300847 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB979C4743D for ; Fri, 4 Jun 2021 22:03:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 930D861405 for ; Fri, 4 Jun 2021 22:03:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229668AbhFDWEt (ORCPT ); Fri, 4 Jun 2021 18:04:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229929AbhFDWEs (ORCPT ); Fri, 4 Jun 2021 18:04:48 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BCF6C061766 for ; Fri, 4 Jun 2021 15:03:02 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id u9so5284544plr.1 for ; Fri, 04 Jun 2021 15:03:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riotgames.com; s=riotgames; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E10jhwQ+zGteZTrclvo5hDD0LPhpRiSihTR8Bydn7YI=; b=YQDkElPsg5KqUtUMQtSmZRKCiRVZf8r2d5mqjZ4ios+qicYsNY6wJdfQAV6Y+zGsUx B45iTCjM0ukeTBbeBI6D/yn17YSp3dcSo4AwI5qD90y0qoU8anJbiOv7jUmwtiS4OTTt PL4QfuOktyymCKAMpgArFyrkI2fJqg6Ktija4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E10jhwQ+zGteZTrclvo5hDD0LPhpRiSihTR8Bydn7YI=; b=s6Cie7eYxCiAy4jgxvMXCB+KxU4SS75vZ+kNHDZLD0e0zDBl09cyCVnOmhDrAFUoeh ogKXaSF7+s1fo/RPoy86JGDn/ah7xlqTNTH2ExU/l6lIryi2aJ3DacQ4DEyG8SQHOj8e t7Lwl8mIisXDvJ51wBrajUJTpgXpqAYxRTTOw1dQbm3l5LZnONmw7xi6YqH4d1USUC/L CcI9cLjiEA7M1hLQ31AltoD+zh+NENeLNmBHIpNjkUMq8zz1egZcklKrs5hAR312aCNg oVZfzRiWDTkTKTbP8GxQoObYuFbGHUfDcegpKdPLGLY1r5ycgcdwfX1Qj2q0VfAkCmei egqA== X-Gm-Message-State: AOAM531W8zUapRDM+GJOg0Yfa0/EY+NHlFauGWR7iorheAAk0l2hqVZO t+CnyOKTTnIeLdzGbYGCdLKK6unzDw4RSQ== X-Google-Smtp-Source: ABdhPJy8gJ+TVrk4wE7FM6Fym838hORO+LSMTASrD4PgY48p869pCH2WH2XcraJhFOGsSt6aKC7haQ== X-Received: by 2002:a17:90b:882:: with SMTP id bj2mr6952861pjb.167.1622844181333; Fri, 04 Jun 2021 15:03:01 -0700 (PDT) Received: from ip-10-184-182-114.us-west-2.compute.internal (ec2-54-191-147-77.us-west-2.compute.amazonaws.com. [54.191.147.77]) by smtp.gmail.com with ESMTPSA id bo14sm5435374pjb.40.2021.06.04.15.03.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Jun 2021 15:03:00 -0700 (PDT) From: Zvi Effron To: bpf@vger.kernel.org Cc: Alexei Starovoitov , "David S. Miller" , Daniel Borkmann , Jesper Dangaard Brouer , Andrii Nakryiko , Maciej Fijalkowski , Martin KaFai Lau , Zvi Effron , Cody Haas , Lisa Watanabe Subject: [PATCH bpf-next v4 2/3] bpf: support specifying ingress via xdp_md context in BPF_PROG_TEST_RUN Date: Fri, 4 Jun 2021 22:02:34 +0000 Message-Id: <20210604220235.6758-3-zeffron@riotgames.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210604220235.6758-1-zeffron@riotgames.com> References: <20210604220235.6758-1-zeffron@riotgames.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Support specifying the ingress_ifindex and rx_queue_index of xdp_md contexts for BPF_PROG_TEST_RUN. The intended use case is to allow testing XDP programs that make decisions based on the ingress interface or RX queue. If ingress_ifindex is specified, look up the device by the provided index in the current namespace and use its xdp_rxq for the xdp_buff. If the rx_queue_index is out of range, or is non-zero when the ingress_ifindex is 0, return EINVAL. Co-developed-by: Cody Haas Signed-off-by: Cody Haas Co-developed-by: Lisa Watanabe Signed-off-by: Lisa Watanabe Signed-off-by: Zvi Effron --- net/bpf/test_run.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index 698618f2b27e..3916205fc3d4 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -690,6 +690,8 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, static int xdp_convert_md_to_buff(struct xdp_buff *xdp, struct xdp_md *xdp_md) { void *data; + struct net_device *device; + struct netdev_rx_queue *rxqueue; if (!xdp_md) return 0; @@ -702,9 +704,21 @@ static int xdp_convert_md_to_buff(struct xdp_buff *xdp, struct xdp_md *xdp_md) xdp->data = xdp->data_meta + xdp_md->data; - if (xdp_md->ingress_ifindex != 0 || xdp_md->rx_queue_index != 0) + if (!xdp_md->ingress_ifindex && xdp_md->rx_queue_index) return -EINVAL; + if (xdp_md->ingress_ifindex) { + device = dev_get_by_index(current->nsproxy->net_ns, xdp_md->ingress_ifindex); + if (!device) + return -EINVAL; + + if (xdp_md->rx_queue_index >= device->real_num_rx_queues) + return -EINVAL; + + rxqueue = __netif_get_rx_queue(device, xdp_md->rx_queue_index); + xdp->rxq = &rxqueue->xdp_rxq; + } + return 0; } From patchwork Fri Jun 4 22:02:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zvi Effron X-Patchwork-Id: 12300853 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 133DBC4743C for ; Fri, 4 Jun 2021 22:04:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F03F9613F1 for ; Fri, 4 Jun 2021 22:04:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229930AbhFDWGG (ORCPT ); Fri, 4 Jun 2021 18:06:06 -0400 Received: from mail-pg1-f175.google.com ([209.85.215.175]:33667 "EHLO mail-pg1-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229746AbhFDWGF (ORCPT ); Fri, 4 Jun 2021 18:06:05 -0400 Received: by mail-pg1-f175.google.com with SMTP id i5so8966867pgm.0 for ; Fri, 04 Jun 2021 15:04:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riotgames.com; s=riotgames; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gE6JKqyNdruBi/cWEwhmI0B7uKKCxYgcBMMsx5i3xIY=; b=nkS7brFHysBKUX6whfIZ5GTpxgLGVMGLQ1vI7GInKFrJn7FgvFO/20o3UewyDtKpOG 9+f0/dxN/Y/Km7fysDFpKMX8nPmUxs+fiAC60mJ6mLMUIISEtL4Cz+9zKvf+aEKYAlXM 51XDVonWPWFRK6t/ynLWDK+tpjoHM7BbKhJK8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gE6JKqyNdruBi/cWEwhmI0B7uKKCxYgcBMMsx5i3xIY=; b=RZn6Pl0AuXg9NLhEa7oTnmytgU7DaQ0p4iTmYYGHUMufbjWqe1vyXCLJvOZQcHOvIP V7dv2XS9UGiwuCGAl/Nlk+E29GzMUz9gN9/KJ0IuDyNjguAnWqG4QqxoW5T1D/2QhTsN QinmHY5ZqAIwpi8vUJT22Yd4m6b/vUdrDJmdsF4IInB8C+pjDnbgTi5vqTso3N5QyC9J 3Ts4nZ3Qo/07HVN2e/Jpj8XWtQHaesCH7ciTe1ZSG6VhRcQQib+sj6/9a/9ESYvx64bU YCowJjysy6qPUqpH/87sSInw7CoxHELGMUHVL+l1wn1ts8Gdswibkji0d/VYj7EPcGtZ eEag== X-Gm-Message-State: AOAM532Sb9tuGEQeR5xKs2Uy3/UxVGejpZJUqceK/BjfIpKxjLP+Qh98 CkJ0iLcT8oay6FNlJALJqrTdzQaOgmIdPw== X-Google-Smtp-Source: ABdhPJxcyE0cIrmx7UdnwtPxPT34JWJCZbPsKfoFzkClDFnKEwlVuYhNRNcRI8PCgTI6kqQMdtOikA== X-Received: by 2002:a63:dc03:: with SMTP id s3mr396932pgg.354.1622844183209; Fri, 04 Jun 2021 15:03:03 -0700 (PDT) Received: from ip-10-184-182-114.us-west-2.compute.internal (ec2-54-191-147-77.us-west-2.compute.amazonaws.com. [54.191.147.77]) by smtp.gmail.com with ESMTPSA id bo14sm5435374pjb.40.2021.06.04.15.03.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Jun 2021 15:03:02 -0700 (PDT) From: Zvi Effron To: bpf@vger.kernel.org Cc: Alexei Starovoitov , "David S. Miller" , Daniel Borkmann , Jesper Dangaard Brouer , Andrii Nakryiko , Maciej Fijalkowski , Martin KaFai Lau , Zvi Effron , Cody Haas , Lisa Watanabe Subject: [PATCH bpf-next v4 3/3] selftests/bpf: Add test for xdp_md context in BPF_PROG_TEST_RUN Date: Fri, 4 Jun 2021 22:02:35 +0000 Message-Id: <20210604220235.6758-4-zeffron@riotgames.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210604220235.6758-1-zeffron@riotgames.com> References: <20210604220235.6758-1-zeffron@riotgames.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Add a test for using xdp_md as a context to BPF_PROG_TEST_RUN for XDP programs. The test uses a BPF program that takes in a return value from XDP metadata, then reduces the size of the XDP metadata by 4 bytes. Test cases validate the possible failure cases for passing in invalid xdp_md contexts, that the return value is successfully passed in, and that the adjusted metadata is successfully copied out. Co-developed-by: Cody Haas Signed-off-by: Cody Haas Co-developed-by: Lisa Watanabe Signed-off-by: Lisa Watanabe Signed-off-by: Zvi Effron --- .../bpf/prog_tests/xdp_context_test_run.c | 114 ++++++++++++++++++ .../bpf/progs/test_xdp_context_test_run.c | 20 +++ 2 files changed, 134 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c b/tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c new file mode 100644 index 000000000000..0dbdebbc66ce --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/xdp_context_test_run.c @@ -0,0 +1,114 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include "test_xdp_context_test_run.skel.h" + +void test_xdp_context_test_run(void) +{ + struct test_xdp_context_test_run *skel = NULL; + char data[sizeof(pkt_v4) + sizeof(__u32)]; + char buf[128]; + char bad_ctx[sizeof(struct xdp_md)]; + struct xdp_md ctx_in, ctx_out; + DECLARE_LIBBPF_OPTS(bpf_test_run_opts, opts, + .data_in = &data, + .data_out = buf, + .data_size_in = sizeof(data), + .data_size_out = sizeof(buf), + .ctx_out = &ctx_out, + .ctx_size_out = sizeof(ctx_out), + .repeat = 1, + ); + int err, prog_fd; + + skel = test_xdp_context_test_run__open_and_load(); + if (!ASSERT_OK_PTR(skel, "skel")) + return; + prog_fd = bpf_program__fd(skel->progs._xdp_context); + + *(__u32 *)data = XDP_PASS; + *(struct ipv4_packet *)(data + sizeof(__u32)) = pkt_v4; + + memset(&ctx_in, 0, sizeof(ctx_in)); + opts.ctx_in = &ctx_in; + opts.ctx_size_in = sizeof(ctx_in); + + opts.ctx_in = &ctx_in; + opts.ctx_size_in = sizeof(ctx_in); + ctx_in.data_meta = 0; + ctx_in.data = sizeof(__u32); + ctx_in.data_end = ctx_in.data + sizeof(pkt_v4); + err = bpf_prog_test_run_opts(prog_fd, &opts); + ASSERT_OK(err, "bpf_prog_test_run(test1)"); + ASSERT_EQ(opts.retval, XDP_PASS, "test1-retval"); + ASSERT_EQ(opts.data_size_out, sizeof(pkt_v4), "test1-datasize"); + ASSERT_EQ(opts.ctx_size_out, opts.ctx_size_in, "test1-ctxsize"); + ASSERT_EQ(ctx_out.data_meta, 0, "test1-datameta"); + ASSERT_EQ(ctx_out.data, ctx_out.data_meta, "test1-data"); + ASSERT_EQ(ctx_out.data_end, sizeof(pkt_v4), "test1-dataend"); + + /* Data past the end of the kernel's struct xdp_md must be 0 */ + bad_ctx[sizeof(bad_ctx) - 1] = 1; + opts.ctx_in = bad_ctx; + opts.ctx_size_in = sizeof(bad_ctx); + err = bpf_prog_test_run_opts(prog_fd, &opts); + ASSERT_EQ(errno, 22, "test2-errno"); + ASSERT_ERR(err, "bpf_prog_test_run(test2)"); + + /* The egress cannot be specified */ + ctx_in.egress_ifindex = 1; + err = bpf_prog_test_run_opts(prog_fd, &opts); + ASSERT_EQ(errno, 22, "test3-errno"); + ASSERT_ERR(err, "bpf_prog_test_run(test3)"); + + /* data_meta must reference the start of data */ + ctx_in.data_meta = sizeof(__u32); + ctx_in.data = ctx_in.data_meta; + ctx_in.data_end = ctx_in.data + sizeof(pkt_v4); + ctx_in.egress_ifindex = 0; + err = bpf_prog_test_run_opts(prog_fd, &opts); + ASSERT_EQ(errno, 22, "test4-errno"); + ASSERT_ERR(err, "bpf_prog_test_run(test4)"); + + /* Metadata must be 32 bytes or smaller */ + ctx_in.data_meta = 0; + ctx_in.data = sizeof(__u32)*9; + ctx_in.data_end = ctx_in.data + sizeof(pkt_v4); + err = bpf_prog_test_run_opts(prog_fd, &opts); + ASSERT_EQ(errno, 22, "test5-errno"); + ASSERT_ERR(err, "bpf_prog_test_run(test5)"); + + /* Metadata's size must be a multiple of 4 */ + ctx_in.data = 3; + err = bpf_prog_test_run_opts(prog_fd, &opts); + ASSERT_EQ(errno, 22, "test6-errno"); + ASSERT_ERR(err, "bpf_prog_test_run(test6)"); + + /* Total size of data must match data_end - data_meta */ + ctx_in.data = 0; + ctx_in.data_end = sizeof(pkt_v4) - 4; + err = bpf_prog_test_run_opts(prog_fd, &opts); + ASSERT_EQ(errno, 22, "test7-errno"); + ASSERT_ERR(err, "bpf_prog_test_run(test7)"); + + ctx_in.data_end = sizeof(pkt_v4) + 4; + err = bpf_prog_test_run_opts(prog_fd, &opts); + ASSERT_EQ(errno, 22, "test8-errno"); + ASSERT_ERR(err, "bpf_prog_test_run(test8)"); + + /* RX queue cannot be specified without specifying an ingress */ + ctx_in.data_end = sizeof(pkt_v4); + ctx_in.ingress_ifindex = 0; + ctx_in.rx_queue_index = 1; + err = bpf_prog_test_run_opts(prog_fd, &opts); + ASSERT_EQ(errno, 22, "test9-errno"); + ASSERT_ERR(err, "bpf_prog_test_run(test9)"); + + ctx_in.ingress_ifindex = 1; + ctx_in.rx_queue_index = 1; + err = bpf_prog_test_run_opts(prog_fd, &opts); + ASSERT_EQ(errno, 22, "test10-errno"); + ASSERT_ERR(err, "bpf_prog_test_run(test10)"); + + test_xdp_context_test_run__destroy(skel); +} diff --git a/tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c b/tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c new file mode 100644 index 000000000000..56fd0995b67c --- /dev/null +++ b/tools/testing/selftests/bpf/progs/test_xdp_context_test_run.c @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include + +SEC("xdp") +int _xdp_context(struct xdp_md *xdp) +{ + void *data = (void *)(unsigned long)xdp->data; + __u32 *metadata = (void *)(unsigned long)xdp->data_meta; + __u32 ret; + + if (metadata + 1 > data) + return XDP_ABORTED; + ret = *metadata; + if (bpf_xdp_adjust_meta(xdp, 4)) + return XDP_ABORTED; + return ret; +} + +char _license[] SEC("license") = "GPL";