From nobody Sun Feb 8 16:34:18 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 200DB2772D for ; Wed, 24 Dec 2025 00:12:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766535181; cv=none; b=cPPGxcOi5boDZBxrU5JiMuigA1x0qG/FA/7Fb6vgeE++WdBSjiKw7afHjDvTvVXPP+f9GYasGJwiKaWXWesDSZ2/vv3/Q3iIySCT4euMwUsIZ3H9SYLBwNAe707E0pwiA7Nx2ctBKGHr3WtSzK45oQ1lzMSo+C4Zy28w8JmVZ7Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766535181; c=relaxed/simple; bh=hWlCqxxO4rNeS3u3z5E066XItSLKm9DA4Bx5w9CplKo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FgPD6sPFWj08tlb2ZgwZ9w/noYn3eBqy8tGYKSxFosjxe/iNZIPlayz3LYZqNJ6luRv++PJKPSiOiDKnWwuS06xbWFpB+bNibuQzlEZxiYAsMKdii7r8KAl2Anw4X8U3HTp5WrvtscjsF0MrNposyCAdqFE1o9jhDPYLoZsPtPM= 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=DjXFD2Xi; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=mT79PEif; arc=none smtp.client-ip=170.10.129.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="DjXFD2Xi"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="mT79PEif" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766535177; 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=Wpa7TThaJI94/M4NKCUGmC4bcd1iUcwxLhMpe/Pmu+I=; b=DjXFD2XiDCi8PdwpIJykKnJjaav3BdgcAPU8mYtDTkE5mEXdX8hE1dkL7fZzp+ejz9SfW+ GeruasQIPXa+SA3bdNoCCfxb8b8PsCDDl50xD/Z8MoeNc9ebFwwHmApjkEPbeQ/eiGyZhZ IyNvGLMgyLe7Va4bWKcgAxmhzb2tr38= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-607-2KEi11pvOQWwbYd0BOXrWQ-1; Tue, 23 Dec 2025 19:12:56 -0500 X-MC-Unique: 2KEi11pvOQWwbYd0BOXrWQ-1 X-Mimecast-MFC-AGG-ID: 2KEi11pvOQWwbYd0BOXrWQ_1766535175 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-477cf25ceccso62876495e9.0 for ; Tue, 23 Dec 2025 16:12:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1766535174; x=1767139974; 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=Wpa7TThaJI94/M4NKCUGmC4bcd1iUcwxLhMpe/Pmu+I=; b=mT79PEifZOE7VN1nrXdpzsqaA4NEd1eDjFI5JrOBCzE8YsHk/JesPwSGBq1i07jdXq KQTx7dlYz7k9JElo+T8lgTqJT6z/KRJnCeQaAP9jfn/Pv44xM/sAnkJAVAcPiFbemt9q PgwYrwL5Oo5IZp7jM4oGsLUL3genNE85QtV7N6r4WFoVXaVUvbWzJcl1v5yIwYgS0ZaH Ob4HqMISAqGDkNx//JSNH6ogNo85gLlQSGruzbSc/nJO6IUXv7lkCCtp5MNtm/vqUd9K Tjxjy5Qho6QeyvKx9tQT8Jcg8fwTkvuHKdTRBAPjXSltSPj7HKy49RfhuBnw5AfEkv19 UHYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766535174; x=1767139974; 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=Wpa7TThaJI94/M4NKCUGmC4bcd1iUcwxLhMpe/Pmu+I=; b=QcHcgJg3sic38ds0wCqlLRvDmTKe0M/8yXXsmMhfTcbwTD8BmEVDQXE+XWQedjrcjZ y5EiL7Zznl95WR4T6i1NeIuHK+NGgF/JKEOAwdgYmXZgZ+dFRXz3olNrNW+CP9a7V8xx /pjuuXza7fN7kWSyzez5QMesCeFCpW0O4Zp6eGSoiBxS6mtDBW9asXx4RxfDiIg5rlj1 F9BwvEYHB5jgde5G6LIrBms2nkdNYHmLyeA2+slxtZ58tb8QN4CimChPNJS82fsoNR2w qFWpHcrVKqU1W+ZbQDGVDe13Hret/Wal/ZJNrPra+LOglq5ap98t1qxNFDInSpakwmpQ argg== X-Gm-Message-State: AOJu0YzhEORI+iByaVHBl36xPtDqUq6SVH7A3CLm2sEmffToNfLcayjF cpDUgGzQ9Mk1N+RN3/u/ObSk4Ks4oRO/vB7XWnS/6sGnyvwd3lVluirgodHpQhXOaQr0E8EDta0 I6HOLlGkiMfvvgzcx7dfdQlKyG2FhoEoeoZhau9vpCaf1dyCUbCRGkn6fySHp0C/RRUUhBdyaf1 dMp2xByWS3BIcSfvK7dcu4+iblFXGYiSGUA1z4WOjteHrKksKD7w== X-Gm-Gg: AY/fxX6JVKo0DdSXcOKhrEREaujn9vI6Nx/v1PgNVJJYHmUo3NnsffVzZuaEqu7QWeb 6aBjCTdKCqrduWgwq42aUUYBHChd+N4Ze1s6bWhwxlebOacuwsviyQdZMnQn4QTPMIJZ0Wz5ZM7 wVNGiLrlQqJIarUcuoNdQdd8kieHa1wd5cVv8cWnM7EdvBBRWVo9hldDJRpPB1OC1n2gkq2Y5AX INiN7uYxqI1UHK5nb9g1lqvKBnOGpPuMTq0/h/gKiywoCHSQtTI/Gdr4uNJ76ImOSmRrN8qL52t PO4jzUwfESQKgmvurkHg9rmFGb/odBAy9JVoErMs+Q4KoB4hNxYbavNWdFcJ8SfBlX4plc2+7yW R6q1jUZQHLME4HkWJU5isYmOGz+Mjd6ZFwymZpFMgr1mUINDRpIFdUorhAw10QXZeL88kNWlTR+ wtJhb5ReAKrpgn91I= X-Received: by 2002:a05:600c:4709:b0:477:9aeb:6a8f with SMTP id 5b1f17b1804b1-47d220b7f4dmr127797295e9.9.1766535174474; Tue, 23 Dec 2025 16:12:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IF4shwSxKh09RXUVkp89RPVC5AHTfJRsb/m35JDsGHtZiPzxZLORNyA9500LRq6dFLONLymXg== X-Received: by 2002:a05:600c:4709:b0:477:9aeb:6a8f with SMTP id 5b1f17b1804b1-47d220b7f4dmr127797055e9.9.1766535174069; Tue, 23 Dec 2025 16:12:54 -0800 (PST) Received: from [192.168.10.48] ([151.95.145.106]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47be279c5f8sm302090195e9.9.2025.12.23.16.12.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 16:12:52 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: seanjc@google.com, x86@kernel.org, stable@vger.kernel.org Subject: [PATCH 1/5] x86, fpu: introduce fpu_load_guest_fpstate() Date: Wed, 24 Dec 2025 01:12:45 +0100 Message-ID: <20251224001249.1041934-2-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" Create a variant of fpregs_lock_and_load() that KVM can use in its vCPU entry code after preemption has been disabled. While basing it on the existing logic in vcpu_enter_guest(), ensure that fpregs_assert_state_consistent() always runs and sprinkle a few more assertions. Cc: stable@vger.kernel.org Fixes: 820a6ee944e7 ("kvm: x86: Add emulation for IA32_XFD", 2022-01-14) Signed-off-by: Paolo Bonzini --- arch/x86/include/asm/fpu/api.h | 1 + arch/x86/kernel/fpu/core.c | 17 +++++++++++++++++ arch/x86/kvm/x86.c | 8 +------- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/fpu/api.h b/arch/x86/include/asm/fpu/api.h index cd6f194a912b..0820b2621416 100644 --- a/arch/x86/include/asm/fpu/api.h +++ b/arch/x86/include/asm/fpu/api.h @@ -147,6 +147,7 @@ extern void *get_xsave_addr(struct xregs_state *xsave, = int xfeature_nr); /* KVM specific functions */ extern bool fpu_alloc_guest_fpstate(struct fpu_guest *gfpu); extern void fpu_free_guest_fpstate(struct fpu_guest *gfpu); +extern void fpu_load_guest_fpstate(struct fpu_guest *gfpu); extern int fpu_swap_kvm_fpstate(struct fpu_guest *gfpu, bool enter_guest); extern int fpu_enable_guest_xfd_features(struct fpu_guest *guest_fpu, u64 = xfeatures); =20 diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c index 3ab27fb86618..a480fa8c65d5 100644 --- a/arch/x86/kernel/fpu/core.c +++ b/arch/x86/kernel/fpu/core.c @@ -878,6 +878,23 @@ void fpregs_lock_and_load(void) fpregs_assert_state_consistent(); } =20 +void fpu_load_guest_fpstate(struct fpu_guest *gfpu) +{ +#ifdef CONFIG_X86_DEBUG_FPU + struct fpu *fpu =3D x86_task_fpu(current); + WARN_ON_ONCE(gfpu->fpstate !=3D fpu->fpstate); +#endif + + lockdep_assert_preemption_disabled(); + if (test_thread_flag(TIF_NEED_FPU_LOAD)) + fpregs_restore_userregs(); + + fpregs_assert_state_consistent(); + if (gfpu->xfd_err) + wrmsrq(MSR_IA32_XFD_ERR, gfpu->xfd_err); +} +EXPORT_SYMBOL_FOR_KVM(fpu_load_guest_fpstate); + #ifdef CONFIG_X86_DEBUG_FPU /* * If current FPU state according to its tracking (loaded FPU context on t= his diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index ff8812f3a129..01d95192dfc5 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -11300,13 +11300,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) kvm_make_request(KVM_REQ_EVENT, vcpu); } =20 - fpregs_assert_state_consistent(); - if (test_thread_flag(TIF_NEED_FPU_LOAD)) - switch_fpu_return(); - - if (vcpu->arch.guest_fpu.xfd_err) - wrmsrq(MSR_IA32_XFD_ERR, vcpu->arch.guest_fpu.xfd_err); - + fpu_load_guest_fpstate(&vcpu->arch.guest_fpu); kvm_load_xfeatures(vcpu, true); =20 if (unlikely(vcpu->arch.switch_db_regs && --=20 2.52.0 From nobody Sun Feb 8 16:34:18 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 C43057082D for ; Wed, 24 Dec 2025 00:13:01 +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=1766535183; cv=none; b=noMdxbtMlrV0OoxevvSm7UWkymNr4leMCkZgmoLSHXx9Ckfz9pVTuSN5oY3pXl8p/TfqW45mU3Mo0pBgs/PPQLC/JeH2ivobMs8acJb+kw1RWKPvnGVPGuwv/7pj0kvMMAzw7vhQLd6/Fh4nPYH0/xZz4LXv00pVJF14YFOtVdo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766535183; c=relaxed/simple; bh=SUxMB9io5kUL3hiZuCM9QEc8yZLw0GrSlV7GpF2gspc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CTMCOk27C07mqcoQev3fdJEIWpouOkT93zotqyUVD72Juy2Gdr4Z2vG4CfsYbUCe9IWabrZGG6QSjUcLgWG6iysQcm3Pm3gS5SZEXtR5AScnTL9F165UyJiMJlvX2mJt4dQn1m8k91vwWhbCcQoz19RXugMJhP3ZpLtkLHsJ+sA= 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=KYRwTpFm; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=Jds33bok; 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="KYRwTpFm"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="Jds33bok" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766535180; 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=Cd2rAlHvk2Fc3rUlxPP7c9W8eyWSusr3FNKcOYNwGnk=; b=KYRwTpFm0ZNFXdictL18Wft53MIq19Yh36Jt+Bg+5eAvNr1UhF1bpSZffISGP5SrLh4D5w fj/f18oABxEtJIgyxK9CBboQu7C3K+rRAYlvJqQdfVagi+q6xEfkyUd1QP15WWHxBvxTh+ LxKLlNKC6I891Yqnh91jwb1qpJfpSDY= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-332-8Tyz2UxINRa2MnZpUV6snQ-1; Tue, 23 Dec 2025 19:12:58 -0500 X-MC-Unique: 8Tyz2UxINRa2MnZpUV6snQ-1 X-Mimecast-MFC-AGG-ID: 8Tyz2UxINRa2MnZpUV6snQ_1766535178 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-477771366cbso35644655e9.0 for ; Tue, 23 Dec 2025 16:12:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1766535177; x=1767139977; 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=Cd2rAlHvk2Fc3rUlxPP7c9W8eyWSusr3FNKcOYNwGnk=; b=Jds33bok7nUlvbx3in6cNYI1t3Y/UP3b64r+trS8YhRuZTRPdxuDPvS3c+zTdlgoP/ f06T9gAreEMqjiHvbJevRoUeFkyrDArh/7m8FN7m21myh01DTvO8jsXmj2GqQUies7gr hrIpcXJOF2U7ersStViJ2+WEJtsribg1dgDLKU+qRrin4XSUDutcyJLr177FXr8ULYhR 0RaWgUmnQgN6T2uvihETJ/BEnG1wVM5fcEaTPxr0rqdxcwfXJraa9TVPnyvSDOcIJIFJ RF7gHBcwMvqWi5kbHo/ruItPqvDl2DGsleEtjNKXLatmzdD665M0MhKYyWcZBpbxc/l2 1pNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766535177; x=1767139977; 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=Cd2rAlHvk2Fc3rUlxPP7c9W8eyWSusr3FNKcOYNwGnk=; b=f3TiRoc8YQa+fyxBsOQ0uBWkMdGWpwuc2maIv/mwX10U0HEJKY4sQO4HxGgpbIS1Xg 9b0HqUlFGstGH1SKAnMAETB/0kUXEqKDbBvR/H9/ZGVDghqVY4ZpHbMtZk1wLoSSKfqc FXPrTxdc8STA4qVob+c38diO6yXHqwM1zWiAOyn9YaS7stiJpH58zQfJDL+YCx2wpJTW BEdZZvRqJIr1kGSLyTGdbj2fy5f6I5BIozu9w15H4wxzJ0xSxywoddJ/zZMG6XvMPy3O w9dEnvx0WXeJG8e0x5fQzT909xe2wfa/ecD9XxdUN2rL0VrO2VHWIvA18+FaGfYWdVQL Kjgg== X-Gm-Message-State: AOJu0YwzkLC8maQuTxgHfHFVExZHNtViqk+EHldRMZjenyN5Bk+DDfar A3piLKZRjCQdzE0Xo9tDvdImeG/FymAeS3gwHvhKbiR/AvtWwHVqlb5wihxcF4HF3Am/8tlOytp KK7uKsDnRh0enx98KT349ULJyST7WWLTdvkI3ZwtrvUIYSd1a/LfPJ2Byz24rpzUFDcXDU60UTh XW2CBhEva37CNKliE15xFE7EV6EEk1nssmWVn+JCOeWPnHhTTLuA== X-Gm-Gg: AY/fxX5wXS7FtL3KqgwH+2ZA0WL/m7zcfjoaW7aw4Qj4tgWBAaVnLSNoA3wMmINZhL+ up41OGkGEq2g+HzjexWn9ZK/URVYojJUigiEPV3HolNzHLJUXpuQHXQVhIjiaSkSg1HClDK5Xnh gQB7/iVxRe0IWxKZiwbEM2bnCJ35bbzRo7gG4Hw670BvdVxseO4SrNRQ5khuHM1T6g533Vv94U2 wSbSO9pdTRpDwlcJBRci9Nehquncar6KL6j3scNHgRR9jH18w0PAk6XsbrUjFk27Mc5QmMm3iD0 LoEWTgL4UU5jImRpNckAXW0V7omgvhyFqAUxxKxzImOy6xJ5xbY+stawtwnn04fKZJVRiILh25a bisK93u0W+3U3Qa3U9xX0N6zeyGh0h88iLznZwwdMPDvMXwca4mOv326BQ3T3OOY6aEwXBY95mR u0p3jRSGNiJyBwaKk= X-Received: by 2002:a05:600c:628c:b0:47a:7fbf:d5c8 with SMTP id 5b1f17b1804b1-47d1958296bmr142012615e9.26.1766535176850; Tue, 23 Dec 2025 16:12:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IH7q/9gwLnCQEkdKpL0Em0GJ2ocZ6ifEAr9yGLRCJjag6irdREePfiliIJO9d7U2xigRdDUJA== X-Received: by 2002:a05:600c:628c:b0:47a:7fbf:d5c8 with SMTP id 5b1f17b1804b1-47d1958296bmr142012415e9.26.1766535176377; Tue, 23 Dec 2025 16:12:56 -0800 (PST) Received: from [192.168.10.48] ([151.95.145.106]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324eaa0908sm30285139f8f.31.2025.12.23.16.12.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 16:12:54 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: seanjc@google.com, x86@kernel.org, stable@vger.kernel.org Subject: [PATCH 2/5] x86, fpu: separate fpstate->xfd and guest XFD Date: Wed, 24 Dec 2025 01:12:46 +0100 Message-ID: <20251224001249.1041934-3-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" Until now, fpstate->xfd has acted as both the guest value and the value that the host used when executing XSAVES and XRSTORS. This is wrong: the data in the guest's FPU might not be initialized even if a bit is set in XFD and, when that happens, XRSTORing the guest FPU will fail with a #NM exception *on the host*. Instead, store the value of XFD together with XFD_ERR in struct fpu_guest; it will still be synchronized in fpu_load_guest_fpstate(), but the XRSTOR(S) operation will be able to load any valid state of the FPU independent of the XFD value. Cc: stable@vger.kernel.org Fixes: 820a6ee944e7 ("kvm: x86: Add emulation for IA32_XFD", 2022-01-14) Signed-off-by: Paolo Bonzini Reported-by: Paolo Bonzini Reviewed-by: Yuan Yao --- arch/x86/include/asm/fpu/api.h | 6 ++---- arch/x86/include/asm/fpu/types.h | 7 +++++++ arch/x86/kernel/fpu/core.c | 19 ++++--------------- arch/x86/kernel/fpu/xstate.h | 18 ++++++++++-------- arch/x86/kvm/x86.c | 6 +++--- 5 files changed, 26 insertions(+), 30 deletions(-) diff --git a/arch/x86/include/asm/fpu/api.h b/arch/x86/include/asm/fpu/api.h index 0820b2621416..ee9ba06b7dbe 100644 --- a/arch/x86/include/asm/fpu/api.h +++ b/arch/x86/include/asm/fpu/api.h @@ -152,11 +152,9 @@ extern int fpu_swap_kvm_fpstate(struct fpu_guest *gfpu= , bool enter_guest); extern int fpu_enable_guest_xfd_features(struct fpu_guest *guest_fpu, u64 = xfeatures); =20 #ifdef CONFIG_X86_64 -extern void fpu_update_guest_xfd(struct fpu_guest *guest_fpu, u64 xfd); -extern void fpu_sync_guest_vmexit_xfd_state(void); +extern void fpu_sync_guest_vmexit_xfd_state(struct fpu_guest *gfpu); #else -static inline void fpu_update_guest_xfd(struct fpu_guest *guest_fpu, u64 x= fd) { } -static inline void fpu_sync_guest_vmexit_xfd_state(void) { } +static inline void fpu_sync_guest_vmexit_xfd_state(struct fpu_guest *gfpu)= { } #endif =20 extern void fpu_copy_guest_fpstate_to_uabi(struct fpu_guest *gfpu, void *b= uf, diff --git a/arch/x86/include/asm/fpu/types.h b/arch/x86/include/asm/fpu/ty= pes.h index 93e99d2583d6..7abe231e2ffe 100644 --- a/arch/x86/include/asm/fpu/types.h +++ b/arch/x86/include/asm/fpu/types.h @@ -545,6 +545,13 @@ struct fpu_guest { */ u64 xfeatures; =20 + /* + * @xfd: Save the guest value. Note that this is + * *not* fpstate->xfd, which is the value + * the host uses when doing XSAVE/XRSTOR. + */ + u64 xfd; + /* * @xfd_err: Save the guest value. */ diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c index a480fa8c65d5..ff17c96d290a 100644 --- a/arch/x86/kernel/fpu/core.c +++ b/arch/x86/kernel/fpu/core.c @@ -317,16 +317,6 @@ int fpu_enable_guest_xfd_features(struct fpu_guest *gu= est_fpu, u64 xfeatures) EXPORT_SYMBOL_FOR_KVM(fpu_enable_guest_xfd_features); =20 #ifdef CONFIG_X86_64 -void fpu_update_guest_xfd(struct fpu_guest *guest_fpu, u64 xfd) -{ - fpregs_lock(); - guest_fpu->fpstate->xfd =3D xfd; - if (guest_fpu->fpstate->in_use) - xfd_update_state(guest_fpu->fpstate); - fpregs_unlock(); -} -EXPORT_SYMBOL_FOR_KVM(fpu_update_guest_xfd); - /** * fpu_sync_guest_vmexit_xfd_state - Synchronize XFD MSR and software state * @@ -339,14 +329,12 @@ EXPORT_SYMBOL_FOR_KVM(fpu_update_guest_xfd); * Note: It can be invoked unconditionally even when write emulation is * enabled for the price of a then pointless MSR read. */ -void fpu_sync_guest_vmexit_xfd_state(void) +void fpu_sync_guest_vmexit_xfd_state(struct fpu_guest *gfpu) { - struct fpstate *fpstate =3D x86_task_fpu(current)->fpstate; - lockdep_assert_irqs_disabled(); if (fpu_state_size_dynamic()) { - rdmsrq(MSR_IA32_XFD, fpstate->xfd); - __this_cpu_write(xfd_state, fpstate->xfd); + rdmsrq(MSR_IA32_XFD, gfpu->xfd); + __this_cpu_write(xfd_state, gfpu->xfd); } } EXPORT_SYMBOL_FOR_KVM(fpu_sync_guest_vmexit_xfd_state); @@ -890,6 +878,7 @@ void fpu_load_guest_fpstate(struct fpu_guest *gfpu) fpregs_restore_userregs(); =20 fpregs_assert_state_consistent(); + xfd_set_state(gfpu->xfd); if (gfpu->xfd_err) wrmsrq(MSR_IA32_XFD_ERR, gfpu->xfd_err); } diff --git a/arch/x86/kernel/fpu/xstate.h b/arch/x86/kernel/fpu/xstate.h index 52ce19289989..c0ce05bee637 100644 --- a/arch/x86/kernel/fpu/xstate.h +++ b/arch/x86/kernel/fpu/xstate.h @@ -180,26 +180,28 @@ static inline void xfd_validate_state(struct fpstate = *fpstate, u64 mask, bool rs #endif =20 #ifdef CONFIG_X86_64 -static inline void xfd_set_state(u64 xfd) +static inline void __xfd_set_state(u64 xfd) { wrmsrq(MSR_IA32_XFD, xfd); __this_cpu_write(xfd_state, xfd); } =20 +static inline void xfd_set_state(u64 xfd) +{ + if (__this_cpu_read(xfd_state) !=3D xfd) + __xfd_set_state(xfd); +} + static inline void xfd_update_state(struct fpstate *fpstate) { - if (fpu_state_size_dynamic()) { - u64 xfd =3D fpstate->xfd; - - if (__this_cpu_read(xfd_state) !=3D xfd) - xfd_set_state(xfd); - } + if (fpu_state_size_dynamic()) + xfd_set_state(fpstate->xfd); } =20 extern int __xfd_enable_feature(u64 which, struct fpu_guest *guest_fpu); #else static inline void xfd_set_state(u64 xfd) { } - +static inline void __xfd_set_state(u64 xfd) { } static inline void xfd_update_state(struct fpstate *fpstate) { } =20 static inline int __xfd_enable_feature(u64 which, struct fpu_guest *guest_= fpu) { diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 01d95192dfc5..56fd082859bc 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4261,7 +4261,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct = msr_data *msr_info) if (data & ~kvm_guest_supported_xfd(vcpu)) return 1; =20 - fpu_update_guest_xfd(&vcpu->arch.guest_fpu, data); + vcpu->arch.guest_fpu.xfd =3D data; break; case MSR_IA32_XFD_ERR: if (!msr_info->host_initiated && @@ -4617,7 +4617,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct = msr_data *msr_info) !guest_cpu_cap_has(vcpu, X86_FEATURE_XFD)) return 1; =20 - msr_info->data =3D vcpu->arch.guest_fpu.fpstate->xfd; + msr_info->data =3D vcpu->arch.guest_fpu.xfd; break; case MSR_IA32_XFD_ERR: if (!msr_info->host_initiated && @@ -11405,7 +11405,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) * in #NM irqoff handler). */ if (vcpu->arch.xfd_no_write_intercept) - fpu_sync_guest_vmexit_xfd_state(); + fpu_sync_guest_vmexit_xfd_state(&vcpu->arch.guest_fpu); =20 kvm_x86_call(handle_exit_irqoff)(vcpu); =20 --=20 2.52.0 From nobody Sun Feb 8 16:34:18 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 C1C1E126C03 for ; Wed, 24 Dec 2025 00:13:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766535185; cv=none; b=r7UdqIwtrnhABZ4xQmC/HlG+16uwHnsO9h90OJSW1ZxPGFfZSvlVR8yGvrowUHYH8JWlznPgfegnfwMpmBqar0W1kxqAhIzXpSiBnS/P28UO0gNN4ZWIsiKIuLGs4Otwf419Bl9MiQEs25Hn5DXHGUv8I22/Yg0dRCynCHJjsoQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766535185; c=relaxed/simple; bh=Hhr7PXcdmRfFR3kTN6U/D9XNsL/5WLUMGhSvIh4gREQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QSmw7qVUrLD9ACkpH3zUuAWR3CiGHzaQ31PI+W+9SrmKhFJFPwLw5TJxxfT2Ls0B2/dqH9ANMZKn4w9WOFgPU+lRN4Z/ybogi1U51JaoMaSvD7hw20SdbudjkX1sSUGWEFnR7SxyJpKXiLXSVGYM4ReFP3eVqi8AyWyGx5CyCs0= 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=U5F926bD; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=cGlEUnta; arc=none smtp.client-ip=170.10.129.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="U5F926bD"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="cGlEUnta" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766535182; 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=II+twdH/pEyHm4MG2MWZs5S1/6s3iyRXmEkcwRND9R0=; b=U5F926bDc6qN3sMADP/J77pr+xprakvZbcWpY4cpei5MPK6/mGFAWkiYezOgGrGJLqw83k lsIaUul1i9JAPj1AP1tChXVObSTNZwlgkapyKbADdJE4EvRAIWmtqP+7lsQ7bBx4j5yLSL 9wXJz6Y1MTHIMrmwldQjBRA8KqJtVGk= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-695-iZfAJ3hvNOKEwtAqE8ytjg-1; Tue, 23 Dec 2025 19:13:01 -0500 X-MC-Unique: iZfAJ3hvNOKEwtAqE8ytjg-1 X-Mimecast-MFC-AGG-ID: iZfAJ3hvNOKEwtAqE8ytjg_1766535180 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-47777158a85so58618675e9.3 for ; Tue, 23 Dec 2025 16:13:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1766535179; x=1767139979; 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=II+twdH/pEyHm4MG2MWZs5S1/6s3iyRXmEkcwRND9R0=; b=cGlEUntasD6+dD55yA6HC7YrVb0oTw/8JYfV7LP2T6hb0J1lair+lVSYL9OOmh0Gw5 e2cgClgTeHl3nTrC2dkUWLAckUL1mPxMMRGZB6P8JHRmvfCdCA8SM5WKc7iD9KSwYgEj uFOV4sZtHRKNtxD2kbXgBpR45Exdoo9XnnClGbaOgeGW8zBE+WF+GlF7slbKOTKNFmfD V+10e7ixpr19itUVk0BLTatGFnVPIjH0+/7a3qbVzLZp33a1pgl97RvG4zKjPGBLUULc Fq0qou1qRjF5bZqQVdC44lUqzNIaDbZoDEt0q59WTOzl8KGjQURoVv/+ceZqawZjy4/n UQNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766535179; x=1767139979; 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=II+twdH/pEyHm4MG2MWZs5S1/6s3iyRXmEkcwRND9R0=; b=MjQbWlUV1oIMsZQ0ZQBPqvDwPcsUg4tHEModWfmgntsvudbbGAEV4aCFGRAbRatJii VigpA/PTKdH9mAGVm5CS+uJd1Dw/GDyPURlcyg4bSiTCKvIni2gD0vOVdYchiz7c4vZ+ ZEwCqLS7NimmE8rAvXsLPb6kgM0aOOS2anit52Ra1cLLLRBTDC4aCtae3k5svRUZ78rv PmL+gX2XnMj/hFso1J23TkCoJ5QUQILM5fx/K+vFWZ2SiEVFimxs8GfsI4pNXnQITFOj 1rdcZZDlQ1JCfDHPG8nxkAPblqUfnBDMeAUbrYzkSPFD9i6mASgSglZ/IAcmzqRq4d6w FpEg== X-Gm-Message-State: AOJu0Yym1LGNTTIG//iZBzJzxAydIq7vtTLpqnjoDcdrUenZDTMkwEei MENj2OT/yWQD6tp95GblmaLqg7Rahlq0/n/OTEN+hjuZqVW3L+nan1LsBDbScecOwA5eXGAUGbn SVjdJPhKk6Ut8vIon5ZkBTmjKIove1DUa2QrKIY2vdzHOvY+LrhmjFb/bEN7aUs9Q4d2VGc+b7C Cb6HXu2aL4AqHrJJTvgbbfzNj0zh7nsLTGPtCMr3wF9Z+JNqGpEw== X-Gm-Gg: AY/fxX5c6kO7+ExPmnCkSMBg2XWzUzCQ6TkPu3jMp1AVf4HTBsFg3fvdfI1dwQHDEXb oP94e2lOhF46s/IjyGqnfyuIMR2CO3zFmzjrD0LCRyfd8iJpsz10BHTvJQWm5qBvYD+We7y86sb zQLwYUR33JE8/uY3Cc7TP021UHtoDTAJHCWuOW+W4qaOdu72PS2peJzUNSS1Swj2md4oVxMsxEI Jd7n2K0rVPOsEZ2350mOj9rBcw6/wXiwssF/Vl3yZfOEIIC0yyHH5xG/iuNHxl0cttih8N0/NcX HgrTOBvy48JRwyopyko1ZE/evarK82oFhQpKbTcKcDa3jrnqXJLIFTWx8hwI0DMPU1RE+CHryp2 +vOEy80mkQ7KOQesiA7gealhC4rcCmo5z+IJMfrKJ8lbOQC8VGGHB3n/an62TjudmQsDeUmYZjX ZDkmQ7AXN8vZHTH4o= X-Received: by 2002:a05:600c:4fd4:b0:477:a219:cdb7 with SMTP id 5b1f17b1804b1-47d194cc59emr145265295e9.0.1766535179555; Tue, 23 Dec 2025 16:12:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+OTzAeyC5yD8A9kSSl7IDV7BRHd2VCz2+9zTgZoj/J4FaHajoxMrs8M/feG65zxctkl3yXQ== X-Received: by 2002:a05:600c:4fd4:b0:477:a219:cdb7 with SMTP id 5b1f17b1804b1-47d194cc59emr145265165e9.0.1766535179148; Tue, 23 Dec 2025 16:12:59 -0800 (PST) Received: from [192.168.10.48] ([151.95.145.106]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324eab33f5sm30942577f8f.41.2025.12.23.16.12.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 16:12:57 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: seanjc@google.com, x86@kernel.org Subject: [PATCH 3/5] selftests: kvm: renumber some sync points in amx_test Date: Wed, 24 Dec 2025 01:12:47 +0100 Message-ID: <20251224001249.1041934-4-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" Make room for the next test; separated for ease of review. Signed-off-by: Paolo Bonzini --- tools/testing/selftests/kvm/x86/amx_test.c | 26 ++++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/kvm/x86/amx_test.c b/tools/testing/sel= ftests/kvm/x86/amx_test.c index f4ce5a185a7d..dd980cdac5df 100644 --- a/tools/testing/selftests/kvm/x86/amx_test.c +++ b/tools/testing/selftests/kvm/x86/amx_test.c @@ -144,7 +144,7 @@ static void __attribute__((__flatten__)) guest_code(str= uct tile_config *amx_cfg, __tileloadd(tiledata); GUEST_SYNC(4); __tilerelease(); - GUEST_SYNC(5); + GUEST_SYNC(10); /* * After XSAVEC, XTILEDATA is cleared in the xstate_bv but is set in * the xcomp_bv. @@ -154,6 +154,8 @@ static void __attribute__((__flatten__)) guest_code(str= uct tile_config *amx_cfg, GUEST_ASSERT(!(xstate->header.xstate_bv & XFEATURE_MASK_XTILE_DATA)); GUEST_ASSERT(xstate->header.xcomp_bv & XFEATURE_MASK_XTILE_DATA); =20 + /* #NM test */ + /* xfd=3D0x40000, disable amx tiledata */ wrmsr(MSR_IA32_XFD, XFEATURE_MASK_XTILE_DATA); =20 @@ -166,13 +168,13 @@ static void __attribute__((__flatten__)) guest_code(s= truct tile_config *amx_cfg, GUEST_ASSERT(!(xstate->header.xstate_bv & XFEATURE_MASK_XTILE_DATA)); GUEST_ASSERT((xstate->header.xcomp_bv & XFEATURE_MASK_XTILE_DATA)); =20 - GUEST_SYNC(6); + GUEST_SYNC(11); GUEST_ASSERT(rdmsr(MSR_IA32_XFD) =3D=3D XFEATURE_MASK_XTILE_DATA); set_tilecfg(amx_cfg); __ldtilecfg(amx_cfg); /* Trigger #NM exception */ __tileloadd(tiledata); - GUEST_SYNC(10); + GUEST_SYNC(15); =20 GUEST_DONE(); } @@ -180,18 +182,18 @@ static void __attribute__((__flatten__)) guest_code(s= truct tile_config *amx_cfg, void guest_nm_handler(struct ex_regs *regs) { /* Check if #NM is triggered by XFEATURE_MASK_XTILE_DATA */ - GUEST_SYNC(7); + GUEST_SYNC(12); GUEST_ASSERT(!(get_cr0() & X86_CR0_TS)); GUEST_ASSERT(rdmsr(MSR_IA32_XFD_ERR) =3D=3D XFEATURE_MASK_XTILE_DATA); GUEST_ASSERT(rdmsr(MSR_IA32_XFD) =3D=3D XFEATURE_MASK_XTILE_DATA); - GUEST_SYNC(8); + GUEST_SYNC(13); GUEST_ASSERT(rdmsr(MSR_IA32_XFD_ERR) =3D=3D XFEATURE_MASK_XTILE_DATA); GUEST_ASSERT(rdmsr(MSR_IA32_XFD) =3D=3D XFEATURE_MASK_XTILE_DATA); /* Clear xfd_err */ wrmsr(MSR_IA32_XFD_ERR, 0); /* xfd=3D0, enable amx */ wrmsr(MSR_IA32_XFD, 0); - GUEST_SYNC(9); + GUEST_SYNC(14); } =20 int main(int argc, char *argv[]) @@ -257,14 +259,14 @@ int main(int argc, char *argv[]) case 1: case 2: case 3: - case 5: - case 6: - case 7: - case 8: + case 10: + case 11: + case 12: + case 13: fprintf(stderr, "GUEST_SYNC(%ld)\n", uc.args[1]); break; case 4: - case 10: + case 15: fprintf(stderr, "GUEST_SYNC(%ld), check save/restore status\n", uc.args[1]); =20 @@ -280,7 +282,7 @@ int main(int argc, char *argv[]) TEST_ASSERT(ret =3D=3D 0, "memcmp failed, ret=3D%d", ret); kvm_x86_state_cleanup(state); break; - case 9: + case 14: fprintf(stderr, "GUEST_SYNC(%ld), #NM exception and enable amx\n", uc.args[1]); break; --=20 2.52.0 From nobody Sun Feb 8 16:34:18 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 EB40054774 for ; Wed, 24 Dec 2025 00:13:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766535187; cv=none; b=LHJwUuS/DYEAmfsOCS+jwO4NsorJQNE5sCMkfmz/YKrT+OzZ87JxSIYZPsI5gM8Ox5gcy9Qnd+33v//7+QGue/8PXa3LhJKdgPO8SKW7mcZjdUmvCE4eEeUTNSo0qSsp3Li/SJZox/oWmigDIMYZitq4qZCne48taNDZ9HRZyDI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766535187; c=relaxed/simple; bh=SQq0xvlgLSlIPAWcmiIlljgsmEpAuxpfwdJTBKdBhbo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MfuJrfvhyx7AYmB9R7TiN18jPgAr9b9jU+IBqt0NkUhLdmpEsy+4F7LdlllwUwDdFDO0O2C/GuPpNQJMBhvRFw3CGKFJ11lDXr43ZlQfEjWene96s1UkrTHzRdXYW/6FtjwgY21Nqtg76DTZqqJiDbchiPwK1P7WIZCwVu+1ZDQ= 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=NUyXNfrk; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=f842CBe8; arc=none smtp.client-ip=170.10.129.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="NUyXNfrk"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="f842CBe8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766535185; 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=tbY7FjbkAYn7FXUAG1r0LIGkyPozJ/Pd3cYf6WyIfHY=; b=NUyXNfrk0NCjIliAzLuqu9xqekOwtlkEAPoT3svFL7CJkOKgup+qz2qqUWWBewSpnMAAEB pEViRtE6bxSeNI7376GjciBSIjNcd8qwtmmC8ajBE01xjQzixysMIwh54i/sVUadeUALLW 4EsRuM01KuFYnCou2ydGgCNvVEF97OU= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-155-rvqBlseJM_ems9x0oZ_DMQ-1; Tue, 23 Dec 2025 19:13:04 -0500 X-MC-Unique: rvqBlseJM_ems9x0oZ_DMQ-1 X-Mimecast-MFC-AGG-ID: rvqBlseJM_ems9x0oZ_DMQ_1766535183 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-47918084ac1so46063015e9.2 for ; Tue, 23 Dec 2025 16:13:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1766535182; x=1767139982; 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=tbY7FjbkAYn7FXUAG1r0LIGkyPozJ/Pd3cYf6WyIfHY=; b=f842CBe8quZggRukNgdYJ7Z/b5mt+7+uJpX0QJZp0fnwBertEVX/x5ZHyGOk2EgJUL 49x9APUX8uRDg46azXZ71QbTEH26fZwnubQcZHIqM8Av/8TdvttXelYpip9K0XFD/vkI U5C7S/QvGSNzigeNChKPjnIW31G4EKCOMoQW9Z4GsAmQYBkXvv4z1+g5mZspcWdkRpL2 qepNoYZNB6bnEnCXymos2DMp50EJ4wd+bH+6Ge5rvaApoj4+ikgjLwclUk+GFsYQQA3Q +cOEf1WT/yOqGeTWCCcZZtKYaOyVDkDe5yCJCOO0v/Eh7ryzxmAYy3A7SnVOq/MRKW66 cpLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766535182; x=1767139982; 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=tbY7FjbkAYn7FXUAG1r0LIGkyPozJ/Pd3cYf6WyIfHY=; b=UYPJuiKa7ZOx+45AdL8prly2KHpsjaQpS8BUkggOibZ9npgn/XrxxhI8o4h572bwSw pGdsEVoLpXgfDm5HNR6ZC1yyIkatQZQIqe79HfyAjGeHhDCZ4+84qKd2WUDZa1WcXDZ7 vRpkdrxD9Mu5NNcW4xi2xkAkjdKOCbcqruQDjNNX+suM9k0uLB6235OWTEM5U7bVzGGN YcibDIvO7dPtmLlWi/uOky7h/rSHV4FsuaBY21iZCIdSTtiqnG/MvK76j+6g3qOMC0Dc 2V87RI2DrbYUUz16oRJmknXFfDBz4DfQKeITs615ekQzcbic/SyjElXnhKJnFJNfoCzE O38Q== X-Gm-Message-State: AOJu0Yz+Ctyf7NM0R+SIZMFdEWyfytMNnSzccT2HdV0f78Q4rot6le6z xx/8pMUJrIqxPUJTOsQi31VHSyR0tRUZZlbI49wZ4me0HWS99WSbUMPMZVMFFYEtzEMd9kaCHX3 2v4a4xV5sQRRNn9x83fqDuI6fCo8YKP+p+EVlvsk+KXEo4MecdKNz0ghDR13ItDDsdxvy1hlUHP 2wfvXPFLR8Y6lfjE9lV3gI8CFjt7R3yM4mcnCvLxQH5w5LR2OGRQ== X-Gm-Gg: AY/fxX73f/Ab9EFkyDlwmytm+kkYbM9omlde2I0XJKGpvGfwdHmhEVrlfO+00DJyH6P weqfNCe9LGKmq5AVPycV2HU5rd+kUJPVy2efCpySIN6SghUJVbTgT/FBoIEOBTV3O+Nt3+WdPkQ g0V0WjQBOZyRoJTlWwnBjc+SZPrD6pXT9BNfVJAtF+t79P8eBE/S8qX37j7Yb5sTYPEVqmKBEHo ef4r+Afuq+FhpsGOnjenCcvwPJJ/Y+20/5T6coideJURxeKSaARiVqncSoCW7gJNyEz7cg9blLR puKGRXz7LQt165kBWwb/x9+Exf/Dv67BYdeIyiI4ofKL5O97LAOV0lWQsCWCBzqku6clsGdjwli B5E4XinqDyVXbZI6WjWgTkcLFOC8djyCYbcIiiBasn9upxpfciakecLtlrGUuOiypscuwWS2Hdz 6Kjnog1WXNqTf7aKc= X-Received: by 2002:a05:600c:6096:b0:479:3a88:de5f with SMTP id 5b1f17b1804b1-47d1959d6eemr161813765e9.36.1766535182018; Tue, 23 Dec 2025 16:13:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IGFcVvVQCTcvc4gpZOC/BTSrK/9Og8bNsbt/fF1seFkODFGvEa5bqxZbDem6cTMnGnwjd+SYw== X-Received: by 2002:a05:600c:6096:b0:479:3a88:de5f with SMTP id 5b1f17b1804b1-47d1959d6eemr161813625e9.36.1766535181572; Tue, 23 Dec 2025 16:13:01 -0800 (PST) Received: from [192.168.10.48] ([151.95.145.106]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47be3aa8fd9sm123107605e9.10.2025.12.23.16.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 16:13:00 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: seanjc@google.com, x86@kernel.org Subject: [PATCH 4/5] selftests, kvm: try getting XFD and XSAVE state out of sync Date: Wed, 24 Dec 2025 01:12:48 +0100 Message-ID: <20251224001249.1041934-5-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 host is allowed to set FPU state that includes a disabled xstate component. Check that this does not cause bad effects. Signed-off-by: Paolo Bonzini --- tools/testing/selftests/kvm/x86/amx_test.c | 25 +++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/x86/amx_test.c b/tools/testing/sel= ftests/kvm/x86/amx_test.c index dd980cdac5df..5222ec6f71d3 100644 --- a/tools/testing/selftests/kvm/x86/amx_test.c +++ b/tools/testing/selftests/kvm/x86/amx_test.c @@ -142,7 +142,16 @@ static void __attribute__((__flatten__)) guest_code(st= ruct tile_config *amx_cfg, GUEST_SYNC(3); /* Check save/restore when trap to userspace */ __tileloadd(tiledata); + GUEST_SYNC(4); + /* xfd=3D0x40000, disable amx tiledata */ + wrmsr(MSR_IA32_XFD, XFEATURE_MASK_XTILE_DATA); + + GUEST_SYNC(5); + /* host tries setting tiledata while guest XFD is set */ + GUEST_SYNC(6); + + wrmsr(MSR_IA32_XFD, 0); __tilerelease(); GUEST_SYNC(10); /* @@ -202,6 +211,7 @@ int main(int argc, char *argv[]) struct kvm_vcpu *vcpu; struct kvm_vm *vm; struct kvm_x86_state *state; + struct kvm_x86_state *tile_state =3D NULL; int xsave_restore_size; vm_vaddr_t amx_cfg, tiledata, xstate; struct ucall uc; @@ -259,6 +269,7 @@ int main(int argc, char *argv[]) case 1: case 2: case 3: + case 6: case 10: case 11: case 12: @@ -267,8 +278,7 @@ int main(int argc, char *argv[]) break; case 4: case 15: - fprintf(stderr, - "GUEST_SYNC(%ld), check save/restore status\n", uc.args[1]); + fprintf(stderr, "GUEST_SYNC(%ld), check save/restore status\n", uc.arg= s[1]); =20 /* Compacted mode, get amx offset by xsave area * size subtract 8K amx size. @@ -280,8 +290,17 @@ int main(int argc, char *argv[]) /* Only check TMM0 register, 1 tile */ ret =3D memcmp(amx_start, tiles_data, TILE_SIZE); TEST_ASSERT(ret =3D=3D 0, "memcmp failed, ret=3D%d", ret); - kvm_x86_state_cleanup(state); + if (uc.args[1] =3D=3D 4) + tile_state =3D state; + else + kvm_x86_state_cleanup(state); break; + case 5: + fprintf(stderr, "GUEST_SYNC(%ld), before KVM_SET_XSAVE\n", uc.args[1]); + vcpu_xsave_set(vcpu, tile_state->xsave); + fprintf(stderr, "GUEST_SYNC(%ld), after KVM_SET_XSAVE\n", uc.args[1]); + /* do not restore full state */ + continue; case 14: fprintf(stderr, "GUEST_SYNC(%ld), #NM exception and enable amx\n", uc.args[1]); --=20 2.52.0 From nobody Sun Feb 8 16:34:18 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