From: Paolo Bonzini <pbonzini@redhat.com>
To: "Sean Christopherson" <sean.j.christopherson@intel.com>,
"Radim Krčmář" <rkrcmar@redhat.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Adam Borowski <kilobyte@angband.pl>,
David Hildenbrand <david@redhat.com>,
Dan Williams <dan.j.williams@intel.com>
Subject: Re: [PATCH 2/2] KVM: x86/mmu: Add helper to consolidate huge page promotion
Date: Wed, 6 Nov 2019 18:22:29 +0100 [thread overview]
Message-ID: <9b3e3cc3-9cd0-1f55-ee19-f33c4cfb7f8a@redhat.com> (raw)
In-Reply-To: <20191106170727.14457-3-sean.j.christopherson@intel.com>
On 06/11/19 18:07, Sean Christopherson wrote:
> */
> - if (!is_error_noslot_pfn(pfn) && !kvm_is_reserved_pfn(pfn) &&
> - !kvm_is_zone_device_pfn(pfn) && level == PT_PAGE_TABLE_LEVEL &&
> - PageTransCompoundMap(pfn_to_page(pfn)) &&
> + if (level == PT_PAGE_TABLE_LEVEL && kvm_is_hugepage_allowed(pfn) &&
> !mmu_gfn_lpage_is_disallowed(vcpu, gfn, PT_DIRECTORY_LEVEL)) {
> unsigned long mask;
> /*
> @@ -5914,9 +5919,7 @@ static bool kvm_mmu_zap_collapsible_spte(struct kvm *kvm,
> * the guest, and the guest page table is using 4K page size
> * mapping if the indirect sp has level = 1.
> */
> - if (sp->role.direct && !kvm_is_reserved_pfn(pfn) &&
> - !kvm_is_zone_device_pfn(pfn) &&
> - PageTransCompoundMap(pfn_to_page(pfn))) {
> + if (sp->role.direct && kvm_is_hugepage_allowed(pfn)) {
> pte_list_remove(rmap_head, sptep);
I don't think is_error_noslot_pfn(pfn) makes sense in
kvm_mmu_zap_collapsible_spte, so I'd rather keep it in
transparent_hugepage_adjust. Actually, it must be is_noslot_pfn only at
this point---error pfns have been sieved earlier in handle_abnormal_pfn,
so perhaps
if (WARN_ON_ONCE(is_error_pfn(pfn)) || is_noslot_pfn(pfn))
return;
if (level == PT_PAGE_TABLE_LEVEL &&
kvm_is_hugepage_allowed(pfn) &&
!mmu_gfn_lpage_is_disallowed(vcpu, gfn, PT_DIRECTORY_LEVEL))
would be the best option.
Paolo
prev parent reply other threads:[~2019-11-06 17:22 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 17:07 [PATCH 0/2] KVM: MMU: Fix a refcount bug with ZONE_DEVICE pages Sean Christopherson
2019-11-06 17:07 ` [PATCH 1/2] KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved Sean Christopherson
2019-11-06 17:14 ` Paolo Bonzini
2019-11-06 17:46 ` Sean Christopherson
2019-11-06 18:04 ` Dan Williams
2019-11-06 20:26 ` Sean Christopherson
2019-11-06 20:34 ` Dan Williams
2019-11-06 21:09 ` Paolo Bonzini
2019-11-06 21:30 ` Sean Christopherson
2019-11-06 23:20 ` Dan Williams
2019-11-06 23:39 ` Sean Christopherson
2019-11-07 0:01 ` Dan Williams
2019-11-07 5:48 ` Dan Williams
2019-11-07 11:12 ` Paolo Bonzini
2019-11-07 15:36 ` Dan Williams
2019-11-07 15:58 ` Sean Christopherson
2019-11-09 1:43 ` Sean Christopherson
2019-11-09 2:00 ` Dan Williams
2019-11-11 18:27 ` Sean Christopherson
2019-11-11 19:15 ` Paolo Bonzini
2019-11-12 0:51 ` Dan Williams
2019-11-12 10:19 ` Paolo Bonzini
2019-11-12 16:57 ` Sean Christopherson
2019-11-06 17:07 ` [PATCH 2/2] KVM: x86/mmu: Add helper to consolidate huge page promotion Sean Christopherson
2019-11-06 17:22 ` Paolo Bonzini [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9b3e3cc3-9cd0-1f55-ee19-f33c4cfb7f8a@redhat.com \
--to=pbonzini@redhat.com \
--cc=dan.j.williams@intel.com \
--cc=david@redhat.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kilobyte@angband.pl \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rkrcmar@redhat.com \
--cc=sean.j.christopherson@intel.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).