From patchwork Wed Mar 12 17:58:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 14013734 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 6D4A4C28B2E for ; Wed, 12 Mar 2025 17:58:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1670728000A; Wed, 12 Mar 2025 13:58:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F134280001; Wed, 12 Mar 2025 13:58:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E38C328000A; Wed, 12 Mar 2025 13:58:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id BB793280001 for ; Wed, 12 Mar 2025 13:58:44 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 45F3912149E for ; Wed, 12 Mar 2025 17:58:45 +0000 (UTC) X-FDA: 83213659410.04.F63FEDD Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf10.hostedemail.com (Postfix) with ESMTP id 5D034C000C for ; Wed, 12 Mar 2025 17:58:43 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=PVdOQpS2; spf=pass (imf10.hostedemail.com: domain of 3UcvRZwUKCHQlSTTSYggYdW.Ugedafmp-eecnSUc.gjY@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3UcvRZwUKCHQlSTTSYggYdW.Ugedafmp-eecnSUc.gjY@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=1741802323; 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=We8c70tl+Zx5FQcQtlW287aL/adOZePxySoQID49z3A=; b=GVTYfoogZV98m5Iwo+MdqGzsOHPWndw+SMCB/mNe2rE0mjqC4kdxJyrQGtJ5FSm+0CirHt BVkoHQ3BX09qP7ii4/ukxGivbHAcaUMfCQQbV5VhIMB0PD6sZ8Vk6xLF1LAQbKrQCd29SW veCer/DdEbFoIeNfTft149XzJgZ7yCg= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=PVdOQpS2; spf=pass (imf10.hostedemail.com: domain of 3UcvRZwUKCHQlSTTSYggYdW.Ugedafmp-eecnSUc.gjY@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3UcvRZwUKCHQlSTTSYggYdW.Ugedafmp-eecnSUc.gjY@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741802323; a=rsa-sha256; cv=none; b=rynGrRE7ljHPXChmwt5lURzrVTjBz1xxULzdPFAc5YSTUrBqMefwdIQHE5snn8QyzM+lL7 HjL7z/3oCJB1MpQLJD+hlj4u/CwJeVXwQ42IZ0v0m31e9H6PNhedBkTKoXvF80eB46AA0m a/g99h1c9sk9WeneZlgZ8sLZfzPBiOE= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43cfd9b833bso5599695e9.1 for ; Wed, 12 Mar 2025 10:58:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741802322; x=1742407122; 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=We8c70tl+Zx5FQcQtlW287aL/adOZePxySoQID49z3A=; b=PVdOQpS2QVJACuC6Yj4eeA63U14wBJLSNqiEDw7g1Be2jpo3Xh6g6wTH2svr3Kdggk Qzzky5Hw1/CqHe65I9vbIg60c/LH6RfWokScw8FijYebyOV/Poq9+kycTjEXmaZWzeZD QC73CaNJUxS6LQpNREEq5aTonk+DzLgjAXCW73bQNU3O/DZCxV1CwBPCbTsgz2C1AhSQ RW1EQgDK+xKkuAHtdiasvCYM3eAPkRbsiHE7S5y9NRNXvqT6ElYam4HgcuZ/82HYuogO sTw4TzypwAaMQdHqbE2vh8xBgQW9ulpPnvNDBJ6RB4r1MOU8RLelfeTJ1ybOgq68oKqP 1nBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741802322; x=1742407122; 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=We8c70tl+Zx5FQcQtlW287aL/adOZePxySoQID49z3A=; b=lws8kSBFgI89RlLGXr0RtBDoPabT3pjkYMeFNKw9AgB/+228RxjDmmT8NxX+BqFiOU t3yuJ+e9qKhPuiB0m2PHnHK5JReSb1i/IQDo9WJtomneTdhe/FaR+ImRNMBqtT81fG6G pr4SKtHRyXOJ4mlyFXcyh6PhTCYMQKaxhvwCpgpH45Vyefpntouo2nZh0ctFiaIUoaZN XVNbSekNPdsHGcePcLxsPBlUQDnecilZeRrIksIFL9Ui+l8+XvGPfHF5lpko57PR6sjm N2GdpScxRKt7PWvGOtQTpKHgwWrfJFdQE4YyJXXgZl6M/kBlA6iMgkRO8HI9zf31gYvY 8J1g== X-Forwarded-Encrypted: i=1; AJvYcCV4JVI/UIhjZ3OrN56N3oeZYAWDDgGRFR/zB0hLnhlQhhTz1zTiZPbyGmoP4Xtk6+iIpo9Q9AaqDw==@kvack.org X-Gm-Message-State: AOJu0Yyb1QEcANBf73Z8CLayB9Gdis39pn7Sk8dHz/oY+5yReCQYu5ts RMJXRI9k96Y6HYQshiEVhOOle1WjiWZZYDNqP8WAxFCbhTUU0aPYHvl//W5bgzbL8QSy/BNPuQ= = X-Google-Smtp-Source: AGHT+IFgL9irGVEt2YWfb1UQbIwVL/VNkbXIcKNXEidvOBQCQVT8F8I3RbRKchYk4z05AIfWZpjSXgIKCw== X-Received: from wmbeq9.prod.google.com ([2002:a05:600c:8489:b0:43b:c9fc:b269]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1913:b0:439:8e95:796a with SMTP id 5b1f17b1804b1-43d161ea047mr4367375e9.13.1741802321988; Wed, 12 Mar 2025 10:58:41 -0700 (PDT) Date: Wed, 12 Mar 2025 17:58:21 +0000 In-Reply-To: <20250312175824.1809636-1-tabba@google.com> Mime-Version: 1.0 References: <20250312175824.1809636-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.rc0.332.g42c0ae87b1-goog Message-ID: <20250312175824.1809636-9-tabba@google.com> Subject: [PATCH v6 08/10] KVM: arm64: Handle guest_memfd()-backed guest page faults 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, tabba@google.com X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 5D034C000C X-Stat-Signature: wu664ueabc3ay989qb718zorpbe8ys4e X-HE-Tag: 1741802323-167627 X-HE-Meta: U2FsdGVkX18SzR+3ruE9J25rPwxYvmatmIkxQzsy5M6KRn6NGzKjVDlfIPUbFzvqycX2CfOg4mlmUfc4Pk2JrDFlJ2jAPsgU4Ry+S9UTRxsJa0TIivhJcnCJ2wzIbH3nALQQmBmo14cPnYEyWGCXUl5dhK0LKDQzJY5fpLIIdqgxi9OZPv1x3qa1JeWo+leUje7kHnHriWC6NMPgvzzzZXeiMBmMoF25whz8ZtG7kvMwXgVULJJcvnzQK1Aauy+CuvavJ3xvzEvrKNDcxzEgbkp45lA17TRDXq0aOUpssRl9q+k3+k6vSYTnI1iufS2Ynq2sDu7ePGzaAz932VKYCrDOYMPczaWJLpFG1PwSNzG3qjRap/gpTSE+Chp7CP8/FAVK15W0WLU1BUnF5uo8I79tg5UZj1dtGPqMffniPTu8DTzsUwzhs3H4NxMRZsApSOwIfJ8RfiEcIEklWsQ7oVepg9kXGN5Hb+/ZyCLeB7VNjtmULMbDMRQnCtdC8+W/5hW8+JGuqxuzyV1DWM/m5UyC3SOZtOynK3HpcX0MyNWPy+6PdMjokesCWOGnjhL6FYsdbjREvAJQI905wG7YADkfXjd9vNwZDJ8QCRb9jRZZ9z2+72LxieTTWoycOF+rl+4HdUT7iMHEeLfQkcFeeNNYjyt4nTkWubry7hRe5v+3AGlOMujAm2uj0hrLtOSiILQO74aanwKHYr/vj+FKQYInO026Q3+XVDhmmFNk2IH/6sCGpkFEPpHR1ZxT0qLkdjmPZnJA/YYFNXqReWcTgh0M6jiZNuBrWwVkN6xof43R2KJ9PfEM4Do4oZT9MYGm5rX1V65GIPuXjrIuIsEagk20zOyj6R9IDVV2KEfbIRJgegwQWxakYWV+gm3j0/a1NZAoL6FgoVWL5RpG8SQ6ctTUn8YApNnFdQ7Y22EZmDUgRdNjPkPckf7rknRZqHfjv2loAMcOXu8PVE7OQRg HpTVHU8u l++g3iaUiaFMcqwjytfW2ytFU5SCFEwFt0gHoApP2qF8EureAG4bpqJ8h/aZYefDRZmp/bqZgVyg20KULVoWphNIHLOsX+ZuAj8ftMJ5WN53bKD+Y+aZSF6eAZryXs4ps9Ypwia8q3PrBpVDGA4g5WO1GNx5Nacx6IOYfpBvdCW7wcHDZf8SZw0Kh5OoXg6yKUeJRr2UdlWD2WNiqC2KTzXnwfYp32sXO43m8XXNesluOd01rSiHFMN49+z5yOvc8GizAuRssp3mAMfSV+yCuRxuXj98pHiC/xZ97VGyEVHRXtuzVCRG1THl312f+ghSamNkmAajhHQCKp9e1no2oJwf9qEgMrMQpkXodvE+ZVZATCl2A3VeGSBfKXLSHxIBlinUi0z0lmEObNnMcg33B7TwWo8C5BXj+s5m5RWvHOceNUkT5nbYwxeSsk7ZlpQS2DMW4AEWqSEb2OgCqllNOGqwKTPyxmSmHVhmpGZI7A26GA2jrhSZjeZjK40MzbhSsrAX41MEDthQg8xx+TxlE8O5tp/7USKEuwPA8/JXMClrJ5LZT8/aeFEzbafUNrTzQA/V8IuPzxh8ag+r+qdUPEA1dZnKZXCcLN2/bG28FAWKqJ+67ds3VEiGbdNBae0ExZUbBGwHFvd25VSBBuP4CWyGbFg== 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: Add arm64 support for handling guest page faults on guest_memfd backed memslots. For now, the fault granule is restricted to PAGE_SIZE. Signed-off-by: Fuad Tabba --- arch/arm64/kvm/mmu.c | 65 +++++++++++++++++++++++++++------------- include/linux/kvm_host.h | 5 ++++ virt/kvm/kvm_main.c | 5 ---- 3 files changed, 50 insertions(+), 25 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 887ffa1f5b14..adb0681fc1c6 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1454,6 +1454,30 @@ static bool kvm_vma_mte_allowed(struct vm_area_struct *vma) return vma->vm_flags & VM_MTE_ALLOWED; } +static kvm_pfn_t faultin_pfn(struct kvm *kvm, struct kvm_memory_slot *slot, + gfn_t gfn, bool write_fault, bool *writable, + struct page **page, bool is_private) +{ + kvm_pfn_t pfn; + int ret; + + if (!is_private) + return __kvm_faultin_pfn(slot, gfn, write_fault ? FOLL_WRITE : 0, writable, page); + + *writable = false; + + ret = kvm_gmem_get_pfn(kvm, slot, gfn, &pfn, page, NULL); + if (!ret) { + *writable = !memslot_is_readonly(slot); + return pfn; + } + + if (ret == -EHWPOISON) + return KVM_PFN_ERR_HWPOISON; + + return KVM_PFN_ERR_NOSLOT_MASK; +} + static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, struct kvm_s2_trans *nested, struct kvm_memory_slot *memslot, unsigned long hva, @@ -1461,19 +1485,20 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, { int ret = 0; bool write_fault, writable; - bool exec_fault, mte_allowed; + bool exec_fault, mte_allowed = false; bool device = false, vfio_allow_any_uc = false; unsigned long mmu_seq; phys_addr_t ipa = fault_ipa; struct kvm *kvm = vcpu->kvm; - struct vm_area_struct *vma; + struct vm_area_struct *vma = NULL; short vma_shift; void *memcache; - gfn_t gfn; + gfn_t gfn = ipa >> PAGE_SHIFT; kvm_pfn_t pfn; bool logging_active = memslot_is_logging(memslot); - bool force_pte = logging_active || is_protected_kvm_enabled(); - long vma_pagesize, fault_granule; + bool is_gmem = kvm_mem_is_private(kvm, gfn); + bool force_pte = logging_active || is_gmem || is_protected_kvm_enabled(); + long vma_pagesize, fault_granule = PAGE_SIZE; enum kvm_pgtable_prot prot = KVM_PGTABLE_PROT_R; struct kvm_pgtable *pgt; struct page *page; @@ -1510,16 +1535,22 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, return ret; } + mmap_read_lock(current->mm); + /* * Let's check if we will get back a huge page backed by hugetlbfs, or * get block mapping for device MMIO region. */ - mmap_read_lock(current->mm); - vma = vma_lookup(current->mm, hva); - if (unlikely(!vma)) { - kvm_err("Failed to find VMA for hva 0x%lx\n", hva); - mmap_read_unlock(current->mm); - return -EFAULT; + if (!is_gmem) { + vma = vma_lookup(current->mm, hva); + if (unlikely(!vma)) { + kvm_err("Failed to find VMA for hva 0x%lx\n", hva); + mmap_read_unlock(current->mm); + return -EFAULT; + } + + vfio_allow_any_uc = vma->vm_flags & VM_ALLOW_ANY_UNCACHED; + mte_allowed = kvm_vma_mte_allowed(vma); } if (force_pte) @@ -1590,18 +1621,13 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, ipa &= ~(vma_pagesize - 1); } - gfn = ipa >> PAGE_SHIFT; - mte_allowed = kvm_vma_mte_allowed(vma); - - vfio_allow_any_uc = vma->vm_flags & VM_ALLOW_ANY_UNCACHED; - /* Don't use the VMA after the unlock -- it may have vanished */ vma = NULL; /* * Read mmu_invalidate_seq so that KVM can detect if the results of - * vma_lookup() or __kvm_faultin_pfn() become stale prior to - * acquiring kvm->mmu_lock. + * vma_lookup() or faultin_pfn() become stale prior to acquiring + * kvm->mmu_lock. * * Rely on mmap_read_unlock() for an implicit smp_rmb(), which pairs * with the smp_wmb() in kvm_mmu_invalidate_end(). @@ -1609,8 +1635,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, mmu_seq = vcpu->kvm->mmu_invalidate_seq; mmap_read_unlock(current->mm); - pfn = __kvm_faultin_pfn(memslot, gfn, write_fault ? FOLL_WRITE : 0, - &writable, &page); + pfn = faultin_pfn(kvm, memslot, gfn, write_fault, &writable, &page, is_gmem); if (pfn == KVM_PFN_ERR_HWPOISON) { kvm_send_hwpoison_signal(hva, vma_shift); return 0; diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 3d5595a71a2a..ec3bedc18eab 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1882,6 +1882,11 @@ static inline int memslot_id(struct kvm *kvm, gfn_t gfn) return gfn_to_memslot(kvm, gfn)->id; } +static inline bool memslot_is_readonly(const struct kvm_memory_slot *slot) +{ + return slot->flags & KVM_MEM_READONLY; +} + static inline gfn_t hva_to_gfn_memslot(unsigned long hva, struct kvm_memory_slot *slot) { diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 38f0f402ea46..3e40acb9f5c0 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2624,11 +2624,6 @@ unsigned long kvm_host_page_size(struct kvm_vcpu *vcpu, gfn_t gfn) return size; } -static bool memslot_is_readonly(const struct kvm_memory_slot *slot) -{ - return slot->flags & KVM_MEM_READONLY; -} - static unsigned long __gfn_to_hva_many(const struct kvm_memory_slot *slot, gfn_t gfn, gfn_t *nr_pages, bool write) {