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 1E7B310ED67E for ; Fri, 27 Mar 2026 14:01:23 +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=LgrjD5noHmDJANSVbPGgjcYS5PeEbzeo0KHKVLAtL38=; b=R8+qG/1AKqYMBMlN+HHQMLtcHN tiwabGotHTarOCR/CqjKXj4DmqAVlkqMKa0Jm2KOzgaPLRqYcGhwkYJtyZl6FLMkQefHra/bRW19I 5/YJR/LvV8H1nXgppNyVPNdk96IsOHtZXfk8PW126y5YOaY6ekjTLuAUutiJcuJuBauRHI1w8X2CU ZfP3CXUovpxFYKKYtds/PFIZFuzxbwNwOzzC1iVZq5OPLy+4uIE9ezwIW5RM2/lGjCYT28Nsk8vDo GxFqQR8B2dPQvJbAzwENxYyszYF3RICHb44SLhBsjIkKpsety/SC+EAoC5ZsPivo+0rZkKX5uEUFY xZ+MYhhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1w67kT-00000007VZo-04dZ; Fri, 27 Mar 2026 14:01:17 +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 1w67kH-00000007VUV-0gtA for linux-arm-kernel@lists.infradead.org; Fri, 27 Mar 2026 14:01:05 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 974A960132; Fri, 27 Mar 2026 14:01:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76F04C19423; Fri, 27 Mar 2026 14:01:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774620064; bh=03J6umtHfd+8x3jSWjUFyG+CUtvyPNtbJU/vryIouac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VTbJGcYpBT76rucUq4rz0ma98df9MXZlXSVNzmIKliPFjo7EspcQUkzLNYlwQY6i1 u4S9+dhvlSGOOWwzmStdCpdTRI8vC2kAC4PNwjJLS0e1zDpVqYVpw1hbsiWH/SwKlZ /T98aFeSpCRBGkm8KtL1hZnYZqIMyzc0wDEEsiIcJCnDDukjfbYza7jy2qezkgbSRn 40HklWcfN0ANG4lc3BDHagVLzK0hJwfdxYRdljpEcbHlmpGY8H/oH+qd/naRnFdXRg 4lNE2QqmHagXu/dd0PwUbaLN/Q/hOE+wtmmH44es1OnJfsm734E4zIbAhA+21Fz/W8 782OfjPs+f85g== From: Will Deacon To: kvmarm@lists.linux.dev Cc: linux-arm-kernel@lists.infradead.org, Will Deacon , Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Quentin Perret , Fuad Tabba , Vincent Donnefort , Mostafa Saleh , Alexandru Elisei Subject: [PATCH v4 04/38] KVM: arm64: Rename __pkvm_pgtable_stage2_unmap() Date: Fri, 27 Mar 2026 14:00:03 +0000 Message-ID: <20260327140039.21228-5-will@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260327140039.21228-1-will@kernel.org> References: <20260327140039.21228-1-will@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 In preparation for adding support for protected VMs, where pages are donated rather than shared, rename __pkvm_pgtable_stage2_unmap() to __pkvm_pgtable_stage2_unshare() to make it clearer about what is going on. Reviewed-by: Fuad Tabba Tested-by: Fuad Tabba Tested-by: Mostafa Saleh Signed-off-by: Will Deacon --- arch/arm64/kvm/pkvm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index 7797813f4dbe..42f6e50825ac 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -322,7 +322,7 @@ int pkvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu, return 0; } -static int __pkvm_pgtable_stage2_unmap(struct kvm_pgtable *pgt, u64 start, u64 end) +static int __pkvm_pgtable_stage2_unshare(struct kvm_pgtable *pgt, u64 start, u64 end) { struct kvm *kvm = kvm_s2_mmu_to_kvm(pgt->mmu); pkvm_handle_t handle = kvm->arch.pkvm.handle; @@ -350,7 +350,7 @@ void pkvm_pgtable_stage2_destroy_range(struct kvm_pgtable *pgt, if (!handle) return; - __pkvm_pgtable_stage2_unmap(pgt, addr, addr + size); + __pkvm_pgtable_stage2_unshare(pgt, addr, addr + size); } void pkvm_pgtable_stage2_destroy_pgd(struct kvm_pgtable *pgt) @@ -386,7 +386,7 @@ int pkvm_pgtable_stage2_map(struct kvm_pgtable *pgt, u64 addr, u64 size, return -EAGAIN; /* Remove _any_ pkvm_mapping overlapping with the range, bigger or smaller. */ - ret = __pkvm_pgtable_stage2_unmap(pgt, addr, addr + size); + ret = __pkvm_pgtable_stage2_unshare(pgt, addr, addr + size); if (ret) return ret; mapping = NULL; @@ -409,7 +409,7 @@ int pkvm_pgtable_stage2_unmap(struct kvm_pgtable *pgt, u64 addr, u64 size) { lockdep_assert_held_write(&kvm_s2_mmu_to_kvm(pgt->mmu)->mmu_lock); - return __pkvm_pgtable_stage2_unmap(pgt, addr, addr + size); + return __pkvm_pgtable_stage2_unshare(pgt, addr, addr + size); } int pkvm_pgtable_stage2_wrprotect(struct kvm_pgtable *pgt, u64 addr, u64 size) -- 2.53.0.1018.g2bb0e51243-goog