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:     Sean Christopherson <seanjc@google.com>
CC:     Paolo Bonzini <pbonzini@redhat.com>,
        "kvm@vger.kernel.org" <kvm@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] KVM: x86: Use cpu_feature_enabled() for PKU instead of
 #ifdef
Thread-Topic: [PATCH] KVM: x86: Use cpu_feature_enabled() for PKU instead of
 #ifdef
Thread-Index: AQHZlO5k4NTBs0ELg0erRYIxXuAawK93qlQA
Date:   Fri, 2 Jun 2023 15:51:31 +0000
Message-ID: <C8324338-FC07-454E-9A5A-1785141FEAB3@nutanix.com>
References: <20230602010550.785722-1-seanjc@google.com>
In-Reply-To: <20230602010550.785722-1-seanjc@google.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?tCcm0F+jsvuNO3MwViZG4hdcuGQol61B+DleNOwk6AmjE4MkMTeQZE9Y9O9y?=
 =?us-ascii?Q?L6WidWZgRoZMnTjE9Hh5wLt7/zoyUUyTgATKh+KutI08kVwtPuDpORidXc2L?=
 =?us-ascii?Q?Nmj4ps+EBRWgUtPvN1zodHfjM2/vFSXtDiSBEXGFfUQwL0LGBPfrCtnkfHBb?=
 =?us-ascii?Q?1jdzzxnJuVQSD2rnRiPL8tnPbumQtAuXZ3z2Rovjfgxk7B8Z8r4v0PTm5Z4b?=
 =?us-ascii?Q?FWtpP/6M5PFnxpArSTa8BuGfqxkPsjUhNegCLH0sHEV47CxxypXRGWg8iBHH?=
 =?us-ascii?Q?ofwdMDkTBPiH4Oc6e256Ha1IdEg9hALokqYKm/Jb2POewiv8E04OEdGDPiks?=
 =?us-ascii?Q?Ff62sKUdCKJswEX+VkOT+frDCqEPnffV5tNpGNd+hop7KM4SNmd94jJRSNTH?=
 =?us-ascii?Q?vci/yn6eV2JCcrpLyAYnF+lkdJGiElDZBPjgMhfH1gw/fM3o44cnOS+omXQJ?=
 =?us-ascii?Q?GpKnSSW00ycAT3t439c+ILTh9+aA57/bSb+ON6xaxw/j4YMZR6bxq36t//Co?=
 =?us-ascii?Q?dXzPkW1gqUdZL28y4/iLbJabW6H/bYzm+REGjKMD1j8SspCIXTgSgIjA+I3B?=
 =?us-ascii?Q?dkYCbBeeDBXqEsjH6ilG5V6n7baLuNW/Ul8EZZPCOKDjNLWZMjG5YRUaIx8u?=
 =?us-ascii?Q?BzG8Dklo9zcAu7MKSMGj15M2rfeWYW16tvdqVv9fIK5TSta2fVPRxeJljgHi?=
 =?us-ascii?Q?22PR1Yj2ajViq+QibOx0DzPfMZc5Pa9ocliCsWzDbHeyGjHdVN+6Qg/4XPwY?=
 =?us-ascii?Q?UKHy2eN9dCaMnmBL4jd0pnhsuVis9kLwo2R6QH9owGyc8OTvQqsnG31oY405?=
 =?us-ascii?Q?F5IzmVuTa3QcEiNhdnVi+yGvj+eo/cAGRlu67kFohtUPqvmF32i6/ktL+SpL?=
 =?us-ascii?Q?U6dSemNu4zwGOVJh0nOnNxIQKiqoKyDxuEbEOxHuoQ9yS9X1nqYziv7SiExF?=
 =?us-ascii?Q?ABFQI7RaIilqwjgNJlO0oexubN5FBE00uwHdWdcMUtZgkDsN/SI27kZjpeC1?=
 =?us-ascii?Q?qTS9cs3rM0Ftu1WCXn1C8yB22yqkMefUTJuH39yazorgIMqQcwBueTaH9fk/?=
 =?us-ascii?Q?1Uhq3x7zhdFOQGVz/3aLCwY9MiIF4Ij3V1MIa+38C2UTNqqIdS7IyssR9fsa?=
 =?us-ascii?Q?fnWFDhoESU4ubPxBSPYI4BB4nZ514gKIXBB0vWghrqTucHHXSts5asc/1J0z?=
 =?us-ascii?Q?TuD2RKBxbqlWbBI3rrrkjYMq9he6xMlrtIJS470/NVWgAYUM5ZZaYfmcoTS0?=
 =?us-ascii?Q?R865halY4uvT/dEVSzE5lwoJZ6pAtN8eIWUxket9ENDJOHJ9sZGtL/hkGYRO?=
 =?us-ascii?Q?R+KDhFBU2kHsvinB1cMR7WnEQQjUXtYUK0gO645zb4/7Ne5hOi1t2NRyi3XG?=
 =?us-ascii?Q?/u24a4ex8zbbRGcWWQR0/DrfLGvgCJooQtLvykiT6T/7O3zKQKCz6tCP4+Eu?=
 =?us-ascii?Q?/bqjRp5tWCYPXFpGRHisZj6D4DCiXyf+4w7V0iPttaGQawSng1j9irqpsmFA?=
 =?us-ascii?Q?WPTgxxQYq6MRP0ot81CXzF5ScF5Hty8mcq7IMM5l9UFMvFw7LWo+DtIhr16U?=
 =?us-ascii?Q?fiod4rVdCGOnZ05y0DqB8s42sz4BByBf9VfuGPZu7kFLuR3X/Icd6gSLGuPC?=
 =?us-ascii?Q?Zw0yeUxLRvIKktjYrTw1EE27QfUUI4RO2FWHsiJhfL76TsdvPAh1LlxygCgv?=
 =?us-ascii?Q?+heTZNiQtBw0Dsciwd0Z+RDkrcU=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <D46A00B76610A741964D1E7C11CA10EF@namprd02.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: nutanix.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BL0PR02MB4579.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 33843663-df98-4cad-4150-08db63813c6f
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jun 2023 15:51:31.8305
 (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: l++t8oE/+p8epR28+Jvcc5jAXGiLljC5ZrNZpsdmQOQGiQzn5pJtxHK4u0oQPYHeY95ul2wKyoe2QmkEnFuYmM07Oo5hDYyglgH2+HC29CE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR02MB9149
X-Proofpoint-ORIG-GUID: p7QYPg1OYviIREWKRiITlXQPeN-Os-jB
X-Proofpoint-GUID: p7QYPg1OYviIREWKRiITlXQPeN-Os-jB
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-06-02_12,2023-06-02_02,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


> On Jun 1, 2023, at 9:05 PM, Sean Christopherson <seanjc@google.com> wrote=
:
>=20
> Replace an #ifdef on CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS with a
> cpu_feature_enabled() check on X86_FEATURE_PKU.  The macro magic of
> DISABLED_MASK_BIT_SET() means that cpu_feature_enabled() provides the
> same end result (no code generated) when PKU is disabled by Kconfig.
>=20
> No functional change intended.
>=20
> Cc: Jon Kohler <jon@nutanix.com>
> Signed-off-by: Sean Christopherson <seanjc@google.com>
> ---
> arch/x86/kvm/x86.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>=20
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index ceb7c5e9cf9e..eed1f0629023 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -1017,13 +1017,11 @@ void kvm_load_guest_xsave_state(struct kvm_vcpu *=
vcpu)
> 			wrmsrl(MSR_IA32_XSS, vcpu->arch.ia32_xss);
> 	}
>=20
> -#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
> -	if (static_cpu_has(X86_FEATURE_PKU) &&
> +	if (cpu_feature_enabled(X86_FEATURE_PKU) &&
> 	    vcpu->arch.pkru !=3D vcpu->arch.host_pkru &&
> 	    ((vcpu->arch.xcr0 & XFEATURE_MASK_PKRU) ||
> 	     kvm_is_cr4_bit_set(vcpu, X86_CR4_PKE)))
> 		write_pkru(vcpu->arch.pkru);
> -#endif /* CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS */
> }
> EXPORT_SYMBOL_GPL(kvm_load_guest_xsave_state);
>=20
> @@ -1032,15 +1030,13 @@ void kvm_load_host_xsave_state(struct kvm_vcpu *v=
cpu)
> 	if (vcpu->arch.guest_state_protected)
> 		return;
>=20
> -#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
> -	if (static_cpu_has(X86_FEATURE_PKU) &&
> +	if (cpu_feature_enabled(X86_FEATURE_PKU) &&
> 	    ((vcpu->arch.xcr0 & XFEATURE_MASK_PKRU) ||
> 	     kvm_is_cr4_bit_set(vcpu, X86_CR4_PKE))) {
> 		vcpu->arch.pkru =3D rdpkru();
> 		if (vcpu->arch.pkru !=3D vcpu->arch.host_pkru)
> 			write_pkru(vcpu->arch.host_pkru);
> 	}
> -#endif /* CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS */
>=20
> 	if (kvm_is_cr4_bit_set(vcpu, X86_CR4_OSXSAVE)) {
>=20
>=20
> base-commit: a053a0e4a9f8c52f3acf8a9d2520c4bf39077a7e
> --=20
> 2.41.0.rc2.161.g9c6817b8e7-goog
>=20

Thanks for the cleanup!

Reviewed-by: Jon Kohler <jon@nutanix.com>=