linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Quentin Perret <qperret@google.com>
To: maz@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com,
	suzuki.poulose@arm.com, catalin.marinas@arm.com, will@kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
	kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org,
	ardb@kernel.org, qwandor@google.com, tabba@google.com,
	dbrazdil@google.com, kernel-team@android.com,
	Quentin Perret <qperret@google.com>
Subject: [PATCH v2 03/16] KVM: arm64: Expose page-table helpers
Date: Mon, 26 Jul 2021 10:28:52 +0100	[thread overview]
Message-ID: <20210726092905.2198501-4-qperret@google.com> (raw)
In-Reply-To: <20210726092905.2198501-1-qperret@google.com>

The KVM pgtable API exposes the kvm_pgtable_walk() function to allow
the definition of walkers outside of pgtable.c. However, it is not easy
to implement any of those walkers without some of the low-level helpers.
Move some of them to the header file to allow re-use from other places.

Signed-off-by: Quentin Perret <qperret@google.com>
---
 arch/arm64/include/asm/kvm_pgtable.h | 27 +++++++++++++++++++++++++++
 arch/arm64/kvm/hyp/pgtable.c         | 26 --------------------------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/kvm_pgtable.h
index 082b9d65f40b..5a7a13bbd4a1 100644
--- a/arch/arm64/include/asm/kvm_pgtable.h
+++ b/arch/arm64/include/asm/kvm_pgtable.h
@@ -25,6 +25,33 @@ static inline u64 kvm_get_parange(u64 mmfr0)
 
 typedef u64 kvm_pte_t;
 
+#define KVM_PTE_VALID			BIT(0)
+
+static inline bool kvm_pte_valid(kvm_pte_t pte)
+{
+	return pte & KVM_PTE_VALID;
+}
+
+static inline u64 kvm_granule_shift(u32 level)
+{
+	/* Assumes KVM_PGTABLE_MAX_LEVELS is 4 */
+	return ARM64_HW_PGTABLE_LEVEL_SHIFT(level);
+}
+
+static inline u64 kvm_granule_size(u32 level)
+{
+	return BIT(kvm_granule_shift(level));
+}
+
+static inline bool kvm_level_supports_block_mapping(u32 level)
+{
+	/*
+	 * Reject invalid block mappings and don't bother with 4TB mappings for
+	 * 52-bit PAs.
+	 */
+	return !(level == 0 || (PAGE_SIZE != SZ_4K && level == 1));
+}
+
 /**
  * struct kvm_pgtable_mm_ops - Memory management callbacks.
  * @zalloc_page:		Allocate a single zeroed memory page.
diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c
index 78f36bd5df6c..2c5d4d3e31cc 100644
--- a/arch/arm64/kvm/hyp/pgtable.c
+++ b/arch/arm64/kvm/hyp/pgtable.c
@@ -11,7 +11,6 @@
 #include <asm/kvm_pgtable.h>
 #include <asm/stage2_pgtable.h>
 
-#define KVM_PTE_VALID			BIT(0)
 
 #define KVM_PTE_TYPE			BIT(1)
 #define KVM_PTE_TYPE_BLOCK		0
@@ -61,17 +60,6 @@ struct kvm_pgtable_walk_data {
 	u64				end;
 };
 
-static u64 kvm_granule_shift(u32 level)
-{
-	/* Assumes KVM_PGTABLE_MAX_LEVELS is 4 */
-	return ARM64_HW_PGTABLE_LEVEL_SHIFT(level);
-}
-
-static u64 kvm_granule_size(u32 level)
-{
-	return BIT(kvm_granule_shift(level));
-}
-
 #define KVM_PHYS_INVALID (-1ULL)
 
 static bool kvm_phys_is_valid(u64 phys)
@@ -79,15 +67,6 @@ static bool kvm_phys_is_valid(u64 phys)
 	return phys < BIT(id_aa64mmfr0_parange_to_phys_shift(ID_AA64MMFR0_PARANGE_MAX));
 }
 
-static bool kvm_level_supports_block_mapping(u32 level)
-{
-	/*
-	 * Reject invalid block mappings and don't bother with 4TB mappings for
-	 * 52-bit PAs.
-	 */
-	return !(level == 0 || (PAGE_SIZE != SZ_4K && level == 1));
-}
-
 static bool kvm_block_mapping_supported(u64 addr, u64 end, u64 phys, u32 level)
 {
 	u64 granule = kvm_granule_size(level);
@@ -135,11 +114,6 @@ static u32 kvm_pgd_pages(u32 ia_bits, u32 start_level)
 	return __kvm_pgd_page_idx(&pgt, -1ULL) + 1;
 }
 
-static bool kvm_pte_valid(kvm_pte_t pte)
-{
-	return pte & KVM_PTE_VALID;
-}
-
 static bool kvm_pte_table(kvm_pte_t pte, u32 level)
 {
 	if (level == KVM_PGTABLE_MAX_LEVELS - 1)
-- 
2.32.0.432.gabb21c7263-goog


  parent reply	other threads:[~2021-07-26  9:29 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-26  9:28 [PATCH v2 00/16] Track shared pages at EL2 in protected mode Quentin Perret
2021-07-26  9:28 ` [PATCH v2 01/16] KVM: arm64: Introduce helper to retrieve a PTE and its level Quentin Perret
2021-07-26  9:28 ` [PATCH v2 02/16] KVM: arm64: Provide the host_stage2_try() helper macro Quentin Perret
2021-07-26  9:28 ` Quentin Perret [this message]
2021-07-26  9:28 ` [PATCH v2 04/16] KVM: arm64: Optimize host memory aborts Quentin Perret
2021-07-26 10:35   ` Marc Zyngier
2021-07-26 13:13     ` Quentin Perret
2021-07-26 13:24       ` Marc Zyngier
2021-07-26  9:28 ` [PATCH v2 05/16] KVM: arm64: Rename KVM_PTE_LEAF_ATTR_S2_IGNORED Quentin Perret
2021-07-26  9:28 ` [PATCH v2 06/16] KVM: arm64: Don't overwrite software bits with owner id Quentin Perret
2021-07-26  9:28 ` [PATCH v2 07/16] KVM: arm64: Tolerate re-creating hyp mappings to set software bits Quentin Perret
2021-07-26  9:28 ` [PATCH v2 08/16] KVM: arm64: Enable forcing page-level stage-2 mappings Quentin Perret
2021-07-26  9:28 ` [PATCH v2 09/16] KVM: arm64: Allow populating software bits Quentin Perret
2021-07-26  9:28 ` [PATCH v2 10/16] KVM: arm64: Add helpers to tag shared pages in SW bits Quentin Perret
2021-07-26  9:29 ` [PATCH v2 11/16] KVM: arm64: Introduce and export host_stage2_idmap_locked() Quentin Perret
2021-07-26  9:29 ` [PATCH v2 12/16] KVM: arm64: Mark host bss and rodata section as shared Quentin Perret
2021-07-28 12:14   ` Quentin Perret
2021-07-26  9:29 ` [PATCH v2 13/16] KVM: arm64: Enable retrieving protections attributes of PTEs Quentin Perret
2021-07-26  9:29 ` [PATCH v2 14/16] KVM: arm64: Refactor protected nVHE stage-1 locking Quentin Perret
2021-07-26  9:29 ` [PATCH v2 15/16] KVM: arm64: Restrict EL2 stage-1 changes in protected mode Quentin Perret
2021-07-26 11:27   ` Marc Zyngier
2021-07-26 12:55     ` Quentin Perret
2021-07-26  9:29 ` [PATCH v2 16/16] KVM: arm64: Make __pkvm_create_mappings static Quentin Perret

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210726092905.2198501-4-qperret@google.com \
    --to=qperret@google.com \
    --cc=alexandru.elisei@arm.com \
    --cc=ardb@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=dbrazdil@google.com \
    --cc=james.morse@arm.com \
    --cc=kernel-team@android.com \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maz@kernel.org \
    --cc=qwandor@google.com \
    --cc=suzuki.poulose@arm.com \
    --cc=tabba@google.com \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).