From patchwork Tue Mar 18 16:18:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 14021240 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 781CEC282EC for ; Tue, 18 Mar 2025 16:18:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 53D2528000C; Tue, 18 Mar 2025 12:18:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4EBCA28000B; Tue, 18 Mar 2025 12:18:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3412F28000C; Tue, 18 Mar 2025 12:18:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 15A6228000B for ; Tue, 18 Mar 2025 12:18:39 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3450A81448 for ; Tue, 18 Mar 2025 16:18:40 +0000 (UTC) X-FDA: 83235180000.05.BC8A8D4 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf23.hostedemail.com (Postfix) with ESMTP id 5587E140011 for ; Tue, 18 Mar 2025 16:18:38 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=tME9BSMZ; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf23.hostedemail.com: domain of 33JzZZwUKCME0hiihnvvnsl.jvtspu14-ttr2hjr.vyn@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=33JzZZwUKCME0hiihnvvnsl.jvtspu14-ttr2hjr.vyn@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742314718; a=rsa-sha256; cv=none; b=Y/PjkUA79+KDYkYuCRdrFrnQTOmsqUUrpcC8SdfvvVxtsnUtslCqWsMTrU46AatG26YOOu 7LjABsTnQ4OBwyo83PgAGJ6Ebj/eMZzgDVN/ttets3j4ccUpCtb9NtMG5NXWRpRLHO1VJS 9x6TSBJn+8wuCHJgVniC5797xItg4vI= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=tME9BSMZ; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf23.hostedemail.com: domain of 33JzZZwUKCME0hiihnvvnsl.jvtspu14-ttr2hjr.vyn@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=33JzZZwUKCME0hiihnvvnsl.jvtspu14-ttr2hjr.vyn@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742314718; 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=DD7dn7Ly/beG6AZrtqzXuPgQ+MQFh8NjMZMFS4hSOZA=; b=TwB4zUNrFbh/NKUKermcA3RE5pPDefLlqZ8xTJI4EHZ/tEoXdSq3fgbQsz6TvfIxu8vOQ4 LSlFzPPK0JrEXlWLT5AMfV9XZWcyGNJYkYuL3MknS+Y9dmQliKHh+WcgSPVGHP8gGaioDU ywjKJPYgTP8rzN9/URfgroIqzjCKwdA= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43cf3168b87so19547165e9.2 for ; Tue, 18 Mar 2025 09:18:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742314717; x=1742919517; 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=DD7dn7Ly/beG6AZrtqzXuPgQ+MQFh8NjMZMFS4hSOZA=; b=tME9BSMZTsIMysaF3lGEN1CAwQNSRa0/poD82NexlDc4BQF4jkYO0bjU192x/uTYrW S/ubCO0L+Y567fYoCs2+96mk7cx20peAQgGEH+PKcebSCSMb9mnXvVNCoKC62jLt6e9s 3wTYYPp7yPJjqYEvbRkagqlLgzeV9Er0bm/GwDN8aJoa4t1EEGqBjnda4ZrIqpa29adE NSaAypbdAJrIiKwyyZaVdA5rp0CXDbx8ye4adj7x4qN/cD0TVDLcHy6fyVLgKa4fXFK+ iVc/sfPl04xJ+1jHwyxYGsgFIGGbR9InLZb7pDc7dxxdqlcBTNR0FCX1Cu5WBYWX5uRu fWgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742314717; x=1742919517; 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=DD7dn7Ly/beG6AZrtqzXuPgQ+MQFh8NjMZMFS4hSOZA=; b=e2aYrk+Tb/PYhXzRenE3+kKENlAWpgf77g3335lBHzletE5wKjHcLj3VR5SkL3O1/X jMl7mfFXfCIPJABlprflTlYaIPx1M3pWakegMGQz6vc+rs3RC8z/mH4UXWEYjRCYdxZf r4ONBIG79FWGU+5fB1O+QTSBZ7B1tdvh/LAZavoFE2gGSYGJ/TuVuUQZ/TD9fNxTdXYV FVsDE/BOEUlXB0DJvF03FEaD2JXjjEPkp0gXQaxuHPioayz9R8LmXVS0HcqGF1mL/ADZ b6YZZFln0zRVe585LVeYKB2by2x/7QYCWkN3r2R/ntw8oMx9xZ31pTDeik1ec3gjUj/M JIKg== X-Forwarded-Encrypted: i=1; AJvYcCWXnRpjXH1YnITsTv0n5yl1Wsey3XY4GsdpbN2om+42OCOVO1u1ooP1BWTTlNgHNSAgeKRhh6HbFA==@kvack.org X-Gm-Message-State: AOJu0Yzy7h3bclCHPWMOqGBysx2w8BcOCFDe8jRnW0eh5tCKluP0gz1F H13LO2hCivXXikXiSeLvIDbgtT2PCJ1+T2fhhTsAFEecd6WR1SXAxIvOkyzO7g15exl2y3kPgw= = X-Google-Smtp-Source: AGHT+IE7EIJMDoVEqpxWR587eRp2r8+Ir2MgzNO4zB8DTw78LEPUQteJjG5XQUYQcTjpzPemxYUdDq36BA== X-Received: from wmcn4.prod.google.com ([2002:a05:600c:c0c4:b0:43c:fae1:8125]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:310e:b0:43c:e478:889 with SMTP id 5b1f17b1804b1-43d3b7c9e1bmr28562425e9.0.1742314716949; Tue, 18 Mar 2025 09:18:36 -0700 (PDT) Date: Tue, 18 Mar 2025 16:18:20 +0000 In-Reply-To: <20250318161823.4005529-1-tabba@google.com> Mime-Version: 1.0 References: <20250318161823.4005529-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: <20250318161823.4005529-7-tabba@google.com> Subject: [PATCH v7 6/9] KVM: arm64: Refactor user_mem_abort() calculation of force_pte 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-Queue-Id: 5587E140011 X-Rspamd-Server: rspam05 X-Stat-Signature: qea8grbcpocgbs6rmuranu8sy97eytth X-HE-Tag: 1742314718-944074 X-HE-Meta: U2FsdGVkX1/5uOnl85JARoh5hyw70H8Or3BYmErGfigcTlbExIMxtTg7eVW8O0/KksKnHK0wORu2E1hfm3FA6dzv203G8ZduGENDQMFDELKhKVXg4FNoupvIOIT7C/dOvOt7uz6UZr3ODYbnpk8cOw9Bi8QcngL2MMJMrM7RrjwXICMXgqe9jbU6y28cQ66OyV4GATtI56fI3O2wC3QoBUThK8khrebTugf6Q2CCJKIsKnyRVdPlW74myFOPDJ0O1dgAJGSDSNvINsvd3jLlOWlXG2KKU+ue8h4C0iMwKoUISKLH+DWrIu9t7rZfzigCFgiO+uUAK/1gNAYhsf7Xig+BIPoBZfcq/J6Nj1z5a32NuVB4airnxT097XEkNDuRULG1JUq0Qhc81AwlPdUpWTCs+YXrothvHxlDwUyfoUmoHOYYv2zw64TxrRLMYQcZBSMywj8MIebBx+S1UyeaQyjFxuEsJCJr8EvlKGXmLEYGePT1TqVWctP/7TXXnBunYaluAy7Uhtbf7sMvASbDl3GLk5NrsjO8ty7CK8weam3JS8g4ny+rD6GumSX9o0sOYYhaloutgVQdlSgy6R3ds3BXhb8r1iMXlS0e0qImFKUiV7vakGj4NK0YLEYPsjfSkUclxh0COAOfpIlj+vre6LIJ2N9HG2QJ39b6B7Y/+QTkNA6M6YXv3AW1s6QLi5JrGPrje1EMxRWuZEAxN5JPkUxFyL+90sePLm1LqUqY4gTSDmslbg7UE+zOIDVpHujZBcxAWih0kRMnIMQTCSagvQ6IqfE5ljWg8gSoQrQ0fRv0IHvUuDKdTsWKhw8zNhwoDGfb6sw4z+9nDvzA9pCG1q89aC66LmG946CkK7L6jj0lnYRGwYGTdsYtefzRRYYQagA2bW2+cXpNZ/dc1ZozRuFkQERixHC5y/kHXbAYT057Pe60hTxxc6LocOGrxktXZiOkjkx86RQ9X3cu5qt fsI9oN6F C7gAUh/hvmu2Kz/XmPgnxAa42V6HJi6X7tZpqCMqgtUERSaF00RNLSJTaX/2JZJLbPZVddgU9Gqje/zM/Zu3W5wTEoagfstl9hllVpYsa/PXOhQx5b0AVRvpfDPtG8QCuJDLFvDWs+VOsFUKN8KfNLScDAGCJxcS2EY+/HFjKvzuOW/lCL8zpXvVeV8iGvy+ybqt43g65nhn7XkUfbeG2h06WUZJX55pVYsyU+XStZEUixGfbau8sDGzaULpoPw3ljO1vUDVT3L040v4ril+1TS9WlG9vJUbUanuZa2f+PLg8DK1Pa0YVGRCrFtE/oJ/9dD422ApYR9LRobKfrO7mwSaOSr8d2bRDTOj9q/EO6Cxv6gV0zbh7KCBvv7nmeaiZ0Ysotue7ufs/Tnky7Ynf855n9F5vpkhdf0Iv/VRT3JcwiJo/5RyCuQGHNvHjX2hdKr9abCi+mZGBDbKUCjQ66AZ2DR0kIbCrmLLGVZl0OdZgEAFWzPSjEiWXZmkAYwlSJk0Fx8MNZsr8zItzoTlTNCGbVwRzzIeb7ktdmelfAVs/AlngluSM/Vcd35EAiVnR7HJOQLllglB3hkIvHaiw0urpNPt06blCx7UQ/rnEa85u2SlPIdD26k6vfGFfwZrt9ReYP30ptQhpZb0x+aInrVmXOQ== 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: To simplify the code and to make the assumptions clearer, refactor user_mem_abort() by immediately setting force_pte to true if the conditions are met. Also, remove the comment about logging_active being guaranteed to never be true for VM_PFNMAP memslots, since it's not technically correct right now. No functional change intended. Signed-off-by: Fuad Tabba --- arch/arm64/kvm/mmu.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 1f55b0c7b11d..887ffa1f5b14 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1460,7 +1460,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, bool fault_is_perm) { int ret = 0; - bool write_fault, writable, force_pte = false; + bool write_fault, writable; bool exec_fault, mte_allowed; bool device = false, vfio_allow_any_uc = false; unsigned long mmu_seq; @@ -1472,6 +1472,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, gfn_t gfn; 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; enum kvm_pgtable_prot prot = KVM_PGTABLE_PROT_R; struct kvm_pgtable *pgt; @@ -1521,16 +1522,10 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, return -EFAULT; } - /* - * logging_active is guaranteed to never be true for VM_PFNMAP - * memslots. - */ - if (logging_active || is_protected_kvm_enabled()) { - force_pte = true; + if (force_pte) vma_shift = PAGE_SHIFT; - } else { + else vma_shift = get_vma_page_shift(vma, hva); - } switch (vma_shift) { #ifndef __PAGETABLE_PMD_FOLDED