From patchwork Tue Feb 11 12:11:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 13969538 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 AE39EC0219B for ; Tue, 11 Feb 2025 12:11:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C55C280008; Tue, 11 Feb 2025 07:11:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 14DBD280004; Tue, 11 Feb 2025 07:11:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE273280008; Tue, 11 Feb 2025 07:11:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C19C1280004 for ; Tue, 11 Feb 2025 07:11:47 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 73B6081601 for ; Tue, 11 Feb 2025 12:11:47 +0000 (UTC) X-FDA: 83107549854.11.AE683B1 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf17.hostedemail.com (Postfix) with ESMTP id A1FE040010 for ; Tue, 11 Feb 2025 12:11:45 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="Ut4Qk7/G"; spf=pass (imf17.hostedemail.com: domain of 3gD6rZwUKCO0iPQQPVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3gD6rZwUKCO0iPQQPVddVaT.RdbaXcjm-bbZkPRZ.dgV@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=1739275905; 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=KGlWsAVkyKnhySbr83igZIXZOroWdqgSNXlU94DUNkk=; b=OvBiHGma1/P9CZ72ljWd7Dbs7BGTK5/RPvCWPej5HUGhD4SwiZuluDSqoaarvxocHURE8o mazCEC5UAxg8IZ1TVArdBAuescOLqKt7UIbIChKW8g1wyLaAplatGJ0KJaEnG6To0wWPFQ K6aBYRMwYEZsJ/1oyLrRLKhX2kyeBRg= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="Ut4Qk7/G"; spf=pass (imf17.hostedemail.com: domain of 3gD6rZwUKCO0iPQQPVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3gD6rZwUKCO0iPQQPVddVaT.RdbaXcjm-bbZkPRZ.dgV@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739275905; a=rsa-sha256; cv=none; b=PD1hSSv/POeJbk8qgBKYHYLFJn3C+wsec0X6x3TN6ne6dTELF6sq+MaUy/Qs7YyAUxMMlv uIgE3dQ2OPWmUx98h6eqCon8aTW6Mbzv9C6qlp+EBiF7+X8XiaJIS/ta1COHMQd3euHqne lWa1gyuJ2gnel9KNYz6P2oGQrYoyvXw= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4393e873962so12533715e9.3 for ; Tue, 11 Feb 2025 04:11:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739275904; x=1739880704; 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=KGlWsAVkyKnhySbr83igZIXZOroWdqgSNXlU94DUNkk=; b=Ut4Qk7/GCW2wN7ujlaBLahztT/HfgUWYNLb3aO2TiFm/wWX+y+3+wEV9/82Vkrjy7S 5vrgTEmGXAJG+O5XPzZSgz4RLvXkKkqNwFAo7e289Ukdjkb0abKQyctmCOTubd4cp6Vn q8bMj4/DPxR9T4lwtM8KA9wQesn6pXskZt4VzG+QR9Dk0Vn0AW1L902Rf7QMHkOURYqg Sycb2KVJh9aFpZ33aS9DfW29gu+Zo+N1DMCcaxH02o1IXAqOqrOnT/2/YlR09i4frxrT 4eHJneDf0n6qTaEfgvMQpF+RgopMg4Knc2shA1llAfBTfBgJeEnkXD3RPfM/F0nu+YiJ IhtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739275904; x=1739880704; 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=KGlWsAVkyKnhySbr83igZIXZOroWdqgSNXlU94DUNkk=; b=Nm3EX2rutscYmlB34lEtKcgMlqZ1r3hjcWZvIsvgXwUyNdG9jpOTVboJx98C9GQ5/Z swnCSBUt7tjt5CWWwVzrD5OnwYnHbqryUN9mTQYVtclDBgb3iB0SAHSIyC+kQETi1jxQ KiKbY3+F9Gek50keOosa/vQP/ebLJJM2QBPEqUNH68ryBW6bIno8TquMbZfDjWGpXBzE bH+P8XIIK+r9wIHVcG3X2Bbll+dOpKND8F8Q67IM2gOMyu298RjclSvP0yYqMscftzpQ zYAT52iYZJDfJIBOi6P7JAiYPo3TRMJeEy3dr5DTwo8qmyi6t5pAuKkuxjt16wl0SxTh rrOA== X-Forwarded-Encrypted: i=1; AJvYcCXUN17qBczZ7yavTmQTp0pxwmDkqyFFoiu0wu9rsjQbUWbfyOi0OrujV9k1xOnXeWSfpksfe1L0ww==@kvack.org X-Gm-Message-State: AOJu0YznMRSK7s5JNF7gc2SUUlzTURy1qfnTlyrxVtFxpmQqVxcVEAPZ 0i62UeEqQBPPTzk2CQ7kHRNwvoHc16vpRHQYlaBK1rvoKdMtWF+ZRM5JNYYsRH+z2KSjZ49nMQ= = X-Google-Smtp-Source: AGHT+IECBWxW5BmjsYJdVFsglQzvNG0pX6h42Ln2RnS0ynPClK45T5nCrnmXnpL5zjCvLKTXEj1dNopf1g== X-Received: from wmqd4.prod.google.com ([2002:a05:600c:34c4:b0:439:4c13:57e5]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:354c:b0:439:4376:cc0 with SMTP id 5b1f17b1804b1-43943761119mr58255965e9.25.1739275904320; Tue, 11 Feb 2025 04:11:44 -0800 (PST) Date: Tue, 11 Feb 2025 12:11:23 +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-8-tabba@google.com> Subject: [PATCH v3 07/11] 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, 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-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: A1FE040010 X-Stat-Signature: tkkzisuzqkhb76tm58fmos55nzdfxfg5 X-HE-Tag: 1739275905-838147 X-HE-Meta: U2FsdGVkX19rGPjGzfvUsXKkjLsB+swXDSvkpoZaq0VWz9tnP1h+1pJUjLyTTDrSMFYFPaMN9ZlTPvRp3Lo28/gn3dVE7w9JZVTVZi8xsU8pZOINzT13yPAxmjaws2ZMqzuUEwbCKwB42IRwIpu0XB7nXg5aJzgCpLYBLkZ3p3noPoejmvPD2fL238fr9DLMmbKU3rx09kW9pGcogPnmuSBg3DDMu7KKC0VloGfDl36vOwKg1dD0w9LP2y7sfV4UYIRu9IGIcMKY2h6cAA9tf8vhZgNIrgdKDOq7JuokPEnmn9yl4AabIfMn6XThjQU++DPdJsF0UGC0/IpYs56XARWqLTEwCC7pdjN5LXVcsLgo9WxjEefLJzB+JZba55DBs46e4TJMmIbn27tx3Na2htmceubH4lDsaF1vEQkn+fykD3rMEMPcNsJouNkfDXNO7yRn0+pbOOFrHVU50VLjJYE66wwqXoUHrq+LLxpAN2lU25Bwy2ECfWS15KXy0L1bVC9mG/jdlG0K3ymYedQmFuJLJyfTvxdkw7A7H3ZXCnrvYj7/6P2cB7IVPP6vRrrWDhfGH/DtV0eoqNzwJzYjYUgDXCAQpYRWdJ3EInr2rNdWwQiyIjn9cITHl0TUaqSYqxKyiIMTXIZD/LppKVMKCXxV3EuZ0LYF1aZz86Tbc2ajI4hQRREvq7qTi42E/YWUcWKyKpLexpC40IfDmmZluwoniFloiOrCq+1PzIvE93BLLuJvjVUJI0hHsjVpIN3RCBHCLrZHfbL8aeT0plE9OZosU9HV/1zgnAmXRD9QBoXcBHtqjnpih92tqw+OGYjjlvirJwRL2fiGa4VrYUahmAt26mvtqtycj6hJrBiytG0ErZ+nlgr/ofJZKjhAgZkCexdre21qM7JjjgyDsYlURSkkMtz5sgtKfQZ8r+MZ770OD+yYIhxgrWPY1UGOYEojICPd40Gi4+1U0WyQ88V eUM+m4SU FmqAqLE+r8jmJx775yDL09RwURQJS0DmJKZphL7CYwQYSYv3tR3suaQI62Su94HD8RVeDyZnpRHTGJvXR3IRkUQT5u8+E/XERsFEwGifDudeZkvmWHhNvNnH7O+MXHNfcjqamX1Xyl7fjAFNg948Sqfbq9wlcnpakOrnVUr6+/qI5oGx775wOZCIzE6A5ASONjQ/1wzQT5zjJAPjdRvYwzuRL6n7eco6+QD1JpvJaxdeaMjTqPg0VPJR21/x55iMVNr3xawvGyKSCxGg3zxNy/ioO4aTR45DB4I/qmGC9Lq/jn2gzM6K+dypyIa7m7vc8LoKg9XCbKiHgt1KKaDTNkA0cIGIcn0b5VU4CRnSv3aq6PAgG236mkrxEvnw3zLxclnugjHFCFv+nkNCDPBcIUnJORMaB0/WM3srwTEmbqMv1PVrCkpO+NuSHFBMXCyQeRnzq2+bOmOJbQCKPDbK/nR+ng/UhjiIF54E9lprvFmRrXRKgIwuElNcm9TqtKhZPO4RYa694avA64VpHMtFFU2Ynmwh2C13GrrzD110jcff/ejaZSqwPPKSRaeKWkgPkrdkrOa74G/3Rn/MFqP9EC4Dr+CT3TWcXdSnLWVKkkeiyaWO6555VbfpOV0R+SQCp16U862YaWTqg3wA= 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, add a check to ensure that the assumption that logging_active is guaranteed to never be true for VM_PFNMAP memslot is true. Signed-off-by: Fuad Tabba --- arch/arm64/kvm/mmu.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 1f55b0c7b11d..b6c0acb2311c 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; @@ -1525,12 +1526,13 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, * logging_active is guaranteed to never be true for VM_PFNMAP * memslots. */ - if (logging_active || is_protected_kvm_enabled()) { - force_pte = true; + if (WARN_ON_ONCE(logging_active && (vma->vm_flags & VM_PFNMAP))) + return -EFAULT; + + if (force_pte) vma_shift = PAGE_SHIFT; - } else { + else vma_shift = get_vma_page_shift(vma, hva); - } switch (vma_shift) { #ifndef __PAGETABLE_PMD_FOLDED