From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alexander Lobakin <aleksander.lobakin@intel.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>, bpf <bpf@vger.kernel.org>,
Networking <netdev@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the bpf-next tree
Date: Wed, 22 Mar 2023 09:35:31 +1100 [thread overview]
Message-ID: <20230322093531.7ac8d09e@canb.auug.org.au> (raw)
In-Reply-To: <dca3f426-e3de-207b-51a0-ae272d2b1462@intel.com>
[-- Attachment #1: Type: text/plain, Size: 2222 bytes --]
Hi all,
On Mon, 20 Mar 2023 13:07:23 +0100 Alexander Lobakin <aleksander.lobakin@intel.com> wrote:
>
> > After merging the bpf-next tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > net/bpf/test_run.c: In function 'frame_was_changed':
> > net/bpf/test_run.c:224:22: error: 'const struct xdp_page_head' has no member named 'frm'; did you mean 'frame'?
> > 224 | return head->frm.data != head->orig_ctx.data ||
> > | ^~~
> > | frame
> > net/bpf/test_run.c:225:22: error: 'const struct xdp_page_head' has no member named 'frm'; did you mean 'frame'?
> > 225 | head->frm.flags != head->orig_ctx.flags;
> > | ^~~
> > | frame
>
> The correct solution is to change `frm.` with `frame->`, but I hope the
> BPF maintainers will merge bpf into bpf-next to pick up fixes and
> changes like this :)
Well, that hasn't happened yet, so I will apply the following patch
until it does.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Mar 2023 09:20:26 +1100
Subject: [PATCH] bpf, test_run: fix up for "bpf, test_run: fix &xdp_frame misplacement for LIVE_FRAMES"
ineracting with commit
e5995bc7e2ba ("bpf, test_run: fix crashes due to XDP frame overwriting/corruption")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
net/bpf/test_run.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c
index af5804d6bff2..c2bab8e20406 100644
--- a/net/bpf/test_run.c
+++ b/net/bpf/test_run.c
@@ -221,8 +221,8 @@ static bool frame_was_changed(const struct xdp_page_head *head)
* i.e. has the highest chances to be overwritten. If those two are
* untouched, it's most likely safe to skip the context reset.
*/
- return head->frm.data != head->orig_ctx.data ||
- head->frm.flags != head->orig_ctx.flags;
+ return head->frame->data != head->orig_ctx.data ||
+ head->frame->flags != head->orig_ctx.flags;
}
static bool ctx_was_changed(struct xdp_page_head *head)
--
2.39.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-03-21 22:35 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-19 23:26 linux-next: build failure after merge of the bpf-next tree Stephen Rothwell
2023-03-20 12:07 ` Alexander Lobakin
2023-03-21 22:35 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-20 1:59 Stephen Rothwell
2022-07-20 3:42 ` Alexei Starovoitov
2022-07-20 3:44 ` Stanislav Fomichev
2022-04-19 1:56 Stephen Rothwell
2022-04-21 0:32 ` Stephen Rothwell
2022-04-21 9:45 ` Daniel Borkmann
2022-04-21 10:40 ` Maciej Fijalkowski
2022-02-09 0:21 Stephen Rothwell
2021-12-03 0:15 Stephen Rothwell
2021-09-14 1:37 Stephen Rothwell
2021-09-14 23:25 ` Andrii Nakryiko
2021-09-14 23:38 ` Stephen Rothwell
2021-09-14 23:40 ` Andrii Nakryiko
2021-09-14 23:59 ` Stephen Rothwell
2021-09-15 1:27 ` Alexei Starovoitov
2021-08-26 1:50 Stephen Rothwell
2021-08-26 2:01 ` Daniel Xu
2021-03-11 0:47 Stephen Rothwell
2021-03-11 6:47 ` Björn Töpel
2021-03-12 1:00 ` Stephen Rothwell
2021-03-26 1:18 ` Stephen Rothwell
2020-12-01 8:07 Stephen Rothwell
2020-12-01 14:55 ` Daniel Borkmann
2020-09-08 3:08 Stephen Rothwell
2020-09-08 17:54 ` Andrii Nakryiko
2020-08-21 1:11 Stephen Rothwell
2020-08-25 1:20 ` Stephen Rothwell
2020-08-25 1:25 ` Alexei Starovoitov
2020-08-25 3:04 ` Stephen Rothwell
2020-08-25 3:27 ` Alexei Starovoitov
2020-08-25 6:50 ` Stephen Rothwell
2020-08-25 14:33 ` Alexei Starovoitov
2020-08-25 21:10 ` Stephen Rothwell
2020-08-25 22:34 ` Alexei Starovoitov
2020-08-25 23:09 ` Stephen Rothwell
2020-07-14 2:22 Stephen Rothwell
2020-07-14 6:16 ` Jiri Olsa
2020-07-14 8:31 ` Jiri Olsa
2020-07-14 9:19 ` Geert Uytterhoeven
2019-07-01 4:57 Stephen Rothwell
2019-07-01 5:01 ` Stephen Rothwell
2019-04-18 1:57 Stephen Rothwell
2019-02-28 1:31 Stephen Rothwell
2019-02-28 2:18 ` Alexei Starovoitov
2018-10-03 3:18 Stephen Rothwell
2018-10-03 5:29 ` Joe Stringer
2018-09-07 0:19 Stephen Rothwell
2018-09-07 0:22 ` Alexei Starovoitov
2018-09-07 5:21 ` Björn Töpel
2018-09-07 5:45 ` Alexei Starovoitov
2017-12-13 1:32 Stephen Rothwell
2017-12-13 1:47 ` Alexei Starovoitov
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=20230322093531.7ac8d09e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=aleksander.lobakin@intel.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).