From nobody Tue Feb 10 03:44:46 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 77A5A191F94 for ; Wed, 24 Dec 2025 00:13:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766535191; cv=none; b=hiMClnPxMJyp6IZOeopK5J22ohlEdDEZt+yfG/Pvy23iaxKSlWCgxOVjj9oPwIvaMEEKvZ0FqaE+nGgUgwPjfRLBlF2N5DkMUjTOsWKXKRlPn668Z4SUJpy90D2vxVP0a6A+rGEDPPhHjZla7HKHJcMiBmbN7wpz1fbLaypuUdg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766535191; c=relaxed/simple; bh=c9wGy9F+ZumVy4Jv5wQ/Y4sWu0FPsWAgkyF5DR5pTaM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MK0CiHcaUTfDirguHsNIM89hE/dnmYNmSmuOLgWd1PdeEkIge41pOfe54DjPMzmzTPURPT95+1UEsTsM6c0ZnP66frlyO1TZ4aRkw33gue+W1XyzwspAF1bewd8g9lCWX/Q+yXgLTlVW6AMWDC2Y7EmQVeYt0cPzD76zoHToKJM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=RGtCFEFY; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=mraKw6va; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RGtCFEFY"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="mraKw6va" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766535188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZP7S2GMgajruIhbPgbnDsTvupUVzprH0sZEYwfNJjmw=; b=RGtCFEFYUG0mSDDaoWWTyTIWvyWxvpFfbhw/OpL1/m09h+W9Q/xeNz6D6j0+g6naFICOiH 4LoVkbXiol8mS/Wn87SBx7YeyUHCNZsLDntISkzf/44rbxQtL+sh/94+kRSF0rlEHBCxhW WOr3uZw5Q/szFudEkPkhh1otD0gwyoI= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-384-u7Hm1El7P72pfLQWwiK6Pg-1; Tue, 23 Dec 2025 19:13:06 -0500 X-MC-Unique: u7Hm1El7P72pfLQWwiK6Pg-1 X-Mimecast-MFC-AGG-ID: u7Hm1El7P72pfLQWwiK6Pg_1766535185 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-47a97b719ccso31116175e9.2 for ; Tue, 23 Dec 2025 16:13:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1766535185; x=1767139985; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZP7S2GMgajruIhbPgbnDsTvupUVzprH0sZEYwfNJjmw=; b=mraKw6va4ADsqNiCSXbk+ibeHd68aAL/MRNisXQG+ZvCU2wM2Uc3w4Sx1ivJz/Xb08 sMDu+Grw3pTmqgdCRSqdVew1d3CxlxZ2OC1+YD9aIoWJEJjAS4yqUjJO0xTVqmjIJ9LG 94saEuW6EU/947QzPWS4J5x6DvnPcH4hHa2oktENgKybbjg27yoiDkK/WnCp9be4+P3N C31Y5jrZEtUY5p3bssPG5j5sDI6U8iHDZ1pAWForE7cTsL6EpB4bJTax4eXEV9YTSoBd /sW2DnHBgtjJ3FkgM1fJXvX/REcI8uCvnCYdMFiPrDsPzoFS1m3PhWlM68J+ilc0a0/r hLXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766535185; x=1767139985; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ZP7S2GMgajruIhbPgbnDsTvupUVzprH0sZEYwfNJjmw=; b=B3vQLyYu2aaxlkvyjxHigQbWB1QI+VdCflTmtH3hyXnt9RfeH0j4rGPXw9pKB7ohqX tpxEZT9tokjg7epYfmkVz+U9YyRjPeO1wOZsFWcdxEcGm5q7FsYzVV/eOGQnZGTZzJid myns9V5iluMidRjtBvfB3nfvjLFobO8re9rbxjo2On678uf98IzBZpXVtY5TP8WxiKEo sVR29h8lhhd/ZE05Hc6bTFotnU4P53MsN/n2n/IUwxqFNZCQ9wTvEvlqpJQi8wGLQxIU ObWp8gbJYvy5ZXQEDZvkpIr9q+UT/eYW6jQMj8SvqZJ9tMHzjnCWoRD///a3vrZUtlKr N0XA== X-Gm-Message-State: AOJu0Ywr7Vz5R2Bpof88UwnfcmJFdmnzb9bunxMmclW2ChCI+1X5fDfX ECYnE/JxlvyibMQe868xgYoCR8pg+5DpJtP82WLCQldbHaHNrmKoKCaVZxGn1a9U2EGgQwt4Jig L2lWlHZNys4gkwEDkZ6nPFWg1LldiqBYNuDsgo7xTaDiSkV+5hUrKfQ0Tk/VjRTHO1opwy6lNBN rWFf9JHAnVBWUr2cwcgYZ5rRbVMiBZ1NCodGeCooAFWVDUU0/jmA== X-Gm-Gg: AY/fxX5KeyZSJYkct8aVqhFM8ymsqrK8eLLHD/s4h4Mh8FHXDtmuY50dqTvqTa/9WBL X2l8LspEJTfnMDYypTawmWP5FHLAdowRy4tJzCs5zjyQfTA3Ow4T+urkkWx2vzXTBU5bQbD0run YVQ1VdkE7DPvr7afFiYwwE9nRWF0Nt7u7wFhpgAfBAkP8SmCsVkujQk2bukKxpX8C2inNXVVG3u Ehj8cvB/OnbK651M5tzMXZ+iuv1tsOHsHt+YHUMslI8HQJjji73LdZw3Slfk8+icHu7hD920ziy ouWfn74zyOhvqav0jo9285qUIBLS00bg8wnT4/+jFaHqeB/OdpC7n5VWC5UQzuFeTKEEZEGe/0S BLJQF/5i3jqT1ZufbX9Uogp5oxvBPLKe13F9jMEXloaEQJqetSP1mnz06Muw44YWLHTL55FuLQr vHny1OVFJeCjqP21U= X-Received: by 2002:a05:600c:4506:b0:477:79f8:daa8 with SMTP id 5b1f17b1804b1-47d1957da6cmr164308985e9.17.1766535184765; Tue, 23 Dec 2025 16:13:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IEAOTNMaYX6wvIpavXVkFRAXB61rUrOXBtv+ITgW4CWC1Dw0QYGzvTLybENg3XQ7l3vGJWmlQ== X-Received: by 2002:a05:600c:4506:b0:477:79f8:daa8 with SMTP id 5b1f17b1804b1-47d1957da6cmr164308795e9.17.1766535184278; Tue, 23 Dec 2025 16:13:04 -0800 (PST) Received: from [192.168.10.48] ([151.95.145.106]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324eab2a94sm30897852f8f.43.2025.12.23.16.13.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 16:13:02 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: seanjc@google.com, x86@kernel.org Subject: [PATCH 5/5] KVM: x86: kvm_fpu_get() is fpregs_lock_and_load() Date: Wed, 24 Dec 2025 01:12:49 +0100 Message-ID: <20251224001249.1041934-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251224001249.1041934-1-pbonzini@redhat.com> References: <20251224001249.1041934-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The only difference is the usage of switch_fpu_return() vs. fpregs_restore_userregs(). In turn, these are only different if there is no FPU at all, but KVM requires one. Therefore use the pre-made export---the code is simpler and there is no functional change. Signed-off-by: Paolo Bonzini Reviewed-by: Sean Christopherson --- arch/x86/kernel/fpu/core.c | 2 +-- arch/x86/kvm/fpu.h | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c index ff17c96d290a..6571952c6ef1 100644 --- a/arch/x86/kernel/fpu/core.c +++ b/arch/x86/kernel/fpu/core.c @@ -846,7 +846,6 @@ void switch_fpu_return(void) =20 fpregs_restore_userregs(); } -EXPORT_SYMBOL_FOR_KVM(switch_fpu_return); =20 void fpregs_lock_and_load(void) { @@ -865,6 +864,7 @@ void fpregs_lock_and_load(void) =20 fpregs_assert_state_consistent(); } +EXPORT_SYMBOL_FOR_KVM(fpregs_lock_and_load); =20 void fpu_load_guest_fpstate(struct fpu_guest *gfpu) { @@ -899,7 +899,6 @@ void fpregs_assert_state_consistent(void) =20 WARN_ON_FPU(!fpregs_state_valid(fpu, smp_processor_id())); } -EXPORT_SYMBOL_FOR_KVM(fpregs_assert_state_consistent); #endif =20 void fpregs_mark_activate(void) diff --git a/arch/x86/kvm/fpu.h b/arch/x86/kvm/fpu.h index f898781b6a06..b6a03d8fa8af 100644 --- a/arch/x86/kvm/fpu.h +++ b/arch/x86/kvm/fpu.h @@ -149,11 +149,7 @@ static inline void _kvm_write_mmx_reg(int reg, const u= 64 *data) =20 static inline void kvm_fpu_get(void) { - fpregs_lock(); - - fpregs_assert_state_consistent(); - if (test_thread_flag(TIF_NEED_FPU_LOAD)) - switch_fpu_return(); + fpregs_lock_and_load(); } =20 static inline void kvm_fpu_put(void) --=20 2.52.0