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;
From:   Jon Kohler <jon@nutanix.com>
To:     Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org,
        "H. Peter Anvin" <hpa@zytor.com>,
        "Chang S. Bae" <chang.seok.bae@intel.com>,
        Kyle Huey <me@kylehuey.com>, neelnatu@google.com,
        Andrew Cooper <andrew.cooper3@citrix.com>,
        Jon Kohler <jon@nutanix.com>, linux-kernel@vger.kernel.org
Cc:     kvm@vger.kernel.org, Sean Christopherson <seanjc@google.com>,
        Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH] x86/fpu/xstate: clear XSAVE features if DISABLED_MASK set
Date:   Tue, 30 May 2023 16:01:50 -0400
Message-Id: <20230530200152.18961-1-jon@nutanix.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aZ/Fu6jogleN22DO8jh7Q4/ESL2yDn7j9RMnrYDKOZVpC9iBk35yKRV+F6dx?=
 =?us-ascii?Q?fH4slqjz9E4mv+H0r21Uqms2GGmfjSTNABJ1b9gQeaFJA78kEGZCEXMsjcZu?=
 =?us-ascii?Q?UJmTy3v7izFQMtpEJyfesBTzqve4hrtvBUGp5o6ho3mEySEzfVvkCY6Pnxhk?=
 =?us-ascii?Q?+aoo6p/HCGRwp8ytAFwYMrLiR6rcr3F0QyuXfWUb9jU/KgWHC/m8Inaow+mm?=
 =?us-ascii?Q?aGMqim/u99U7y0VBoLiNkSNkHx7w6fKsCBXYyLik5BkEGp3payPawzwW2QJq?=
 =?us-ascii?Q?uP+HD3V01KM1PZ4OpDKEs4s6uT0xOALMhA3Irh2KKr3P/ldMYidtth4E9Lx8?=
 =?us-ascii?Q?dMK9zDeh7fOEuKeZv1mDtzk/Vo7M1QbDft2z52ngzRw3ZVXL3ZZDNuDCcvf3?=
 =?us-ascii?Q?/3gJhVL7+moRC0XLehHu4+opme13cILlAiA5vsJsealJvZqSC33XJg/igzjL?=
 =?us-ascii?Q?5F2+s1KRZf7jonSK/onPcLq2qZPfKqOjw2lTtLu2X0Up6YNKZausPQg7F6ki?=
 =?us-ascii?Q?bdGoUC5pGM564DtXs6YhPuGZ9DPbvq/TEkpvrn1Eb8n2F5F0TLlzFHt4JR1a?=
 =?us-ascii?Q?hXZpqvZKtjjFXxZYXWNE747zU4QYaORbL5Zs9PIvBXo09SQoGeu/4tttyBVp?=
 =?us-ascii?Q?GmT93Nf/Bh7vGgg0FX1iGayNaXVyfZ3XtIC6jATKBtqHpjC/815a80hnOc0A?=
 =?us-ascii?Q?cvoo/PQhSx+5iAmuACINtuNInw+h3dEVRLNhiN5Qrw4hdwBnd9/kf+7H7t0z?=
 =?us-ascii?Q?gjrGaDMfqIJJYgSMfuH7Vx/jJClAT/7Wg/0kcKyf/W/2nDy7CMtN3eLkCIew?=
 =?us-ascii?Q?oePfWDrrWXHK8JSDNqn5zjobYKPA6JNkcEWH38hz764JAgZV/XiyBe3In93E?=
 =?us-ascii?Q?LCbOT6azDRan6slcYhAgrafrtZL++Z10cfMPdgxWsHLyyFkkhziLSBfljQ7G?=
 =?us-ascii?Q?nprJAwTIwiNdzjxEp+qGhsTZ2puxfDrqQl1wv5FrmLr8kPTp10yid2jzZHVp?=
 =?us-ascii?Q?u0TSaoKLhqhYtvilQNL0/OcrecnshKymHeJt90/k4NB9Aabwp3ux07zLlHCA?=
 =?us-ascii?Q?VhzZBJDSiV+LP8Kqm8zvRHNUUdvrkHBm2Ilo9hp/xC2fpK5xWDoUhImuVeBI?=
 =?us-ascii?Q?f1v/7qXI92mlY7mYoBBi0jmSeBJ0/2iYLI2H/O+f/lEHaQyyW+Ufu5wbZ365?=
 =?us-ascii?Q?/K6TOadpWV62vVYU3ozqhGY/DKQQGPZVvtXQGcImuS8R4KEsixeMCIjLgWNi?=
 =?us-ascii?Q?BbwKh7xD7fYAbL3cdsvlshe50yzecdD9COfHCAnV1A/j3UuxWZqbLAgP2QlB?=
 =?us-ascii?Q?/ba1o4fVAVkNtY/XRX9ZNC/x3obhBoKA4KiLVCH+w7fvhHS9lZB7SiZRLawT?=
 =?us-ascii?Q?eqwEvt8QOg94KD/t2/gPbKLKlw6UBmO9oCgSVQt/EmLyyy4/IDIErvb/aT90?=
 =?us-ascii?Q?SGebRZ0L7hXEEwnYAtPD6v2C5Awk11t4wesMRbPcvier2w+0ZXCmcmeQQGK0?=
 =?us-ascii?Q?yg0IOQnm1KVb8i+mmGFb5O2RGX8S7UtKo44LVPW2JijGaGdCxVXoqaJxLEOL?=
 =?us-ascii?Q?aubLjGsU1xUAfTnChMOYI/SH1OJ+vWgBCxVmRT+f35Qjf2mYvLvZFGlHwHDY?=
 =?us-ascii?Q?nV1rCafzxVmDnHNNQpE0UgJplQiSa5WgqAupm+r1GizPRk0uXTuIDgTUjFdU?=
 =?us-ascii?Q?1P4XNA=3D=3D?=
X-OriginatorOrg: nutanix.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 057866ce-51eb-4127-a10a-08db6148c13c
X-MS-Exchange-CrossTenant-AuthSource: BL0PR02MB4579.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2023 20:02:11.2493
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 4+4Joj9DheKsbRMI03rMpS6TqYXsMtPHfv64rbhPJxxv831RkRcky+3vqaRWdBKun24U0kvVRH11lpdZLYCn1eoiiKorSl2P1gxqlsKIpNY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR02MB9787
X-Proofpoint-ORIG-GUID: a6WSXJ-4ZUQQnxg4xhucGpWsLAEua8Xv
X-Proofpoint-GUID: a6WSXJ-4ZUQQnxg4xhucGpWsLAEua8Xv
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26
 definitions=2023-05-30_15,2023-05-30_01,2023-05-22_02
X-Proofpoint-Spam-Reason: safe
X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Respect DISABLED_MASK when clearing XSAVE features, such that features
that are disabled do not appear in the xfeatures mask.

This is important for kvm_load_{guest|host}_xsave_state, which look
at host_xcr0 and will do an expensive xsetbv when the guest and host
do not match.

A prime example if CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is disabled,
the guest OS will not see PKU masked; however, the guest will incur
xsetbv since the host mask will never match the guest, even though
DISABLED_MASK16 has DISABLE_PKU set.

Signed-off-by: Jon Kohler <jon@nutanix.com>
CC: kvm@vger.kernel.org
CC: Sean Christopherson <seanjc@google.com>
CC: Paolo Bonzini <pbonzini@redhat.com>
---
 arch/x86/kernel/fpu/xstate.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
index 0bab497c9436..211ef82b53e3 100644
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@ -798,7 +798,8 @@ void __init fpu__init_system_xstate(unsigned int legacy_size)
 		unsigned short cid = xsave_cpuid_features[i];

 		/* Careful: X86_FEATURE_FPU is 0! */
-		if ((i != XFEATURE_FP && !cid) || !boot_cpu_has(cid))
+		if ((i != XFEATURE_FP && !cid) || !boot_cpu_has(cid) ||
+		    DISABLED_MASK_BIT_SET(cid))
 			fpu_kernel_cfg.max_features &= ~BIT_ULL(i);
 	}

--
2.30.1 (Apple Git-130)