From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.zytor.com (terminus.zytor.com [198.137.202.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 581782EBB8F for ; Fri, 16 Jan 2026 20:41:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.136 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768596104; cv=none; b=VG5HvaCd4ZMi7Rpptgkhirv5V/1DHb/4rZal8zDhIduFc5N1cnfu27hqsr83wzxuAYS1IsnGMf3Kf5JnTC0fM9wvcDwKulGh05reP75YqX6LXmdA8nAwbDEABQiNHkEOk2gt/p/xL+55CQ+9MD9Qo+deBAvHyAAYiJbTrke0PMw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768596104; c=relaxed/simple; bh=wZMQNbHwzZnmkaKIP1qVL+vDiFaR4KEa84vANQo2PgM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=qBzHHg28bYhyFiezPaGL8Pvc5Q/I1VbfreSAWpQyenp0hEhfSTa2qOhhneEMKyk4DmzXVfqNUt0s4muVpF1u2NwgqA88NJdFr3lUyHskFC52scf4yfaCXsSYC6whv4rrZX4X3Bv9oKtuoVDPIY3elOzbA9VZiw1kiBqo5KfsJ1w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zytor.com; spf=pass smtp.mailfrom=zytor.com; dkim=pass (2048-bit key) header.d=zytor.com header.i=@zytor.com header.b=GelT2gzN; arc=none smtp.client-ip=198.137.202.136 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zytor.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zytor.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=zytor.com header.i=@zytor.com header.b="GelT2gzN" Received: from mail.zytor.com (c-76-133-66-138.hsd1.ca.comcast.net [76.133.66.138]) (authenticated bits=0) by mail.zytor.com (8.18.1/8.17.1) with ESMTPSA id 60GKf1UL2688687 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 16 Jan 2026 12:41:02 -0800 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.zytor.com 60GKf1UL2688687 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zytor.com; s=2025122301; t=1768596063; bh=MiktmDIHSeqzt/sIzuzjMl45+3OEjwz8BaOFmyIeafE=; h=From:To:Cc:Subject:Date:From; b=GelT2gzNH9ql19Mpbgedeiod7V8Or+TcOTvJkHCwVUNWpmguvC+gH3fESMmzo2MCd IpiVqvmFN0daXIJTXfiHjnSaPuabhioCrMLbEvVmTlPjnaqlE1OunTnJ9uicHuMrGb FK8VsBAvFAoD+gfF8Q9ugC52H6SJUpdqCZuPRE2NiKW9cWOGNkeUfBpVtUP2aYcvoe 5rSHxA29+N4O20FBkhM4eNOSsczKrjLKI0R+7VpY6jx99QaicSP0NzRk77jthCYoJI 5ohW16osdwGUqOq6EUe3zhSG0fALhLgqAjzWjQ1FN28ILcigFI6GgZHftULFhmGZMa T9IRG1xRDbMqQ== From: "H. Peter Anvin" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen Cc: "H. Peter Anvin" , x86@kernel.org, Chris Mason , Thorsten Leemhuis , linux-kernel@vger.kernel.org Subject: [PATCH v2 0/3] tip:x86/entry: fix vdso build restructuring fallout Date: Fri, 16 Jan 2026 12:40:53 -0800 Message-ID: <20260116204057.386268-1-hpa@zytor.com> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit After integration in linux-next, the movement of files from the vdso restructuring broke "make vdso_install" and one of the kernel self tests. [Thorsten Leemhuis, kernel test robot] It also contained an incorrect filtering pattern which although non-manifest at this point, is a forward compatibility bug [Chris Mason] x86/entry/vdso, selftest: update location of vgetrandom-chacha.S x86/entry/vdso: x86/entry/vdso: fix filtering of compiler flags x86/entry/vdso: update the object paths for "make vdso_install" --- arch/x86/Makefile | 6 +++--- arch/x86/entry/vdso/common/Makefile.include | 6 +++--- tools/testing/selftests/vDSO/vgetrandom-chacha.S | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 9ab7522ced18..5f881460a8b5 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -318,9 +318,9 @@ PHONY += install install: $(call cmd,install) -vdso-install-$(CONFIG_X86_64) += arch/x86/entry/vdso/vdso64.so.dbg -vdso-install-$(CONFIG_X86_X32_ABI) += arch/x86/entry/vdso/vdsox32.so.dbg -vdso-install-$(CONFIG_COMPAT_32) += arch/x86/entry/vdso/vdso32.so.dbg +vdso-install-$(CONFIG_X86_64) += arch/x86/entry/vdso/vdso64/vdso64.so.dbg +vdso-install-$(CONFIG_X86_X32_ABI) += arch/x86/entry/vdso/vdso64/vdsox32.so.dbg +vdso-install-$(CONFIG_COMPAT_32) += arch/x86/entry/vdso/vdso32/vdso32.so.dbg archprepare: checkbin checkbin: diff --git a/arch/x86/entry/vdso/common/Makefile.include b/arch/x86/entry/vdso/common/Makefile.include index 3514b4a6869b..bf5798cb6781 100644 --- a/arch/x86/entry/vdso/common/Makefile.include +++ b/arch/x86/entry/vdso/common/Makefile.include @@ -23,9 +23,9 @@ $(obj)/%.lds : KBUILD_CPPFLAGS += $(CPPFLAGS_VDSO_LDS) # flags-remove-y += \ -D__KERNEL__ -mcmodel=kernel -mregparm=3 \ - -fno-pic -fno-PIC -fno-pie fno-PIE \ + -fno-pic -fno-PIC -fno-pie -fno-PIE \ -mfentry -pg \ - $(RANDSTRUCT_CFLAGS) $(GCC_PLUGIN_CFLAGS) $(KSTACK_ERASE_CFLAGS) \ + $(RANDSTRUCT_CFLAGS) $(GCC_PLUGINS_CFLAGS) $(KSTACK_ERASE_CFLAGS) \ $(RETPOLINE_CFLAGS) $(CC_FLAGS_LTO) $(CC_FLAGS_CFI) \ $(PADDING_CFLAGS) @@ -45,7 +45,7 @@ flags-y += -fasynchronous-unwind-tables # Reset cf protections enabled by compiler default flags-y += $(call cc-option, -fcf-protection=none) -flags-$(X86_USER_SHADOW_STACK) += $(call cc-option, -fcf-protection=return) +flags-$(CONFIG_X86_USER_SHADOW_STACK) += $(call cc-option, -fcf-protection=return) # When user space IBT is supported, enable this. # flags-$(CONFIG_USER_IBT) += $(call cc-option, -fcf-protection=branch) diff --git a/tools/testing/selftests/vDSO/vgetrandom-chacha.S b/tools/testing/selftests/vDSO/vgetrandom-chacha.S index a4a82e1c28a9..10f982157a1f 100644 --- a/tools/testing/selftests/vDSO/vgetrandom-chacha.S +++ b/tools/testing/selftests/vDSO/vgetrandom-chacha.S @@ -16,5 +16,5 @@ #elif defined(__s390x__) #include "../../../../arch/s390/kernel/vdso64/vgetrandom-chacha.S" #elif defined(__x86_64__) -#include "../../../../arch/x86/entry/vdso/vgetrandom-chacha.S" +#include "../../../../arch/x86/entry/vdso/vdso64/vgetrandom-chacha.S" #endif