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 2C6D5C3ABC9 for ; Fri, 16 May 2025 13:31:41 +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-Type:MIME-Version: References:In-Reply-To:Subject:Cc:To:From:Message-ID:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=bQe5RZCfwspNJB8D+x30PNG0BlPDJmEWin44bfmuTho=; b=xdRGulgEqnt+XST4sBVInvxvL8 zWv27aDoHW0UFzpmP7v/jf/U9EbtAjt2hINlf3QnjMarGw/YzjghAk3kEGDP6vGacV79oB0a7eDIZ 3hBUlkqj5GEna+jiapdzFHhinAdEN62WhXktwRGJdLeE6JxrgJICuao7dPeXB+WXDmrb1sW58eI10 k8G9wYDuUP/Xnv5VCLXN0udaqJEQmRnYHmhUNvHqi9JSPfQQsAIeeucui4EiJQCI3EevaUciFhyou LnApxbGVDVNjZgJJtdPLbyNgYQO22GUjM7CXucqpJR+H/HsgvrG2GBYuuBV5Nn0KGCFrXg7jyRlV3 1Yly1Ydg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uFv9x-00000003WVa-22OC; Fri, 16 May 2025 13:31:33 +0000 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uFv71-00000003Vps-3dse for linux-arm-kernel@lists.infradead.org; Fri, 16 May 2025 13:28:31 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id EB134629F9; Fri, 16 May 2025 13:28:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98826C4CEE4; Fri, 16 May 2025 13:28:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747402110; bh=3sB616abDAZb5EfAV8UVfyzoSDpEdedb+Tq6sVApafs=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=tAXSSID34gaLT7yTutbPqUGXCPqNDpcju20eDMkAm/NIZ6RUyjVcTtewhn/OQSwQR 9W4/+ZCRGTe77wpfOlJDgGjffsjTo0mtzd2Wj72RlMFajFPntjcMdG34s7JBmj94+6 I6lAwCARa+DL+ZpywiThTkmY0fHM8CvPygtcR9lVjDwzg6PELcWXlblPscZ5XvwVMi H8/4J7OjKbIHbukh/bulZOKm1g7NCbvzgtsI7sLaQz46F5YZRIbp0FdQDTu33WLkF0 Wv+ffmd40ig0YN5MVZvcZZTTko1EsZ+9Wyu055ti6MCM7SGycbKkczQKVveJ9qxAdg lpn9iBHEBDJVw== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1uFv6y-00FZ8u-CD; Fri, 16 May 2025 14:28:28 +0100 Date: Fri, 16 May 2025 14:28:27 +0100 Message-ID: <865xi0fzwk.wl-maz@kernel.org> From: Marc Zyngier To: Vincent Donnefort Cc: oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, qperret@google.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kernel-team@android.com Subject: Re: [PATCH v4 09/10] KVM: arm64: Stage-2 huge mappings for np-guests In-Reply-To: <20250509131706.2336138-10-vdonnefort@google.com> References: <20250509131706.2336138-1-vdonnefort@google.com> <20250509131706.2336138-10-vdonnefort@google.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/30.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: vdonnefort@google.com, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, qperret@google.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false 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 On Fri, 09 May 2025 14:17:05 +0100, Vincent Donnefort wrote: > > Now np-guests hypercalls with range are supported, we can let the > hypervisor to install block mappings whenever the Stage-1 allows it, > that is when backed by either Hugetlbfs or THPs. The size of those block > mappings is limited to PMD_SIZE. > > Signed-off-by: Vincent Donnefort > > diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > index 78fb9cea2034..97e0fea9db4e 100644 > --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c > +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c > @@ -167,7 +167,7 @@ int kvm_host_prepare_stage2(void *pgt_pool_base) > static bool guest_stage2_force_pte_cb(u64 addr, u64 end, > enum kvm_pgtable_prot prot) > { > - return true; > + return false; > } Can we get rid of this callback now? And of the .force_pte_cb field in the kvm_pgtable struct? > > static void *guest_s2_zalloc_pages_exact(size_t size) > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index 754f2fe0cc67..7c8be22e81f9 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -1537,7 +1537,7 @@ 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()) { > + if (logging_active) { > force_pte = true; > vma_shift = PAGE_SHIFT; > } else { > @@ -1547,7 +1547,8 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > switch (vma_shift) { > #ifndef __PAGETABLE_PMD_FOLDED > case PUD_SHIFT: > - if (fault_supports_stage2_huge_mapping(memslot, hva, PUD_SIZE)) > + if (!is_protected_kvm_enabled() && > + fault_supports_stage2_huge_mapping(memslot, hva, PUD_SIZE)) Can you move this new condition into the fault_supports...() helper instead? Thanks, M. -- Without deviation from the norm, progress is not possible.