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=-17.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 A5728C433E2 for ; Fri, 26 Mar 2021 08:59:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 664E061A45 for ; Fri, 26 Mar 2021 08:59:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230026AbhCZI6q (ORCPT ); Fri, 26 Mar 2021 04:58:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229624AbhCZI6U (ORCPT ); Fri, 26 Mar 2021 04:58:20 -0400 Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19E2FC0613AA; Fri, 26 Mar 2021 01:58:20 -0700 (PDT) Received: by mail-il1-x131.google.com with SMTP id w2so3976579ilj.12; Fri, 26 Mar 2021 01:58:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:reply-to:from:date:message-id :subject:to:cc; bh=l9gbWzCZ8sOW1i9QHPhtjOrMNdak/ShYPTyDf3NGDKA=; b=c+ynMnCmKrVQ1yuNyPCQ2R34kJotwByI5mKeVlXe5fmJYu7rf3JgxA6FVNJrODpZHq vb3c8++5tjvoVdWH71RAPsZW7w6TQF3zPCAv8Tqtw4321M3RUNuLHyFoFM3eNjdR9SiM EuYnZLigXKC8l2tq+eqXSbXAjqDD+LlYW33dYM6nY94YxP/QFy86YVtT1EjXBtswlYyk j87Aik23OGx+4/G0OyvMWpnvSchBX7D6+3OuzWOzyfe627A7xqTq8Fj2+PRdGsKGy3iD USFNFyJAwFcnF3tvzZFFcQXLIu2xOQE6Q+IftkGsEoAWDKb9/kmbCERbPYMWPjmN2QzV wGLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:reply-to :from:date:message-id:subject:to:cc; bh=l9gbWzCZ8sOW1i9QHPhtjOrMNdak/ShYPTyDf3NGDKA=; b=mpFqo6b+siV2Iss22qyaT3ouH/i85GGvNo9cE1OJMbs7F4TeUyz/awd8yIttUJEAcb WTU8fyKCLk06DY0BrdfW95ntj2WrU24/nhHnofeSCEfiEV4UQSoq0y5/ilnP4wjMoMRB QQ0HyCo15iuPx5hDaGoI2a00JhACrjKxopS3aIG1X6Fnob6D3CKBvxhUm5uCdavUMZHw iKzuGLGTGhR8Chg8h2cAvKlCHOFT/99/rpqKPw+zMlny7KqZPZuYwGItW/9rXzO+gkSu 8eOFsxSJ0r/Eg6DRPynuYEvEqInr1C3/uTAAbXeucvYrC7q0bMVW0gp4QIUGPj2WKrdp 98wQ== X-Gm-Message-State: AOAM531Fjuzkf9agcHZ79MrVjx/gb6IAjHTNFKhSt0sDzQpSmvzE9WSq 3Z3i8/cmeaQ33RnMh/b76PFXQ4qVj6cIrcaZYIw= X-Google-Smtp-Source: ABdhPJxRSRmZPkaFJ9lIZ2i2BYVsNFqjiz0yKj1NZKgvoYdQ57SsLPTRUlA6PL29NXfGRbHLKzFKHiVybIsTnfw89uA= X-Received: by 2002:a92:d78f:: with SMTP id d15mr8934897iln.112.1616749099521; Fri, 26 Mar 2021 01:58:19 -0700 (PDT) MIME-Version: 1.0 References: <20210322143714.494603ed@canb.auug.org.au> <20210322090036.GB10031@zn.tnic> In-Reply-To: <20210322090036.GB10031@zn.tnic> Reply-To: sedat.dilek@gmail.com From: Sedat Dilek Date: Fri, 26 Mar 2021 09:57:43 +0100 Message-ID: Subject: Re: linux-next: build failure after merge of the tip tree To: Borislav Petkov Cc: Stephen Rothwell , 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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 22, 2021 at 10:02 AM Borislav Petkov wrote: > > 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. > The commit b90829704780 "bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG" is now in Linus Git (see [1]). Where will Stephen's fixup-patch be carried? Linux-next? net-next? ? Thanks. - Sedat - [1] https://git.kernel.org/linus/b9082970478009b778aa9b22d5561eef35b53b63