From patchwork Mon Mar 3 17:10:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 13999272 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 67711C282D1 for ; Mon, 3 Mar 2025 17:11:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 83D3B28002B; Mon, 3 Mar 2025 12:10:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7ED0A280016; Mon, 3 Mar 2025 12:10:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 68D8428002B; Mon, 3 Mar 2025 12:10:34 -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 4B4D8280016 for ; Mon, 3 Mar 2025 12:10:34 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E91C3120D32 for ; Mon, 3 Mar 2025 17:10:33 +0000 (UTC) X-FDA: 83180878746.11.12ECE31 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf04.hostedemail.com (Postfix) with ESMTP id D02F54001F for ; Mon, 3 Mar 2025 17:10:29 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=lFjhr+du; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of 3hOLFZwUKCKUYFGGFLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3hOLFZwUKCKUYFGGFLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--tabba.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741021829; 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=eGgo65KrsUc27GFmFSac9JDxcDr3yyxu9F6SQNqcVKk=; b=m30+cEKmKgjzvweTODddvGWq3abc/75drZ8ClS7ss0AVLlY7UW9cGHT97t9E4lXNvJOeW0 lAw9aExbm5WWwTt/f7VsfSBgwLGorttse6YodNSwj9c0tLcAiNoFrOpcfOdxmFmIt+QXzV CMM8X3FKFT4EFJft/vJDRFKNCGt3HMs= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=lFjhr+du; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf04.hostedemail.com: domain of 3hOLFZwUKCKUYFGGFLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3hOLFZwUKCKUYFGGFLTTLQJ.HTRQNSZc-RRPaFHP.TWL@flex--tabba.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741021829; a=rsa-sha256; cv=none; b=Xb1FS9TptOHFSBVVxGl0pN/Sx5R+Eh2fmZ9C8ErFn1IssMBSAWGastshtCxpE4V3NYRilH nb0omN8/rFwjyApMo3W45R8ObjwGbW7bPw/ZFFn6Fxqq9/3SOUzY4DXL5VN9Zu27uAQTaX VgM73La38bBLd8Pc5OpJD/KxPtH07XA= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43942e82719so33496735e9.2 for ; Mon, 03 Mar 2025 09:10:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741021828; x=1741626628; 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=eGgo65KrsUc27GFmFSac9JDxcDr3yyxu9F6SQNqcVKk=; b=lFjhr+duUGP4UmIp5rGDM0cdSP8Sm7kXYsJHY0NMDZPIO9Hpjl0OfNVKb8fqJOeJay 4n/dcoIReHOJtJg1+JyKkVw4YkOnKtldLlUdT6olzvxjXveUprqfIQcTbLzdUC8K3seq Yg6RDg0T49ORw1dRVGZbSmzPxbnrdxdY1aLwdBflNRJOs1K0jbpAOmse8mefhKW3XZSE 51sgGDUbSY6UsAJEkDrgVTFwgX6WsjncSIrALknsP5II0Up2SUTNxH/xJXpY5/+TD53O Y2y4KvX7TvaoCPYkhWm47tnUcywcgQpJsSF+3zEXOdJILGSysgHqDEUYC3WAcEEMjDlb urWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741021828; x=1741626628; 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=eGgo65KrsUc27GFmFSac9JDxcDr3yyxu9F6SQNqcVKk=; b=BFRqEUoefv2d79b/7F03LRT2wHdQ95Jclc/JebvJ0ieVIEBXSiojlAe1yvdFfeL4yl NJ9W6UVRsUutXY0AXBbXuDmopp5oYVUEK54brh/Qm2y57qM715O5qtGK+vnsORF1IRGX 1a24Lv7g7/G4b4eKgydzzXUoa4wjwdOndGj+4dqoEAAkuRN2amvACqvBO0pvw5kv0TuE ceV2PqtBT9vdUYH3pup1wXDqm8GcOZbdSl/ePuu9idNYHxkpHLkAW7KIKvkP5ta18Rui 2j0xr9PQd/B/icz5pEqOFkGMNKAJ6ik5rFCr70Iv7uXqG4oB2S/cNd4J3sCnzm0Rz/0L Z6Fg== X-Forwarded-Encrypted: i=1; AJvYcCWRSUkxP9C11FHrF1X+NTuxINlzzxkm7a7HdhVhqnehRwA8305+K6k6df5X9d4A2cRAXLSBHW56jA==@kvack.org X-Gm-Message-State: AOJu0YwlJYVJLsyUP5B1lhHZsZj5RRywe3D9bRE5YEqmVryeQS1X+fZF odYFDkKsCMkilY69nKAdoAuTNix0NH2Pos3ATW1Y6Hxz7XdMHk2191uavywdyEX4+uqSPDbpIw= = X-Google-Smtp-Source: AGHT+IEzTL2DCjgOiyb3Cw1M14HJjX54cJX0QrxcjGlJF7HY9SJWIHrxMRrLYT+9PiOpxfffVqhEaRBMeg== X-Received: from wmbbd15.prod.google.com ([2002:a05:600c:1f0f:b0:43b:c4f0:4c2f]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:5122:b0:439:8ef6:5782 with SMTP id 5b1f17b1804b1-43ba6703c4amr121624595e9.10.1741021828083; Mon, 03 Mar 2025 09:10:28 -0800 (PST) Date: Mon, 3 Mar 2025 17:10:10 +0000 In-Reply-To: <20250303171013.3548775-1-tabba@google.com> Mime-Version: 1.0 References: <20250303171013.3548775-1-tabba@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250303171013.3548775-7-tabba@google.com> Subject: [PATCH v5 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-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: D02F54001F X-Rspam-User: X-Stat-Signature: een8jpcofr5x7oqkjfedh4scnm8ch3da X-HE-Tag: 1741021829-39076 X-HE-Meta: U2FsdGVkX1+NCZSd/8CiuSQ7rCHQqZZJUz31+uu4wAX0wzLZsdVqlTUxaZDwQAxtNC5rAHSEvULy7XBJ/kpr3PRxEXIiufQpHho75uEZ2YSMR1SB0ZaGgkNmlGxSIv6lPY9ZbSKV9POJ18QYAFPAUek5fsO29vLmBFAv+Xx9J6qpIMbdrqcvH0ta9jnHnmRYd5bWSMtbHiz6UXh2LOEJ1JWKrJ+912WrYXVi8EZWtdOIatna5A4CyjXc+/DQoKFxq5lDbmXRFVKxncjFZdUeZhH5cw0IstkB5hydh5q4D2H2RmGUQGD/2eCO/f9Zv72Dk+Xi0WZrdo9jxgybJ2VIpRykYq6IyETlHh0ErqQj9p6um5XXoT/SfcHVe7dPNmfild/C8x+0h+PVWRB6ZIIYMG9QbV6Byf8L06P5bYzr+EaUHI7nolKN9iyMmaS4wP6NsoJLzHtLKalY5l6dqWjhluwa5XdZ/Kh54NnL2LaEHsczPHcqO3T+1QR4VyWpbwo9g9LGpj5+qU1M/jcFEx+3ecLgmRxNeYwD6cABM6stpBe1em1gTOw6SACuTI4ty+lXl7cV9v4RnZdD0YTQ11SS+aVe8jQP9NlFIkpQ5rNqHtbgTNzw9kT8pCAZ9YkENY5oZn7vnoxHXyXCp7zH8fXdEg9mbaWUeExEpDgwi/spcyygI0Wo9BhcS80LCnw97gT7BaqDohFhgp8Uc1wb2V+3LklVvXz+vk/o3ihoMFQwi0Z7hjoCq9XHZvxeA3gEl4E+rxRKRQuPrPTNCmgz8Fiq6OOZImpnGVDDB6eZwvihons18le4b6lEoP9hRXlAR2bBea8FqwnTU5Yd+U7sxyE4hcVLDz+DMCcMR4uUVj5FX5JtAoU0tJFhXT3rwrInhLM18RFmqC7Ck+HMUuJL1vihIPAt1GKYIZf4mGHJ3SStJJO0yaekjvtYGvNNy5mP9DYWsZqeeiAq51Gmc3390qc vWxM+Llw 6CFbWB3wH5RhutkwQXMcHgJfs4U7AmTBGY7iVubZDA8OyrvY5ma+gT8RomxCc/HzrULDax3MB4bEJNvDhD9wUcclDNXApMPZTZsN3N2Yiu8YmUXMvIJ1KMdkPDtXukaBfv1+1iAcHWj10Rdxvp+aq8Dfxy1b5fj3MirPtE2Oz3t6y/or0u6MybKI/f9oBpZ+N+6mdCyGW1SvCUfV03JufW1uNdg/uDGW/Ih+Z1LddEAODamUYYt6qtqAP/S31jPSbOoorFYzW56tH1+AIqqxCMd/xVj90ZsNAvq5d/RoFzm1CXt0x3hETccDLKTI4UOGMXWfK0TJxP8Zo7GOO4dj6sZG7bjzVn9OyGfiLV3z6UJT/SdCmV0GbYA2/RkDbfqrwN/vdFrYxzD5Tad2/fX/O7jkiIFWY+5tDmgpPjdiVe1Baxj5z144OYUSLu+bruLvUohBAXWsG7nv1gAL3DY5o0QVjODuCnJ/3de0KMOL4Y/4TSyjsdZXN3kw45xSmH1QvdIsfmxh2ghBQkO/nOfCXQlg4QGprDMzzRGNxUn/NngVs2I/CuhHLpm+0c/ff5hR9yiiMFKP5PNi/Qeg9nBVQ6hcQeoFatZocAw/LKdzJBpRMDO4yizbB2kntl6Yy54+m2N9Do8+Osdv1GqShGBgXBdy5dA== 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