From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.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 4CAFF10F1 for ; Sat, 13 Jun 2026 00:03:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781309032; cv=none; b=DJDpQHrsiswddZtTveLMTjwI9LAWdJITSAVy1OwSuctjYhn7wYBeac3sZWU5wTJieQFJ8cq73/bOnaQZe30HsNF4Sqh9CJNzbdYkjl/jluYfkkOdVeRMN4SHuIBe4Uf1baQRBYrQeBwcGrD9wjwWNE92reIgI/eYNZFkMe/LPUM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781309032; c=relaxed/simple; bh=noctCE8fNkJ1CPbGJu5QDC7NhA0mjVZEK62hEki3/l0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=n+F8L1js+52C5XVd00Bb1pqjl2UinPqxHxjo3rWXN1vvccGAxLrOviSz3B3AyZyDIcNH8/o7EIxT3NeSsblOSdMlAipst9jdmM+wYibrdjVOfd0SFe4EVC3jWQ+xTBleHfa/p9b2ut7uWP+4VjvVacGfljjjVEvO1Fit6+bpRQ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=PwWCG5Wv; arc=none smtp.client-ip=209.85.215.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--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PwWCG5Wv" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c85c530ddebso716545a12.1 for ; Fri, 12 Jun 2026 17:03:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781309029; x=1781913829; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=s75p+w0J+iMg7rDe3eRLMtCsj68aJcc5iFyS6tg4dXQ=; b=PwWCG5WvAjBZkAN9gLoo/v8hK44kQCqY+LzAI2kMzJQYQwMR5z84gZKVHggJB6NbD/ NRLEHqvi8o/6SeNsjmSRCo5yvMPVLEd7/PqNfGqCnqi3rFPshupgX3KXURSSqH3zUVwG 4rKpxNDOYevonJzNJFZlx313qRWNwRtIs/hBifqlQXS4p3laZyPi6nlkXVvIKJc8bIXa XK/HPiI3oltBSON/x8oFUoIexBWr4aG0X/RqPRCLsaycu/IJx4NW3Kg0tKdswUoGJoZJ MRW8zcJwJ1ro1j/fc51mPeYCxw9hNyje5qhcUfoueMf0J1hnkx6x/KHlrtiZ6rdlC+L+ K6cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781309029; x=1781913829; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=s75p+w0J+iMg7rDe3eRLMtCsj68aJcc5iFyS6tg4dXQ=; b=HI9XXE2hwX3XB+fpuJqsJUXwhNypHFgwqxaDqF3dI13E4e9eo/D+REacFNBjXeo05m 3HIX+t8Prt/6N7HlfrrEwoXpQ8hkargHasDSX5HJeq7hRrbWd18QV/Q2rKoSOid5vVT0 ucRHf6soqd7SY+ah8xUMJwTbcvJK9OcnDwU47rFHjie3quwoba+aBocvjXLI/4rEfBKR X58rhjgHltN9NZTaxpch0mqpzhmRXL8xUIrYQzMU7SL4pFWOeKxAA6Slo99wm1+Cj+Ag 6G1CzFeabDXW9NvuWb9wmtGfqhF5fZfuyHDlPs/3kF2Yd2I1L8jJHW6+X9bDTZ1e+oY9 KZNQ== X-Forwarded-Encrypted: i=1; AFNElJ8mGclyGUiojnX7g0tOFCmMD10SC2axBHDdN6bHn6tXeocb80xtqoWgRVP2sxLHUIcgxNcFbCDJYa8qk80=@vger.kernel.org X-Gm-Message-State: AOJu0YzG7by5kPGKgdl3LTgFDGHDk3SB2WBKwBXpj8SqefNvhdFQwIPc vJVjf971m0To+ZMtmqjNqP9HBYKZfNUKojA+2A1rNvVn5oEUJnbm+iJ/7oql/4OBLgCbTJBv8Mk Cy/8BjA== X-Received: from pgcd22.prod.google.com ([2002:a05:6a02:4c56:b0:c85:9c9a:ab55]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:918f:b0:398:9662:10ff with SMTP id adf61e73a8af0-3b783b13d77mr6083924637.4.1781309028589; Fri, 12 Jun 2026 17:03:48 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 Jun 2026 17:03:10 -0700 In-Reply-To: <20260613000329.732085-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260613000329.732085-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260613000329.732085-12-seanjc@google.com> Subject: [PATCH v4 11/30] KVM: x86: Move kvm_{load,put}_guest_fpu() to fpu.h From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed , Kai Huang Content-Type: text/plain; charset="UTF-8" Move the kvm_{load,put}_guest_fpu() helpers to fpu.h in anticipation of moving the bulk of KVM's register specific code out of x86.c. No functional change intended. Reviewed-by: Yosry Ahmed Reviewed-by: Kai Huang Signed-off-by: Sean Christopherson --- arch/x86/kvm/fpu.h | 26 ++++++++++++++++++++++++++ arch/x86/kvm/x86.c | 24 ------------------------ 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/arch/x86/kvm/fpu.h b/arch/x86/kvm/fpu.h index f898781b6a06..6b7b628f530d 100644 --- a/arch/x86/kvm/fpu.h +++ b/arch/x86/kvm/fpu.h @@ -3,8 +3,34 @@ #ifndef __KVM_FPU_H_ #define __KVM_FPU_H_ +#include + +#include + #include +/* Swap (qemu) user FPU context for the guest FPU context. */ +static inline void kvm_load_guest_fpu(struct kvm_vcpu *vcpu) +{ + if (KVM_BUG_ON(vcpu->arch.guest_fpu.fpstate->in_use, vcpu->kvm)) + return; + + /* Exclude PKRU, it's restored separately immediately after VM-Exit. */ + fpu_swap_kvm_fpstate(&vcpu->arch.guest_fpu, true); + trace_kvm_fpu(1); +} + +/* When vcpu_run ends, restore user space FPU context. */ +static inline void kvm_put_guest_fpu(struct kvm_vcpu *vcpu) +{ + if (KVM_BUG_ON(!vcpu->arch.guest_fpu.fpstate->in_use, vcpu->kvm)) + return; + + fpu_swap_kvm_fpstate(&vcpu->arch.guest_fpu, false); + ++vcpu->stat.fpu_reload; + trace_kvm_fpu(0); +} + typedef u32 __attribute__((vector_size(16))) sse128_t; #define __sse128_u union { sse128_t vec; u64 as_u64[2]; u32 as_u32[4]; } #define sse128_lo(x) ({ __sse128_u t; t.vec = x; t.as_u64[0]; }) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 3813078cc028..8f9a1572a39f 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -133,8 +133,6 @@ static void store_regs(struct kvm_vcpu *vcpu); static int sync_regs(struct kvm_vcpu *vcpu); static DEFINE_MUTEX(vendor_module_lock); -static void kvm_load_guest_fpu(struct kvm_vcpu *vcpu); -static void kvm_put_guest_fpu(struct kvm_vcpu *vcpu); struct kvm_x86_ops kvm_x86_ops __read_mostly; @@ -11432,28 +11430,6 @@ static int complete_emulated_mmio(struct kvm_vcpu *vcpu) return 0; } -/* Swap (qemu) user FPU context for the guest FPU context. */ -static void kvm_load_guest_fpu(struct kvm_vcpu *vcpu) -{ - if (KVM_BUG_ON(vcpu->arch.guest_fpu.fpstate->in_use, vcpu->kvm)) - return; - - /* Exclude PKRU, it's restored separately immediately after VM-Exit. */ - fpu_swap_kvm_fpstate(&vcpu->arch.guest_fpu, true); - trace_kvm_fpu(1); -} - -/* When vcpu_run ends, restore user space FPU context. */ -static void kvm_put_guest_fpu(struct kvm_vcpu *vcpu) -{ - if (KVM_BUG_ON(!vcpu->arch.guest_fpu.fpstate->in_use, vcpu->kvm)) - return; - - fpu_swap_kvm_fpstate(&vcpu->arch.guest_fpu, false); - ++vcpu->stat.fpu_reload; - trace_kvm_fpu(0); -} - static int kvm_x86_vcpu_pre_run(struct kvm_vcpu *vcpu) { /* -- 2.54.0.1136.gdb2ca164c4-goog