From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A98EC433DB for ; Mon, 22 Mar 2021 09:01:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC7C061923 for ; Mon, 22 Mar 2021 09:01:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229482AbhCVJBK (ORCPT ); Mon, 22 Mar 2021 05:01:10 -0400 Received: from mx2.suse.de ([195.135.220.15]:41384 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229548AbhCVJAp (ORCPT ); Mon, 22 Mar 2021 05:00:45 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id C4E01AD71; Mon, 22 Mar 2021 09:00:43 +0000 (UTC) Date: Mon, 22 Mar 2021 10:00:36 +0100 From: Borislav Petkov To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , David Miller , Networking , Alexei Starovoitov , Stanislav Fomichev , Daniel Borkmann , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: build failure after merge of the tip tree Message-ID: <20210322090036.GB10031@zn.tnic> References: <20210322143714.494603ed@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210322143714.494603ed@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Mar 22, 2021 at 02:37:14PM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the tip tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > arch/x86/net/bpf_jit_comp.c: In function 'arch_prepare_bpf_trampoline': > arch/x86/net/bpf_jit_comp.c:2015:16: error: 'ideal_nops' undeclared (first use in this function) > 2015 | memcpy(prog, ideal_nops[NOP_ATOMIC5], X86_PATCH_SIZE); > | ^~~~~~~~~~ > arch/x86/net/bpf_jit_comp.c:2015:16: note: each undeclared identifier is reported only once for each function it appears in > arch/x86/net/bpf_jit_comp.c:2015:27: error: 'NOP_ATOMIC5' undeclared (first use in this function); did you mean 'GFP_ATOMIC'? > 2015 | memcpy(prog, ideal_nops[NOP_ATOMIC5], X86_PATCH_SIZE); > | ^~~~~~~~~~~ > | GFP_ATOMIC > > Caused by commit > > a89dfde3dc3c ("x86: Remove dynamic NOP selection") > > interacting with commit > > b90829704780 ("bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG") > > from the net tree. > > I have applied the following merge fix patch. > > From: Stephen Rothwell > Date: Mon, 22 Mar 2021 14:30:37 +1100 > Subject: [PATCH] x86: fix up for "bpf: Use NOP_ATOMIC5 instead of > emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG" > > Signed-off-by: Stephen Rothwell > --- > arch/x86/net/bpf_jit_comp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c > index db50ab14df67..e2b5da5d441d 100644 > --- a/arch/x86/net/bpf_jit_comp.c > +++ b/arch/x86/net/bpf_jit_comp.c > @@ -2012,7 +2012,7 @@ int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *image, void *i > /* remember return value in a stack for bpf prog to access */ > emit_stx(&prog, BPF_DW, BPF_REG_FP, BPF_REG_0, -8); > im->ip_after_call = prog; > - memcpy(prog, ideal_nops[NOP_ATOMIC5], X86_PATCH_SIZE); > + memcpy(prog, x86_nops[5], X86_PATCH_SIZE); > prog += X86_PATCH_SIZE; > } > > -- I guess we can do the same as with the hyperv tree - the folks who send the respective branches to Linus in the next merge window should point to this patch of yours which Linus can apply after merging the second branch in order. Thx. -- Regards/Gruss, Boris. SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg