x86/fpu: Refactor xfeature bitmask update code for sigframe XSAVE

Currently, saving register states in the signal frame, the legacy feature
bits are always set in xregs_state->header->xfeatures. This code sequence
can be generalized for reuse in similar cases.

Refactor the logic to ensure a consistent approach across similar usages.

Signed-off-by: Chang S. Bae <chang.seok.bae@intel.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Link: https://lore.kernel.org/r/20250416021720.12305-8-chang.seok.bae@intel.com

diff --git a/arch/x86/kernel/fpu/signal.c b/arch/x86/kernel/fpu/signal.c
index b8b4fa9c2d04ef650aca8134e81559b91a6336aa..c3ec2512f2bbe498767156c0cd90bce6bdf11320 100644 (file)
--- a/arch/x86/kernel/fpu/signal.c
+++ b/arch/x86/kernel/fpu/signal.c
@@ -114,7 +114,6 @@ static inline bool save_xstate_epilog(void __user *buf, int ia32_frame,
 {
        struct xregs_state __user *x = buf;
        struct _fpx_sw_bytes sw_bytes = {};
-       u32 xfeatures;
        int err;
 
        /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
@@ -127,12 +126,6 @@ static inline bool save_xstate_epilog(void __user *buf, int ia32_frame,
        err |= __put_user(FP_XSTATE_MAGIC2,
                          (__u32 __user *)(buf + fpstate->user_size));
 
-       /*
-        * Read the xfeatures which we copied (directly from the cpu or
-        * from the state in task struct) to the user buffers.
-        */
-       err |= __get_user(xfeatures, (__u32 __user *)&x->header.xfeatures);
-
        /*
         * For legacy compatible, we always set FP/SSE bits in the bit
         * vector while saving the state to the user context. This will
@@ -144,9 +137,7 @@ static inline bool save_xstate_epilog(void __user *buf, int ia32_frame,
         * header as well as change any contents in the memory layout.
         * xrestore as part of sigreturn will capture all the changes.
         */
-       xfeatures |= XFEATURE_MASK_FPSSE;
-
-       err |= __put_user(xfeatures, (__u32 __user *)&x->header.xfeatures);
+       err |= set_xfeature_in_sigframe(x, XFEATURE_MASK_FPSSE);
 
        return !err;
 }

diff --git a/arch/x86/kernel/fpu/xstate.h b/arch/x86/kernel/fpu/xstate.h
index 9a3a8ccf13bfc3caa8b6342ac908d780f7fef841..4231e449f0b4694ec50241ec1b11bb673f265c2a 100644 (file)
--- a/arch/x86/kernel/fpu/xstate.h
+++ b/arch/x86/kernel/fpu/xstate.h
@@ -69,6 +69,19 @@ static inline u64 xfeatures_mask_independent(void)
        return fpu_kernel_cfg.independent_features;
 }
 
+static inline int set_xfeature_in_sigframe(struct xregs_state __user *xbuf, u64 mask)
+{
+       u64 xfeatures;
+       int err;
+
+       /* Read the xfeatures value already saved in the user buffer */
+       err  = __get_user(xfeatures, &xbuf->header.xfeatures);
+       xfeatures |= mask;
+       err |= __put_user(xfeatures, &xbuf->header.xfeatures);
+
+       return err;
+}
+
 /*
  * Update the value of PKRU register that was already pushed onto the signal frame.
  */