From patchwork Tue Feb 18 17:24:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 13980317 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 5E2CDC021AF for ; Tue, 18 Feb 2025 17:25:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A43D28015D; Tue, 18 Feb 2025 12:25:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 08736280169; Tue, 18 Feb 2025 12:25:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E691F28015D; Tue, 18 Feb 2025 12:25:20 -0500 (EST) 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 BEFD76B00A3 for ; Tue, 18 Feb 2025 12:25:20 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 775DE160211 for ; Tue, 18 Feb 2025 17:25:20 +0000 (UTC) X-FDA: 83133741600.16.8016BA7 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf11.hostedemail.com (Postfix) with ESMTP id 9C24240006 for ; Tue, 18 Feb 2025 17:25:18 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=USLU4WCC; spf=pass (imf11.hostedemail.com: domain of 3fcK0ZwUKCBoJ01106EE6B4.2ECB8DKN-CCAL02A.EH6@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3fcK0ZwUKCBoJ01106EE6B4.2ECB8DKN-CCAL02A.EH6@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739899518; a=rsa-sha256; cv=none; b=7MdSEKchH+5DiRxM5/Qz72lRtLwG6DAYXGFWSIiv9xO5p5gj8K4P+i58bieF4XG17x+wfi M40QDJpxMvAMP/FkL1xaYrK3nR6Q58JQkNsGRARcKeX49R7pXDlwjte4X3gnMLk+oVapCc rIEHrGiH+tBAHlHUqdDNjEG81Fn+hJk= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=USLU4WCC; spf=pass (imf11.hostedemail.com: domain of 3fcK0ZwUKCBoJ01106EE6B4.2ECB8DKN-CCAL02A.EH6@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3fcK0ZwUKCBoJ01106EE6B4.2ECB8DKN-CCAL02A.EH6@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=1739899518; 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=0+1jJ542FIUn0Rr8Fjhsk4rNdZzsZ79ixZS3qAefs1s=; b=azFZexaByG/SBv8ipAFm0QPQr+Fv1SOEVa42Wo3rKKUccP3Xyld+pEVzh1G+GRN1ozK94u iku3c8MtVL88DzHH8N1ovnsHZ/pI7MwzV47xfHDSC78qCqTs9AMMMEqdiA/eNQZF2ApySq YLREUl8d1M6VMTR9GyUJTgLWu+H94jA= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4399304b329so5552255e9.3 for ; Tue, 18 Feb 2025 09:25:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739899517; x=1740504317; 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=0+1jJ542FIUn0Rr8Fjhsk4rNdZzsZ79ixZS3qAefs1s=; b=USLU4WCCTgKfXVcrWyIqZpgAkvKm/YIEV5uObvO9XeOVePDwA8BxtcJyQT+XZtcOqf OsoFh35oKn/fPldyjKZcxDaDxGRbI8stjbr0j3DfwD87lDu01X1sYnbDx8XuV6UhMm7x VW7i+wbYxDLd8sGItBrG0j0DIjN42C9pcPhC2USNBEL5e+lfz/b3CUaFb2pjQ5TWrA4h k7z3A7g9uAKKnwqNun0Iva2PBeOoL/rz+Q8U3o05VpmEdOnVW9eoD0+RROVk0z5gRRcL X4JifpwDUqdg8wBdAi5SUpdkOvQ8og3syauV7uKH7jxBojG8e8m0ZHPh06OsRRfYSqEu OcgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739899517; x=1740504317; 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=0+1jJ542FIUn0Rr8Fjhsk4rNdZzsZ79ixZS3qAefs1s=; b=PSQ4yzdPokUs1nYYaMfs2HiuWz6cS4ilAl4MvLw2PBFfKI82UkUHP3U0d9mgHy7Epj T8W3GxSNPwa4fwIosxAou4JYduYC0t3B1o5xnHmBDyNTocFU0BlTg6MT69mb94zOR5d/ 8rxwxAV1vz1F7ES8Z9+LFW1LohGFbq93uTt6oMlgfYrzQ4MOkb2KypDzYVCnvI0XCyJ4 OIOGHcpp0QhKeh3YER7FwubPLOWPj4y0hfNLmbSOPMrs0y7ymgj8kRdsKlZjABwuqHnm Nh6JMsWuVMXnf5zW7bTMUAw19ck3Fa87DRoExp5j+lSsvZN4o6A0DppFgltDOZw7aBq4 m6Ew== X-Forwarded-Encrypted: i=1; AJvYcCX6iPq+7P8CXYwoX+tqkj7hG4PvvNeUcJxWEyffQ8HDZGK5EePhCrLbdHBWzgqbseWcXSHLCuw3Ug==@kvack.org X-Gm-Message-State: AOJu0YyKd65nzDbwdKpYOsWyGH9zOHqihwU1RqXHKGvR1V1tHTTJjqHs 8e+Va+i9uKzxhzRbiTx2l487dKcHrMlgfnfu3W5vIct1zIDUtY4U5+squeQqJQ3h82MYtplNSQ= = X-Google-Smtp-Source: AGHT+IEomX75wSUKcjYlPTL8ccxKDoIA0hN0/nqjvlvYP7OWhi/yQq6R2XsnyWNa2w6ZlekuJlp64UeMTg== X-Received: from wmbfl27.prod.google.com ([2002:a05:600c:b9b:b0:439:848f:2fc7]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4ecc:b0:439:685e:d4c8 with SMTP id 5b1f17b1804b1-43999daff2bmr5080855e9.15.1739899517280; Tue, 18 Feb 2025 09:25:17 -0800 (PST) Date: Tue, 18 Feb 2025 17:24:57 +0000 In-Reply-To: <20250218172500.807733-1-tabba@google.com> Mime-Version: 1.0 References: <20250218172500.807733-1-tabba@google.com> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Message-ID: <20250218172500.807733-8-tabba@google.com> Subject: [PATCH v4 07/10] 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, tabba@google.com X-Stat-Signature: utqz7m1o1gy3dwn4r3k4tnr37yik9tu7 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 9C24240006 X-Rspam-User: X-HE-Tag: 1739899518-225024 X-HE-Meta: U2FsdGVkX1+Gc+A34pnR0DLwiZDCzPHzb6raIZUh1cqg5sm/2+5EY86GoChtjYRjjbxIhjuHmUNuZ3x5KXwOVG+UckkpMgv7jGCep7ubbid++JPCxav1FIA2lDxfDTgWzrTr8dMFXVeDdUqnjhmn6dBc+KrL5RGleDdh6lFsQmGBPCdn0EHZs4H2s/pBXWj42yqFC0hEugqTtTNJ8rzfEG4KGbOuPq8muRA3mb3xlB8r2wWU91yIa1xuDUr+dRAtv1GHdTRjmHz0qE8iWZnJ4oWLkx4wQgOWihUZKXam4JU9Z6wsACJxdugNAd373a5THMxODLRrw/gKJDJr65bRXgw/EmMzeeJZLL0d2RUe9qbC3KOVHX2xRbHEdpHTrDh3XV1oHJMGge8gnqX/42jp+8dRXyt104mRx8dZ5qnwCv+VMVD6kRnfqwRqffskJDVkjvRxICO/2YfR+vJB4o2NXYsQiCfdhFDaA4pEjMqslAWBkY89xIoNq+djA4DvFXQRMrYwNjENvtF0/6BDDXQNPH4QEoOt1bpTKbW+K/f0QQ+2HtzWgve6cR5xpWA50q9EO1UiHMxSOe8YCYBi1igwLUxXbB6J7k/6HZCViEUwol2qOkh1wwMdDEYrHswV64/fpLOUQDBF4NuoKma3AyLJh445MmKeC7BEvOVio6sYtijZnCKXsE3wK8Xr0BTuHVv9OpH8AUI7wtnAQR6HpkJlKaEnP8C/Vjjep7EDsBwkUOeauO5Ubu73XJfAaIkx8NoE7Q0/1g4WUm2EtNVqxYKFMlo1xrUmjq8wZhTRZMd7PamsFcq3/cRQvMOGxe4/s5dH83FYHCs1RPYOFZGM0h35T6r9B8z+DPktLgh/Nu8kSgwAcy0pEHvoLEwO7V6XO6eQNZC6MHfGY7kjZkeVijZNZdehlzNhVHvIoGyzYd0hyA2KpiWfCeMJpIxii/ckCjmXYYQMr/VeyTt9O7uAzOA ge3GLXhl hYP3mUxPHk0/ogeQp/S/gYu145+X6t/PAX31YVeq+AHoYVu30Lb4SIM/AANUhqF6RwXDkcQVp29OiObc/saGo22HVIABqchOD7SU8Aq2LNseV/UqZL4jDuabcKhrwKrUCRZewUc08xzaCPq/sn9rSYCWvy/k/yWaTzlGTbYk3qFEEOM3JQUHPsH0Fr2j4Cnwsut6fO7bOvNNnRPKUG+ZC+cdeApEQ/Ea1+NXdDFVYR27rtrjx4Tarox2To255Zlv1cRXkqk3I+oKoxnw2QK6fMePhb6cSH5sbhCJEE057A171G1XusnKuGOxXbCdCsQ8xfmN//cmoSgBNwxUXC3QaqExgHL9I9BNFLMw+660eZbZQjuiwl0cx1WpjaNXol3fbpiDfHmry8AXX1Vq9Ptbjrg4tKTQtAFsn9Ab7JmhvIfvcsi8/aKH62BbRpzn1kC9JxR3GD+efa63HR8knXHXZUM7hvd4ij+UFwOYtD9vsXJWcYkI9AhGhLERv/9SJentcYLI4vgYcWP6j+4BBKqt5Ahyqt+v6MyS6tgNz+PZ4mCgCFjvLbPsayvotSsyjP0PqJEX42AKDlFGQQFGdSE9e9hCGFEPtjruqZCQUoNEUQNSNcfBEo6YDvwQ5+jO6V3RINN8FU2g6d80ReIEpuss502CNFA== 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