From patchwork Wed Nov 16 23:33:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 21327 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp116104wrr; Wed, 16 Nov 2022 15:36:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf79JI+w00T0/GoIdTPulsc7800CU2dRRccgK7GXrRYjr5rCBBwptwi9kXIN5ihv9cM2Og1q X-Received: by 2002:a50:fb89:0:b0:461:ecca:e8a with SMTP id e9-20020a50fb89000000b00461ecca0e8amr18948edq.139.1668641761877; Wed, 16 Nov 2022 15:36:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668641761; cv=none; d=google.com; s=arc-20160816; b=SfdjCVyhCEa+d5ghiVXCEbUUQVQYK4rMqFj63b8S2qJoh+y0wjojaOJ75OA3Pjy9Mu YQH1StmfM+FAcoF0UrAQCXqea+1t8CcGrb3NSug34d+9cedbvtnXbNa+y4TKluborhj4 YSyThJJzvAzfKZVQMse546lN2RAl5Nt6KW/bhrpkk2K4Y9UlT76sLB/mOog+9XMdZ4kj AG14ca+QhatzGhqgHd/0PqHb/K9MZ1y+tYwCt+ZeuUYSE1kjq3+L6ajgFmAGPOTwrAPm HhmV3MY10U72dmsqj/XIYxR2Ig9lYou4RHEXHQon1K7HzLJNmKxJnma9VcoB2SEP5Mzd Rszw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=Rrwn3XiFQACWItqwB/rq8DEZB6S62a07vlj6rycE4sg=; b=AnK4m0j4db3PFVfrNGyNFlgnyo8ZOMb7vH8rig0bze9KGy+V05JkyYpW/sBJwt7TtQ XW+jfjfqLHJob/v3HjKvCd7WKJ8qHnKHINvTCd+3zmTGDbTDjJeHbQITa7yeYU0Hfvmr lAPuIhBdK91WErOl6QuGpriXTkRUhsAF/0sWkuIB/OvPwl2ii3w9CPuBpUfr72Un7eUN Ymf0I2xkFRa0wCSbFacuvbp2YibcTVjZRkrDXwVA/aQqs+lFF0Lq6xWUhUTMnyyeJvcy LEr/UEP+ZXdQZ2hyfaPbYm8vsFfE9D5/jcfUeyafHnuS6tOZgNwYxj6Wd7rjKkxCeZWr 8W5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=igKRZ4ur; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gb14-20020a170907960e00b007ae9f42f878si15453194ejc.354.2022.11.16.15.35.38; Wed, 16 Nov 2022 15:36:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=igKRZ4ur; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234175AbiKPXeP (ORCPT + 99 others); Wed, 16 Nov 2022 18:34:15 -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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749697704287713288?= X-GMAIL-MSGID: =?utf-8?q?1749697704287713288?= The following commit has been merged into the x86/fpu branch of tip: Commit-ID: 1c813ce0305571e1b2e4cc4acca451da9e6ad18f Gitweb: https://git.kernel.org/tip/1c813ce0305571e1b2e4cc4acca451da9e6ad18f 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 *gfpu, const void *buf, if (ustate->xsave.header.xfeatures & ~xcr0) return -EINVAL; - ret = copy_uabi_from_kernel_to_xstate(kstate, ustate); + ret = copy_uabi_from_kernel_to_xstate(kstate, ustate, vpkru); if (ret) return ret; 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 struct user_regset *regset, } fpu_force_restore(fpu); - ret = copy_uabi_from_kernel_to_xstate(fpu->fpstate, kbuf ?: tmpbuf); + ret = copy_uabi_from_kernel_to_xstate(fpu->fpstate, kbuf ?: tmpbuf, &target->thread.pkru); 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 *fpstate, 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 *kbuf) +int copy_uabi_from_kernel_to_xstate(struct fpstate *fpstate, const void *kbuf, 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, struct 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, const void __user *ubuf);