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 C71DBC678DC for ; Wed, 11 Jun 2025 13:34:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D06936B00A4; Wed, 11 Jun 2025 09:33:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CDF1E6B00A5; Wed, 11 Jun 2025 09:33:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B7E196B00A6; Wed, 11 Jun 2025 09:33:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9A0616B00A4 for ; Wed, 11 Jun 2025 09:33:56 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 614ED1A0D75 for ; Wed, 11 Jun 2025 13:33:56 +0000 (UTC) X-FDA: 83543212872.02.33ED91E Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf22.hostedemail.com (Postfix) with ESMTP id A5345C0003 for ; Wed, 11 Jun 2025 13:33:54 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=c5l2GMZg; spf=pass (imf22.hostedemail.com: domain of 3wYVJaAUKCDwrYZZYemmejc.amkjglsv-kkitYai.mpe@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3wYVJaAUKCDwrYZZYemmejc.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=1749648834; 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=VsETe8JP2RK+jwc0W86kgeiqvrWmEHj3D0sgGemuJ58=; b=8FSAkIg5Mtj7eyGmpHiqVjXkc1iUNT1FbX3BdTXY/cVdT8vv3ZkySQaLVsFK14xr4FD7nw guU+k4pFChRaF+IGnlQAKwGq+6lM+D1zIOd7JHLYNI60iEppT/+rDMkYiDLA5YlsDxfmPP PKqOho+bJjaid5M4SxTSF/o/lihzK54= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=c5l2GMZg; spf=pass (imf22.hostedemail.com: domain of 3wYVJaAUKCDwrYZZYemmejc.amkjglsv-kkitYai.mpe@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3wYVJaAUKCDwrYZZYemmejc.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=1749648834; a=rsa-sha256; cv=none; b=cIR4UQViJc20fg2sfbnU25LD8waOOIbU3+EPWkmTUEx23dq6+vcm1LGw2J9Yt6pWZ1633F oF1/1WT/Qkp6szTwdSBVIkhibKt1FuAhOYUGiWOW7THcMeO2+2/CxTZ1+JS8huGWIR/KH2 /7Ik+DrhsMgz8/z4T2g+vaN5l/dy7pc= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4530ec2c87cso22564905e9.0 for ; Wed, 11 Jun 2025 06:33:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749648833; x=1750253633; 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=VsETe8JP2RK+jwc0W86kgeiqvrWmEHj3D0sgGemuJ58=; b=c5l2GMZg1IuMmFt2OhzHGb5JHOA/DBwIn8lJPE0py9cswlg7tp9E6NB7kCOHBRU4La 6Tr+6CzhzRJzIpk7YBQtkIUSspV+IpqVxeeVY78yUl1TKOrODqxi+snPtQgFUFzs5OGY DUpqdyXZ9+GuW24UzaI/ahels10mDQzrybcKVvzpBFxTIC7iFtrLb7YqpjAefYRzk7f0 AGrKYkXD9K9sYyBF4WNgAckHE4I7SYDQNrkl/d3Csqqm4CdmOQDYxOJ9CAxSHYMDtuny RPaP29nn1KP9xmf98YjUIyVxFkrtETJrXq8/PghvORCp1kny50Bysv3yDce/xlQtuqri 8t9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749648833; x=1750253633; 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=VsETe8JP2RK+jwc0W86kgeiqvrWmEHj3D0sgGemuJ58=; b=YhTUmpZV/MJd0LiqxtwI4IdpDT+28vKMgcHXI+RbLJiVWtIdOeWMO2Z0wmOBPOhYOz b1T/RVTxmDlX/UvLCxBY9wo4lsAJNESok00ocR6gqK+uv5yXVsjzNGr0+kOKDdzJBriC h/gxr7ZaU0B9pAz9rNKXPc9lxnI3NmiLf4F6Ta8nXZUVam77cd5Us8RS0eDTVnnWSW+p bUORWQKqsh8+sEg+/aUWzNEXN+vM1/NVdBQSQepUUM4bnV6uwMJjugNozI/cp3244if/ xDnzhj0CI32W64DXm5KgHSk5rVW/X05qcmHv4qK9xxgiewXpJchJ8s37U+lZ2As0TVGU uSoQ== X-Forwarded-Encrypted: i=1; AJvYcCVtosoyF2X4OO/mlIJvELMbC2Qe1LbKKhsqvvMpqQVf1O3ktVzSjfkrjTPtf3X+aR2A8obgmUWpJA==@kvack.org X-Gm-Message-State: AOJu0YwbJ7emt7GqWSb0ye/e+gsEUYrOSrAv3lNswcjFHvZ8oWWv02b5 1bWjnMT5Dm8v+pwGvMvnH4CHAuydA/GKXjWWX+OKdwSJd2e0oFWnvbdOVuVWyXueWl7StcEpOdj 9Rg== X-Google-Smtp-Source: AGHT+IEOpTQLWb/W99hYWPydN9AF4WxIXy9RQ1ao2fIs6Oh5u3U5LCTeCP7RQZ+lgMAn59d3H/C1V9UDvQ== X-Received: from wmbhe6.prod.google.com ([2002:a05:600c:5406:b0:453:f28:e99f]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:190e:b0:442:dcdc:41c8 with SMTP id 5b1f17b1804b1-45325965490mr23058795e9.19.1749648833055; Wed, 11 Jun 2025 06:33:53 -0700 (PDT) Date: Wed, 11 Jun 2025 14:33:22 +0100 In-Reply-To: <20250611133330.1514028-1-tabba@google.com> Mime-Version: 1.0 References: <20250611133330.1514028-1-tabba@google.com> X-Mailer: git-send-email 2.50.0.rc0.642.g800a2b2222-goog Message-ID: <20250611133330.1514028-11-tabba@google.com> Subject: [PATCH v12 10/18] KVM: x86/mmu: Handle guest page faults for guest_memfd with shared memory From: Fuad Tabba To: kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mm@kvack.org, kvmarm@lists.linux.dev 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-Stat-Signature: x1ab77x8zhyzjqqxwmgnuysj6uw83gwt X-Rspamd-Queue-Id: A5345C0003 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1749648834-223010 X-HE-Meta: U2FsdGVkX1+ZstwEeTpZz9sOF0d82ylmEsNhLB8EH108DlhDbuX2QKEybi3G/DEkAPWkBjej1zAb1LyOnwNQa4U8BhvJ6LWfWAYJM42CyA8htPYBiEdJzT6lujCXuQrcAm/lkT8adHfMoyRUvBPPmhKPb9F8HjwO9vgKZ/LB1iDe+fFs3t1HkLE3empD3csB+tbA24cjDqzO8o+dGwMGkpO4ifwU6p/i2QGbS8FeDBIi0Hz4b2k4IHhNOQdRfDiDhzCtRg1nG1Vp73ZOBAsoqsnNfbqmZHt81LrA5vDXpTVUATpv787gwjqJWUj1p4nyywvw7LdbC7bpHIqBxMVOWDP0ALMpNVhgAgbxNgxQdtY2ybYNEQ8PseiX07izIzuoclr6mtRryfC02WqGjojTVqu9qFi+dOL09Pttims3wOOk0tMIywP2ElRN3yNeBaMk4Z/5Yin8tTDa7OvTmFkPi96TfIQQ97OECTGPzYr+8hqFNuTzUtijH3YKVAVpvxaGU0bh75npWfjeu+fG0O6+g1319KpEnr75PskJ4eLtregMB5BMb5Qzjdlgvd8NA1Dj9suRlmEMh9PfOKLa/2ipSTpgo0v+ik4xCZtg8xMJkMIB9ofX8UFmmshr0WKfbEpX2x5VJ14/Ertwwf2tbsF08a208wZxn32XlqzK754gMLKK8aEopCf6A/CY6Mg8WYNJXv5nkfW4KxXqaCuN+//+o3LvywCBjw71tS0XkjEzfYB2xqPQStwBLxJ0iBvFNEEibPVNCEA2fQLuCGU85P4GkOkeAhHYJYuDFCbdsPUfhAhXzLYKvp2sT+qo3LftiD79TNqt21B/UTQBLe+VghENil+Bh0E/RF10Qtm0j2bqBSA8uxSpUQg36glDjyVX5KE8uBO0xt4lnXcK4zz664TT1n5iwQACTun5zOwVM5A9mmUCY8QkxgNRcYu06UPwQRHnTol1MU6fg532P+99UEn sCvUeYjd elEi5iPwB2bR7OXEVZRTTbTMFKJrvdIJUTmmeylT+Rmc1NXWdMb0RoRQPj3FlWXkux9rjVXNOrmXLr69SN1inLYX/CgQOcmKV7EmS3uVznSUQ1ZROHHQw6MEa5qimo9EgcIwAi2P0j++ovPOZv2YOU3bkne0nZlFN9//4tkvAy6nEtSMLOP05K+3GaDEY9NLm/wMb1zXhlQjZBZHkpJQh+/sKT4t80yU8wC1IC5mDltv+pvoZnIY8PnNmGCuoEvHwPlrvKfi/sUkzX3/HnoZsThmO+LcEdVGSKZb0hIwDvubkw8h5DcEEYXGohjlMwxi7usIsymXZvQW57ZvmdZJFKSzORu+q6gHmGS2O0gj15rFhriXnggLGd6rYtQ== 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 For memslots backed by guest_memfd with shared mem support, the KVM MMU must always fault in pages from guest_memfd, and not from the host userspace_addr. Update the fault handler to do so. This patch also refactors related function names for accuracy: kvm_mem_is_private() returns true only when the current private/shared state (in the CoCo sense) of the memory is private, and returns false if the current state is shared explicitly or impicitly, e.g., belongs to a non-CoCo VM. kvm_mmu_faultin_pfn_gmem() is updated to indicate that it can be used to fault in not just private memory, but more generally, from guest_memfd. Co-developed-by: David Hildenbrand Signed-off-by: David Hildenbrand Signed-off-by: Ackerley Tng Co-developed-by: Fuad Tabba Signed-off-by: Fuad Tabba --- arch/x86/kvm/mmu/mmu.c | 38 +++++++++++++++++++++++--------------- include/linux/kvm_host.h | 25 +++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 17 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 75b7b02cfcb7..2aab5a00caee 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3291,6 +3291,11 @@ int kvm_mmu_max_mapping_level(struct kvm *kvm, return __kvm_mmu_max_mapping_level(kvm, slot, gfn, PG_LEVEL_NUM, is_private); } +static inline bool fault_from_gmem(struct kvm_page_fault *fault) +{ + return fault->is_private || kvm_gmem_memslot_supports_shared(fault->slot); +} + void kvm_mmu_hugepage_adjust(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) { struct kvm_memory_slot *slot = fault->slot; @@ -4467,21 +4472,25 @@ static inline u8 kvm_max_level_for_order(int order) return PG_LEVEL_4K; } -static u8 kvm_max_private_mapping_level(struct kvm *kvm, kvm_pfn_t pfn, - u8 max_level, int gmem_order) +static u8 kvm_max_level_for_fault_and_order(struct kvm *kvm, + struct kvm_page_fault *fault, + int order) { - u8 req_max_level; + u8 max_level = fault->max_level; if (max_level == PG_LEVEL_4K) return PG_LEVEL_4K; - max_level = min(kvm_max_level_for_order(gmem_order), max_level); + max_level = min(kvm_max_level_for_order(order), max_level); if (max_level == PG_LEVEL_4K) return PG_LEVEL_4K; - req_max_level = kvm_x86_call(private_max_mapping_level)(kvm, pfn); - if (req_max_level) - max_level = min(max_level, req_max_level); + if (fault->is_private) { + u8 level = kvm_x86_call(private_max_mapping_level)(kvm, fault->pfn); + + if (level) + max_level = min(max_level, level); + } return max_level; } @@ -4493,10 +4502,10 @@ static void kvm_mmu_finish_page_fault(struct kvm_vcpu *vcpu, r == RET_PF_RETRY, fault->map_writable); } -static int kvm_mmu_faultin_pfn_private(struct kvm_vcpu *vcpu, - struct kvm_page_fault *fault) +static int kvm_mmu_faultin_pfn_gmem(struct kvm_vcpu *vcpu, + struct kvm_page_fault *fault) { - int max_order, r; + int gmem_order, r; if (!kvm_slot_has_gmem(fault->slot)) { kvm_mmu_prepare_memory_fault_exit(vcpu, fault); @@ -4504,15 +4513,14 @@ static int kvm_mmu_faultin_pfn_private(struct kvm_vcpu *vcpu, } r = kvm_gmem_get_pfn(vcpu->kvm, fault->slot, fault->gfn, &fault->pfn, - &fault->refcounted_page, &max_order); + &fault->refcounted_page, &gmem_order); if (r) { kvm_mmu_prepare_memory_fault_exit(vcpu, fault); return r; } fault->map_writable = !(fault->slot->flags & KVM_MEM_READONLY); - fault->max_level = kvm_max_private_mapping_level(vcpu->kvm, fault->pfn, - fault->max_level, max_order); + fault->max_level = kvm_max_level_for_fault_and_order(vcpu->kvm, fault, gmem_order); return RET_PF_CONTINUE; } @@ -4522,8 +4530,8 @@ static int __kvm_mmu_faultin_pfn(struct kvm_vcpu *vcpu, { unsigned int foll = fault->write ? FOLL_WRITE : 0; - if (fault->is_private) - return kvm_mmu_faultin_pfn_private(vcpu, fault); + if (fault_from_gmem(fault)) + return kvm_mmu_faultin_pfn_gmem(vcpu, fault); foll |= FOLL_NOWAIT; fault->pfn = __kvm_faultin_pfn(fault->slot, fault->gfn, foll, diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index bba7d2c14177..8f7069385189 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -2547,10 +2547,31 @@ bool kvm_arch_pre_set_memory_attributes(struct kvm *kvm, bool kvm_arch_post_set_memory_attributes(struct kvm *kvm, struct kvm_gfn_range *range); +/* + * Returns true if the given gfn's private/shared status (in the CoCo sense) is + * private. + * + * A return value of false indicates that the gfn is explicitly or implicitly + * shared (i.e., non-CoCo VMs). + */ static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn) { - return IS_ENABLED(CONFIG_KVM_GMEM) && - kvm_get_memory_attributes(kvm, gfn) & KVM_MEMORY_ATTRIBUTE_PRIVATE; + struct kvm_memory_slot *slot; + + if (!IS_ENABLED(CONFIG_KVM_GMEM)) + return false; + + slot = gfn_to_memslot(kvm, gfn); + if (kvm_slot_has_gmem(slot) && kvm_gmem_memslot_supports_shared(slot)) { + /* + * Without in-place conversion support, if a guest_memfd memslot + * supports shared memory, then all the slot's memory is + * considered not private, i.e., implicitly shared. + */ + return false; + } + + return kvm_get_memory_attributes(kvm, gfn) & KVM_MEMORY_ATTRIBUTE_PRIVATE; } #else static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn) -- 2.50.0.rc0.642.g800a2b2222-goog