From patchwork Wed Jul 7 22:16:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zvi Effron X-Patchwork-Id: 471123 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, USER_AGENT_GIT autolearn=unavailable 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 306FFC11F66 for ; Wed, 7 Jul 2021 22:17:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1DE1061CE5 for ; Wed, 7 Jul 2021 22:17:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232479AbhGGWTu (ORCPT ); Wed, 7 Jul 2021 18:19:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231756AbhGGWTt (ORCPT ); Wed, 7 Jul 2021 18:19:49 -0400 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A499AC061574 for ; Wed, 7 Jul 2021 15:17:07 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id b5so1878769plg.2 for ; Wed, 07 Jul 2021 15:17:07 -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=6WA3SzVjBCH0Q3Xq+A8Mtmumh+nsHK+be6i9Ea//A9I=; b=bFRJTltoJw1lIXiDZnx8C5g+rPe43WZmVM1uJqjEvP70s+IFYyfYplA7M1tT8Wvv5Z YeIQ/4Gn0FIFdd2SnNPX47/rWvfTYx9M9d106a0cKgO4D43m5V+u+4PkA8i7YNufxT+4 bWYPZz8MSAPmCOl6BCEHOHcYnfupe2KOs/N3Q= 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=6WA3SzVjBCH0Q3Xq+A8Mtmumh+nsHK+be6i9Ea//A9I=; b=P/on40tlwsLZRdrBDTZ3mkHtjIcIwMRF8x8dHf7epeY4peTvTghgLLkX0gx4FWfSAT x+jBl5ToLeUj4mSDQNRweSU/Dm+fjlSavt0eIw4yPQHy5uo0LT761XUtL+Y0Mcr8BcHE 32+zlP5WYpu+tneMhUV34aZEsg6nSXILB7L+xDwsJuDSEtVdyA/OgKKGGjJnfn9Q17lF esCDguq4PxJSDSK8xXwJluJBqqjjsoWW75TuLbYKtKlNSf3/GFU03VFiTC99ZwEn+gpt wJR1OXkx4MTHLv3oFYIxYgcFQXi7ZBQ/ahfqxERju3IEHTFAdMoI/KHQPbSqmbIXFGFt 18Eg== X-Gm-Message-State: AOAM532OvTWP1eKYsTkl6u7BSZF/kkHs/kWGuizC+FAu/yfOIqBXe1Tb pOZJ5rH4HkuvNSEhzHr6TZRMew== X-Google-Smtp-Source: ABdhPJzByQpIB335oijU1wzmQpsqh6DKiWnF0FRRtLtT6fWvJCpNxa7rT1bDs3rdeXu1FRx6puSx8w== X-Received: by 2002:a17:90a:17e7:: with SMTP id q94mr27667052pja.117.1625696227151; Wed, 07 Jul 2021 15:17:07 -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 75sm203748pfx.71.2021.07.07.15.17.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jul 2021 15:17:06 -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 , Yonghong Song , netdev@vger.kernel.org, KP Singh , Andrii Nakryiko , John Fastabend , Song Liu , Jakub Kicinski , Zvi Effron , Cody Haas , Lisa Watanabe Subject: [PATCH bpf-next v8 1/4] bpf: add function for XDP meta data length check Date: Wed, 7 Jul 2021 22:16:54 +0000 Message-Id: <20210707221657.3985075-2-zeffron@riotgames.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210707221657.3985075-1-zeffron@riotgames.com> References: <20210707221657.3985075-1-zeffron@riotgames.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This commit prepares to use the XDP meta data length check in multiple places by making it into a static inline function instead of a literal. 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 Acked-by: Yonghong Song --- include/net/xdp.h | 5 +++++ net/core/filter.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/net/xdp.h b/include/net/xdp.h index 5533f0ab2afc..ad5b02dcb6f4 100644 --- a/include/net/xdp.h +++ b/include/net/xdp.h @@ -276,6 +276,11 @@ xdp_data_meta_unsupported(const struct xdp_buff *xdp) return unlikely(xdp->data_meta > xdp->data); } +static inline bool xdp_metalen_invalid(unsigned long metalen) +{ + return (metalen & (sizeof(__u32) - 1)) || (metalen > 32); +} + struct xdp_attachment_info { struct bpf_prog *prog; u32 flags; diff --git a/net/core/filter.c b/net/core/filter.c index d70187ce851b..f2c15b2a057a 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -77,6 +77,7 @@ #include #include #include +#include static const struct bpf_func_proto * bpf_sk_base_func_proto(enum bpf_func_id func_id); @@ -3880,8 +3881,7 @@ BPF_CALL_2(bpf_xdp_adjust_meta, struct xdp_buff *, xdp, int, offset) if (unlikely(meta < xdp_frame_end || meta > xdp->data)) return -EINVAL; - if (unlikely((metalen & (sizeof(__u32) - 1)) || - (metalen > 32))) + if (unlikely(xdp_metalen_invalid(metalen))) return -EACCES; xdp->data_meta = meta; From patchwork Wed Jul 7 22:16:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zvi Effron X-Patchwork-Id: 471122 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, USER_AGENT_GIT autolearn=unavailable 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 A29EAC07E9B for ; Wed, 7 Jul 2021 22:17:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F4AA61CE1 for ; Wed, 7 Jul 2021 22:17:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232637AbhGGWTx (ORCPT ); Wed, 7 Jul 2021 18:19:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231756AbhGGWTv (ORCPT ); Wed, 7 Jul 2021 18:19:51 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85B8CC061762 for ; Wed, 7 Jul 2021 15:17:10 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id m15so1869879plx.7 for ; Wed, 07 Jul 2021 15:17:10 -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=wQT4RJzyl4mGAjwl0rEQHtOnquH245B6mvc8hjvLOVA=; b=PhXr5yXvvxGS0Bo3Dz4L5vTYEpAr/oV6ytsQ6KvcRaSmWGyuFQ2nPhTsQLZmNABbZ+ gFEMrFBNcLpggs1XYy9SlCbmXgVWWf6nGpEnOf2f1p6Amex0VTV8Qs5wPbRYCbG0jWiA uOWod386QDFiVRltJjJtHQXdPHncvYwT05MtE= 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=wQT4RJzyl4mGAjwl0rEQHtOnquH245B6mvc8hjvLOVA=; b=ttBxvEgMMMKFpME8b3KP/PuyiWTCEuxdqSAcUE9PsM4PIFdkmHqzJ6horz/Vzo3u75 X1cBpoO1eUR1wn+UFNuPmXJVHpXbOog1rt1L9Y/emjdaeFqK0fvbaTyFbuWiuZWqaRy3 khpkIT5+3HpayiB9/J7xGIGRYv5MKV9j1xw/tSBYmq8eha6Tl520KriSqTrOHeUK8tZW FAqfKxEuygNMAfwnpg5TpPz9R4RlHDXRMECjc+8RuOlBax8n7hX9Tll+xYpmNioMy0Gi N85R+MjGo5AsuDDkHgVVzMimjr8Q2dXEY6eNiM92UP5GAUiI6/g7kAF7TtC32HQDiRgu VF1Q== X-Gm-Message-State: AOAM532Q1EcS/ncaVasx2WOxXd5peH21T6UJ3jrBCncHnoKntX/LfAkI nVRmqZt5LhzJT82YR7kftI+jWA== X-Google-Smtp-Source: ABdhPJxfBhBydi4uE/Lm6z0anE41YcUW6jFggVrslYGGbDneSlLEnIL5G8oAgipKgjct6RvHDv2xCQ== X-Received: by 2002:a17:90a:474f:: with SMTP id y15mr6572288pjg.2.1625696229401; Wed, 07 Jul 2021 15:17:09 -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 75sm203748pfx.71.2021.07.07.15.17.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jul 2021 15:17:08 -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 , Yonghong Song , netdev@vger.kernel.org, KP Singh , Andrii Nakryiko , John Fastabend , Song Liu , Jakub Kicinski , Zvi Effron , Cody Haas , Lisa Watanabe Subject: [PATCH bpf-next v8 3/4] bpf: support specifying ingress via xdp_md context in BPF_PROG_TEST_RUN Date: Wed, 7 Jul 2021 22:16:56 +0000 Message-Id: <20210707221657.3985075-4-zeffron@riotgames.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210707221657.3985075-1-zeffron@riotgames.com> References: <20210707221657.3985075-1-zeffron@riotgames.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Yonghong Song --- net/bpf/test_run.c | 56 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index 229c5deb813c..cda8375bbbaf 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -690,18 +690,60 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, static int xdp_convert_md_to_buff(struct xdp_md *xdp_md, struct xdp_buff *xdp) { + unsigned int ingress_ifindex, rx_queue_index; + struct netdev_rx_queue *rxqueue; + struct net_device *device; + if (!xdp_md) return 0; if (xdp_md->egress_ifindex != 0) return -EINVAL; - if (xdp_md->ingress_ifindex != 0 || xdp_md->rx_queue_index != 0) + ingress_ifindex = xdp_md->ingress_ifindex; + rx_queue_index = xdp_md->rx_queue_index; + + if (!ingress_ifindex && rx_queue_index) return -EINVAL; - xdp->data = xdp->data_meta + xdp_md->data; + if (ingress_ifindex) { + device = dev_get_by_index(current->nsproxy->net_ns, + ingress_ifindex); + if (!device) + return -ENODEV; + + if (rx_queue_index >= device->real_num_rx_queues) + goto free_dev; + + rxqueue = __netif_get_rx_queue(device, rx_queue_index); + if (!xdp_rxq_info_is_reg(&rxqueue->xdp_rxq)) + goto free_dev; + + xdp->rxq = &rxqueue->xdp_rxq; + /* The device is now tracked in the xdp->rxq for later + * dev_put() + */ + } + + xdp->data = xdp->data_meta + xdp_md->data; return 0; + +free_dev: + dev_put(device); + return -EINVAL; +} + +static void xdp_convert_buff_to_md(struct xdp_buff *xdp, struct xdp_md *xdp_md) +{ + if (!xdp_md) + return; + + xdp_md->data = xdp->data - xdp->data_meta; + xdp_md->data_end = xdp->data_end - xdp->data_meta; + + if (xdp_md->ingress_ifindex) + dev_put(xdp->rxq->dev); } int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, @@ -753,6 +795,11 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, bpf_prog_change_xdp(NULL, prog); ret = bpf_test_run(prog, &xdp, repeat, &retval, &duration, true); + /* We convert the xdp_buff back to an xdp_md before checking the return + * code so the reference count of any held netdevice will be decremented + * even if the test run failed. + */ + xdp_convert_buff_to_md(&xdp, ctx); if (ret) goto out; @@ -760,11 +807,6 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr, xdp.data_end != xdp.data_meta + size) size = xdp.data_end - xdp.data_meta; - if (ctx) { - ctx->data = xdp.data - xdp.data_meta; - ctx->data_end = xdp.data_end - xdp.data_meta; - } - ret = bpf_test_finish(kattr, uattr, xdp.data_meta, size, retval, duration); if (!ret)