Re: [PATCH 2/2] x86/kstack_erase: Use REP STOSQ for large stack fills

From: Peter Zijlstra

Date: Fri Nov 20 2026 - 07:26:48 EST


On Fri, Nov 20, 2026 at 11:45:34AM +0100, Peter Zijlstra wrote:
> On Thu, Nov 19, 2026 at 01:31:08PM -0800, Usama Arif wrote:
> > +#ifdef CONFIG_X86_64
> > +#define __stackleak_poison __stackleak_poison
> > +static __always_inline void __stackleak_poison(unsigned long erase_low,
> > + unsigned long erase_high,
> > + unsigned long poison)
> > +{
> > + unsigned long count;
> > +
> > + /* Short spans do not amortize the startup cost of REP STOSQ. */
> > + if (erase_high <= erase_low + 512) {
> > + while (erase_low < erase_high) {
> > + *(unsigned long *)erase_low = poison;
> > + erase_low += sizeof(unsigned long);
> > + }
> > + return;
> > + }
> > +
> > + count = (erase_high - erase_low) / sizeof(unsigned long);
> > + asm volatile("rep stosq"
> > + : "+D" (erase_low), "+c" (count)
> > + : "a" (poison)
> > + : "memory");
> > +}
> > +#endif
>
> Gemini seems to suggest 16-32 words would be sufficient to amortize the
> REP STOS setup. It was also adamant I try and unroll that earlier loop.
>
> How about something like so, does that make sense? Also, I suppose we
> should make memset64() __always_inline if we use it here. I'm not at all
> sold on the unroll here, the asm is pretty horrid for what it does.

This one is much improved:

--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -28,6 +28,7 @@ struct vm86;
#include <asm/vmxfeatures.h>
#include <asm/vdso/processor.h>
#include <asm/shstk.h>
+#include <asm/string.h>

#include <linux/personality.h>
#include <linux/cache.h>
@@ -580,6 +581,35 @@ static __always_inline bool on_thread_st
current_stack_pointer) < THREAD_SIZE;
}

+#ifdef CONFIG_X86_64
+#define __stackleak_poison __stackleak_poison
+static __always_inline void __stackleak_poison(unsigned long erase_low,
+ unsigned long erase_high,
+ unsigned long poison)
+{
+ unsigned long count = (erase_high - erase_low) / sizeof(unsigned long);
+
+ /* Amortize the startup cost of REP STOSQ. */
+ if (count < 32) {
+ unsigned long *ptr = (unsigned long *)erase_low;
+
+ while (count) {
+ unsigned long mod = (count-1) % 4;
+ count -= mod+1;
+ switch (mod) {
+ case 3: ptr[count+3] = poison; fallthrough;
+ case 2: ptr[count+2] = poison; fallthrough;
+ case 1: ptr[count+1] = poison; fallthrough;
+ case 0: ptr[count+0] = poison; break;
+ }
+ }
+ return;
+ }
+
+ memset64((void *)erase_low, poison, count);
+}
+#endif
+
#ifdef CONFIG_PARAVIRT_XXL
#include <asm/paravirt.h>
#else