From: Quentin Perret <qperret@google.com>
To: Marc Zyngier <maz@kernel.org>,
Oliver Upton <oliver.upton@linux.dev>,
Joey Gouly <joey.gouly@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Zenghui Yu <yuzenghui@huawei.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>
Cc: Vincent Donnefort <vdonnefort@google.com>,
Fuad Tabba <tabba@google.com>,
Quentin Perret <qperret@google.com>,
linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/7] KVM: arm64: Fix pKVM page-tracking comments
Date: Wed, 16 Apr 2025 15:26:42 +0000 [thread overview]
Message-ID: <20250416152648.2982950-3-qperret@google.com> (raw)
In-Reply-To: <20250416152648.2982950-1-qperret@google.com>
Most of the comments relating to pKVM page-tracking in nvhe/memory.h are
now either slightly outdated or outright wrong. Fix the comments.
Signed-off-by: Quentin Perret <qperret@google.com>
---
arch/arm64/kvm/hyp/include/nvhe/memory.h | 29 ++++++++++++++++--------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/kvm/hyp/include/nvhe/memory.h b/arch/arm64/kvm/hyp/include/nvhe/memory.h
index 34233d586060..178028172c0b 100644
--- a/arch/arm64/kvm/hyp/include/nvhe/memory.h
+++ b/arch/arm64/kvm/hyp/include/nvhe/memory.h
@@ -8,20 +8,29 @@
#include <linux/types.h>
/*
- * Bits 0-1 are reserved to track the memory ownership state of each page:
- * 00: The page is owned exclusively by the page-table owner.
- * 01: The page is owned by the page-table owner, but is shared
- * with another entity.
- * 10: The page is shared with, but not owned by the page-table owner.
- * 11: Reserved for future use (lending).
+ * Bits 0-1 are used to encode the memory ownership state of each page from the
+ * point of view of a pKVM "component" (host, hyp, guest, ... see enum
+ * pkvm_component_id):
+ * 00: The page is owned and exclusively accessible by the component;
+ * 01: The page is owned and accessible by the component, but is also
+ * accessible by another component;
+ * 10: The page is accessible but not owned by the component;
+ * The storage of this state depends on the component: either in the
+ * hyp_vmemmap for the host state or in PTE software bits for the hypervisor
+ * and guests.
*/
enum pkvm_page_state {
PKVM_PAGE_OWNED = 0ULL,
PKVM_PAGE_SHARED_OWNED = BIT(0),
PKVM_PAGE_SHARED_BORROWED = BIT(1),
- __PKVM_PAGE_RESERVED = BIT(0) | BIT(1),
-
- /* Meta-states which aren't encoded directly in the PTE's SW bits */
+ __PKVM_PAGE_RESERVED = BIT(0) | BIT(1),
+
+ /*
+ * 'Meta-states' are not stored directly in PTE SW bits for hyp and
+ * guest states, but inferred from the context (e.g. invalid PTE
+ * entries). For the host, meta-states are stored directly in the
+ * struct hyp_page.
+ */
PKVM_NOPAGE = BIT(2),
};
#define PKVM_PAGE_META_STATES_MASK (~__PKVM_PAGE_RESERVED)
@@ -44,7 +53,7 @@ struct hyp_page {
u16 refcount;
u8 order;
- /* Host (non-meta) state. Guarded by the host stage-2 lock. */
+ /* Host state. Guarded by the host stage-2 lock. */
enum pkvm_page_state host_state : 8;
u32 host_share_guest_count;
--
2.49.0.604.gff1f9ca942-goog
next prev parent reply other threads:[~2025-04-16 15:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-16 15:26 [PATCH v2 0/7] Move pKVM ownership state to hyp_vmemmap Quentin Perret
2025-04-16 15:26 ` [PATCH v2 1/7] KVM: arm64: Track SVE state in the hypervisor vcpu structure Quentin Perret
2025-04-16 15:26 ` Quentin Perret [this message]
2025-04-16 15:26 ` [PATCH v2 3/7] KVM: arm64: Use 0b11 for encoding PKVM_NOPAGE Quentin Perret
2025-04-16 15:26 ` [PATCH v2 4/7] KVM: arm64: Introduce {get,set}_host_state() helpers Quentin Perret
2025-04-16 15:26 ` [PATCH v2 5/7] KVM: arm64: Move hyp state to hyp_vmemmap Quentin Perret
2025-04-16 15:26 ` [PATCH v2 6/7] KVM: arm64: Defer EL2 stage-1 mapping on share Quentin Perret
2025-04-16 15:26 ` [PATCH v2 7/7] KVM: arm64: Unconditionally cross check hyp state Quentin Perret
2025-04-29 13:41 ` [PATCH v2 0/7] Move pKVM ownership state to hyp_vmemmap Marc Zyngier
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=20250416152648.2982950-3-qperret@google.com \
--to=qperret@google.com \
--cc=catalin.marinas@arm.com \
--cc=joey.gouly@arm.com \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=suzuki.poulose@arm.com \
--cc=tabba@google.com \
--cc=vdonnefort@google.com \
--cc=will@kernel.org \
--cc=yuzenghui@huawei.com \
/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
all inboxes | Powered by JetHome®