From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi1-f201.google.com (mail-oi1-f201.google.com [209.85.167.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C555A3B442B for ; Mon, 15 Jun 2026 19:37:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781552248; cv=none; b=qA++jfKW6klK8l4/ynquH+/VLXFTeMWDtAGlhXjiOg14ISVofqc01+SV/JXDDGIktHX4Rnco17mC5KtRQNxvCXwdIeTiP+KR2zJJy6PZVbkuRn0JBRviTBAfOPuhCn7JXSMVLXtqpC0TjgKdJ4qDuHOaiaxMRFO4BYg0t+uoXZo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781552248; c=relaxed/simple; bh=BOIgaDYevkRl9CrKQnWtqnuGA8KjSTYhwf6e/TMMBaY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=IpbQn9hnczNlQ/Br0JU/mFeldAzLMCszyO7S+GwVmOE0MJpxptgjt/jBgyMGHTw5A0bvSoblYJJEQWMJvbT249S3EAykAW5KIBQJkhXnEMGSr/tOljwKU6ybJxLlQrnzrNynaoLnXhju6LSIakCctYRr2CdpRCNu0NpG0PvKN/Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--avagin.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=NH63oqJr; arc=none smtp.client-ip=209.85.167.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--avagin.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="NH63oqJr" Received: by mail-oi1-f201.google.com with SMTP id 5614622812f47-486055c1c6fso3779636b6e.1 for ; Mon, 15 Jun 2026 12:37:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781552246; x=1782157046; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=kuScpCky9EV51pcaPNLg+z+OB6uFw6CK2H65VvozpcQ=; b=NH63oqJrAhPypSd1WiJwFB1+ZQku+B9qETC56Du6Zu8LfMnn85fmaVj/Kfud27UpxW r9kMITKvNffIaa7CHi8oaKa1XMKKBGvpPpF+gL/pYfVwqQdUtkH+uubx+VCWP+KERRDv UQvdOnohLkX6ihzS+ypHP4UR9IuuYp9LazaZ9rUMGHSxT5xPuw9n0B5U64cfDbRr/0mz bIPwwhBetxwubjRMjGrsQjw9GCuOVcq3e+kwg5txrIjnkhjeGNT0cI5QKAt4P2HBZcIn axC1vb3ESaLh0RdgrRG/tdnN4YllW14FFOORgI7rghrVdPBSzRrE8/kwo/RcovqBNCbO XHFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781552246; x=1782157046; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kuScpCky9EV51pcaPNLg+z+OB6uFw6CK2H65VvozpcQ=; b=Zv6WrzSB+wKZ2fck5nXpzqFieauaTnwqIvagNEBMdf6ocARGsLhu8mPKOzWEtEegw5 EkOsVnIpMBn7kL3pkj/n2RsBai0fF3g6VaHMV4Zhc+6yxI+9CG3tHQvJS/MldeDdOJyJ fNvgtZFRtmxtnFLg+M2LWSVy4o0v5lpdUDQUvxeuLXRk/R6mgXko3llmTUPbijqQ8Wp3 /sbwlxk6aQbc7XxmmyZCAqDf585/1XGFhhwG+2WPBCEg/IiQnPjTFXaZuOx0otSqV5q7 Bflba7xRP4jTNKWXksCwlB21mIlzYctmPjHiUjo4x0KYQOMlf1eyPfJ1Tm2TgUOFoW/O XDnw== X-Gm-Message-State: AOJu0Ywlu3ALMnp/zSKu8t4UGfWigY7cfv7a1EIo08bSQaJCeLg7zlwy sJLqCGl51K4uNrcO1nA9DEgTvP8T3hrpbt1LLucP5GsVZwgZWnczxV2qCMCm8vPEWwyh9+7QMxc b4vszKw== X-Received: from iohf19-n2.prod.google.com ([2002:a05:6602:a5d3:20b0:978:ad30:f0da]) (user=avagin job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6808:4f50:b0:464:5f3:ed1 with SMTP id 5614622812f47-4872f50a5abmr9737033b6e.26.1781552245421; Mon, 15 Jun 2026 12:37:25 -0700 (PDT) Date: Mon, 15 Jun 2026 19:37:08 +0000 In-Reply-To: <20260615193716.1843340-1-avagin@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260615193716.1843340-1-avagin@google.com> X-Mailer: git-send-email 2.54.0.1189.g8c84645362-goog Message-ID: <20260615193716.1843340-3-avagin@google.com> Subject: [PATCH 02/10] x86/fpu: Clean up and rename variables in signal frame handling From: Andrei Vagin To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , "Chang S. Bae" Cc: linux-kernel@vger.kernel.org, criu@lists.linux.dev, Dave Hansen , x86@kernel.org, Andrei Vagin , "H. Peter Anvin" , Ingo Molnar Content-Type: text/plain; charset="UTF-8" Clean up signal frame handling code by renaming several variables for clarity and consistency, and moving masking logic closer to its usage. - Rename 'fxbuf' to 'buf_fx' in check_xstate_in_sigframe() for consistency. - Rename label 'setfx' to 'err_setfx' in check_xstate_in_sigframe() to indicate it is an error path. - In __restore_fpregs_from_user(), rename 'ufeatures' to 'task_xfeatures' and 'xrestore' to 'xrestore_mask'. - Move the masking logic 'xrestore_mask &= task_xfeatures' from restore_fpregs_from_user() into __restore_fpregs_from_user(). - Rename 'xrestore' to 'xrestore_mask' in restore_fpregs_from_user() to match the name in __restore_fpregs_from_user() and __fpu_restore_sig(). - In __fpu_restore_sig(), rename 'buf' to 'buf_f' to distinguish it from 'buf_fx', and 'user_xfeatures' to 'xrestore_mask'. No functional changes. Suggested-by: Ingo Molnar Signed-off-by: Andrei Vagin --- arch/x86/kernel/fpu/signal.c | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/arch/x86/kernel/fpu/signal.c b/arch/x86/kernel/fpu/signal.c index 20b638c507ca..42c3d78bd849 100644 --- a/arch/x86/kernel/fpu/signal.c +++ b/arch/x86/kernel/fpu/signal.c @@ -24,15 +24,15 @@ * Check for the presence of extended state information in the * user fpstate pointer in the sigcontext. */ -static inline bool check_xstate_in_sigframe(struct fxregs_state __user *fxbuf, +static inline bool check_xstate_in_sigframe(struct fxregs_state __user *buf_fx, struct _fpx_sw_bytes *fx_sw) { int min_xstate_size = sizeof(struct fxregs_state) + sizeof(struct xstate_header); - void __user *fpstate = fxbuf; + void __user *fpstate = buf_fx; unsigned int magic2; - if (__copy_from_user(fx_sw, &fxbuf->sw_reserved[0], sizeof(*fx_sw))) + if (__copy_from_user(fx_sw, &buf_fx->sw_reserved[0], sizeof(*fx_sw))) return false; /* Check for the first magic field and other error scenarios. */ @@ -40,7 +40,7 @@ static inline bool check_xstate_in_sigframe(struct fxregs_state __user *fxbuf, fx_sw->xstate_size < min_xstate_size || fx_sw->xstate_size > x86_task_fpu(current)->fpstate->user_size || fx_sw->xstate_size > fx_sw->extended_size) - goto setfx; + goto err_setfx; /* * Check for the presence of second magic word at the end of memory @@ -53,7 +53,7 @@ static inline bool check_xstate_in_sigframe(struct fxregs_state __user *fxbuf, if (likely(magic2 == FP_XSTATE_MAGIC2)) return true; -setfx: +err_setfx: trace_x86_fpu_xstate_check_failed(x86_task_fpu(current)); /* Set the parameters for fx only state */ @@ -240,15 +240,17 @@ bool copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size, u return true; } -static int __restore_fpregs_from_user(void __user *buf, u64 ufeatures, - u64 xrestore, bool fx_only) +static int __restore_fpregs_from_user(void __user *buf, u64 task_xfeatures, + u64 xrestore_mask, bool fx_only) { if (use_xsave()) { - u64 init_bv = ufeatures & ~xrestore; + u64 init_bv = task_xfeatures & ~xrestore_mask; int ret; + /* Restore enabled features only. */ + xrestore_mask &= task_xfeatures; if (likely(!fx_only)) - ret = xrstor_from_user_sigframe(buf, xrestore); + ret = xrstor_from_user_sigframe(buf, xrestore_mask); else ret = fxrstor_from_user_sigframe(buf); @@ -266,20 +268,18 @@ static int __restore_fpregs_from_user(void __user *buf, u64 ufeatures, * Attempt to restore the FPU registers directly from user memory. * Pagefaults are handled and any errors returned are fatal. */ -static bool restore_fpregs_from_user(void __user *buf, u64 xrestore, bool fx_only) +static bool restore_fpregs_from_user(void __user *buf, u64 xrestore_mask, bool fx_only) { struct fpu *fpu = x86_task_fpu(current); int ret; - /* Restore enabled features only. */ - xrestore &= fpu->fpstate->user_xfeatures; retry: fpregs_lock(); /* Ensure that XFD is up to date */ xfd_update_state(fpu->fpstate); pagefault_disable(); ret = __restore_fpregs_from_user(buf, fpu->fpstate->user_xfeatures, - xrestore, fx_only); + xrestore_mask, fx_only); pagefault_enable(); if (unlikely(ret)) { @@ -324,7 +324,7 @@ static bool restore_fpregs_from_user(void __user *buf, u64 xrestore, bool fx_onl return true; } -static bool __fpu_restore_sig(void __user *buf, void __user *buf_fx, +static bool __fpu_restore_sig(void __user *buf_f, void __user *buf_fx, bool ia32_fxstate) { struct task_struct *tsk = current; @@ -332,7 +332,7 @@ static bool __fpu_restore_sig(void __user *buf, void __user *buf_fx, struct user_i387_ia32_struct env; bool success, fx_only = false; union fpregs_state *fpregs; - u64 user_xfeatures = 0; + u64 xrestore_mask = 0; if (use_xsave()) { struct _fpx_sw_bytes fx_sw_user; @@ -341,14 +341,14 @@ static bool __fpu_restore_sig(void __user *buf, void __user *buf_fx, return false; fx_only = !fx_sw_user.magic1; - user_xfeatures = fx_sw_user.xfeatures; + xrestore_mask = fx_sw_user.xfeatures; } else { - user_xfeatures = XFEATURE_MASK_FPSSE; + xrestore_mask = XFEATURE_MASK_FPSSE; } if (likely(!ia32_fxstate)) { /* Restore the FPU registers directly from user memory. */ - return restore_fpregs_from_user(buf_fx, user_xfeatures, fx_only); + return restore_fpregs_from_user(buf_fx, xrestore_mask, fx_only); } /* @@ -356,7 +356,7 @@ static bool __fpu_restore_sig(void __user *buf, void __user *buf_fx, * to be ignored for histerical raisins. The legacy state is folded * in once the larger state has been copied. */ - if (__copy_from_user(&env, buf, sizeof(env))) + if (__copy_from_user(&env, buf_f, sizeof(env))) return false; /* @@ -420,7 +420,7 @@ static bool __fpu_restore_sig(void __user *buf, void __user *buf_fx, * * Preserve supervisor states! */ - u64 mask = user_xfeatures | xfeatures_mask_supervisor(); + u64 mask = xrestore_mask | xfeatures_mask_supervisor(); fpregs->xsave.header.xfeatures &= mask; success = !os_xrstor_safe(fpu->fpstate, -- 2.54.0.1189.g8c84645362-goog