From patchwork Fri Feb 28 10:25:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Donnefort X-Patchwork-Id: 13996235 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 E009CC282C5 for ; Fri, 28 Feb 2025 10:55:02 +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:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To: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=qXik8AjbYyPYjDFsjvp2RmgmvxUrFId1oBHnRgszILo=; b=ZG04NELY60/MUYtJNmz9i9uCWH Zr5qkuoAi4JGumBYRnAia/UjZzYWDO+QuxFN7c8oAhz+cQMHW3JMFRgdwqxHgb90LF7M8VRu2vVbS NCT2lVRhEBMO/wgVxmuN9McFDsRDtAQ+uX9vS/NIQ5nAmkgEW3P35iNxwXWGVpeH/6jzWqavd06RY QbPF18ipkSpyge/cD5SGZcg/X4x0jl4YlWfOtWO6U9KmZNpxdg9TAezeE7LkSx5PqxiG+d0HiGRwA Mt2qDBI20xNRB++60ykxOjhyAloxmL5+OQ+CCfVYDBT5/v4UwluA5HabttiLRWCQ0SgTcNh3h3CP9 knWMJnow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tny16-0000000AfBl-1uNE; Fri, 28 Feb 2025 10:54:52 +0000 Received: from mail-wm1-x349.google.com ([2a00:1450:4864:20::349]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tnxZJ-0000000AaYW-3a3N for linux-arm-kernel@lists.infradead.org; Fri, 28 Feb 2025 10:26:10 +0000 Received: by mail-wm1-x349.google.com with SMTP id 5b1f17b1804b1-4394b8bd4e1so10359145e9.0 for ; Fri, 28 Feb 2025 02:26:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740738368; x=1741343168; darn=lists.infradead.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=qXik8AjbYyPYjDFsjvp2RmgmvxUrFId1oBHnRgszILo=; b=M5ij9DzNvxuOmcxuaURA8dcYPJS15LFj907dGBLJnNWR+BmzfYdDwbOe+yHtzWexL1 0jbBcUNnLh5zaN7O24UKW6HY7Oz4o5Z7OG938AI8TWe9Hy2TyaD5/V7gfnc0Hax4aD4g iQFVddKPaZZzptC4KztArqtdjKF0M5qLWROiObF+ui0m5uYyH5u9f6ZlNS4j7DNyrdkj 42Qc3fJQmRO8DNISwvb6QZDzGs5SEWrQgjnTDcMtyHowBjPmpIqAzA2ObcTNbDkunIXU TAbs6lPndRtCOt7WJySANSR+Nfuaj6IObospWW0sUqav7z5GfQojbRiIIWagzatgd/ap YINg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740738368; x=1741343168; 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=qXik8AjbYyPYjDFsjvp2RmgmvxUrFId1oBHnRgszILo=; b=dJdgdcT6MB4Ia6l8TANtJpQ7qWkHW5E6juFcfHSmaT/MscGebk3bbA/gUa5VWBIl/r i37pQHrUkcXxrCqi0HN111x2K/1VGqJxayWMg5yw8ieaZuutrQ1ZQXMsVR7LW6lrj0hf oUm1aCw/qtKA+Es5nTNL+ZyGRy49l/arL3d96z+e2xdTXECO4yCgY7mLxJBo7csExzT2 ohGLbRAYefd/1jZz8CHbJW7nAWXdXEQASpKu7pQY+EiJJ2c7yObEoGpF/SUXS9fz0SqE jnHcQbB3irs91bSE3O2IdI0kwkkjbewDyqWxWYtbFR0ianl5rBesIKdUHYxBtyoHNTZ0 sP8Q== X-Forwarded-Encrypted: i=1; AJvYcCXi9QLy1XeNB2YzOgdwBzjRUn+lcssC7VEAs6TXg/SsTbOWqDqv1mEARtgOm/iKd/a9fxTvjGMftNPZ5gPFaTgX@lists.infradead.org X-Gm-Message-State: AOJu0YydoEPumkVIB1bZt14cjLAHVGYXnbTcHO0U5eq/MfWfWF9KUwF2 WSeDZHGrBDDfi4S6FAKb1/ioh8qTNpG+rzE216jn63AkrtiiErKVNmsgTEurJ30ty7nKboG6FLi ZLqFQrtr9YmAmYSxf0w== X-Google-Smtp-Source: AGHT+IH/ZodnD1gyWS5hoJvXm/WVgeMEtL4EusvAc9MyOb9eH7X6R8XviTaOHXTcXiUhD+8ewQSvRRjN0xDhTCV2 X-Received: from wmbfm26.prod.google.com ([2002:a05:600c:c1a:b0:439:848f:2fc7]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1c25:b0:439:5a37:8157 with SMTP id 5b1f17b1804b1-43ba6774a03mr24052865e9.30.1740738368068; Fri, 28 Feb 2025 02:26:08 -0800 (PST) Date: Fri, 28 Feb 2025 10:25:27 +0000 In-Reply-To: <20250228102530.1229089-1-vdonnefort@google.com> Mime-Version: 1.0 References: <20250228102530.1229089-1-vdonnefort@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250228102530.1229089-12-vdonnefort@google.com> Subject: [PATCH 7/9] KVM: arm64: Add a range to pkvm_mappings From: Vincent Donnefort To: maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org Cc: qperret@google.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kernel-team@android.com, Vincent Donnefort X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250228_022609_892290_1FFC4745 X-CRM114-Status: GOOD ( 13.53 ) 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: Quentin Perret In preparation for supporting stage-2 huge mappings for np-guest, add a nr_pages member for pkvm_mappings to allow EL1 to track the size of the stage-2 mapping. Signed-off-by: Quentin Perret Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_pkvm.h b/arch/arm64/include/asm/kvm_pkvm.h index f0d52efb858e..0e944a754b96 100644 --- a/arch/arm64/include/asm/kvm_pkvm.h +++ b/arch/arm64/include/asm/kvm_pkvm.h @@ -166,6 +166,7 @@ struct pkvm_mapping { struct rb_node node; u64 gfn; u64 pfn; + u64 nr_pages; u64 __subtree_last; /* Internal member for interval tree */ }; diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index da637c565ac9..9c9833f27fe3 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -278,7 +278,7 @@ static u64 __pkvm_mapping_start(struct pkvm_mapping *m) static u64 __pkvm_mapping_end(struct pkvm_mapping *m) { - return (m->gfn + 1) * PAGE_SIZE - 1; + return (m->gfn + m->nr_pages) * PAGE_SIZE - 1; } INTERVAL_TREE_DEFINE(struct pkvm_mapping, node, u64, __subtree_last, @@ -315,7 +315,8 @@ static int __pkvm_pgtable_stage2_unmap(struct kvm_pgtable *pgt, u64 start, u64 e return 0; for_each_mapping_in_range_safe(pgt, start, end, mapping) { - ret = kvm_call_hyp_nvhe(__pkvm_host_unshare_guest, handle, mapping->gfn, 1); + ret = kvm_call_hyp_nvhe(__pkvm_host_unshare_guest, handle, mapping->gfn, + mapping->nr_pages); if (WARN_ON(ret)) return ret; pkvm_mapping_remove(mapping, &pgt->pkvm_mappings); @@ -345,16 +346,32 @@ int pkvm_pgtable_stage2_map(struct kvm_pgtable *pgt, u64 addr, u64 size, return -EINVAL; lockdep_assert_held_write(&kvm->mmu_lock); - ret = kvm_call_hyp_nvhe(__pkvm_host_share_guest, pfn, gfn, 1, prot); - if (ret) { - /* Is the gfn already mapped due to a racing vCPU? */ - if (ret == -EPERM) + + /* + * Calling stage2_map() on top of existing mappings is either happening because of a race + * with another vCPU, or because we're changing between page and block mappings. As per + * user_mem_abort(), same-size permission faults are handled in the relax_perms() path. + */ + mapping = pkvm_mapping_iter_first(&pgt->pkvm_mappings, addr, addr + size - 1); + if (mapping) { + if (size == (mapping->nr_pages * PAGE_SIZE)) return -EAGAIN; + + /* Remove _any_ pkvm_mapping overlapping with the range, bigger or smaller. */ + ret = __pkvm_pgtable_stage2_unmap(pgt, addr, addr + size); + if (ret) + return ret; + mapping = NULL; } + ret = kvm_call_hyp_nvhe(__pkvm_host_share_guest, pfn, gfn, size / PAGE_SIZE, prot); + if (WARN_ON(ret)) + return ret; + swap(mapping, cache->mapping); mapping->gfn = gfn; mapping->pfn = pfn; + mapping->nr_pages = size / PAGE_SIZE; pkvm_mapping_insert(mapping, &pgt->pkvm_mappings); return ret; @@ -376,7 +393,8 @@ int pkvm_pgtable_stage2_wrprotect(struct kvm_pgtable *pgt, u64 addr, u64 size) lockdep_assert_held(&kvm->mmu_lock); for_each_mapping_in_range_safe(pgt, addr, addr + size, mapping) { - ret = kvm_call_hyp_nvhe(__pkvm_host_wrprotect_guest, handle, mapping->gfn, 1); + ret = kvm_call_hyp_nvhe(__pkvm_host_wrprotect_guest, handle, mapping->gfn, + mapping->nr_pages); if (WARN_ON(ret)) break; } @@ -391,7 +409,8 @@ int pkvm_pgtable_stage2_flush(struct kvm_pgtable *pgt, u64 addr, u64 size) lockdep_assert_held(&kvm->mmu_lock); for_each_mapping_in_range_safe(pgt, addr, addr + size, mapping) - __clean_dcache_guest_page(pfn_to_kaddr(mapping->pfn), PAGE_SIZE); + __clean_dcache_guest_page(pfn_to_kaddr(mapping->pfn), + PAGE_SIZE * mapping->nr_pages); return 0; } @@ -406,7 +425,7 @@ bool pkvm_pgtable_stage2_test_clear_young(struct kvm_pgtable *pgt, u64 addr, u64 lockdep_assert_held(&kvm->mmu_lock); for_each_mapping_in_range_safe(pgt, addr, addr + size, mapping) young |= kvm_call_hyp_nvhe(__pkvm_host_test_clear_young_guest, handle, mapping->gfn, - 1, mkold); + mapping->nr_pages, mkold); return young; }