From: Vadim Fedorenko <vadim.fedorenko@linux.dev>
To: Daniel Borkmann <daniel@iogearbox.net>
Cc: bpf@vger.kernel.org, netdev@vger.kernel.org,
Jakub Kicinski <kuba@kernel.org>, Mykola Lysenko <mykolal@fb.com>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <martin.lau@linux.dev>,
Alexei Starovoitov <ast@kernel.org>
Subject: Re: [PATCH bpf-next v3 1/2] bpf: add CHECKSUM_COMPLETE to bpf test progs
Date: Wed, 5 Jun 2024 10:42:01 +0100 [thread overview]
Message-ID: <f7fe13a8-c379-495b-9e42-3a5ff50b50e3@linux.dev> (raw)
In-Reply-To: <20240527185928.1871649-1-vadfed@meta.com>
On 27/05/2024 19:59, Vadim Fedorenko wrote:
> Add special flag to validate that TC BPF program properly updates
> checksum information in skb.
>
> Signed-off-by: Vadim Fedorenko <vadfed@meta.com>
> ---
> include/uapi/linux/bpf.h | 2 ++
> net/bpf/test_run.c | 18 +++++++++++++++++-
> tools/include/uapi/linux/bpf.h | 2 ++
> 3 files changed, 21 insertions(+), 1 deletion(-)
>
> diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
> index 90706a47f6ff..f7d458d88111 100644
> --- a/include/uapi/linux/bpf.h
> +++ b/include/uapi/linux/bpf.h
> @@ -1425,6 +1425,8 @@ enum {
> #define BPF_F_TEST_RUN_ON_CPU (1U << 0)
> /* If set, XDP frames will be transmitted after processing */
> #define BPF_F_TEST_XDP_LIVE_FRAMES (1U << 1)
> +/* If set, apply CHECKSUM_COMPLETE to skb and validate the checksum */
> +#define BPF_F_TEST_SKB_CHECKSUM_COMPLETE (1U << 2)
>
> /* type for BPF_ENABLE_STATS */
> enum bpf_stats_type {
> diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c
> index f6aad4ed2ab2..4c21562ad526 100644
> --- a/net/bpf/test_run.c
> +++ b/net/bpf/test_run.c
> @@ -977,7 +977,8 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,
> void *data;
> int ret;
>
> - if (kattr->test.flags || kattr->test.cpu || kattr->test.batch_size)
> + if ((kattr->test.flags & ~BPF_F_TEST_SKB_CHECKSUM_COMPLETE) ||
> + kattr->test.cpu || kattr->test.batch_size)
> return -EINVAL;
>
> data = bpf_test_init(kattr, kattr->test.data_size_in,
> @@ -1025,6 +1026,12 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,
>
> skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN);
> __skb_put(skb, size);
> +
> + if (kattr->test.flags & BPF_F_TEST_SKB_CHECKSUM_COMPLETE) {
> + skb->csum = skb_checksum(skb, 0, skb->len, 0);
> + skb->ip_summed = CHECKSUM_COMPLETE;
> + }
> +
> if (ctx && ctx->ifindex > 1) {
> dev = dev_get_by_index(net, ctx->ifindex);
> if (!dev) {
> @@ -1079,6 +1086,15 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,
> }
> convert_skb_to___skb(skb, ctx);
>
> + if (kattr->test.flags & BPF_F_TEST_SKB_CHECKSUM_COMPLETE) {
> + __wsum csum = skb_checksum(skb, 0, skb->len, 0);
> +
> + if (skb->csum != csum) {
> + ret = -EBADMSG;
> + goto out;
> + }
> + }
> +
> size = skb->len;
> /* bpf program can never convert linear skb to non-linear */
> if (WARN_ON_ONCE(skb_is_nonlinear(skb)))
> diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
> index 90706a47f6ff..f7d458d88111 100644
> --- a/tools/include/uapi/linux/bpf.h
> +++ b/tools/include/uapi/linux/bpf.h
> @@ -1425,6 +1425,8 @@ enum {
> #define BPF_F_TEST_RUN_ON_CPU (1U << 0)
> /* If set, XDP frames will be transmitted after processing */
> #define BPF_F_TEST_XDP_LIVE_FRAMES (1U << 1)
> +/* If set, apply CHECKSUM_COMPLETE to skb and validate the checksum */
> +#define BPF_F_TEST_SKB_CHECKSUM_COMPLETE (1U << 2)
>
> /* type for BPF_ENABLE_STATS */
> enum bpf_stats_type {
Hi Daniel!
Have you had a chance to look at v3 of this patch?
I think I addressed all your comments form v2.
Thanks,
Vadim
next prev parent reply other threads:[~2024-06-05 9:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-27 18:59 [PATCH bpf-next v3 1/2] bpf: add CHECKSUM_COMPLETE to bpf test progs Vadim Fedorenko
2024-05-27 18:59 ` [PATCH bpf-next v3 2/2] selftests: bpf: validate CHECKSUM_COMPLETE option Vadim Fedorenko
2024-06-05 9:42 ` Vadim Fedorenko [this message]
2024-06-05 14:43 ` [PATCH bpf-next v3 1/2] bpf: add CHECKSUM_COMPLETE to bpf test progs Daniel Borkmann
2024-06-06 14:42 ` Vadim Fedorenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f7fe13a8-c379-495b-9e42-3a5ff50b50e3@linux.dev \
--to=vadim.fedorenko@linux.dev \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kuba@kernel.org \
--cc=martin.lau@linux.dev \
--cc=mykolal@fb.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox