From: tip-bot for Naohiro Aota <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: naohiro.aota@wdc.com, tglx@linutronix.de,
vincenzo.frascino@arm.com, linux-kernel@vger.kernel.org,
mingo@kernel.org, hpa@zytor.com, yamada.masahiro@socionext.com
Subject: [tip:x86/urgent] x86/vdso: Fix flip/flop vdso build bug
Date: Fri, 12 Jul 2019 08:41:14 -0700 [thread overview]
Message-ID: <tip-e9a1379f9219be439f47a0f063431a92dc529eda@git.kernel.org> (raw)
In-Reply-To: <20190712101556.17833-1-naohiro.aota@wdc.com>
Commit-ID: e9a1379f9219be439f47a0f063431a92dc529eda
Gitweb: https://git.kernel.org/tip/e9a1379f9219be439f47a0f063431a92dc529eda
Author: Naohiro Aota <naohiro.aota@wdc.com>
AuthorDate: Fri, 12 Jul 2019 19:15:55 +0900
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Fri, 12 Jul 2019 17:35:07 +0200
x86/vdso: Fix flip/flop vdso build bug
Two consecutive "make" on an already compiled kernel tree will show
different behavior:
$ make
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
VDSOCHK arch/x86/entry/vdso/vdso64.so.dbg
VDSOCHK arch/x86/entry/vdso/vdso32.so.dbg
Kernel: arch/x86/boot/bzImage is ready (#3)
Building modules, stage 2.
MODPOST 12 modules
$ make
make
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
VDSO arch/x86/entry/vdso/vdso64.so.dbg
OBJCOPY arch/x86/entry/vdso/vdso64.so
VDSO2C arch/x86/entry/vdso/vdso-image-64.c
CC arch/x86/entry/vdso/vdso-image-64.o
VDSO arch/x86/entry/vdso/vdso32.so.dbg
OBJCOPY arch/x86/entry/vdso/vdso32.so
VDSO2C arch/x86/entry/vdso/vdso-image-32.c
CC arch/x86/entry/vdso/vdso-image-32.o
AR arch/x86/entry/vdso/built-in.a
AR arch/x86/entry/built-in.a
AR arch/x86/built-in.a
GEN .version
CHK include/generated/compile.h
UPD include/generated/compile.h
CC init/version.o
AR init/built-in.a
LD vmlinux.o
<snip>
This is causing "LD vmlinux" once every two times even without any
modifications. This is the same bug fixed in commit 92a4728608a8
("x86/boot: Fix if_changed build flip/flop bug"). Two "if_changed" cannot
be used in one target.
Fix this merging two commands into one function.
Fixes: 7ac870747988 ("x86/vdso: Switch to generic vDSO implementation")
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Link: https://lkml.kernel.org/r/20190712101556.17833-1-naohiro.aota@wdc.com
---
arch/x86/entry/vdso/Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 39106111be86..34773395139a 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -56,8 +56,7 @@ VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -soname linux-vdso.so.1 --no-undefined \
-z max-page-size=4096
$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
- $(call if_changed,vdso)
- $(call if_changed,vdso_check)
+ $(call if_changed,vdso_and_check)
HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/$(SUBARCH)/include/uapi
hostprogs-y += vdso2c
@@ -127,8 +126,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE
$(call if_changed,objcopy)
$(obj)/vdsox32.so.dbg: $(obj)/vdsox32.lds $(vobjx32s) FORCE
- $(call if_changed,vdso)
- $(call if_changed,vdso_check)
+ $(call if_changed,vdso_and_check)
CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)
VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -soname linux-gate.so.1
@@ -167,8 +165,7 @@ $(obj)/vdso32.so.dbg: FORCE \
$(obj)/vdso32/note.o \
$(obj)/vdso32/system_call.o \
$(obj)/vdso32/sigreturn.o
- $(call if_changed,vdso)
- $(call if_changed,vdso_check)
+ $(call if_changed,vdso_and_check)
#
# The DSO images are built using a special linker script.
@@ -184,6 +181,9 @@ VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \
-Bsymbolic
GCOV_PROFILE := n
+quiet_cmd_vdso_and_check = VDSO $@
+ cmd_vdso_and_check = $(cmd_vdso); $(cmd_vdso_check)
+
#
# Install the unstripped copies of vdso*.so. If our toolchain supports
# build-id, install .build-id links as well.
prev parent reply other threads:[~2019-07-12 15:41 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-12 10:15 [PATCH v2 1/2] x86/vdso: fix flip/flop vdso build bug Naohiro Aota
2019-07-12 10:15 ` Naohiro Aota
2019-07-12 10:15 ` [PATCH v2 2/2] arm64/vdso: " Naohiro Aota
2019-07-12 10:15 ` Naohiro Aota
2019-07-12 12:06 ` [PATCH] arm64: compat: Fix flip/flop vdso building bug Vincenzo Frascino
2019-07-12 12:06 ` Vincenzo Frascino
2019-07-12 12:10 ` [PATCH v2 2/2] arm64/vdso: fix flip/flop vdso build bug Vincenzo Frascino
2019-07-12 12:10 ` Vincenzo Frascino
2019-07-12 14:55 ` Masahiro Yamada
2019-07-12 14:55 ` Masahiro Yamada
2019-07-12 15:37 ` Will Deacon
2019-07-12 15:37 ` Will Deacon
2019-07-18 11:41 ` [PATCH] arm64: vdso: Cleanup Makefiles Vincenzo Frascino
2019-07-18 11:41 ` Vincenzo Frascino
2019-07-19 8:04 ` Will Deacon
2019-07-19 8:04 ` Will Deacon
2019-07-19 9:49 ` Vincenzo Frascino
2019-07-19 9:49 ` Vincenzo Frascino
2019-07-19 10:10 ` [PATCH v2] " Vincenzo Frascino
2019-07-19 10:10 ` Vincenzo Frascino
2019-07-22 9:41 ` Will Deacon
2019-07-22 9:41 ` Will Deacon
2019-07-12 12:09 ` [PATCH v2 1/2] x86/vdso: fix flip/flop vdso build bug Vincenzo Frascino
2019-07-12 12:09 ` Vincenzo Frascino
2019-07-12 14:54 ` Masahiro Yamada
2019-07-12 14:54 ` Masahiro Yamada
2019-07-12 15:41 ` tip-bot for Naohiro Aota [this message]
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=tip-e9a1379f9219be439f47a0f063431a92dc529eda@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=naohiro.aota@wdc.com \
--cc=tglx@linutronix.de \
--cc=vincenzo.frascino@arm.com \
--cc=yamada.masahiro@socionext.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.