Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933297AbdCJSFR (ORCPT ); Fri, 10 Mar 2017 13:05:17 -0500 Received: from mail.kernel.org ([198.145.29.136]:44678 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932159AbdCJSFJ (ORCPT ); Fri, 10 Mar 2017 13:05:09 -0500 Date: Fri, 10 Mar 2017 13:04:58 -0500 From: Steven Rostedt To: Gleb Fotengauer-Malinovskiy Cc: Masahiro Yamada , David Lin , "Anton V. Boyarshinov" , "Dmitry V. Levin" , Michal Marek , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Morton Subject: Re: [PATCH v2] jump label: fix passing kbuild_cflags when checking for asm goto support Message-ID: <20170310130458.05041dc3@gandalf.local.home> In-Reply-To: <20170310175536.GX27556@glebfm.cloud.tilaa.com> References: <20170310162411.GA18175@glebfm.cloud.tilaa.com> <20170310120422.14e19269@gandalf.local.home> <20170310173952.GW27556@glebfm.cloud.tilaa.com> <20170310124210.5f52305f@gandalf.local.home> <20170310175536.GX27556@glebfm.cloud.tilaa.com> X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2972 Lines: 76 Acked-by: Steven Rostedt (VMware) Andrew, want to take this through your tree? Thanks, -- Steve On Fri, 10 Mar 2017 20:55:36 +0300 Gleb Fotengauer-Malinovskiy wrote: > The latest change of asm goto support check added passing of KBUILD_CFLAGS > to compiler. When these flags reference gcc plugins that are not built yet, > the check fails. > > When one runs "make bzImage" followed by "make modules", the kernel is always > built with HAVE_JUMP_LABEL disabled, while the modules are built depending on > CONFIG_JUMP_LABEL. If HAVE_JUMP_LABEL macro happens to be different, modules > are built with undefined references, e.g.: > > ERROR: "static_key_slow_inc" [net/netfilter/xt_TEE.ko] undefined! > ERROR: "static_key_slow_dec" [net/netfilter/xt_TEE.ko] undefined! > ERROR: "static_key_slow_dec" [net/netfilter/nft_meta.ko] undefined! > ERROR: "static_key_slow_inc" [net/netfilter/nft_meta.ko] undefined! > ERROR: "nf_hooks_needed" [net/netfilter/ipvs/ip_vs.ko] undefined! > ERROR: "nf_hooks_needed" [net/ipv6/ipv6.ko] undefined! > ERROR: "static_key_count" [net/ipv6/ipv6.ko] undefined! > ERROR: "static_key_slow_inc" [net/ipv6/ipv6.ko] undefined! > > This change moves the check before all these references are added > to KBUILD_CFLAGS. This is correct because subsequent KBUILD_CFLAGS > modifications are not relevant to this check. > > Reported-by: Anton V. Boyarshinov > Fixes: 35f860f9ba6a ("jump label: pass kbuild_cflags when checking for asm goto support") > Cc: stable@vger.kernel.org # v4.10 > Signed-off-by: Gleb Fotengauer-Malinovskiy > Signed-off-by: Dmitry V. Levin > --- > v2: update description of the problem fixed by this patch > > Makefile | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/Makefile b/Makefile > index 165cf97..7e3aade 100644 > --- a/Makefile > +++ b/Makefile > @@ -653,6 +653,12 @@ KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, \ > # Tell gcc to never replace conditional load with a non-conditional one > KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0) > > +# check for 'asm goto' > +ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) > + KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO > + KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO > +endif > + > include scripts/Makefile.gcc-plugins > > ifdef CONFIG_READABLE_ASM > @@ -798,12 +804,6 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types) > # use the deterministic mode of AR if available > KBUILD_ARFLAGS := $(call ar-option,D) > > -# check for 'asm goto' > -ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) > - KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO > - KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO > -endif > - > include scripts/Makefile.kasan > include scripts/Makefile.extrawarn > include scripts/Makefile.ubsan