From nobody Sat Feb 7 06:21:45 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 314EF277CBF for ; Mon, 22 Dec 2025 21:33: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=1766439191; cv=none; b=nLTZ/uz0ojG9Z7dP+Gm+VmOQHk1I02gskkCx3ef3wacM2tH8FEID4GzKdfDKQGImSfDifQyFtAK7/HNzWMPOfqG2e2DWDlY4856TBVLoyDJzQ83zAyYWfResknKZcP2no1f6UFbx9Jsb+xnn4z/gUMuZzoYvxVMrJb0JC27fx0Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766439191; c=relaxed/simple; bh=uBKzy4vsA9U0uaBjrGei/fIbtOEZ7zDf8k+Qt7SkY54=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=GQra2JcgrJKbWZTT0O8EbpzDkirQgygxNhdaDUTvgcW7P7vkFrEMORHW3ZLjBiSx8C2aIwHTl4ULiLZIBCNJCzyr85gKWr8lDi0CesqgPYIrroARX5NdLaL8DwF+Mg93CkHPCT3WCikmiwqu6UlA2IZ8ZWqZnF32MD+SxmL37Vw= 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=WO2CxhpP; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=TLDDt5Vj; 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="WO2CxhpP"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="TLDDt5Vj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766439189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9L0LBm88/XUniKAvABHBDueOTVArMkx1e9V9lkXx0W0=; b=WO2CxhpPA+Rc9KR31jVxXjGy09b/qk9n53qGwKsSFYbjbRV9RH6c7VJVg4rkmcm3nDVn7q NWNVEl/cTsGdQZBYlL0Z9t1+LPE8KfAiqhksyHTrW9lCZq/mfN1Cybu4mrrFRSa6jmpPGT 6oDYlT5eKWZzmZhKCFkXW1vQ7ULQbwQ= 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-416-HjpeHpD4PjyWvikKWEsr_A-1; Mon, 22 Dec 2025 16:33:07 -0500 X-MC-Unique: HjpeHpD4PjyWvikKWEsr_A-1 X-Mimecast-MFC-AGG-ID: HjpeHpD4PjyWvikKWEsr_A_1766439186 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4779b3749a8so32008235e9.1 for ; Mon, 22 Dec 2025 13:33:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1766439185; x=1767043985; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=9L0LBm88/XUniKAvABHBDueOTVArMkx1e9V9lkXx0W0=; b=TLDDt5Vj8+Xtw1N/L+D8dHFPmrERlNIXc/eIbEYWzqRHY5kmRhGBSO4hqNuzdYnpX/ X98p52H6+K2lATXn8XrdjKDItGnBn8sNjM9Gvl9dHUftU7hIg5vQi16xJiYXuvJ7kBQJ Gld+oRLaOXWGJwXprTJrURHZgCV8DvptJpKNoaBQyKq/OdnKZng1TdGPNEu6+i+r4/0+ skth8rdTDYc3DkBLyqtXehei//eCUk5yDzGacTAKsP3xFC6b4gdQijHvGbhhAz6WWFDF cFtaVDuhcKp/vKPazmmkdqF1A8UKiYSnWw3cadsTFWF+FUi9KOKNooldWo8e9Kp0hpls 0kcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766439185; x=1767043985; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9L0LBm88/XUniKAvABHBDueOTVArMkx1e9V9lkXx0W0=; b=FuSlSfl93WTNto/m3KiZM1zIzNLI9ba8n9625qNb40aXEqgvMiYXhNPnaOWke/Kjlc /pQv5hvs2W1dy0PX/nK1FR8ToDkVn/iZyHkMPBYAsu2RARm2qkn77KhIYOanLfszAxEI Dj4FcYXW/K3CDrkljfYN3blgChT3ago+JOLFn/WrYUcXa8W8jIlG7fUoU9lxRw+Ra09n DFeHxEghboqSnZP3PDjpTnsHzz7HYc/X+BYXZSwllnxBJ9M1/wCTr3EXjnQTchpDvo/Y raWBr+bM1toqttO8tx1kWLN4OEo/rxwrGqDD7tNmKB0yNEDNsv8qdQN81EU3mKpP102s xszQ== X-Gm-Message-State: AOJu0YzMKAp5ytaqUJCOCYjBtU79q6N48jbJDr0rOyea5dR3VhvLLsDZ SS0hddVyE1zCsM7rOYuuZn18O9RwzrRcAJmXUeltLGjxiQomqo31EWn+2NelaY+xpCSo2+dg6Vn b+0+Ri6MIoGdaADSWYizi9yOEnkD4EimzZW551h5mXlG9OWV2ys3ktalrHGldAa4m61CQ4BDu99 GF90oWmeU6IqsERVrmI2608mlomPGbncr6TBToSkeGj0Wc7lua2w== X-Gm-Gg: AY/fxX6EIMX/KyH++6p9GZcSRdrVcOb2GcMkqzyTWOFM6N7I9qBz/XcIOuNuy5UtXtt Ba4UIAuy+2OuofU4qT9l5tyr4uUPu5C3P/mYzqpNGwRfBnrKdJAXi+PRE/EHfrX9TlfjToJVXya XQZH+0LNA4clolH/pnRzsdBw/13U9jLFVJS4Cy9Cgy23CYT0Db+xDKG3heWu7qFXl0X3wCt961s yj4ODvU0imsiquhaeM3aCyk85CvOGWUqZDbx9arr0NZYX9TT595vmcJ9MdckT4yRH3rmXl3uF6k qq3B+SMb3KpFz0I//4ljpr5NPXMma79gfNCfuLmgJEKuTe5iWQpaea//0F/zYzvY1j7yP8Njhzx l2GHKQCiWaEaixKX4DTtjlNlPYbGcaLDcEwNonddzBleMegKh5QDOWoIjyfXnOP7z8EPGfvg70+ 37xiD8jMqxKIVs5RM= X-Received: by 2002:a05:600c:8b70:b0:477:a02d:397a with SMTP id 5b1f17b1804b1-47d1953b94cmr101835235e9.2.1766439185632; Mon, 22 Dec 2025 13:33:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IHfT5nY9wBu0XYtQZ1gIvPIYMH0nkSaLQbaZKrB2tQMIc3Kq3TQPkVEof6ionxFVhwY1rKEFg== X-Received: by 2002:a05:600c:8b70:b0:477:a02d:397a with SMTP id 5b1f17b1804b1-47d1953b94cmr101835175e9.2.1766439185218; Mon, 22 Dec 2025 13:33:05 -0800 (PST) Received: from [192.168.10.48] ([151.95.145.106]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47be272eaf8sm260129355e9.5.2025.12.22.13.33.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Dec 2025 13:33:04 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH] KVM: x86: kvm_fpu_get() is fpregs_lock_and_load() Date: Mon, 22 Dec 2025 22:33:03 +0100 Message-ID: <20251222213303.842810-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.52.0 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 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 --- arch/x86/kernel/fpu/core.c | 2 +- arch/x86/kvm/fpu.h | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c index 3ab27fb86618..8ded41b023a2 100644 --- a/arch/x86/kernel/fpu/core.c +++ b/arch/x86/kernel/fpu/core.c @@ -858,7 +858,6 @@ void switch_fpu_return(void) =20 fpregs_restore_userregs(); } -EXPORT_SYMBOL_FOR_KVM(switch_fpu_return); =20 void fpregs_lock_and_load(void) { @@ -877,6 +876,7 @@ void fpregs_lock_and_load(void) =20 fpregs_assert_state_consistent(); } +EXPORT_SYMBOL_FOR_KVM(fpregs_lock_and_load); =20 #ifdef CONFIG_X86_DEBUG_FPU /* 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