Re: Patch "alpha: make stack 16-byte aligned (most cases)" has been added to the 6.6-stable tree
On Tue, Feb 18, 2025 at 01:55:45PM +0100, gregkh@linuxfoundation.org wrote:
This is a note to let you know that I've just added the patch titled
alpha: make stack 16-byte aligned (most cases)
Hi Greg, thanks for applying this!
Patches currently in stable-queue which might be from ink@unseen.parts are
queue-6.6/alpha-make-stack-16-byte-aligned-most-cases.patch queue-6.6/alpha-align-stack-for-page-fault-and-user-unaligned-trap-handlers.patch
The third one (commit 77b823fa619f97d alpha: replace hardcoded stack offsets with autogenerated ones) is also needed, but it won't apply as-is to 6.6 and older kernels.
Do you want me to provide the patches?
Ivan.
On Tue, Feb 18, 2025 at 02:40:38PM +0100, Ivan Kokshaysky wrote:
On Tue, Feb 18, 2025 at 01:55:45PM +0100, gregkh@linuxfoundation.org wrote:
This is a note to let you know that I've just added the patch titled
alpha: make stack 16-byte aligned (most cases)Hi Greg, thanks for applying this!
Patches currently in stable-queue which might be from ink@unseen.parts are
queue-6.6/alpha-make-stack-16-byte-aligned-most-cases.patch queue-6.6/alpha-align-stack-for-page-fault-and-user-unaligned-trap-handlers.patch
The third one (commit 77b823fa619f97d alpha: replace hardcoded stack offsets with autogenerated ones) is also needed, but it won't apply as-is to 6.6 and older kernels.
Do you want me to provide the patches?
Please do!
thanks,
greg k-h
[backported commit 77b823fa619f97d16409]
This allows the assembly in entry.S to automatically keep in sync with changes in the stack layout (struct pt_regs and struct switch_stack).
Cc: stable@vger.kernel.org # v4.19.x-v6.1.x Signed-off-by: Ivan Kokshaysky ink@unseen.parts --- arch/alpha/kernel/asm-offsets.c | 4 ++++ arch/alpha/kernel/entry.S | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/alpha/kernel/asm-offsets.c b/arch/alpha/kernel/asm-offsets.c index 4cfeae42c79a..e9dad60b147f 100644 --- a/arch/alpha/kernel/asm-offsets.c +++ b/arch/alpha/kernel/asm-offsets.c @@ -32,7 +32,9 @@ void foo(void) DEFINE(CRED_EGID, offsetof(struct cred, egid)); BLANK();
+ DEFINE(SP_OFF, offsetof(struct pt_regs, ps)); DEFINE(SIZEOF_PT_REGS, sizeof(struct pt_regs)); + DEFINE(SWITCH_STACK_SIZE, sizeof(struct switch_stack)); DEFINE(PT_PTRACED, PT_PTRACED); DEFINE(CLONE_VM, CLONE_VM); DEFINE(CLONE_UNTRACED, CLONE_UNTRACED); diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index dd26062d75b3..6fb38365539d 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S @@ -15,10 +15,6 @@ .set noat .cfi_sections .debug_frame
-/* Stack offsets. */ -#define SP_OFF 184 -#define SWITCH_STACK_SIZE 320 - .macro CFI_START_OSF_FRAME func .align 4 .globl \func
[backported commit 77b823fa619f97d16409]
This allows the assembly in entry.S to automatically keep in sync with changes in the stack layout (struct pt_regs and struct switch_stack).
Cc: stable@vger.kernel.org # v6.6.x Signed-off-by: Ivan Kokshaysky ink@unseen.parts --- arch/alpha/kernel/asm-offsets.c | 4 ++++ arch/alpha/kernel/entry.S | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/alpha/kernel/asm-offsets.c b/arch/alpha/kernel/asm-offsets.c index 4cfeae42c79a..e9dad60b147f 100644 --- a/arch/alpha/kernel/asm-offsets.c +++ b/arch/alpha/kernel/asm-offsets.c @@ -34,7 +34,9 @@ void foo(void) DEFINE(CRED_EGID, offsetof(struct cred, egid)); BLANK();
+ DEFINE(SP_OFF, offsetof(struct pt_regs, ps)); DEFINE(SIZEOF_PT_REGS, sizeof(struct pt_regs)); + DEFINE(SWITCH_STACK_SIZE, sizeof(struct switch_stack)); DEFINE(PT_PTRACED, PT_PTRACED); DEFINE(CLONE_VM, CLONE_VM); DEFINE(CLONE_UNTRACED, CLONE_UNTRACED); diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index dd26062d75b3..6fb38365539d 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S @@ -15,10 +15,6 @@ .set noat .cfi_sections .debug_frame
-/* Stack offsets. */ -#define SP_OFF 184 -#define SWITCH_STACK_SIZE 64 - .macro CFI_START_OSF_FRAME func .align 4 .globl \func
On Tue, Feb 18, 2025 at 03:52:20PM +0100, Ivan Kokshaysky wrote:
[backported commit 77b823fa619f97d16409]
Nit, please use the full commit id.
This allows the assembly in entry.S to automatically keep in sync with changes in the stack layout (struct pt_regs and struct switch_stack).
Cc: stable@vger.kernel.org # v6.6.x Signed-off-by: Ivan Kokshaysky ink@unseen.parts
Also you dropped all the other signed-off-by here. I'll go fix this up...
thanks,
greg k-h
linux-stable-mirror@lists.linaro.org
-
Greg KH -
Ivan Kokshaysky