From patchwork Fri Feb 17 23:10:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 58795 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp114318wrn; Fri, 17 Feb 2023 15:11:43 -0800 (PST) X-Google-Smtp-Source: AK7set+ELLYvzFNNmff6+y8zSwwQ6/54RdPmVILn6E7PeXklc3fVKpDsBng/i3n/CHJagLvzZpTP X-Received: by 2002:a17:906:a217:b0:8a4:7806:6eed with SMTP id r23-20020a170906a21700b008a478066eedmr2901872ejy.63.1676675502867; Fri, 17 Feb 2023 15:11:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676675502; cv=none; d=google.com; s=arc-20160816; b=eH22HJHHfN/IMGnYzcDEWM0B9FuPf79kJxmRUWTadsZ2lI3NDJbLCIb705ZxEJJT+2 vUnEXnRfs2xO2bd/iQ3cvP+gRStsF6k3BPIOAvi+AJrFiREsh+xBn6er2KZ6J7t4wXZM u1tqQzJ/sPRWChQMnPZYiX0Ha0dP+WqoRb4IQZW2y3QvnMGg6a0jo9nAsYs0T1aYMbE1 PvgA9kDx1NtAh1seNS+4y1knLR8yhyGZ9MNmIEyXlt5KBtAB8xmCE94KkS/hXRUJiU1+ Eklp6u3DHqLFEzDIe1Icdaa2VDkmskz9Or0OcJ95cgrFswt63oBSuzIVeQmBSatABdgJ Jdhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=Jv7eFJCQHJdShrZad4wg6qbhczS1BO2S26DrILrvWfg=; b=iv4VqxKGU9Z3NvGpnyBk1yQsBEa1ElxRoYat5SS+Ol/553KsR0s7Tm8IgljGiGwFIy SU5igQzA4usiaHm2FgbjFiVlytwMwYGdm3cAM2cmItHq/BvMlrjgCyl9sWbzz/I+eNtU 5O+LTXXkcEynkeKxyfYPcYQybYyHlKHr4ty/nJL4P7J3LwPz1ECia3ARRQ97fqUVprgi Y6ZUpDn1VZCT3N1VY7d2CG79XIa1i4eUqbyQnEczzzRsZVWpnGP0cRx+nj9e0WEvnG9o mhSSbM9Iq/BU4rgcF1rJPuwMgBRBDlHXzZ4OgC2XM5lv4d3/HPQzb0vJIMgJpwzlzeII eD8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=PFHXa5FB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 16-20020a17090602d000b008af4651d2a2si8543112ejk.530.2023.02.17.15.11.19; Fri, 17 Feb 2023 15:11:42 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=PFHXa5FB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229915AbjBQXKo (ORCPT + 99 others); Fri, 17 Feb 2023 18:10:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229893AbjBQXKc (ORCPT ); Fri, 17 Feb 2023 18:10:32 -0500 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1078E68AC5 for ; Fri, 17 Feb 2023 15:10:30 -0800 (PST) Received: by mail-pj1-x104a.google.com with SMTP id qa16-20020a17090b4fd000b00233c6b388ddso914398pjb.5 for ; Fri, 17 Feb 2023 15:10:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=Jv7eFJCQHJdShrZad4wg6qbhczS1BO2S26DrILrvWfg=; b=PFHXa5FBY+a98Z9yhWweF+SxDQQJFEMs/DEpJGFZxDfSIxf44H5vOl3VOmkB5k/UXL U3qRSMbobqQF16A/BVrXRskJUiV2o0dTn/LKHqc9U2JijMlZ4cxm9EioE+Ge1KjSeugJ ILLisMTKa/AFV865ZWzsbS1JSwkmuPn6yF7z18WK9tugVUsjbEiBPGQNPv3f5dQabJPH /nHNy9lxyEQQezs5pqgLJcaAPGgIepldgdv4CCVkTaRmLij2029pBnXCp7ZCf2MZjXZo OawdxxDdwOLXn91PoeKTV+UXRw0EChPxEAp31Vk9jO5/uqniV2CbcKYWBO31lsjoM89w lebQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Jv7eFJCQHJdShrZad4wg6qbhczS1BO2S26DrILrvWfg=; b=qI/RJ+nDSc+vYfFxCcY/41ODZ93gOSAvrPLJXyMijcARH5FL0ZHJb+JicwN5+O4LhH 9NX0APiCMuh9y90a9LvYJFkYuB6x6qpeV6w9ufaKG7I8LzwCljqVRiioB1BjTptwSBe2 zDL4e8hBeOUNFBB9gv1v02kt1Gz3EtKtmC2iljbz9vZmlmsSQM72O7Vmtxflf9M04aU6 Oya5XbiyMwyzkg7eVsd8hUxSActYNwzaLO2ZmOCzVuQCT8Dmil1f3k4pGy88pG+UKKoG pw7DdsdbcnIqjT11d0pvXGvhIS9fnGH0RLHL6NyTEnjU8Coca//q4UVwoLG1LiCj23W1 KMtQ== X-Gm-Message-State: AO0yUKV8p1GSp72S3Wo9wrW8vdxYVueOANbiXZ/m+gUvgViIIgstL4RK OB/g+NQEIg4bbrZ+hloKPOq0O1vLzAA= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:ab0e:b0:19b:c29:3932 with SMTP id ik14-20020a170902ab0e00b0019b0c293932mr427871plb.3.1676675430051; Fri, 17 Feb 2023 15:10:30 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 17 Feb 2023 15:10:12 -0800 In-Reply-To: <20230217231022.816138-1-seanjc@google.com> Mime-Version: 1.0 References: <20230217231022.816138-1-seanjc@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Message-ID: <20230217231022.816138-3-seanjc@google.com> Subject: [PATCH 02/12] KVM: x86/mmu: Use KVM-governed feature framework to track "GBPAGES enabled" From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758121691868468046?= X-GMAIL-MSGID: =?utf-8?q?1758121691868468046?= Use the governed feature framework to track whether or not the guest can use 1GiB pages, and drop the one-off helper that wraps the surprisingly non-trivial logic surrounding 1GiB page usage in the guest. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/cpuid.c | 16 ++++++++++++++++ arch/x86/kvm/governed_features.h | 2 ++ arch/x86/kvm/mmu/mmu.c | 20 +++----------------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 013fdc27fc8f..3b604499c35c 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -337,6 +337,22 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) vcpu->arch.governed_features.enabled = 0; + /* + * If TDP is enabled, let the guest use GBPAGES if they're supported in + * hardware. The hardware page walker doesn't let KVM disable GBPAGES, + * i.e. won't treat them as reserved, and KVM doesn't redo the GVA->GPA + * walk for performance and complexity reasons. Not to mention KVM + * _can't_ solve the problem because GVA->GPA walks aren't visible to + * KVM once a TDP translation is installed. Mimic hardware behavior so + * that KVM's is at least consistent, i.e. doesn't randomly inject #PF. + * If TDP is disabled, honor guest CPUID as KVM has full visibility and + * can install smaller shadow pages if the host lacks 1GiB support. + */ + if (!tdp_enabled) + kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_GBPAGES); + else if (boot_cpu_has(X86_FEATURE_GBPAGES)) + kvm_governed_feature_set(vcpu, X86_FEATURE_GBPAGES); + best = kvm_find_cpuid_entry(vcpu, 1); if (best && apic) { if (cpuid_entry_has(best, X86_FEATURE_TSC_DEADLINE_TIMER)) diff --git a/arch/x86/kvm/governed_features.h b/arch/x86/kvm/governed_features.h index 40ce8e6608cd..b29c15d5e038 100644 --- a/arch/x86/kvm/governed_features.h +++ b/arch/x86/kvm/governed_features.h @@ -5,5 +5,7 @@ BUILD_BUG() #define KVM_GOVERNED_X86_FEATURE(x) KVM_GOVERNED_FEATURE(X86_FEATURE_##x) +KVM_GOVERNED_X86_FEATURE(GBPAGES) + #undef KVM_GOVERNED_X86_FEATURE #undef KVM_GOVERNED_FEATURE diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index c91ee2927dd7..36e4561554ca 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4728,28 +4728,13 @@ __reset_rsvds_bits_mask(struct rsvd_bits_validate *rsvd_check, } } -static bool guest_can_use_gbpages(struct kvm_vcpu *vcpu) -{ - /* - * If TDP is enabled, let the guest use GBPAGES if they're supported in - * hardware. The hardware page walker doesn't let KVM disable GBPAGES, - * i.e. won't treat them as reserved, and KVM doesn't redo the GVA->GPA - * walk for performance and complexity reasons. Not to mention KVM - * _can't_ solve the problem because GVA->GPA walks aren't visible to - * KVM once a TDP translation is installed. Mimic hardware behavior so - * that KVM's is at least consistent, i.e. doesn't randomly inject #PF. - */ - return tdp_enabled ? boot_cpu_has(X86_FEATURE_GBPAGES) : - guest_cpuid_has(vcpu, X86_FEATURE_GBPAGES); -} - static void reset_guest_rsvds_bits_mask(struct kvm_vcpu *vcpu, struct kvm_mmu *context) { __reset_rsvds_bits_mask(&context->guest_rsvd_check, vcpu->arch.reserved_gpa_bits, context->cpu_role.base.level, is_efer_nx(context), - guest_can_use_gbpages(vcpu), + guest_can_use(vcpu, X86_FEATURE_GBPAGES), is_cr4_pse(context), guest_cpuid_is_amd_or_hygon(vcpu)); } @@ -4826,7 +4811,8 @@ static void reset_shadow_zero_bits_mask(struct kvm_vcpu *vcpu, __reset_rsvds_bits_mask(shadow_zero_check, reserved_hpa_bits(), context->root_role.level, context->root_role.efer_nx, - guest_can_use_gbpages(vcpu), is_pse, is_amd); + guest_can_use(vcpu, X86_FEATURE_GBPAGES), + is_pse, is_amd); if (!shadow_me_mask) return;