From patchwork Tue Feb 11 12:11:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 13969539 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 0E753C0219D for ; Tue, 11 Feb 2025 12:11:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6F74D280009; Tue, 11 Feb 2025 07:11:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6569D280004; Tue, 11 Feb 2025 07:11:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4A91D280009; Tue, 11 Feb 2025 07:11:50 -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 28CB2280004 for ; Tue, 11 Feb 2025 07:11:50 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id DA9C81C93D2 for ; Tue, 11 Feb 2025 12:11:49 +0000 (UTC) X-FDA: 83107549938.02.6DD4275 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf08.hostedemail.com (Postfix) with ESMTP id 04B3C160007 for ; Tue, 11 Feb 2025 12:11:47 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=FpAW7Ihd; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf08.hostedemail.com: domain of 3gj6rZwUKCO8kRSSRXffXcV.TfdcZelo-ddbmRTb.fiX@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3gj6rZwUKCO8kRSSRXffXcV.TfdcZelo-ddbmRTb.fiX@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739275908; a=rsa-sha256; cv=none; b=XmoMeh/32pxHW6qxBa1sJ0smxKtin1uSM87mX6dbvoGVHPWRH8DkYEBOrpFDPs/HRWucdC 41mRE3UhsX9SR0yOm5TAAVeOUXNrfTfc7tVzxHqYiKcscObROTnBpKXqMd6JJ9MlOHbKTX ALlGKlKUWG5neUeioFu5QKZl3kv7S3k= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=FpAW7Ihd; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf08.hostedemail.com: domain of 3gj6rZwUKCO8kRSSRXffXcV.TfdcZelo-ddbmRTb.fiX@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3gj6rZwUKCO8kRSSRXffXcV.TfdcZelo-ddbmRTb.fiX@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739275908; 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=aEy+uMDhoWpq4iTCT5JLvzuI0rE/4/GuORtNn1GWkCY=; b=j767zgP+9f+cLxjxlSyPN2mXhnMIiSyFw7prMCmD1VMN7FMFs5maJ4Jkx5mWUtRSR54sPY G40d9kDIYTpxidEmhlvMn3Z/4GEw+G5XZYUKmgPybQ9o/gZJIaNLfTZ8szE3yFqvJXfn7m z2JzcwoGhlRqIAvg8e/mCXfPRnG4+kU= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4393e873962so12534265e9.3 for ; Tue, 11 Feb 2025 04:11:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739275906; x=1739880706; 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=aEy+uMDhoWpq4iTCT5JLvzuI0rE/4/GuORtNn1GWkCY=; b=FpAW7IhdTjEtpSJcmwmL0/CKA2wM94yttz4l1lXjYemkl05o91yDwvU7fETOSONzCx aLsaRwQEC9MsiJPCsl2Ya8aczakcvdZ2h20dQMXUuaHNAy7dU8kCkdh6r46RYe2UVu69 xZiX6OuF+by6CwEAKyihFzBVUXbGy/FdVK7PJXFMg3H693xPBBg0W7w6l1kMTSD+XXzN maUFO4nF2T6oPtdCtBkji77V0MGu4xDqN1GwjdaX25CWEiXAc4CQh1Xw4ZndyRrIna6p RlClb+R9i3Dk3nD4TGVjXF+lMXZ2US9B1YTnSOhYKJfRqUs38vh/1Y6gXOJQHfWp77c3 MWIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739275906; x=1739880706; 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=aEy+uMDhoWpq4iTCT5JLvzuI0rE/4/GuORtNn1GWkCY=; b=eRXASPKQs5pHh5heb7oDAgk0nrtp/50fdnpqZgvyYVN6iOGuLDKbJeyCuEEpnWny6m rMmSBrsJAJgGKeqBCm5BJ1dxXvSKXNCbZQNoGllqKOo8etzeSkLKPNSS3tAsUX8+Q0yu ZD6/iQXMb1Lzvr+i84d6WSIjtB1PrtEilBWcMyd0Zr8aHVxinYEASwsJ6FEhx/V3F96u y9oxbRqs6rK/nB56livopAwd5Je7Nt/X3NZJNtHo6eepZnsscITXCY0rpSAlx+3nDsi3 I2zdyaI8yEMfmzfWhKk07IWijHPWGaIMq3Rn7/Z7sbhg6N/JQhXzTa9/MoP3NHyuOfn5 8EEg== X-Forwarded-Encrypted: i=1; AJvYcCUvj22daj3FrWVAsHm6iQi/kFyXP0YKC5QC2BNzED5etRNOHR3ntRBfFDkqfTsCN60WLa2zVakVkg==@kvack.org X-Gm-Message-State: AOJu0YwbvJ7VFu/bEnAAi3vfDXlvwozKXIutOHQ40V6e2diZLdZEdELI ZbYVLWU+qfnjzH+3pn2t1Mt/a/d4S4+MFvtSSx6lkAiVcsG/GaGkA5NcUBxu9tGW2Z1b72qQiA= = X-Google-Smtp-Source: AGHT+IFpMluwBrp1e1iVvzK5nRkJpIOD6K8YzM5QfPfRoI4YahF/GtcuCoo0tDbujX6eAm2iyJ7gmW+WFg== X-Received: from wmbhc12.prod.google.com ([2002:a05:600c:870c:b0:434:f2eb:aa72]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:59a9:0:b0:38d:db8b:f50a with SMTP id ffacd0b85a97d-38ddb8bf6efmr8898263f8f.24.1739275906632; Tue, 11 Feb 2025 04:11:46 -0800 (PST) Date: Tue, 11 Feb 2025 12:11:24 +0000 In-Reply-To: <20250211121128.703390-1-tabba@google.com> Mime-Version: 1.0 References: <20250211121128.703390-1-tabba@google.com> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog Message-ID: <20250211121128.703390-9-tabba@google.com> Subject: [PATCH v3 08/11] 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, yu.c.zhang@linux.intel.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, tabba@google.com X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 04B3C160007 X-Stat-Signature: sn14y3yuw9348roz4tr7jnddqnpsoxyx X-Rspam-User: X-HE-Tag: 1739275907-300124 X-HE-Meta: U2FsdGVkX1/l1RNMSV7hkg8IeLz1MFYiY1WNBhO9Ym/RhklI5OkOKcqV6SZxbW6eU1WFjIzdGanlG8pZyDbegM1jbJa9YOtc5KLmTinrLlE/MfQtz29LcVoZ93j4yPPe0Re8Fp0ejJMX2WMWgFr+mDt9UO0f0oGfPTmvK3GF/rvv7ZY4gIzkGGm0vPJqPlrzGaYA66YZk/Dn2sUpcwpCLMq3U5zjMGI2/wKrO4mdIxU2PEiSFsx2wmXJFP9xf7T1V9HucOVUOR04VLJW7wyHde7BdpNA2i9x8ArU4wnDZm8BV8gSctUjAcJ4i2rcJwi/7Nba9vjuHIDYGEi/RH9T0x0QP5RorW8gH8s+BqxT1/uc3l/8AyjxA1h95wexFM6xMH/hO+dhy3TmQrXFcCTYKX9GbSF5/mB72oczRypwcNcEBitReiWGcUPTXnXaRpzUYfyMrvKevZ6tNk1pJkqy+BYoMyr2+wlZzzrOFZ/d+cP2wm2JQAPZjCutmiric5BhYy12W1ujJYeUgPpKVreXXZ4uHwWhWAsw8lJBiOPmTI1bkFIboGy5CbICN6sKDmsI2SLFgU7xAqx7H8loOarFXY3tT1MO8ERvNuT/WH7/yKocGQ1LiIg6aBP4wqSVStVCG1X0lXgIVfGdL7KSm+fL7wMGTPGuJG8dYLYjP5g4Wx3K8RC3jg2IUXOEf9l8woGDUq4g34ljaD5ORxZrYBhgOQFaNUA1T5xlIe1S7lLDQCQh4EWvShJAnOXM8Hv7Pdpq5SFtK4Lp83kZXXdnRe3V91OEi4MslUOitf8XQ0gWb//vgMe+7reJM+tb38uky1lVZwsI0V0qa28YpvPWTicGPtvWXMi4TdqoIZ84fyaZFj/SG7NA4ZQ1U/cMlUgzW6hzHlBpLxGTZTURYlzbBfP1BBhAasTQDRJUThCWEFk7GIf0Pye7MSj47kJ/LtrywQAXYExENY2AKNOHRC9/nw/ yGu7Heqi 6gh0zwP1WKF45kKSQhMBNFHsIweU0zbG9xB4yFYWjHusP/ScyIy/eOgGsz6L4rCh0mRRp70K0uqRkIwyMkvyzG9B7767BBJvXyXjK6tIGPf+9CWDpbB90wX66E+AjVhpS84mshjW0r8C/aMUhR2T0CWt6WYRJ4hz3fia9Gq5ulJcdYQ0rdQj7bBjOxeQcl8m3Iaf4iZk61k2GO3A2ni9lKTF6dYlq8KtSi4gz9xbxzY8SNXMuEuLh3s5+9Gchll512HKlZcfTsDM2rf3xk2JegppC3YRx03vN6rmbGXvBRgFqKh/cJd9S6ggf5pnhM4QmS+ZvYt0R1CD2Qinb5kZloJfAECdhjcVQS9QunWFjnmPSE7thZDY+ea5IkMIwv9jwaMbyEZPVuLIZZTNRh9Q9+FfBzNR5T9jQZyS2Lz3y87nFfOVYxYB65QfJXpCrTjXcEZuFnE5I3ZXX35N3UFF4lFS2Y6v00r5uED0OB4gADr+fkEcEx7yKAjLnz76UynyJYKDOYussigLoNipRov2bLwnWsv+H7TQO5SOQ95TnUZ66+L1OYBkguHZVwl3emWd80MSLGOHfi82iMhqkTbDiZpH5/AHXnu3m1zxvj0GOK6Qgo0N1WuByJwRGv3iTcCZ+6B3qq9G8wbT/2M/DqPb5UFPtJw== 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 | 84 ++++++++++++++++++++++++++-------------- include/linux/kvm_host.h | 5 +++ virt/kvm/kvm_main.c | 5 --- 3 files changed, 61 insertions(+), 33 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index b6c0acb2311c..305060518766 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1454,6 +1454,33 @@ 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; + + if (WARN_ON_ONCE(write_fault && memslot_is_readonly(slot))) + return KVM_PFN_ERR_NOSLOT_MASK; + + ret = kvm_gmem_get_pfn(kvm, slot, gfn, &pfn, page, NULL); + if (!ret) { + *writable = write_fault; + 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,25 +1488,26 @@ 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_private = kvm_mem_is_private(kvm, gfn); + bool force_pte = logging_active || is_private || 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; enum kvm_pgtable_walk_flags flags = KVM_PGTABLE_WALK_HANDLE_FAULT | KVM_PGTABLE_WALK_SHARED; - if (fault_is_perm) + if (fault_is_perm && !is_private) fault_granule = kvm_vcpu_trap_get_perm_fault_granule(vcpu); write_fault = kvm_is_write_fault(vcpu); exec_fault = kvm_vcpu_trap_is_exec_fault(vcpu); @@ -1510,24 +1538,30 @@ 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_private) { + 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; + } - /* - * logging_active is guaranteed to never be true for VM_PFNMAP - * memslots. - */ - if (WARN_ON_ONCE(logging_active && (vma->vm_flags & VM_PFNMAP))) - return -EFAULT; + /* + * logging_active is guaranteed to never be true for VM_PFNMAP + * memslots. + */ + if (WARN_ON_ONCE(logging_active && (vma->vm_flags & VM_PFNMAP))) + return -EFAULT; + + vfio_allow_any_uc = vma->vm_flags & VM_ALLOW_ANY_UNCACHED; + mte_allowed = kvm_vma_mte_allowed(vma); + } if (force_pte) vma_shift = PAGE_SHIFT; @@ -1597,18 +1631,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(). @@ -1616,8 +1645,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_private); 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 39fd6e35c723..415c6274aede 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) {