From patchwork Mon Mar 3 17:10:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 13999274 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 8C82CC282CD for ; Mon, 3 Mar 2025 17:12:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9EA7C28002E; Mon, 3 Mar 2025 12:10:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 99A8528002D; Mon, 3 Mar 2025 12:10:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 83B3028002E; Mon, 3 Mar 2025 12:10:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 6505728002D for ; Mon, 3 Mar 2025 12:10:38 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A6E35140D0B for ; Mon, 3 Mar 2025 17:10:36 +0000 (UTC) X-FDA: 83180878872.14.27686A4 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf09.hostedemail.com (Postfix) with ESMTP id 1B8A814000D for ; Mon, 3 Mar 2025 17:10:31 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=iirtDVC4; spf=pass (imf09.hostedemail.com: domain of 3huLFZwUKCKcaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3huLFZwUKCKcaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@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=1741021832; 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=gt/riWGcUGRHcZwRoC2V1jTyAk/j0KNMZMVzsat7B0s=; b=kDzFhjTUi3ZAm/a9AFo8NpvCKrnF3K7pxVdV0I83DSVevyVfXKtzi8FkfZ5cK+3Sj1Fnep LeuuKcCzHkD2XEwKYbZ0rQdLv0r5joTLswUGAwvcSrwfA43613GiLAxWLEtyn7m7VVaf/G z0Q1HscACpVAnkE4Od08fg638AxgI2w= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=iirtDVC4; spf=pass (imf09.hostedemail.com: domain of 3huLFZwUKCKcaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tabba.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3huLFZwUKCKcaHIIHNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741021832; a=rsa-sha256; cv=none; b=L3zwXj9/foUjsCpsQwrgnAAEW0T/M7ffhqmfPDIu5rIEmdYo95n5iPMiMvt/pkBGV5M1up H/Gu966/EgmeQAOs/ME2zlySimo1gxZiSzDDwbLHkr3d2SbIGvgD5QOEgT9W2a+wYU9YXJ cXwckDzC2ckp7FqR7P1cGoS+yS3oRb0= Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-390f000e962so1119757f8f.2 for ; Mon, 03 Mar 2025 09:10:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741021830; x=1741626630; 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=gt/riWGcUGRHcZwRoC2V1jTyAk/j0KNMZMVzsat7B0s=; b=iirtDVC4ojuCySZbICPZSS+Tu4nAE7BRGBL+Y2qGNGG6nnfbV447Ka9lewX2Bpgk+0 xlL6dpTQTIz8Zf3ESRJTkFOrBGQCv2ngFiHt2cKq07ZgY15lwzXsNdwC8QDQhiUQBFm9 vMYP30x69ZuubbZ/fhQ3mQEG3Dwu7rSsQo1mDaYue7Ngicktv0vZo9kJuVh1u4uiJeyO StOMpuIAbyl2Ams38LQPq+tjGlE8C8A1a9XdDY2ZVwvc6yey1ZiLuOiolB6h44nFHvEK zSsm5NMXNjuSQOm9LoiEzoCtqjwXN1rvj+LqAlupQWQ5Xsm0BCxMyt4v37RSBMwTYk+N WYgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741021830; x=1741626630; 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=gt/riWGcUGRHcZwRoC2V1jTyAk/j0KNMZMVzsat7B0s=; b=YjmKtuycDEcsrIcZlWy4aTPytQh1qrRqg83T4jquKJX2KSpUwMeL5Ri3tOvBLByAhn QUSXDmuFFPJd9Fk04XtljeFQwu/PcpxnoJNYFiA8ZHmcFeQ82iJIqAKI/s9Yosg+Mr4I DtodEJOR7H/FgIWA+5GbrQJaoA4hp2HCJOq56WwdlmNm2jZu+NQMrDpeWHDpKACM0eCA GwypDFvUZQk6r5KIbLrQkX8TvfNS5fQJBA2KFzR/UrHiZJwQXauv9nX88wQO0qDv5LUY Punac0t8VQcRr8GroygWUCL9x++yKAMn2+xtzbjOqAtmz+tiotPaJHoGWuFg1JBsvQow Suww== X-Forwarded-Encrypted: i=1; AJvYcCXSMk4B4CNIyB0Sw5rWndPqQA7i5svJth7mLy1YB9l5cNBPVE5WSpC4DpS0ssO6+0ngiw49si8EFw==@kvack.org X-Gm-Message-State: AOJu0YxjuHB6NGUSxmCGZX1KiNT7bmo01HhIV2Ors7hEpWtEOaq/S3ZT SfAwcXdcjp4BX7dsX0cjc5Eq+5U1TCU01rGIoEFQ3GpLaEHFBrvuVGwTEb5zgQxAdHPtG/x4sw= = X-Google-Smtp-Source: AGHT+IHjUvSjd+E6xvwns/9W7bCh3g1PvhkarhqtlRtOoo2/O/7/4oOGG+YV5YIkmlaYkfIS1yNvw3pbbA== X-Received: from wmbfk7.prod.google.com ([2002:a05:600c:cc7:b0:43b:bfff:e091]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:4023:b0:390:fb2b:62bc with SMTP id ffacd0b85a97d-390fb2b634dmr8086880f8f.23.1741021830280; Mon, 03 Mar 2025 09:10:30 -0800 (PST) Date: Mon, 3 Mar 2025 17:10:11 +0000 In-Reply-To: <20250303171013.3548775-1-tabba@google.com> Mime-Version: 1.0 References: <20250303171013.3548775-1-tabba@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250303171013.3548775-8-tabba@google.com> Subject: [PATCH v5 7/9] 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-Stat-Signature: srx5fqdm1jn99pj4wfk4i7u6snur6qa5 X-Rspamd-Queue-Id: 1B8A814000D X-Rspamd-Server: rspam06 X-Rspam-User: X-HE-Tag: 1741021831-3338 X-HE-Meta: U2FsdGVkX1+wK1pdXAZqFDhxCrDgm/+OksO/8WUbanqZ3QJxJCncP6uI1NKEOsSFewTeCB8hxFN+9z8ta1SqkFvK87hLYTwqoQCEWutwz/VPCbqiQ1j1K6CaqpK/vfrW7A8ibAmlhCcMGjXCZMTcF0X+Yzy0e3ZpgKwPrSB0vmns96fOgXmCM58yzvSNTJsqxkKfg6n76R9rWwbAOXSKeWC0FAfEKVa13vCi3+0P8pGX8pNOX6bZLQd25PZJWzNZ/p2X30h2XX7+ZCh7+azn0UZZ5lLVmliXaHokXhCCeJpXYvZMpK0nckUoJyAIy34mZagolxKTVomsGJBQabx7SEQvanXFE0czc/4wPV07fkAT94kKhu+OkvfnQTd7qetgYK8nuTFS3UWfIvnMiV42o9f9n/P2WLkgA8YUVLM9dl6WygCLVcoGWwn6tbOeglNtrvFayE6fZD1ROeYNTUrH5yEMvUbVrhk0JzelE/EybHvRYj5yFAUNsIE6QaJMNa4aSQVJ12fl3M5NP65FEAZX4FxRTC8jWdbBKry5pJWMLykAJXvtlkdJUNDRq23FKF7SVbeG+uhvvq/fc2GxF7ZcJtHKjLgGmc5mJwI6mjx3Qt/+HVOpl0PEp0Ur5a+DedIbdoe0ldJ06xRO85OevPk8hMoMUdURg21ZcVAHXi13Nx8NdzmlPhdTQq7SJhXeFypAeD44saZjFI/RZynB9BUZGoH1SuXSpuM4+k/oVpSpvujWZSGbmu14Aj46CAVba0UYjDm1cFSoZ7GG3VeUrM7e6LCCbpbsKSUVhLVR7kpxbI+aUsbVYVtsQ4wI24aAMZDz0HUdKh7v880U9ywkiRv5K3EzVtu8Ts9GwH4GwF7NhjvSIFtmqa/9KlHVb0dzA83O6UiyVnPWmH+KyyRbVVmZ26NifszbpvG5zlxxLzlwV/DXneNyNdTNejWIopGBvKdaGjAUqd01yNb3hdvoGst O38E/2sS QVyCnXEDgPWXpflknoI7utzKYneJsB7/M0fMubB+QlXE9aOxh1Zvlw3wmsK4SCjzgzXKrWGEqDzOqtVq2d4bMg7pZqG7z9Mo4CukGHmKnT3mht1BVjjznpkyL6NO4CxieEgihpDjaR7eWTrBqRRCuocmEsWBJIp5GgzHLq1qPwekJxUnmxaqZ/GlO42ajH3tS2qRg65+1c2j4kgF6H/M6tlUXCsZKgx4b1Fo96FO7kbr65JajsFV7zvlB2uLC0evS4NTQwvdhtfphH3Thj8prRCzFJlh7oeRtB6rUZ/moRGbIwxecoNkMnQKGvaA2VjTleNsiV9ItMRQiUMfEbsYKi3o2XyJOFzQEzWr7OxNtroBnr0DLzOqBme56DaZaHBXJjPTiu6r9fxQv4G5DnybHtKSuj7IETVtkExMsO6z1rTw4gVkt50pL4hesEfnqS2+Vjmz3FcgWgs613RqkrQaFOqv8O15p9pgicj/Nbz30JfaEzT/DUZN2S4kStUT6+gmHjbB7ugZasFc4YUgSQ8YexpBPhgZuERD5lCn/Du5br+TwRVOCovfZ2H4KFR4t/H7A+louuXsX69/UYg2xCw2KOwbs/uUGVCWwyruVKd6f+vu3sWSsm8gmUQUOoY3llJA5Z2OMdX7CHf70+4apW9amdrQXvg== 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 296f1d284d55..88efbbf04db1 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) {