From: Geliang Tang <geliang@kernel.org>
To: John Fastabend <john.fastabend@gmail.com>,
Jakub Sitnicki <jakub@cloudflare.com>
Cc: Andrii Nakryiko <andrii@kernel.org>,
Eduard Zingerman <eddyz87@gmail.com>,
Mykola Lysenko <mykolal@fb.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <martin.lau@linux.dev>,
Song Liu <song@kernel.org>,
Yonghong Song <yonghong.song@linux.dev>,
KP Singh <kpsingh@kernel.org>,
Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
Jiri Olsa <jolsa@kernel.org>, Shuah Khan <shuah@kernel.org>,
bpf@vger.kernel.org, mptcp@lists.linux.dev,
linux-kselftest@vger.kernel.org
Subject: Re: [PATCH bpf-next] selftests/bpf: Add F_SETFL for fcntl
Date: Sun, 07 Apr 2024 16:29:31 +0800 [thread overview]
Message-ID: <3a006357f78a07fdd558db827049307076ba6e23.camel@kernel.org> (raw)
In-Reply-To: <660f8268ddd8f_50b87208bb@john.notmuch>
On Thu, 2024-04-04 at 21:47 -0700, John Fastabend wrote:
> Geliang Tang wrote:
> > Hi Jakub,
> >
> > On Wed, 2024-04-03 at 15:29 -0700, John Fastabend wrote:
> > > Jakub Sitnicki wrote:
> > > > Hi Geliang,
> > > >
> > > > On Wed, Apr 03, 2024 at 04:32 PM +08, Geliang Tang wrote:
> > > > > From: Geliang Tang <tanggeliang@kylinos.cn>
> > > > >
> > > > > Incorrect arguments are passed to fcntl() in test_sockmap.c
> > > > > when
> > > > > invoking
> > > > > it to set file status flags. If O_NONBLOCK is used as 2nd
> > > > > argument and
> > > > > passed into fcntl, -EINVAL will be returned (See do_fcntl()
> > > > > in
> > > > > fs/fcntl.c).
> > > > > The correct approach is to use F_SETFL as 2nd argument, and
> > > > > O_NONBLOCK as
> > > > > 3rd one.
> > > > >
> > > > > Fixes: 16962b2404ac ("bpf: sockmap, add selftests")
> > > > > Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> > > > > ---
> > > > > tools/testing/selftests/bpf/test_sockmap.c | 2 +-
> > > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > > >
> > > > > diff --git a/tools/testing/selftests/bpf/test_sockmap.c
> > > > > b/tools/testing/selftests/bpf/test_sockmap.c
> > > > > index 024a0faafb3b..34d6a1e6f664 100644
> > > > > --- a/tools/testing/selftests/bpf/test_sockmap.c
> > > > > +++ b/tools/testing/selftests/bpf/test_sockmap.c
> > > > > @@ -603,7 +603,7 @@ static int msg_loop(int fd, int
> > > > > iov_count,
> > > > > int iov_length, int cnt,
> > > > > struct timeval timeout;
> > > > > fd_set w;
> > > > >
> > > > > - fcntl(fd, fd_flags);
> > > > > + fcntl(fd, F_SETFL, fd_flags);
> > > > > /* Account for pop bytes noting each
> > > > > iteration
> > > > > of apply will
> > > > > * call msg_pop_data helper so we need to
> > > > > account for this
> > > > > * by calculating the number of apply
> > > > > iterations. Note user
> > > >
> > > > Good catch. But we also need to figure out why some tests
> > > > failing
> > > > with
> > > > this patch applied and fix them in one go:
> > > >
> > > > # 6/ 7 sockmap::txmsg test skb:FAIL
> > > > #21/ 7 sockhash::txmsg test skb:FAIL
> > > > #36/ 7 sockhash:ktls:txmsg test skb:FAIL
> > > > Pass: 42 Fail: 3
> >
> > Sorry, I didn't notice these fails in my testing before, they do
> > exist.
> > I'll try to fix them and sent a v2 soon.
>
> Not 100% sure but a hint. I would look into where the stream parser
> is waking up the sock here. I'm not sure there is an easy fix tbh.
> I can help look at this soon as well if you don't beat me to a fix.
>
> Thanks for looking into it.
I just sent a v2, please review it for me.
Thanks,
-Geliang
>
> >
> > Thanks,
> > -Geliang
prev parent reply other threads:[~2024-04-07 8:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-03 8:32 [PATCH bpf-next] selftests/bpf: Add F_SETFL for fcntl Geliang Tang
2024-04-03 9:26 ` MPTCP CI
2024-04-03 12:05 ` Jakub Sitnicki
2024-04-03 22:29 ` John Fastabend
2024-04-04 0:27 ` Geliang Tang
2024-04-05 4:47 ` John Fastabend
2024-04-07 8:29 ` Geliang Tang [this message]
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=3a006357f78a07fdd558db827049307076ba6e23.camel@kernel.org \
--to=geliang@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=haoluo@google.com \
--cc=jakub@cloudflare.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=mptcp@lists.linux.dev \
--cc=mykolal@fb.com \
--cc=sdf@google.com \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=yonghong.song@linux.dev \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).