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: 13999244 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD05424E4C7 for ; Mon, 3 Mar 2025 17:10:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741021831; cv=none; b=kOXLzkEytBiTkmx4AqQ40cIsh6gftDFHGrQw3tRVHKBZSaYcBjlPFRfgwoBOhLKbr2Bm7NjRSMPqWugHO1WqDyxe9t9OmCtOLt4OpMLUYxdFavKbXpxwG1faZrXYdN8ocRz1Qrg8QoBFHj3J47HbZB+rq/1oQsGBrgtuGFjg//o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741021831; c=relaxed/simple; bh=1cHCATkOU7kAcjbAu4EXi1pUFvndj0xVj7tS8IfkgcY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=YzvPbJfMEneFrPYRKcq0Kvl1Xi4q2of9I565l4o8qr+S6VcIDWjeDVVQSsePOawtbZuMPJCnlRootBfobMdQY2b4ub5xVEYT7FzXMzP2KjO8Gbk7lq0J2584Egss79G9JbBBi/p2u0GjUviychd+I1smBe5DHDzi1Nuv/Ij/11Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tabba.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Z60HpV93; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tabba.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Z60HpV93" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-43ba50406fcso27986215e9.3 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=vger.kernel.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=Z60HpV93AI72bzjhXmrcLinDSRBoylc2W/jPfxAdYN0Pi1M6x6e2bzC6WRQbUwpukF tLIvACkbFbbsSnT9U1HRgyaq0N8qA1t6nTXOkER/sFnkeUBmAew8Bi1nTjnG8o6SQZxS A/sfNGOO+g2ywT7GZ8z+Ol48BYzNOlrVhwFWGqVlFLAKkaBWF6WyRt3EBKvNmL2WnW2K qxTgzRaFuQD5R0hzjElknmu/yRCql3/6QvEhVEBKNkULRhfw0256C9nuMuMe0AlNiPdA SQxZBlPFdXoN1dQTlKuPSbi0j2xuDD8FUYCjeG17IfmLoutF/HTyYaSEE7xN6t3JpTOS bDzw== 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=DdBynbSb5UXz5HD/6pmAvWTo50ZK2iu4DDFppTgo+4tagT5tV2kEbN2sIcFJYW38lS Lv6Ldu0N70h/KyTFbMGtNPCgpDEPJCUqDS6Xp1kgvmwiB+/WdiLxmlYEuPpDdRNz/BMN HC9m1znlB69Bq6LMNvezd+shUw5hl5qjdZ/lNOLMwTMRd9fs7HYcS9IWgYl2MosWsxuy 3Dpd9UP0WWMagvUrccQnj7GqyA5Af9UDjeUrnsCqlEmOURrvToVeroULYA7B9tFN3uRh H36Ce45RO4uVKjpek8WoHSuCH5B+EfY+mWC/0uDQO2mINumx0rdj7pwGOEbcN2pRwy+s rLtw== X-Gm-Message-State: AOJu0YwFhSl0ehS1/h1xkGw5jiB9wDMQYJUOzYtGAAzVBp15PrWH9kXo tawDXc0SNbDh8NQVr/Zsfo+dVSLleGxbG8uKucZruG+/G41Yf+kGt7SbMJsWsJFlnQzA9bz0Z/a FoccKM/Q4oqcaf5nSeWNObnCuxUQ6c9QGgnEwQ8t1OT9mzURIixyR7qO8WZl4Z8fhvTkI016N5+ RcpQmsUpKNsZQNcf8FcJr+0oo= 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> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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