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 862E7C3ABA9 for ; Wed, 30 Apr 2025 16:57:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9C4166B0093; Wed, 30 Apr 2025 12:57:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9572B6B00A6; Wed, 30 Apr 2025 12:57:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 68AFC6B00D6; Wed, 30 Apr 2025 12:57:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 336DC6B0093 for ; Wed, 30 Apr 2025 12:57:18 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C4471B988A for ; Wed, 30 Apr 2025 16:57:18 +0000 (UTC) X-FDA: 83391315756.26.2F4B88E Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf07.hostedemail.com (Postfix) with ESMTP id EC94040017 for ; Wed, 30 Apr 2025 16:57:16 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=YdEs2S9U; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf07.hostedemail.com: domain of 3a1YSaAUKCKgbIJJIOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3a1YSaAUKCKgbIJJIOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746032237; a=rsa-sha256; cv=none; b=KoH5hjTxxHVpQrrKclg3UN3p/8/gUrZb+8x2WcE4tdk6SDWZvAqLoMJZOyZPO5yl2f8Mz3 MRWY1byVjFieB5t2mOLD8UNkYMpOmtlnut4z2Ei2/I9GE9A0BdmHrOAXmjvsRfXCe6P7Nw e1NUpKNyVb6IcW3ZlD2w/8RvfG6RMq0= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=YdEs2S9U; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf07.hostedemail.com: domain of 3a1YSaAUKCKgbIJJIOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3a1YSaAUKCKgbIJJIOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746032237; 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=LVAJjWabCG3OGzL9nZTYbHeceT78jHenYYJP1PJaCf8=; b=qzL8zvIkbK2NiNbjDdMoHJPV4viavsFBmIEQZnYY8qPotkcgbtlHOCT85kA1f3A/6ujQuA AsfaLmB21xIOIxrQRC+Pm33fLM6jA39jNndEd/YquStQuz2HbkLSWhe2P1+LASga8Ku8o8 xKJxoklkCKIN7Pvil8CVD0F3UVhaM7g= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43d007b2c79so81225e9.2 for ; Wed, 30 Apr 2025 09:57:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746032235; x=1746637035; 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=LVAJjWabCG3OGzL9nZTYbHeceT78jHenYYJP1PJaCf8=; b=YdEs2S9U/kMlEf9HZb4jOS+8j+UIRNI/tsNDt0nFOiH596s2fqsoo5M4Rg3NuVMUbJ HKl88t5SQehYL1hVFm7mbjwFdL9FIyDyAVGOwUHI9TETYZsOXXPkoVTpx64qg5C4pSAi o+qB0Jg8wcaKY7AZlRmeRsIHaoPiDR3EEFRAAlbQi3iNAFraAaoxtDCLwGpku+v1G2+0 OyySmAfXCP/RYLL5123AzK+gFLmX2ltTrx67zp//ntZK55hdl4cy6VQ6DTqEhGcM6JQT 3pISoPz7VKimcSCr9w4cLP1qGT3wa5W0fPyOYwLlcroYa/1nAO9mbLw8XXxKM7II1NZ6 2L6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746032235; x=1746637035; 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=LVAJjWabCG3OGzL9nZTYbHeceT78jHenYYJP1PJaCf8=; b=nlD23xO4b3Y0QjQc7207sOkF0FrskQ9xG54tNjSW45qxzouxHKFIR68Z7CBo6zGlhx 4vjGcZPqO0Z5ihPpKEjuEZ1a4CjpOYCO7jkN7qMYLUGKOd1ek9TFksnA0dv+lpB8wS1y mqI3r7Q/xUwJyis+qGaoqyVXPFPNm1f2Jbq4kpazgilUdwr1yQBWq4tOKLGAS4XmonF+ WwOcFIqoz96yqte7JMBMDuKPyyz/3Q3uw4ftL9qAZyIvGmZPDEc/Zj2Ykbuutc0RiY4n W/gWtJzDRk+t8iz+JPWfPUjDBxEhBN00M7m+C7SnrYmp1XC1IhQf8JHb5hPz2X4btQrW Qsyw== X-Forwarded-Encrypted: i=1; AJvYcCWzCNYAoZPhBGH8spfL2yhKnW9hLu1T+vR106PGLWKPfvosTb8jwzakA/S+QGQGA1c/SumIZvypWw==@kvack.org X-Gm-Message-State: AOJu0YxNGJzFR8TxuJyVYfrRQPFPYzalp45NVsrUkpgRUpZR3Pp4ptC3 iUjsfYLaYH4D0JAWkiQn5EP2QVIAfPxcQ/Ufm5lMKtikuajZa9tHgDEvWs6E6gxQFun2QjJMjg= = X-Google-Smtp-Source: AGHT+IFO6+rLQ0EajKHUJSNNxKCG9biVTumSU06fED5NLBWVqs++8Ov0pRt8qI0Ifp6jDl4rnxgq1fe1XA== X-Received: from wmgi20.prod.google.com ([2002:a05:600c:2d94:b0:441:b363:76fa]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1e02:b0:43c:e305:6d50 with SMTP id 5b1f17b1804b1-441b1f5ae61mr33787605e9.24.1746032235467; Wed, 30 Apr 2025 09:57:15 -0700 (PDT) Date: Wed, 30 Apr 2025 17:56:51 +0100 In-Reply-To: <20250430165655.605595-1-tabba@google.com> Mime-Version: 1.0 References: <20250430165655.605595-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.967.g6a0df3ecc3-goog Message-ID: <20250430165655.605595-10-tabba@google.com> Subject: [PATCH v8 09/13] 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, pankaj.gupta@amd.com, tabba@google.com Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: EC94040017 X-Stat-Signature: z9u33cp9a8amjbggy4dtiu4yiwxhahci X-Rspam-User: X-HE-Tag: 1746032236-824677 X-HE-Meta: U2FsdGVkX1/Dj8a8WVSbtkbbLDC+bo8KfqeBINygBA2OklDl05GdMCA7OY62eeo5bEX17y+xuG4yCdPY+eerb5A9RlxbyLg4utlkstttKKaCa7pwUHvtaxS1Ua8rLDuJ/hY2zBr+MSkPeJNL8BXf1tfYm2JF2CJiIJLdmMuzQIn37liqAeujvcfcHDup24JUcJj63dIq2+Mdsk9af5C4T4FKKPefZHlFUFXdkd4lPw4yBqjncUtv+oWH0DnJI2Qm6barq8pxinOxZcTuB3yoFLFYC7wyUo3w38EJQ/hZPCcI80k9vp5TJSd6MpHPzp7K6t9dMp1tBcOmF5odO6DR5sZvjMceADqxsT/IvdFmff/zO9XH/PMTntCCobFFUrgzaXdnZBvcQi9JnXdDRqU2OBqZpIy8qGnB7Q3pIKfZWvVps8JsLSXTau8yqZj4pZJk7N+L24TQmVB7s4EYUvnxWevd9Yxv5rf6DvwumPB//82IJpYJIplNYZGjv8pWQTit50jj6LXwTL+Do6l3iPOZQK2qEpwwCDX8sRcdstHKnD+X6axzDDI/30p/ovzuJcPiawtB27U7jeFA5Ya408TihxwvzKnCWW2sriXRdBsn1rqmxRC2RK8WuFyQKDLFFXqRknFo/nww16RZZtDYJkflU6cAqjWvYwRJSCz+Yn0P23NUTVrISUMl9+G8AdzTnigef2UYZHzqSS/WqD5NfODhU3pVshNLjl/vluMISLpgrqhVSEPsJa4pKxJpBOrsqCHz2txKu4qrxgAjwMfgDgCa1pXK5xv0Jwx0MJcXdeayVvKkxl2TBiS0ZFryCAX08+1/gHP7q788ksMmhUiTnA6+V3QjHoMRnJqVWKKTeoxhuwIgDHNRGoxyZFwFwPvD+Cpl68vXHTHDFXcPAquvtTrR+pt8LjNln6FuflP4ONdyk/fz4VL+ffScGQjfknf1AXaAyvFoUTGJNVwJ30vWqq0 li2lMGrS jfeRJlcsdK5CFOixfAtuZuQPbabFNZ2xkMKyYj3aFK64BpkLJh4HFScPlxMpvworYfgjNWmvEbsDfI83DPHlVyAPzyUAd2Ne9JfKR8576YGj939VIUoT3bu5wG9ZpxagM+QN186Ex25e6OW6txbItKnfHwv1+qrM+IWVgOnwPBWoTNelNxiGBkZdEqQxTLOxivWP/FWJaDrLGkQmcYxZ5tYWvdszhoEVx4l/3ovAn2JppBsQ/Xl9d7hHU8BY1Nt5To3kEkqs3why8fjGC1qESMFf37/VN5YUQZ1raZvG6+OeiivTvJkCdEJbTOWzSo0C04HXA5h8e0Ai5GxmLGWE966uDTsxY27VBNADjKgFjrCGKiGAuBP6VvXSUal2Xc22eMFbOWIuInxFLkPWpdly2Ug4+3c4sQ0GThU9VVFs/ziM3FcE/TU7r3vW6+hLJ0T7y2VPmnd7OSHHOVgU4Qe6tTRzDNYXpxH7xkpSxOlW1A2UGy5O0OXj8Wn9WvS/l8ZYT9maN1WRYnWqUDKMnpy884Ccu+wiSEaVaxaJUgo1Z+bYzyvuaEYJg3KrrTsI166cBJxxL3IBvflTQNy0gbqNenjkGgEZNgvnIJkX1gngQzTaNlWCi/2tWm0R695tw+I1UNDB5Y4+uT/oK0aUiREjRX7odgg== 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 actually correct. 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 754f2fe0cc67..148a97c129de 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1472,7 +1472,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; @@ -1484,6 +1484,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; @@ -1533,16 +1534,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 -- 2.49.0.901.g37484f566f-goog