Messages in this thread Patch in this message | | | Date | Wed, 22 Mar 2023 09:35:31 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: build failure after merge of the bpf-next tree |
| |
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 [unhandled content-type:application/pgp-signature] | |