| From 85c20a022a8b0e15dd8e3aadf9a086eaf14eb2f8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 29 Apr 2024 14:28:43 +0200 |
| Subject: s390/vdso: Use standard stack frame layout |
| |
| From: Heiko Carstens <hca@linux.ibm.com> |
| |
| [ Upstream commit 185445c7c137822ad856aae91a41e199370cb534 ] |
| |
| By default user space is compiled with standard stack frame layout and not |
| with the packed stack layout. The vdso code however inherited the |
| -mpacked-stack compiler option from the kernel. Remove this option to make |
| sure the vdso is compiled with standard stack frame layout. |
| |
| This makes sure that the stack frame backchain location for vdso generated |
| stack frames is the same like for calling code (if compiled with default |
| options). This allows to manually walk stack frames without DWARF |
| information, like the kernel is doing it e.g. with arch_stack_walk_user(). |
| |
| Fixes: 4bff8cb54502 ("s390: convert to GENERIC_VDSO") |
| Reviewed-by: Jens Remus <jremus@linux.ibm.com> |
| Signed-off-by: Heiko Carstens <hca@linux.ibm.com> |
| Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/s390/kernel/vdso32/Makefile | 1 + |
| arch/s390/kernel/vdso64/Makefile | 1 + |
| 2 files changed, 2 insertions(+) |
| |
| diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile |
| index 9090c0e5de254..4800d80decee6 100644 |
| --- a/arch/s390/kernel/vdso32/Makefile |
| +++ b/arch/s390/kernel/vdso32/Makefile |
| @@ -19,6 +19,7 @@ KBUILD_AFLAGS_32 := $(filter-out -m64,$(KBUILD_AFLAGS)) |
| KBUILD_AFLAGS_32 += -m31 -s |
| |
| KBUILD_CFLAGS_32 := $(filter-out -m64,$(KBUILD_CFLAGS)) |
| +KBUILD_CFLAGS_32 := $(filter-out -mpacked-stack,$(KBUILD_CFLAGS)) |
| KBUILD_CFLAGS_32 := $(filter-out -mno-pic-data-is-text-relative,$(KBUILD_CFLAGS_32)) |
| KBUILD_CFLAGS_32 := $(filter-out -fno-asynchronous-unwind-tables,$(KBUILD_CFLAGS_32)) |
| KBUILD_CFLAGS_32 += -m31 -fPIC -shared -fno-common -fno-builtin -fasynchronous-unwind-tables |
| diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile |
| index a44f51de1f1ea..2f2e4e997030c 100644 |
| --- a/arch/s390/kernel/vdso64/Makefile |
| +++ b/arch/s390/kernel/vdso64/Makefile |
| @@ -24,6 +24,7 @@ KBUILD_AFLAGS_64 := $(filter-out -m64,$(KBUILD_AFLAGS)) |
| KBUILD_AFLAGS_64 += -m64 |
| |
| KBUILD_CFLAGS_64 := $(filter-out -m64,$(KBUILD_CFLAGS)) |
| +KBUILD_CFLAGS_64 := $(filter-out -mpacked-stack,$(KBUILD_CFLAGS_64)) |
| KBUILD_CFLAGS_64 := $(filter-out -mno-pic-data-is-text-relative,$(KBUILD_CFLAGS_64)) |
| KBUILD_CFLAGS_64 := $(filter-out -munaligned-symbols,$(KBUILD_CFLAGS_64)) |
| KBUILD_CFLAGS_64 := $(filter-out -fno-asynchronous-unwind-tables,$(KBUILD_CFLAGS_64)) |
| -- |
| 2.43.0 |
| |
