From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02BD5C5B543 for ; Tue, 27 May 2025 18:03:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 443EE6B00A1; Tue, 27 May 2025 14:03:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3F68B6B00A2; Tue, 27 May 2025 14:03:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 248346B00A3; Tue, 27 May 2025 14:03:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id EF7426B00A1 for ; Tue, 27 May 2025 14:03:12 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9E4E814135E for ; Tue, 27 May 2025 18:03:12 +0000 (UTC) X-FDA: 83489459424.05.8D923E1 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf13.hostedemail.com (Postfix) with ESMTP id B71D720014 for ; Tue, 27 May 2025 18:03:10 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=NRkNUo+j; spf=pass (imf13.hostedemail.com: domain of 3Xf41aAUKCHorYZZYemmejc.amkjglsv-kkitYai.mpe@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3Xf41aAUKCHorYZZYemmejc.amkjglsv-kkitYai.mpe@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1748368990; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=tGxGAz/J8q+l9ioy8ZyCt7XqRvXAVcRnGlKU7YzuHUQ=; b=Tpp11qUalbyg04EZgK2RpvcMSKgehwBOCTG16H9f01Cuzve7HTa15pSMSvWyDVbaiqE2d0 qGfPF3ZifkYXfOTKRbQFG/LFqGGRyoqM7mOKCN4HLlWrXXrYavVp5NQslSc4MPCobLeh8I jJlGCu9BkZFf/tpzvx3yDlGjPvB8Wpg= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=NRkNUo+j; spf=pass (imf13.hostedemail.com: domain of 3Xf41aAUKCHorYZZYemmejc.amkjglsv-kkitYai.mpe@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3Xf41aAUKCHorYZZYemmejc.amkjglsv-kkitYai.mpe@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1748368990; a=rsa-sha256; cv=none; b=MEvBnxbScoZbrOxm43oehAMdKf3JeVi6dcToyD8+7O5uKuksHOBcLWb2uLHjwOrbrdnyQo CuWcXjUL1mW269owNnu4nmWt11n5mPjSx1EX0cOj1aDAiHBpTotcrakBF1PcHw5RGzK1TC dNGo9G1QA0wKWM/oYXM4uBtq9PPsHe8= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-445135eb689so22970135e9.2 for ; Tue, 27 May 2025 11:03:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748368989; x=1748973789; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=tGxGAz/J8q+l9ioy8ZyCt7XqRvXAVcRnGlKU7YzuHUQ=; b=NRkNUo+jWdTvo1OemIA4+i56pQTegZxZaDwWW5KDe9gBJbNYEQiXPc2lNSsq4aLwFo iFLbKEZhfSdpy9T7u97+T6gibRmxXtvPK8PQ4NL9aOWeQuhDMESkGu66GHQdhUfqMmbn 0WrNvfFBM4G7jrpn6C5jClhPF6qMwlT9gtI98QRs6z7YJ+/euTl9YJmesvRHVxVD+NTJ ncf2el1Ea40hjQe8/K3ObRYs871iiTC4UzSEv1iSAeDv8ZImgiZHUojU4FxAhMRigcYU LjIuVQKGTzaxr1CifoFs7hbXaC1qG008H19k8WldYMuoQF2XPhk58QebXZFfzrLYBTDb HSjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748368989; x=1748973789; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tGxGAz/J8q+l9ioy8ZyCt7XqRvXAVcRnGlKU7YzuHUQ=; b=HXYybnbDNcwOA+VgroT3wnqXBHPTIqrIas62AfkEEs0mAxISUqQM3APMgoOxJvQvxk ycnpf1CVuAJnnHA/+PMExv45A0hlkjBf3adV66BMkP0pr81stv17qxXoYdeAr+HcYUph DCm11LzH4KXuATXpOrhOQ0fFMYcJBJeW6CTffBVD4MPS8/haBXlSHhI3lq39Au85IVDz stFi9fm2wzqbpb+o9w6Iu2LbG8yJQF2n9p8wYHXK648tP80yLMa3R3nT+Ew/HV4Cjt6U sbiaVl3xDrBhvUDnlYm4qrSgAM+LDXUZjtyCGmtJMZf902CZT6sytZgDmx/YPJp21n5L 1d5g== X-Forwarded-Encrypted: i=1; AJvYcCXvSZujyEhsd7SBBJS+VIbpwiIni8MFZa8hTf4RQGKlf4Em2wOoSUbgJacXrXUXMrjCvVpQz5ufKg==@kvack.org X-Gm-Message-State: AOJu0YwBTNa3ib+15fp4W5MqUUUSKZFtvT7UbcF7xtLx0si+pLTxMIRS 24jkjcChe9OhqmVztnTbJmxz6TO9M/D7nSfd7+gKdyy0nKcp4ZlTq0TDQzkzE+pYFldjApCWUmX l+Q== X-Google-Smtp-Source: AGHT+IHCdTen+VlEN4YQKRHsWbOzuscw8dC+M4jud7nfLuiyuZdUz84LMjBfZHDeQ9BGX6pnIYBwYRdpZg== X-Received: from wmrn14.prod.google.com ([2002:a05:600c:500e:b0:440:6830:ae64]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3c93:b0:43d:fa58:81d3 with SMTP id 5b1f17b1804b1-44c933f0edfmr102933645e9.32.1748368989076; Tue, 27 May 2025 11:03:09 -0700 (PDT) Date: Tue, 27 May 2025 19:02:40 +0100 In-Reply-To: <20250527180245.1413463-1-tabba@google.com> Mime-Version: 1.0 References: <20250527180245.1413463-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.1164.gab81da1b16-goog Message-ID: <20250527180245.1413463-12-tabba@google.com> Subject: [PATCH v10 11/16] KVM: x86: Compute max_mapping_level with input from guest_memfd From: Fuad Tabba To: kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mm@kvack.org Cc: pbonzini@redhat.com, chenhuacai@kernel.org, mpe@ellerman.id.au, anup@brainfault.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, seanjc@google.com, viro@zeniv.linux.org.uk, brauner@kernel.org, willy@infradead.org, akpm@linux-foundation.org, xiaoyao.li@intel.com, yilun.xu@intel.com, chao.p.peng@linux.intel.com, jarkko@kernel.org, amoorthy@google.com, dmatlack@google.com, isaku.yamahata@intel.com, mic@digikod.net, vbabka@suse.cz, vannapurve@google.com, ackerleytng@google.com, mail@maciej.szmigiero.name, david@redhat.com, michael.roth@amd.com, wei.w.wang@intel.com, liam.merwick@oracle.com, isaku.yamahata@gmail.com, kirill.shutemov@linux.intel.com, suzuki.poulose@arm.com, steven.price@arm.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_tsoni@quicinc.com, quic_svaddagi@quicinc.com, quic_cvanscha@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, catalin.marinas@arm.com, james.morse@arm.com, yuzenghui@huawei.com, oliver.upton@linux.dev, maz@kernel.org, will@kernel.org, qperret@google.com, keirf@google.com, roypat@amazon.co.uk, shuah@kernel.org, hch@infradead.org, jgg@nvidia.com, rientjes@google.com, jhubbard@nvidia.com, fvdl@google.com, hughd@google.com, jthoughton@google.com, peterx@redhat.com, pankaj.gupta@amd.com, ira.weiny@intel.com, tabba@google.com Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Queue-Id: B71D720014 X-Rspamd-Server: rspam09 X-Stat-Signature: n7tc8oqde6wpmbjkb4sdzukcbc7fsd39 X-HE-Tag: 1748368990-672462 X-HE-Meta: U2FsdGVkX1/bLSakKYyMcCbmhdFkfon5/KA4SBsWWsZAsKIYyl/E1CB5OgxdkxzlvlOmB0Pc80Z/Apcdm5KloW55rN+zHlk4MRyDMvvZJQq5mlBXz5Dh15Oa8uPXlG0wMBstetHDfo5V1fR7+jbpmJNsjD6qBI5wHMSmfovf04T1REF6rlV59yxl4N3veygq5NL4pe77RWCgqXUFnryBg6hMZqzeA2aLRRs6h0gNEP51wtPX1gxk0g1XzH6roi7e1CnYemodcdkfkPAKj4sNYr5T/+SVzLpuG7NDPH52twAoDLeJLb88clPzdj7d8qMw/dzo2CbCYJxBkUbwUxUpF+JOVld3rw4ElK1PZuGpJmfDjHB51QHddDXmiuhR4PUiC6oHpu7/kmpUpGU0+d+wtOOnND9Jw1aZs6l2V263ZmUl0r9elwPgt5vUkmTrqw69cDDBuLiPXiGmSe+bfeIUVT8P+LOVdR8cDVIJldI98rMFxp7ZcYRlR+tLU6bRQTxqP/PvrmKOyXClgGKmq/35CQFUhzdYQBl0YUljo9C6ebbC9DrVea90vm4Vp70kTByT9KSm+LLR8WDFom01cJ8tE0Ac50mNbFc+On5f0W1F+8Y1g1MakOyK0WJk5snUZ6+44ciuR9Dos3gyy+Tg6uMlWZXH1CJVfASqXt9O3iVAog/KO5ZxE0mE1Cb7XXv2MCdTF5Pwld/ekV2jVyCdGY3568hO0eWJ0FM9+jjJLfk8TvQ6O5iKlxepn7Zn3L2QKXugj3elV5g7JnV+DjqcGjpOUZSWnfpJjVzbM/x39bteCI6iAFdFA7tKa4y3UlYXU0ry/2EwUbz7sE+j50wA2jer03p4Rtvl855a6loyQB94ik0w/vydwaZiHM6ZylIe8hXVd2HUc0JEWm2mbFGp3dvKbW2BgXhxpJZVZBX1LRswBpoMfX18pz/SJescZXLMjQ8LT33001YJUTZihEpPiXx N449/SAP VjwZcUezXcgeQK8r9EbP/2Hmx/mpJNYLmWLIL1BPD2poARtu0M74fuEG4bNiUdVk8OcVvcILeOiKNQrQ4hYUx9prMkjdxX7HApKBPLYJgLqD0D2CDxiUvy5kC0LDP+KEEV2hvXWkDtHXLZXdc6pKnVDUiSfN4/mzz7JB0JP95GVAX45MD9mrIELbbFXpEMRLHM80drqOIXd+3qIJNkxLYRK4xYfw9rmJ0NHBAm86HVEnoaLYMnB7LH475sahFHHp1FeNkJU3ugP1fsmKfXn69cPf161GdycpIwlzUUIVL10iPlSx6L7/MaN3+0q7jVONDwFLeoM2dZy4AlBQLBPf35uEXTLoBSMFN53AdmXw2hsyVpegwbETsTO7y7s5j34vvd5Dk3arZRyEMj659Y8+5PEcT4lyuBF1LtZt/1y1LnYPWMp8e0yZjTfWf5Bn7Goz/JEPHeTRyGRhWF23FCwibbxScsymwUmCSrV+s2tPht0gEaOTyloa/oY2IOlUrz5lfMq/mglCeFU6C+IhJnYm/62U3R+L5mnA/PgoR79XaEuc2GzgSisyVBFzu89cPgWfgA7j9bid6nKzSH5RCTMs3VjhQN3W9nGOx6CUxzN0Ji8C84t+9LrrdIAWk4i/mpSDn4t3ziLpD4n4xZ0ZN+b/hTy0pBg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Ackerley Tng This patch adds kvm_gmem_max_mapping_level(), which always returns PG_LEVEL_4K since guest_memfd only supports 4K pages for now. When guest_memfd supports shared memory, max_mapping_level (especially when recovering huge pages - see call to __kvm_mmu_max_mapping_level() from recover_huge_pages_range()) should take input from guest_memfd. Input from guest_memfd should be taken in these cases: + if the memslot supports shared memory (guest_memfd is used for shared memory, or in future both shared and private memory) or + if the memslot is only used for private memory and that gfn is private. If the memslot doesn't use guest_memfd, figure out the max_mapping_level using the host page tables like before. This patch also refactors and inlines the other call to __kvm_mmu_max_mapping_level(). In kvm_mmu_hugepage_adjust(), guest_memfd's input is already provided (if applicable) in fault->max_level. Hence, there is no need to query guest_memfd. lpage_info is queried like before, and then if the fault is not from guest_memfd, adjust fault->req_level based on input from host page tables. Signed-off-by: Ackerley Tng Signed-off-by: Fuad Tabba --- arch/x86/kvm/mmu/mmu.c | 87 +++++++++++++++++++++++++--------------- include/linux/kvm_host.h | 11 +++++ virt/kvm/guest_memfd.c | 12 ++++++ 3 files changed, 78 insertions(+), 32 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 5b7df2905aa9..9e0bc8114859 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3256,12 +3256,11 @@ static int host_pfn_mapping_level(struct kvm *kvm, gfn_t gfn, return level; } -static int __kvm_mmu_max_mapping_level(struct kvm *kvm, - const struct kvm_memory_slot *slot, - gfn_t gfn, int max_level, bool is_private) +static int kvm_lpage_info_max_mapping_level(struct kvm *kvm, + const struct kvm_memory_slot *slot, + gfn_t gfn, int max_level) { struct kvm_lpage_info *linfo; - int host_level; max_level = min(max_level, max_huge_page_level); for ( ; max_level > PG_LEVEL_4K; max_level--) { @@ -3270,28 +3269,61 @@ static int __kvm_mmu_max_mapping_level(struct kvm *kvm, break; } - if (is_private) - return max_level; + return max_level; +} + +static inline u8 kvm_max_level_for_order(int order) +{ + BUILD_BUG_ON(KVM_MAX_HUGEPAGE_LEVEL > PG_LEVEL_1G); + + KVM_MMU_WARN_ON(order != KVM_HPAGE_GFN_SHIFT(PG_LEVEL_1G) && + order != KVM_HPAGE_GFN_SHIFT(PG_LEVEL_2M) && + order != KVM_HPAGE_GFN_SHIFT(PG_LEVEL_4K)); + + if (order >= KVM_HPAGE_GFN_SHIFT(PG_LEVEL_1G)) + return PG_LEVEL_1G; + + if (order >= KVM_HPAGE_GFN_SHIFT(PG_LEVEL_2M)) + return PG_LEVEL_2M; + + return PG_LEVEL_4K; +} + +static inline int kvm_gmem_max_mapping_level(const struct kvm_memory_slot *slot, + gfn_t gfn, int max_level) +{ + int max_order; if (max_level == PG_LEVEL_4K) return PG_LEVEL_4K; - host_level = host_pfn_mapping_level(kvm, gfn, slot); - return min(host_level, max_level); + max_order = kvm_gmem_mapping_order(slot, gfn); + return min(max_level, kvm_max_level_for_order(max_order)); } int kvm_mmu_max_mapping_level(struct kvm *kvm, const struct kvm_memory_slot *slot, gfn_t gfn) { - bool is_private = kvm_slot_has_gmem(slot) && - kvm_mem_is_private(kvm, gfn); + int max_level; - return __kvm_mmu_max_mapping_level(kvm, slot, gfn, PG_LEVEL_NUM, is_private); + max_level = kvm_lpage_info_max_mapping_level(kvm, slot, gfn, PG_LEVEL_NUM); + if (max_level == PG_LEVEL_4K) + return PG_LEVEL_4K; + + if (kvm_slot_has_gmem(slot) && + (kvm_gmem_memslot_supports_shared(slot) || + kvm_get_memory_attributes(kvm, gfn) & KVM_MEMORY_ATTRIBUTE_PRIVATE)) { + return kvm_gmem_max_mapping_level(slot, gfn, max_level); + } + + return min(max_level, host_pfn_mapping_level(kvm, gfn, slot)); } static inline bool fault_from_gmem(struct kvm_page_fault *fault) { - return fault->is_private || kvm_gmem_memslot_supports_shared(fault->slot); + return fault->is_private || + (kvm_slot_has_gmem(fault->slot) && + kvm_gmem_memslot_supports_shared(fault->slot)); } void kvm_mmu_hugepage_adjust(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) @@ -3314,12 +3346,20 @@ void kvm_mmu_hugepage_adjust(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault * Enforce the iTLB multihit workaround after capturing the requested * level, which will be used to do precise, accurate accounting. */ - fault->req_level = __kvm_mmu_max_mapping_level(vcpu->kvm, slot, - fault->gfn, fault->max_level, - fault->is_private); + fault->req_level = kvm_lpage_info_max_mapping_level(vcpu->kvm, slot, + fault->gfn, fault->max_level); if (fault->req_level == PG_LEVEL_4K || fault->huge_page_disallowed) return; + if (!fault_from_gmem(fault)) { + int host_level; + + host_level = host_pfn_mapping_level(vcpu->kvm, fault->gfn, slot); + fault->req_level = min(fault->req_level, host_level); + if (fault->req_level == PG_LEVEL_4K) + return; + } + /* * mmu_invalidate_retry() was successful and mmu_lock is held, so * the pmd can't be split from under us. @@ -4453,23 +4493,6 @@ void kvm_arch_async_page_ready(struct kvm_vcpu *vcpu, struct kvm_async_pf *work) vcpu->stat.pf_fixed++; } -static inline u8 kvm_max_level_for_order(int order) -{ - BUILD_BUG_ON(KVM_MAX_HUGEPAGE_LEVEL > PG_LEVEL_1G); - - KVM_MMU_WARN_ON(order != KVM_HPAGE_GFN_SHIFT(PG_LEVEL_1G) && - order != KVM_HPAGE_GFN_SHIFT(PG_LEVEL_2M) && - order != KVM_HPAGE_GFN_SHIFT(PG_LEVEL_4K)); - - if (order >= KVM_HPAGE_GFN_SHIFT(PG_LEVEL_1G)) - return PG_LEVEL_1G; - - if (order >= KVM_HPAGE_GFN_SHIFT(PG_LEVEL_2M)) - return PG_LEVEL_2M; - - return PG_LEVEL_4K; -} - static u8 kvm_max_level_for_fault_and_order(struct kvm *kvm, struct kvm_page_fault *fault, int order) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index b1786ef6d8ea..629915b2bb8d 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -2551,6 +2551,10 @@ static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn) return kvm_get_memory_attributes(kvm, gfn) & KVM_MEMORY_ATTRIBUTE_PRIVATE; } #else +static inline unsigned long kvm_get_memory_attributes(struct kvm *kvm, gfn_t gfn) +{ + return 0; +} static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn) { return false; @@ -2561,6 +2565,7 @@ static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn) int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, kvm_pfn_t *pfn, struct page **page, int *max_order); +int kvm_gmem_mapping_order(const struct kvm_memory_slot *slot, gfn_t gfn); #else static inline int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, @@ -2570,6 +2575,12 @@ static inline int kvm_gmem_get_pfn(struct kvm *kvm, KVM_BUG_ON(1, kvm); return -EIO; } +static inline int kvm_gmem_mapping_order(const struct kvm_memory_slot *slot, + gfn_t gfn) +{ + BUG(); + return 0; +} #endif /* CONFIG_KVM_GMEM */ #ifdef CONFIG_HAVE_KVM_ARCH_GMEM_PREPARE diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 9ded8d5139ee..0cd12f94958b 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -723,6 +723,18 @@ int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, } EXPORT_SYMBOL_GPL(kvm_gmem_get_pfn); +/* + * Returns the mapping order for this @gfn in @slot. + * + * This is equal to max_order that would be returned if kvm_gmem_get_pfn() were + * called now. + */ +int kvm_gmem_mapping_order(const struct kvm_memory_slot *slot, gfn_t gfn) +{ + return 0; +} +EXPORT_SYMBOL_GPL(kvm_gmem_mapping_order); + #ifdef CONFIG_KVM_GENERIC_GMEM_POPULATE long kvm_gmem_populate(struct kvm *kvm, gfn_t start_gfn, void __user *src, long npages, kvm_gmem_populate_cb post_populate, void *opaque) -- 2.49.0.1164.gab81da1b16-goog