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 78DB6C3ABCC for ; Tue, 13 May 2025 16:35:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4C6B06B00DE; Tue, 13 May 2025 12:35:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 473346B00DF; Tue, 13 May 2025 12:35:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2EE1F6B00E0; Tue, 13 May 2025 12:35:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0B8D86B00DE for ; Tue, 13 May 2025 12:35:05 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 576F41D040C for ; Tue, 13 May 2025 16:35:06 +0000 (UTC) X-FDA: 83438434212.22.DE4B75F Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf13.hostedemail.com (Postfix) with ESMTP id 6AA2120018 for ; Tue, 13 May 2025 16:35:04 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=2K7SAW89; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of 3t3QjaAUKCHYnUVVUaiiafY.Wigfchor-ggepUWe.ila@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3t3QjaAUKCHYnUVVUaiiafY.Wigfchor-ggepUWe.ila@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747154104; a=rsa-sha256; cv=none; b=XE27vZEywpML/Q85HVuguOi95fdbn1sLHOy+S/zO31EnY5xO/LOHixULOMkvCI4RQUVnCy CNugcfJREeOIS28H1tOyumAKkIWrWHjj9M8VbZMZoCU2f+ViBM2WSJqOqN48hPv/KBCoZZ 3iiOYnnHYzinNofNEtzAgNpF7Y1MCNw= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=2K7SAW89; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of 3t3QjaAUKCHYnUVVUaiiafY.Wigfchor-ggepUWe.ila@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3t3QjaAUKCHYnUVVUaiiafY.Wigfchor-ggepUWe.ila@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747154104; 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=mw5Aq9liTvfBW6lDsmXdp3t+4bJEbgWE1aVwHCss4lo=; b=tp+CUYSOkZwMBs7NRBnBw0NULK6pb2v6yykp2so+q7zyE5tUrEo9uGmZjE2iBXPH0/4c9i OTfw7b6GhP/Q8i19LHEbzVW8EfivtzldKTrMPeOjHYlcgFYJKadYHtr2EH87pKosJvjrMS jED4DZ6lvFJ4gIMCbGmzF6g2wsTUkY8= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-442cdf07ad9so24687925e9.2 for ; Tue, 13 May 2025 09:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747154103; x=1747758903; 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=mw5Aq9liTvfBW6lDsmXdp3t+4bJEbgWE1aVwHCss4lo=; b=2K7SAW89ye2iKkHJz0es22JuVaHCux1p9wQPWoNdZQXMvFUNW5UjytDtYHmvzQ4yP9 I3r18hRDpUJ9Qq6rv5qH4di1CCqhouSa5Shoi8SU93pPau3FsJstZPlJO0DUhKxN9G+v 5Ngl4zgaAFgojjhpRMn9LHglY9AzxNCp9CU1JmkNkkRSBg630VzhPTVz3klRbYOyJRnn q4I6NzbQnPka6UfcN271Z5CToqGcsZuqrep0Rm8dHurQoN7i6qkbUj6O57HMiKEGfk47 U5Grz5hTs9KbGiiNOFa1FwlQU9PrQB9JaNOXDJArM7S/Eu1s1TzgyM3YiPFGo6t+kYlQ 7d5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747154103; x=1747758903; 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=mw5Aq9liTvfBW6lDsmXdp3t+4bJEbgWE1aVwHCss4lo=; b=DBPZ82+hwOx6BRhpukCKwnWuwrOaidHZfNPdua1kvti9nMw2iY2S2CX/Yn5X5HJkzS 9XfTNQFBVAdTMXQGHrfHIHeVVZuyzgvJWy61nhZemdnhTJLgOOpqq4okOgYdQFSHiTFW Z/iKSZy0MROSMAiYmEqzan5EmQAMKtrwCmqHCEZDxr7+WYW1OlCCdfsq6sv25miRS7Tj LD8ks8RCHxL33J2Kse58cznCNf+Z0F0mTGlhFCQ2Lx6aNEoPD9GJekpw9Cq+dCR9LRFW GENSKaEe4ooD7r2vbo+p3hI3qrv/CDPJ3xFFlmBSErgNKiiF5sOpn1N28D6SQH/mBZaf miHw== X-Forwarded-Encrypted: i=1; AJvYcCV9lp0lBsyarWYlut6M5rlN1FHbbIxBMhirI1z6CnL1YIUYiIWX+kfkBQJ2gSBKOruKXiAVjK+thw==@kvack.org X-Gm-Message-State: AOJu0YzCA1cFO8nOHVPQ/uJqpYJ+umY2vs57izhkVOL/8S3ahpjpDjkY Ks3rlubEytw6SMN6P4pO7KFR6A4xAlYeKpfJ6XigaPU1kHJNMB67QhGA9w9eYqTTZo3pK9WlCw= = X-Google-Smtp-Source: AGHT+IGSpDrcEpe7uNDVI+souhz0v7v+9RHjQC1tc7Aljkmth6DLnm0zlJcclwS/YNY3iQUF+yig/Y2hJg== X-Received: from wmqe12.prod.google.com ([2002:a05:600c:4e4c:b0:442:cd42:1f7]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4e46:b0:441:b3f0:e5f6 with SMTP id 5b1f17b1804b1-442d6dd2276mr134034145e9.25.1747154103042; Tue, 13 May 2025 09:35:03 -0700 (PDT) Date: Tue, 13 May 2025 17:34:32 +0100 In-Reply-To: <20250513163438.3942405-1-tabba@google.com> Mime-Version: 1.0 References: <20250513163438.3942405-1-tabba@google.com> X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog Message-ID: <20250513163438.3942405-12-tabba@google.com> Subject: [PATCH v9 11/17] 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, ira.weiny@intel.com, tabba@google.com Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 6AA2120018 X-Stat-Signature: rbwxwhkzmcsoa5ik8369419kte88781x X-HE-Tag: 1747154104-291652 X-HE-Meta: U2FsdGVkX19dz/W7dPEo//cYITSYQR7cwOfY/H3EfDPTf/iIFjvF1gwD4xUPqn2w8IGNNcQzpWwYmbpufhgI31CN3rZYzpTQdwD1ram1uF1uA2AMLmockTHoBhuBQQTgf4DCgWKrU4VB/xjCAHL/vul6PzSM3lR7/4gHM5hckeMMaoNpm/x/RGPPGWRdHT903GmDS0kl3QRRCn0eSU3+fyTdsz7emDbEV9BfyOR2W+guihBiZbvomo1lEhShME8ObibIhygrSVMeFjrhwAOJinZArGEezl/X4DK47fU88g5KmnrcbndAmeTJh/q5XtbQhkpxct4BcoLpNYE1MY8w+cGiXPNr98jCbDaIuK55Kzt5EN4O+dC2fdcPDDQjm6gcxmbudMZ1YJp1dGYSUwDJJdrVdLzSor/C9OlRm7LXbDH2x4qsrAQqI+8QSQJSBqDj1sR1tTSoQxdMYKjwvvlzD4aowoq4t97umq1Kh14aNFX6xWexIiDOX5KkThZxqBO0IDq7XP4h2gxlW1ixNwIWatdHjJ9N8zUlPJdUMIBSIz7fkAmFn4WjP4K+4BsgdN6jpbvIeqRCcim6G7P1USXs0spHCBCFi1Zu6Jr4pK2UoHj16UvqiwvkUb0usE951jkt8aWi9UT60b4TlEYdNvc7EfX8pDYl11ypszKZCFuP2fLAls1J92peG7NBWua6ugrvcnRUBKK+e86d79BiXC5+RJ5p54cmV1fvjy/ga4g0MRcGBu1/356E/eZn4iapHHnsNGBFmyUdPeUFcRPUxR2PBoLxno6HXHR8rq2vP5nc5Rf2Re+zTAj9rwncFKKDV1AmzkEx1gxnGAEgl3IfAKEsoqhbh1xP3910KNlodcK1cZl94bbdceVi0wSu/P91Tamas8aLXUKrXAN8uF79R4MK5ZvpU+QSuVzjVab+/XQCTXC2tzrM2q/RmGszve2+fNaUUX9vL0qWsF28YSBbPw6 s+QNIuDn EHd6GSoB4JfVxAqN/sbDwFFclDxzXZBVPANVfGPE5J24Jxwyk60HUyJJ5dFjBJG6LCfAHuJH+9yRIEfcyXwWgmVgG61pVYjw2iDMt4A85hh+WsQ1lTvwcxCM1tClYM0A3HF03HO955W54OiK4RPCxhlBt76vbwKjRx4AAHJ9tEmkgsPMwBCFPDcM2KRNmAywC4xqVAksYwBvL0xImLJed251H/hoZB5JHyxPWjkVxl5o5MQatSyXczR3dEd2qiSnrzc04lH2OhO122iVYmcIG1yxgo5qV5LxnLNcVh4gbPO3ySJsjyo1qec6oyvQZfdQasUSIEMgwaGJmdTmYQE3MZhKOrr020yF5OncwGIYPmNlTwE2RvOrp9UdbMqFISZ9+tKXxL9xhixyzvfDhlI1B0tcXjWm+4ymSnVzAEvB/eQvF0ids704qfJqsmkjbWSofypZtGegy8ivuc5JVq3QUqUrXxkh+XWxUGPcQwIa5LRzv+x+hPjaxgNEVKxkgCtWp3A9k3/u+vgLgE5rn1cu67LhahQI7xJJzA/YyjnfuMiCx/fvpeWkrnZLAfWR/mhpamy5x7ixYH42tWdY4iB01HpAqeinN6hMIqXlu59vjAB8sZKo4i0i9mFrosnJYhUTfNcZ0RJYHifcPBRrzxGsfrpbjHXdVe1meySKRtzVRxxzSZVk= 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. Reviewed-by: David Hildenbrand 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 eeda92330ade..9865ada04a81 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; @@ -1536,16 +1537,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.1045.g170613ef41-goog