From nobody Mon Apr 13 21:41:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0485C433FE for ; Wed, 16 Nov 2022 23:34:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234549AbiKPXeS (ORCPT ); Wed, 16 Nov 2022 18:34:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234181AbiKPXd5 (ORCPT ); Wed, 16 Nov 2022 18:33:57 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D48C632B9C; Wed, 16 Nov 2022 15:33:56 -0800 (PST) Date: Wed, 16 Nov 2022 23:33:53 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1668641634; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rrwn3XiFQACWItqwB/rq8DEZB6S62a07vlj6rycE4sg=; b=igKRZ4urK0SUk7PUglIhEmy+DBYKAVRCLlJXDAGbc3LXhNu0fIaInVhY3ghzijMVSs6KfM HXnrmWZYgEpDhVLQerBILAVeyhFDAqWpePfzX8Ao06I+4owOemWe1uqN7KIjTqZpERoAet i4n278nI+bBMFcxCkfEAVzvAD9b/ZWTbcaIHK4LsKLeoXw5DdxY7nCu8H4AKqW9oTQS+b6 hPEGly4bj5DDOc3tg2gqTOzCEX+gfBHbP1xThFK39NZIlbHEoddB/0X1IPsVBIjiy8w5X1 TSmFeD6s0jhIW18QnDYNCR3R6RgXQ/PrMvX46BWYJKhR5vUSBz2wHbuVbSnW4Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1668641634; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rrwn3XiFQACWItqwB/rq8DEZB6S62a07vlj6rycE4sg=; b=Szud7kgtTdq3cvWh8KlA5MoYg6Uuk9Q/R6S1BQLUATmml/rhkwNW46WZwRU4zq3lXax95f wIg7UM3Xvxzyw/DQ== From: "tip-bot2 for Kyle Huey" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/fpu] x86/fpu: Add a pkru argument to copy_uabi_from_kernel_to_xstate(). Cc: Kyle Huey , Dave Hansen , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <166864163317.4906.15150213496380358511.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/fpu branch of tip: Commit-ID: 1c813ce0305571e1b2e4cc4acca451da9e6ad18f Gitweb: https://git.kernel.org/tip/1c813ce0305571e1b2e4cc4acca451da9= e6ad18f Author: Kyle Huey AuthorDate: Tue, 15 Nov 2022 15:09:28 -08:00 Committer: Dave Hansen CommitterDate: Wed, 16 Nov 2022 15:03:01 -08:00 x86/fpu: Add a pkru argument to copy_uabi_from_kernel_to_xstate(). Both KVM (through KVM_SET_XSTATE) and ptrace (through PTRACE_SETREGSET with NT_X86_XSTATE) ultimately call copy_uabi_from_kernel_to_xstate(), but the canonical locations for the current PKRU value for KVM guests and processes in a ptrace stop are different (in the kvm_vcpu_arch and the thread_state structs respectively). In preparation for eventually handling PKRU in copy_uabi_to_xstate, pass in a pointer to the PKRU location. Signed-off-by: Kyle Huey Signed-off-by: Dave Hansen Link: https://lore.kernel.org/all/20221115230932.7126-3-khuey%40kylehuey.com --- arch/x86/kernel/fpu/core.c | 2 +- arch/x86/kernel/fpu/regset.c | 2 +- arch/x86/kernel/fpu/xstate.c | 2 +- arch/x86/kernel/fpu/xstate.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c index 3b28c5b..5501576 100644 --- a/arch/x86/kernel/fpu/core.c +++ b/arch/x86/kernel/fpu/core.c @@ -406,7 +406,7 @@ int fpu_copy_uabi_to_guest_fpstate(struct fpu_guest *gf= pu, const void *buf, if (ustate->xsave.header.xfeatures & ~xcr0) return -EINVAL; =20 - ret =3D copy_uabi_from_kernel_to_xstate(kstate, ustate); + ret =3D copy_uabi_from_kernel_to_xstate(kstate, ustate, vpkru); if (ret) return ret; =20 diff --git a/arch/x86/kernel/fpu/regset.c b/arch/x86/kernel/fpu/regset.c index 75ffaef..6d056b6 100644 --- a/arch/x86/kernel/fpu/regset.c +++ b/arch/x86/kernel/fpu/regset.c @@ -167,7 +167,7 @@ int xstateregs_set(struct task_struct *target, const st= ruct user_regset *regset, } =20 fpu_force_restore(fpu); - ret =3D copy_uabi_from_kernel_to_xstate(fpu->fpstate, kbuf ?: tmpbuf); + ret =3D copy_uabi_from_kernel_to_xstate(fpu->fpstate, kbuf ?: tmpbuf, &ta= rget->thread.pkru); =20 out: vfree(tmpbuf); diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index c88c60b..d6f414a 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -1268,7 +1268,7 @@ static int copy_uabi_to_xstate(struct fpstate *fpstat= e, const void *kbuf, * Convert from a ptrace standard-format kernel buffer to kernel XSAVE[S] * format and copy to the target thread. Used by ptrace and KVM. */ -int copy_uabi_from_kernel_to_xstate(struct fpstate *fpstate, const void *k= buf) +int copy_uabi_from_kernel_to_xstate(struct fpstate *fpstate, const void *k= buf, u32 *pkru) { return copy_uabi_to_xstate(fpstate, kbuf, NULL); } diff --git a/arch/x86/kernel/fpu/xstate.h b/arch/x86/kernel/fpu/xstate.h index f08ee27..a4ecb04 100644 --- a/arch/x86/kernel/fpu/xstate.h +++ b/arch/x86/kernel/fpu/xstate.h @@ -46,7 +46,7 @@ extern void __copy_xstate_to_uabi_buf(struct membuf to, s= truct fpstate *fpstate, u32 pkru_val, enum xstate_copy_mode copy_mode); extern void copy_xstate_to_uabi_buf(struct membuf to, struct task_struct *= tsk, enum xstate_copy_mode mode); -extern int copy_uabi_from_kernel_to_xstate(struct fpstate *fpstate, const = void *kbuf); +extern int copy_uabi_from_kernel_to_xstate(struct fpstate *fpstate, const = void *kbuf, u32 *pkru); extern int copy_sigframe_from_user_to_xstate(struct task_struct *tsk, cons= t void __user *ubuf);