Commit 204f7c01 authored by Wei-Lin Chang's avatar Wei-Lin Chang Committed by Marc Zyngier
Browse files

KVM: arm64: ptdump: Make KVM ptdump code s2 mmu aware 



To reuse the ptdump code for shadow page table dumping later, let's pass
s2 mmu as the private data, so we have the freedom to select which page
table to print.

Signed-off-by: default avatarWei-Lin Chang <weilin.chang@arm.com>
Reviewed-by: default avatarJoey Gouly <joey.gouly@arm.com>
Link: https://patch.msgid.link/20260317182638.1592507-2-weilin.chang@arm.com


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 1f318b96

arch/arm64/kvm/ptdump.c

+17 −16
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#define KVM_PGTABLE_MAX_LEVELS	(KVM_PGTABLE_LAST_LEVEL + 1)



struct kvm_ptdump_guest_state {

	struct kvm		*kvm;

	struct kvm_s2_mmu	*mmu;

	struct ptdump_pg_state	parser_state;

	struct addr_marker	ipa_marker[MARKERS_LEN];

	struct ptdump_pg_level	level[KVM_PGTABLE_MAX_LEVELS];
@@ -112,10 +112,9 @@ static int kvm_ptdump_build_levels(struct ptdump_pg_level *level, u32 start_lvl) 
	return 0;

}



static struct kvm_ptdump_guest_state *kvm_ptdump_parser_create(struct kvm *kvm)

static struct kvm_ptdump_guest_state *kvm_ptdump_parser_create(struct kvm_s2_mmu *mmu)

{

	struct kvm_ptdump_guest_state *st;

	struct kvm_s2_mmu *mmu = &kvm->arch.mmu;

	struct kvm_pgtable *pgtable = mmu->pgt;

	int ret;
@@ -133,7 +132,7 @@ static struct kvm_ptdump_guest_state *kvm_ptdump_parser_create(struct kvm *kvm) 
	st->ipa_marker[1].start_address = BIT(pgtable->ia_bits);

	st->range[0].end		= BIT(pgtable->ia_bits);



	st->kvm				= kvm;

	st->mmu				= mmu;

	st->parser_state = (struct ptdump_pg_state) {

		.marker		= &st->ipa_marker[0],

		.level		= -1,
@@ -149,8 +148,8 @@ static int kvm_ptdump_guest_show(struct seq_file *m, void *unused) 
{

	int ret;

	struct kvm_ptdump_guest_state *st = m->private;

	struct kvm *kvm = st->kvm;

	struct kvm_s2_mmu *mmu = &kvm->arch.mmu;

	struct kvm_s2_mmu *mmu = st->mmu;

	struct kvm *kvm = kvm_s2_mmu_to_kvm(mmu);

	struct ptdump_pg_state *parser_state = &st->parser_state;

	struct kvm_pgtable_walker walker = (struct kvm_pgtable_walker) {

		.cb	= kvm_ptdump_visitor,
@@ -169,14 +168,15 @@ static int kvm_ptdump_guest_show(struct seq_file *m, void *unused) 


static int kvm_ptdump_guest_open(struct inode *m, struct file *file)

{

	struct kvm *kvm = m->i_private;

	struct kvm_s2_mmu *mmu = m->i_private;

	struct kvm *kvm = kvm_s2_mmu_to_kvm(mmu);

	struct kvm_ptdump_guest_state *st;

	int ret;



	if (!kvm_get_kvm_safe(kvm))

		return -ENOENT;



	st = kvm_ptdump_parser_create(kvm);

	st = kvm_ptdump_parser_create(mmu);

	if (IS_ERR(st)) {

		ret = PTR_ERR(st);

		goto err_with_kvm_ref;
@@ -194,7 +194,7 @@ static int kvm_ptdump_guest_open(struct inode *m, struct file *file) 


static int kvm_ptdump_guest_close(struct inode *m, struct file *file)

{

	struct kvm *kvm = m->i_private;

	struct kvm *kvm = kvm_s2_mmu_to_kvm(m->i_private);

	void *st = ((struct seq_file *)file->private_data)->private;



	kfree(st);
@@ -229,14 +229,15 @@ static int kvm_pgtable_levels_show(struct seq_file *m, void *unused) 
static int kvm_pgtable_debugfs_open(struct inode *m, struct file *file,

				    int (*show)(struct seq_file *, void *))

{

	struct kvm *kvm = m->i_private;

	struct kvm_s2_mmu *mmu = m->i_private;

	struct kvm *kvm = kvm_s2_mmu_to_kvm(mmu);

	struct kvm_pgtable *pgtable;

	int ret;



	if (!kvm_get_kvm_safe(kvm))

		return -ENOENT;



	pgtable = kvm->arch.mmu.pgt;

	pgtable = mmu->pgt;



	ret = single_open(file, show, pgtable);

	if (ret < 0)
@@ -256,7 +257,7 @@ static int kvm_pgtable_levels_open(struct inode *m, struct file *file) 


static int kvm_pgtable_debugfs_close(struct inode *m, struct file *file)

{

	struct kvm *kvm = m->i_private;

	struct kvm *kvm = kvm_s2_mmu_to_kvm(m->i_private);



	kvm_put_kvm(kvm);

	return single_release(m, file);
@@ -279,9 +280,9 @@ static const struct file_operations kvm_pgtable_levels_fops = { 
void kvm_s2_ptdump_create_debugfs(struct kvm *kvm)

{

	debugfs_create_file("stage2_page_tables", 0400, kvm->debugfs_dentry,

			    kvm, &kvm_ptdump_guest_fops);

	debugfs_create_file("ipa_range", 0400, kvm->debugfs_dentry, kvm,

			    &kvm_pgtable_range_fops);

			    &kvm->arch.mmu, &kvm_ptdump_guest_fops);

	debugfs_create_file("ipa_range", 0400, kvm->debugfs_dentry,

			    &kvm->arch.mmu, &kvm_pgtable_range_fops);

	debugfs_create_file("stage2_levels", 0400, kvm->debugfs_dentry,

			    kvm, &kvm_pgtable_levels_fops);

			    &kvm->arch.mmu, &kvm_pgtable_levels_fops);

}