Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220826055025.1018491-1-james.hilliard1@gmail.com> <e3d9f936-926c-8cd4-1a21-4c2894bf22b6@iogearbox.net>
In-Reply-To: <e3d9f936-926c-8cd4-1a21-4c2894bf22b6@iogearbox.net>
From:   James Hilliard <james.hilliard1@gmail.com>
Date:   Mon, 29 Aug 2022 09:49:55 -0600
Message-ID: <CADvTj4qBmZyzoSsHVYcg1mLvBRqCr59dWJk2t_mf7njUesa+dA@mail.gmail.com>
Subject: Re: [PATCH] selftests/bpf: Fix connect4_prog tcp/socket header type conflict
To:     Daniel Borkmann <daniel@iogearbox.net>
Cc:     bpf@vger.kernel.org, Alexei Starovoitov <ast@kernel.org>,
        Andrii Nakryiko <andrii@kernel.org>,
        Martin KaFai Lau <martin.lau@linux.dev>,
        Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@kernel.org>,
        Stanislav Fomichev <sdf@google.com>,
        Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>,
        Mykola Lysenko <mykolal@fb.com>, Shuah Khan <shuah@kernel.org>,
        Dave Marchevsky <davemarchevsky@fb.com>,
        linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Mon, Aug 29, 2022 at 9:11 AM Daniel Borkmann <daniel@iogearbox.net> wrote:
>
> On 8/26/22 7:50 AM, James Hilliard wrote:
> [...]
> > diff --git a/tools/testing/selftests/bpf/progs/connect4_prog.c b/tools/testing/selftests/bpf/progs/connect4_prog.c
> > index b241932911db..0f68b8d756b3 100644
> > --- a/tools/testing/selftests/bpf/progs/connect4_prog.c
> > +++ b/tools/testing/selftests/bpf/progs/connect4_prog.c
> > @@ -7,8 +7,7 @@
> >   #include <linux/bpf.h>
> >   #include <linux/in.h>
> >   #include <linux/in6.h>
> > -#include <sys/socket.h>
> > -#include <netinet/tcp.h>
> > +#include <linux/tcp.h>
> >   #include <linux/if.h>
> >   #include <errno.h>
>
> Can't we just add:
>
> #include "bpf_tcp_helpers.h"

Yeah, that seems to work, changed in v2:
https://lore.kernel.org/bpf/20220829154710.3870139-1-james.hilliard1@gmail.com/

>
> It does define SOL_TCP already and is used also in other prog tests. I presume this
> would avoid the need the change all the below.
>
> > @@ -52,7 +51,7 @@ static __inline int verify_cc(struct bpf_sock_addr *ctx,
> >       char buf[TCP_CA_NAME_MAX];
> >       int i;
> >
> > -     if (bpf_getsockopt(ctx, SOL_TCP, TCP_CONGESTION, &buf, sizeof(buf)))
> > +     if (bpf_getsockopt(ctx, IPPROTO_TCP, TCP_CONGESTION, &buf, sizeof(buf)))
> >               return 1;
> >
> >       for (i = 0; i < TCP_CA_NAME_MAX; i++) {
> > @@ -70,12 +69,12 @@ static __inline int set_cc(struct bpf_sock_addr *ctx)
> >       char reno[TCP_CA_NAME_MAX] = "reno";
> >       char cubic[TCP_CA_NAME_MAX] = "cubic";
> >
> > -     if (bpf_setsockopt(ctx, SOL_TCP, TCP_CONGESTION, &reno, sizeof(reno)))
> > +     if (bpf_setsockopt(ctx, IPPROTO_TCP, TCP_CONGESTION, &reno, sizeof(reno)))
> >               return 1;
> >       if (verify_cc(ctx, reno))
> >               return 1;
> >
> > -     if (bpf_setsockopt(ctx, SOL_TCP, TCP_CONGESTION, &cubic, sizeof(cubic)))
> > +     if (bpf_setsockopt(ctx, IPPROTO_TCP, TCP_CONGESTION, &cubic, sizeof(cubic)))
> >               return 1;
> >       if (verify_cc(ctx, cubic))
> >               return 1;
> > @@ -113,15 +112,15 @@ static __inline int set_keepalive(struct bpf_sock_addr *ctx)
> >       if (bpf_setsockopt(ctx, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)))
> >               return 1;
> >       if (ctx->type == SOCK_STREAM) {
> > -             if (bpf_setsockopt(ctx, SOL_TCP, TCP_KEEPIDLE, &one, sizeof(one)))
> > +             if (bpf_setsockopt(ctx, IPPROTO_TCP, TCP_KEEPIDLE, &one, sizeof(one)))
> >                       return 1;
> > -             if (bpf_setsockopt(ctx, SOL_TCP, TCP_KEEPINTVL, &one, sizeof(one)))
> > +             if (bpf_setsockopt(ctx, IPPROTO_TCP, TCP_KEEPINTVL, &one, sizeof(one)))
> >                       return 1;
> > -             if (bpf_setsockopt(ctx, SOL_TCP, TCP_KEEPCNT, &one, sizeof(one)))
> > +             if (bpf_setsockopt(ctx, IPPROTO_TCP, TCP_KEEPCNT, &one, sizeof(one)))
> >                       return 1;
> > -             if (bpf_setsockopt(ctx, SOL_TCP, TCP_SYNCNT, &one, sizeof(one)))
> > +             if (bpf_setsockopt(ctx, IPPROTO_TCP, TCP_SYNCNT, &one, sizeof(one)))
> >                       return 1;
> > -             if (bpf_setsockopt(ctx, SOL_TCP, TCP_USER_TIMEOUT, &one, sizeof(one)))
> > +             if (bpf_setsockopt(ctx, IPPROTO_TCP, TCP_USER_TIMEOUT, &one, sizeof(one)))
> >                       return 1;
> >       }
> >       if (bpf_setsockopt(ctx, SOL_SOCKET, SO_KEEPALIVE, &zero, sizeof(zero)))
> > @@ -135,7 +134,7 @@ static __inline int set_notsent_lowat(struct bpf_sock_addr *ctx)
> >       int lowat = 65535;
> >
> >       if (ctx->type == SOCK_STREAM) {
> > -             if (bpf_setsockopt(ctx, SOL_TCP, TCP_NOTSENT_LOWAT, &lowat, sizeof(lowat)))
> > +             if (bpf_setsockopt(ctx, IPPROTO_TCP, TCP_NOTSENT_LOWAT, &lowat, sizeof(lowat)))
> >                       return 1;
> >       }
> >
> >
>