From: "Dmitry V. Levin" <ldv@altlinux•org>
To: Alexei Starovoitov <alexei.starovoitov@gmail•com>
Cc: Linus Torvalds <torvalds@linux-foundation•org>,
Eugene Syromiatnikov <esyr@redhat•com>,
netdev@vger•kernel.org, linux-kernel@vger•kernel.org,
Martin KaFai Lau <kafai@fb•com>,
Daniel Borkmann <daniel@iogearbox•net>,
Alexei Starovoitov <ast@kernel•org>,
"David S. Miller" <davem@davemloft•net>,
Jiri Olsa <jolsa@kernel•org>, Ingo Molnar <mingo@kernel•org>,
Lawrence Brakmo <brakmo@fb•com>, Andrey Ignatov <rdna@fb•com>,
Jakub Kicinski <jakub.kicinski@netronome•com>,
John Fastabend <john.fastabend@gmail•com>
Subject: Re: [PATCH bpf 1/2] bpf: fix alignment of netns_dev/netns_ino fields in bpf_{map,prog}_info
Date: Fri, 1 Jun 2018 14:12:12 +0300 [thread overview]
Message-ID: <20180601111211.GA3423@altlinux.org> (raw)
In-Reply-To: <20180601084114.xgvtg7nmihdavnnd@ast-mbp>
[-- Attachment #1: Type: text/plain, Size: 5859 bytes --]
On Fri, Jun 01, 2018 at 04:41:16AM -0400, Alexei Starovoitov wrote:
> On Fri, Jun 01, 2018 at 06:12:10AM +0300, Dmitry V. Levin wrote:
> > Hi,
> >
> > Looks like the ABI bug in bpf_map_info and bpf_prog info introduced
> > in 4.16 is going to slip into 4.17, causing extra pain to 32-bit
> > userspace. I'm adding Linus to this thread in hope it might help
> > to get a fix applied before 4.17 is released.
>
> The issue identified in patch 1 is valid.
> These two fields won't be properly accessible by 32-bit user space
> on 64-bit kernel.
Yes, and currently there is no way to build a 32-bit userspace that would
work properly both with 32-bit and 64-bit kernels.
> But the fix in patch 1 is wrong.
Please elaborate.
> The patch 2 is completely unnecessary.
The patch 2 doesn't have to be backported to 4.16, but if it was
implemented in 4.16, there would be no bug to discuss. That is,
the patch 2 is a good policy that would help to avoid this class of bugs
in the future.
Alexei, looks like your Acked-by on the buggy commit
52775b33bb5072fbc07b02c0cf4fe8da1f7ee7cd affects your judgement.
If this is the case, please refer patch 2 to other people who are less biased.
> Everyone can also see that the patches are still marked as 'new' in patchworks
> meaning that we didn't process them.
> At the moment many networking folks are traveling to netconf
> and we only had a chance to discuss this set last night.
> We'll try to send a fix in coming days.
> But regardless whether 4.17 is realesed this sunday or not
> we're not going to rush wrong patch in without proper code review
> and discussion.
> That future patch either will land in 4.17 (if it's dealyed into next sunday)
> or it will be sent to stable.
Note that the fix was submitted to netdev on 2018-05-27.
One week is surely enough to make this bug fixed, isn't it?
> To speed up the situation next time please report the issue that you find
> to public netdev mailing list instead of using proprietary distro emails.
Please explain to me and to the public what do you mean by making this
statement.
I do believe strace developers are free to discuss among themselves
using whatever means of communication they find appropriate.
I do believe the issue was properly reported to netdev, see
https://lkml.kernel.org/r/20180527112835.GA9118@asgard.redhat.com
https://lkml.kernel.org/r/20180527112842.GA18204@asgard.redhat.com
I'd like to use this opportunity to thank Eugene for submitting the fix
the same day the issue was identified as a kernel bug.
Alexei, please do not exclude my email address from this discussion.
Thanks.
> > On Wed, May 30, 2018 at 09:18:58PM +0300, Dmitry V. Levin wrote:
> > > On Sun, May 27, 2018 at 01:28:42PM +0200, Eugene Syromiatnikov wrote:
> > > > Recent introduction of netns_dev/netns_ino to bpf_map_info/bpf_prog info
> > > > has broken compat, as offsets of these fields are different in 32-bit
> > > > and 64-bit ABIs. One fix (other than implementing compat support in
> > > > syscall in order to handle this discrepancy) is to use __aligned_u64
> > > > instead of __u64 for these fields.
> > > >
> > > > Reported-by: Dmitry V. Levin <ldv@altlinux•org>
> > > > Fixes: 52775b33bb507 ("bpf: offload: report device information about
> > > > offloaded maps")
> > > > Fixes: 675fc275a3a2d ("bpf: offload: report device information for
> > > > offloaded programs")
> > > >
> > > > Signed-off-by: Eugene Syromiatnikov <esyr@redhat•com>
> > >
> > > Reviewed-by: "Dmitry V. Levin" <ldv@altlinux•org>
> > > Cc: <stable@vger•kernel.org> # v4.16+
> > >
> > > Thanks,
> > >
> > > > ---
> > > > include/uapi/linux/bpf.h | 8 ++++----
> > > > tools/include/uapi/linux/bpf.h | 8 ++++----
> > > > 2 files changed, 8 insertions(+), 8 deletions(-)
> > > >
> > > > diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
> > > > index c5ec897..903010a 100644
> > > > --- a/include/uapi/linux/bpf.h
> > > > +++ b/include/uapi/linux/bpf.h
> > > > @@ -1017,8 +1017,8 @@ struct bpf_prog_info {
> > > > __aligned_u64 map_ids;
> > > > char name[BPF_OBJ_NAME_LEN];
> > > > __u32 ifindex;
> > > > - __u64 netns_dev;
> > > > - __u64 netns_ino;
> > > > + __aligned_u64 netns_dev;
> > > > + __aligned_u64 netns_ino;
> > > > } __attribute__((aligned(8)));
> > > >
> > > > struct bpf_map_info {
> > > > @@ -1030,8 +1030,8 @@ struct bpf_map_info {
> > > > __u32 map_flags;
> > > > char name[BPF_OBJ_NAME_LEN];
> > > > __u32 ifindex;
> > > > - __u64 netns_dev;
> > > > - __u64 netns_ino;
> > > > + __aligned_u64 netns_dev;
> > > > + __aligned_u64 netns_ino;
> > > > } __attribute__((aligned(8)));
> > > >
> > > > /* User bpf_sock_addr struct to access socket fields and sockaddr struct passed
> > > > diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
> > > > index c5ec897..903010a 100644
> > > > --- a/tools/include/uapi/linux/bpf.h
> > > > +++ b/tools/include/uapi/linux/bpf.h
> > > > @@ -1017,8 +1017,8 @@ struct bpf_prog_info {
> > > > __aligned_u64 map_ids;
> > > > char name[BPF_OBJ_NAME_LEN];
> > > > __u32 ifindex;
> > > > - __u64 netns_dev;
> > > > - __u64 netns_ino;
> > > > + __aligned_u64 netns_dev;
> > > > + __aligned_u64 netns_ino;
> > > > } __attribute__((aligned(8)));
> > > >
> > > > struct bpf_map_info {
> > > > @@ -1030,8 +1030,8 @@ struct bpf_map_info {
> > > > __u32 map_flags;
> > > > char name[BPF_OBJ_NAME_LEN];
> > > > __u32 ifindex;
> > > > - __u64 netns_dev;
> > > > - __u64 netns_ino;
> > > > + __aligned_u64 netns_dev;
> > > > + __aligned_u64 netns_ino;
> > > > } __attribute__((aligned(8)));
> > > >
> > > > /* User bpf_sock_addr struct to access socket fields and sockaddr struct passed
--
ldv
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
prev parent reply other threads:[~2018-06-01 11:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-27 11:28 [PATCH bpf 1/2] bpf: fix alignment of netns_dev/netns_ino fields in bpf_{map,prog}_info Eugene Syromiatnikov
2018-05-29 17:17 ` Song Liu
2018-06-02 3:28 ` Daniel Borkmann
2018-05-30 18:18 ` Dmitry V. Levin
2018-06-01 3:12 ` Dmitry V. Levin
2018-06-01 8:41 ` Alexei Starovoitov
2018-06-01 11:12 ` Dmitry V. Levin [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=20180601111211.GA3423@altlinux.org \
--to=ldv@altlinux$(echo .)org \
--cc=alexei.starovoitov@gmail$(echo .)com \
--cc=ast@kernel$(echo .)org \
--cc=brakmo@fb$(echo .)com \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=esyr@redhat$(echo .)com \
--cc=jakub.kicinski@netronome$(echo .)com \
--cc=john.fastabend@gmail$(echo .)com \
--cc=jolsa@kernel$(echo .)org \
--cc=kafai@fb$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=rdna@fb$(echo .)com \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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