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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3DF3010ED65E for ; Fri, 27 Mar 2026 11:36:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=eiVv67+xE4Y/1GuIHc7BaRKauyr8cJAfeKGAf1QY424=; b=16fWhPKEvDQOpaoaOdXLMFo732 hB0flVAzWWncNE/3sCofRpqern8U6v+DkCRc9xB1x34GJTQKfcX1zaymGAAXMLOMLSIAjTZVE9M2a +PcxsDlreq2vOYHf5WFEZqkmzBG0m3W1pGvbpJHd87A48+PfrBoNCOgGwFz+VI0OEmxMoHyGQqCfu 2Nv3Khu73ItrGmo1y0MvarwdgGpxBNkSAvrrMQeVkr/lCZUyD+H1JCj+yBARHf14KMDiSYkTB/2NZ T/4na+QyfVx9gykBZGKcKPwyJsHoVbgyvwNXr0a1kuiegzO05+56R4ehPvpVcjMX+7E5B7fO7a/3m kzV/9zaQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1w65Ug-00000007FMX-0IqT; Fri, 27 Mar 2026 11:36:50 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1w65UJ-00000007F2g-1z6c for linux-arm-kernel@lists.infradead.org; Fri, 27 Mar 2026 11:36:29 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 2D3F243DE6; Fri, 27 Mar 2026 11:36:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12DC6C2BC86; Fri, 27 Mar 2026 11:36:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774611387; bh=hIUGlkLWi3fTRHlufn3OSpHkefKXTw36L7/Tz0DM4Kg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UvhS8tj+y2RSuda17MFIegPJ/WFcNh+csVDJDbM15qzwMhd2EA9w0t3a593sxw+kb 4bYpr1uYSKlNxsXBKQvtf6z6YMdXtM4WiwUG23SinTcqVVTpby/EnqmZIbcKRk64Zq 6XplYiJ4hGtcJNMgaESmkEROzmO1Sw/ZtKlNzypcfy1b3MabJhiMHkCscbezxMFN65 aUUT0+LA/k1Lhk9wNCp3sW6u5q/ONgFtuqxwnoBh6xbOvnGNenq/JKWiJRNGF7vGRF 6gt3EtzuWDY5D8QT3AJkSbChRB/dPn8ceimab9xwcE8/FB0JUqiiByyK0D1pQfS5OY lau+C3SQb9IRw== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1w65UH-00000006K4a-11HL; Fri, 27 Mar 2026 11:36:25 +0000 From: Marc Zyngier To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Cc: Joey Gouly , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Fuad Tabba , Will Deacon , Quentin Perret Subject: [PATCH v2 13/30] KVM: arm64: Clean up control flow in kvm_s2_fault_map() Date: Fri, 27 Mar 2026 11:36:01 +0000 Message-ID: <20260327113618.4051534-14-maz@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260327113618.4051534-1-maz@kernel.org> References: <20260327113618.4051534-1-maz@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, joey.gouly@arm.com, suzuki.poulose@arm.com, oupton@kernel.org, yuzenghui@huawei.com, tabba@google.com, will@kernel.org, qperret@google.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260327_043627_559764_EAEDCA5C X-CRM114-Status: GOOD ( 15.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Fuad Tabba Clean up the KVM MMU lock retry loop by pre-assigning the error code. Add clear braces to the THP adjustment integration for readability, and safely unnest the transparent hugepage logic branches. Signed-off-by: Fuad Tabba Signed-off-by: Marc Zyngier --- arch/arm64/kvm/mmu.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index ee2a548999b1b..c6cd6ce5254be 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1897,10 +1897,9 @@ static int kvm_s2_fault_map(struct kvm_s2_fault *fault, void *memcache) kvm_fault_lock(kvm); pgt = fault->vcpu->arch.hw_mmu->pgt; - if (mmu_invalidate_retry(kvm, fault->mmu_seq)) { - ret = -EAGAIN; + ret = -EAGAIN; + if (mmu_invalidate_retry(kvm, fault->mmu_seq)) goto out_unlock; - } /* * If we are not forced to use page mapping, check if we are @@ -1908,16 +1907,17 @@ static int kvm_s2_fault_map(struct kvm_s2_fault *fault, void *memcache) */ if (fault->vma_pagesize == PAGE_SIZE && !(fault->force_pte || fault->s2_force_noncacheable)) { - if (fault->fault_is_perm && fault->fault_granule > PAGE_SIZE) + if (fault->fault_is_perm && fault->fault_granule > PAGE_SIZE) { fault->vma_pagesize = fault->fault_granule; - else + } else { fault->vma_pagesize = transparent_hugepage_adjust(kvm, fault->memslot, fault->hva, &fault->pfn, &fault->fault_ipa); - if (fault->vma_pagesize < 0) { - ret = fault->vma_pagesize; - goto out_unlock; + if (fault->vma_pagesize < 0) { + ret = fault->vma_pagesize; + goto out_unlock; + } } } @@ -1951,7 +1951,9 @@ static int kvm_s2_fault_map(struct kvm_s2_fault *fault, void *memcache) if (fault->writable && !ret) mark_page_dirty_in_slot(kvm, fault->memslot, fault->gfn); - return ret != -EAGAIN ? ret : 0; + if (ret != -EAGAIN) + return ret; + return 0; } static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, -- 2.47.3