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 CBDABCA0EFB for ; Fri, 30 Aug 2024 10:27:20 +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:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From: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=ZH1qUElNPeIs+ypi1Pa44gEF4kTEfMQl8bg8LHqcYoQ=; b=edfNtFX/wcWqTmhAqelnRrSQWu c6WMvhKXeOMarRkNj8ZJhP/5262pe6MRb8YkKWt6sej8F1tskeGxWgtRSsGvXG/IlF3pQSzlU5iLA nsBxTsYj8jashrri/adu+O2MTvfIcOBuZ8DZGJ288s3NmUZLfCAvddGQIwE8BhgV2QETlK3zXzCRR Ac4C+Yh715hrhDUG/xu+g2A9ReMHOAtVZQx9q5/U0ahaNfy8LHx9bHcps14oRlS8wlJYNUehrtmVR FY4dU6lkvspmibWYE2VDbllyDcRdkMOI9MM5YNaYrjklr8Ht1OkK8+4tflK2GRH1y/SlNYuLI6rlC X7y9C8Iw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sjyqR-00000005oAn-2Mqu; Fri, 30 Aug 2024 10:27:07 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sjyoZ-00000005nX6-0L4z for linux-arm-kernel@bombadil.infradead.org; Fri, 30 Aug 2024 10:25:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=ZH1qUElNPeIs+ypi1Pa44gEF4kTEfMQl8bg8LHqcYoQ=; b=qnTU4XW4AlUivsEsOcIIddAV4B EZ3AK7pt3S3VBnIux7OQUNLAa7t79wW2teFLQHpdMFlPLIsSuVSjR1MYnCUiCqDlOZYffUW2GbL6L 4E7uRFLhaNQDZwzattvsS5vxLwTpKAJsKMdHhdaD9qAXvjTx5+2dZkNDdBIa7mZgNc4JOViGImUub ykaEcFdxUMhDBrA/BaUgWTgCRSbafdu+hSPCrs78XeINHkH1VP7W9LdLYW5uoMHm0PGq7Od2iKGp8 ZYUBmEYnGVbJNWymNqNLuuKk2wfLuPhMij5Q/V5kg5k7V/JeOC5UeCt46w98Oxe5SHdJN3OmCb6QS t8puc90Q==; Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sjyoV-0000000Bebj-3HBP for linux-arm-kernel@lists.infradead.org; Fri, 30 Aug 2024 10:25:09 +0000 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-371a9bea8d4so998075f8f.2 for ; Fri, 30 Aug 2024 03:25:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1725013499; x=1725618299; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ZH1qUElNPeIs+ypi1Pa44gEF4kTEfMQl8bg8LHqcYoQ=; b=yJIjILzXZeKQ4EPKbeSc79katYI9hKeDQA7rVwD230o9ouXVcfUmWgEXe5qwCvj/u/ hHuVBqkxEtCkG4K31w6aEqvbHkNO4nRQLQ84WppOt1OL6oVD5qxAogyABPgK0ZhILAet PSW/VRdZJzTzjL0oBsAbO+JeR+tGfp/st0NQKxpGDElVT3cv/yKoBGKxuU7fLH+rlcYc wPLj0/T4YhHe77L5O/W+YXuP1EAzfaZ1mXpWdj9BJ52Il+Ef/Iy3CFpMzjrLSa9f4lFn NnaiffnNeufEOL9UxMMYOlC7765lz3irYd/bOP3o6R8nF23qUYtmNJFDzfLIBP098iB9 pVCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725013499; x=1725618299; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ZH1qUElNPeIs+ypi1Pa44gEF4kTEfMQl8bg8LHqcYoQ=; b=csKZebDw/wbUk+cRynC3jMaFzf51dbCpk/SHAyQq6+YHni2biHYXTsB5DtxBS0TBJF c39rXaP9jrFp1c8Fhev3N7YVD1Vb6LIUu0zSKVQPjXDnnr7LNoRxiBNVuJrgm9bwjzom RtagdfpZF2l7a3yp3wynG5Xnl2Ufzzuk98PA8Vji8OpSavoceDu6emENA8xb0u9H2h0H vcxaoPfQHxLSlsoJ3TEVsXd9jpJcfsQ/lPCb0QTvDMgWBHayJ6H051tm3Gn8JxsMEcmp vzsR7NPAwwq0w5vEFI8JWXCRc6Oc9w2xGsZt1UshfkPAsBu+nq9XPw/5YkHzLRdlFnEa EUvQ== X-Forwarded-Encrypted: i=1; AJvYcCWZPlZ6D1NIKbaGzZRUBSfVWCBlCo2hTtGxkEkgN7HzsMiY630GJ7+KhxCaqysMq0vBzurf+E5kzV3W2qMUHAni@lists.infradead.org X-Gm-Message-State: AOJu0Yww8TAbs03q2Wpvb3YH8u4ltNOPHcFPXQCwwktq9RVeWmqE4MR/ 585t19SVG8JSJvz7GddUcc0U632uHE8Ed0efJ6XC+66IlzZqwR9YEP8KWPF3Gw== X-Google-Smtp-Source: AGHT+IGwxGU32w3lwDHtf90T5zi9X+mb1V/P3deq77Cg5QRsJKyTkZbGGWPX7yrzUN1+E7lZ0zMrXg== X-Received: by 2002:a5d:5c87:0:b0:374:b683:266 with SMTP id ffacd0b85a97d-374b683056cmr412034f8f.24.1725013498501; Fri, 30 Aug 2024 03:24:58 -0700 (PDT) Received: from google.com (203.75.199.104.bc.googleusercontent.com. [104.199.75.203]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3749ef7e933sm3597707f8f.87.2024.08.30.03.24.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 03:24:57 -0700 (PDT) Date: Fri, 30 Aug 2024 11:24:53 +0100 From: Vincent Donnefort To: Sebastian Ene Cc: akpm@linux-foundation.org, alexghiti@rivosinc.com, ankita@nvidia.com, ardb@kernel.org, catalin.marinas@arm.com, christophe.leroy@csgroup.eu, james.morse@arm.com, mark.rutland@arm.com, maz@kernel.org, oliver.upton@linux.dev, rananta@google.com, ryan.roberts@arm.com, shahuang@redhat.com, suzuki.poulose@arm.com, will@kernel.org, yuzenghui@huawei.com, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Subject: Re: [PATCH v9 4/5] KVM: arm64: Register ptdump with debugfs on guest creation Message-ID: References: <20240827084549.45731-1-sebastianene@google.com> <20240827084549.45731-5-sebastianene@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240827084549.45731-5-sebastianene@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240830_112508_127458_3C39150C X-CRM114-Status: GOOD ( 35.36 ) 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 Hi Seb, Thanks for the respin. On Tue, Aug 27, 2024 at 08:45:47AM +0000, Sebastian Ene wrote: > While arch/*/mem/ptdump handles the kernel pagetable dumping code, > introduce KVM/ptdump to show the guest stage-2 pagetables. The > separation is necessary because most of the definitions from the > stage-2 pagetable reside in the KVM path and we will be invoking > functionality specific to KVM. > > When a guest is created, register a new file entry under the guest > debugfs dir which allows userspace to show the contents of the guest > stage-2 pagetables when accessed. > > Signed-off-by: Sebastian Ene I only have some nits, otherwise: Reviewed-by: Vincent Donnefort > --- > arch/arm64/include/asm/kvm_host.h | 6 + > arch/arm64/kvm/Makefile | 1 + > arch/arm64/kvm/arm.c | 1 + > arch/arm64/kvm/ptdump.c | 247 ++++++++++++++++++++++++++++++ > 4 files changed, 255 insertions(+) > create mode 100644 arch/arm64/kvm/ptdump.c > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index a33f5996ca9f..4acd589f086b 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -1473,4 +1473,10 @@ void kvm_set_vm_id_reg(struct kvm *kvm, u32 reg, u64 val); > (pa + pi + pa3) == 1; \ > }) > > +#ifdef CONFIG_PTDUMP_STAGE2_DEBUGFS > +void kvm_s2_ptdump_create_debugfs(struct kvm *kvm); > +#else > +static inline void kvm_s2_ptdump_create_debugfs(struct kvm *kvm) {} > +#endif /* CONFIG_PTDUMP_STAGE2_DEBUGFS */ > + > #endif /* __ARM64_KVM_HOST_H__ */ > diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile > index 86a629aaf0a1..e4233b323a73 100644 > --- a/arch/arm64/kvm/Makefile > +++ b/arch/arm64/kvm/Makefile > @@ -27,6 +27,7 @@ kvm-y += arm.o mmu.o mmio.o psci.o hypercalls.o pvtime.o \ > > kvm-$(CONFIG_HW_PERF_EVENTS) += pmu-emul.o pmu.o > kvm-$(CONFIG_ARM64_PTR_AUTH) += pauth.o > +kvm-$(CONFIG_PTDUMP_STAGE2_DEBUGFS) += ptdump.o > > always-y := hyp_constants.h hyp-constants.s > > diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c > index 9bef7638342e..b9fd928d3477 100644 > --- a/arch/arm64/kvm/arm.c > +++ b/arch/arm64/kvm/arm.c > @@ -228,6 +228,7 @@ vm_fault_t kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf) > void kvm_arch_create_vm_debugfs(struct kvm *kvm) > { > kvm_sys_regs_create_debugfs(kvm); > + kvm_s2_ptdump_create_debugfs(kvm); > } > > static void kvm_destroy_mpidr_data(struct kvm *kvm) > diff --git a/arch/arm64/kvm/ptdump.c b/arch/arm64/kvm/ptdump.c > new file mode 100644 > index 000000000000..e72a928d4445 > --- /dev/null > +++ b/arch/arm64/kvm/ptdump.c > @@ -0,0 +1,247 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Debug helper used to dump the stage-2 pagetables of the system and their > + * associated permissions. > + * > + * Copyright (C) Google, 2024 > + * Author: Sebastian Ene > + */ > +#include > +#include > +#include > + > +#include > +#include nit: I believe you wanted to follow the alphabetical order, if that is the case, kvm_host.h then kvm_pgtable.h > +#include > + > + nit: don't think double empty are a rule, I would remove it. > +#define MARKERS_LEN (2) nit: The brackets are not necessary for MARKERS_LEN. > +#define KVM_PGTABLE_MAX_LEVELS (KVM_PGTABLE_LAST_LEVEL + 1) > + > +struct kvm_ptdump_guest_state { > + struct kvm *kvm; > + struct ptdump_pg_state parser_state; > + struct addr_marker ipa_marker[MARKERS_LEN]; > + struct ptdump_pg_level level[KVM_PGTABLE_MAX_LEVELS]; > + struct ptdump_range range[MARKERS_LEN]; > +}; > + > +static const struct ptdump_prot_bits stage2_pte_bits[] = { > + { > + .mask = PTE_VALID, > + .val = PTE_VALID, > + .set = " ", > + .clear = "F", This is effectively never used because an invalid PTE is 0 and note_page() won't print it. This probably can be removed? > + }, { > + .mask = KVM_PTE_LEAF_ATTR_LO_S2_S2AP_R | PTE_VALID, > + .val = KVM_PTE_LEAF_ATTR_LO_S2_S2AP_R | PTE_VALID, > + .set = "R", > + .clear = " ", > + }, { > + .mask = KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W | PTE_VALID, > + .val = KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W | PTE_VALID, > + .set = "W", > + .clear = " ", > + }, { > + .mask = KVM_PTE_LEAF_ATTR_HI_S2_XN | PTE_VALID, > + .val = PTE_VALID, > + .set = " ", > + .clear = "X", > + }, { > + .mask = KVM_PTE_LEAF_ATTR_LO_S2_AF | PTE_VALID, > + .val = KVM_PTE_LEAF_ATTR_LO_S2_AF | PTE_VALID, > + .set = "AF", > + .clear = " ", > + }, { > + .mask = PTE_TABLE_BIT | PTE_VALID, > + .val = PTE_VALID, > + .set = "BLK", > + .clear = " ", > + }, > +}; > + > +static int kvm_ptdump_visitor(const struct kvm_pgtable_visit_ctx *ctx, > + enum kvm_pgtable_walk_flags visit) > +{ > + struct ptdump_pg_state *st = ctx->arg; > + struct ptdump_state *pt_st = &st->ptdump; > + > + note_page(pt_st, ctx->addr, ctx->level, ctx->old); > + > + return 0; > +} > + > +static int kvm_ptdump_build_levels(struct ptdump_pg_level *level, u32 start_lvl) > +{ > + u32 i; > + u64 mask; > + > + if (WARN_ON_ONCE(start_lvl >= KVM_PGTABLE_LAST_LEVEL)) > + return -EINVAL; > + > + mask = 0; > + for (i = 0; i < ARRAY_SIZE(stage2_pte_bits); i++) > + mask |= stage2_pte_bits[i].mask; > + > + for (i = start_lvl; i < KVM_PGTABLE_MAX_LEVELS; i++) { > + snprintf(level[i].name, sizeof(level[i].name), "%d", i); %u, i being unsigned. > + > + level[i].num = ARRAY_SIZE(stage2_pte_bits); > + level[i].bits = stage2_pte_bits; > + level[i].mask = mask; > + } > + > + return 0; > +} > + > +static struct kvm_ptdump_guest_state *kvm_ptdump_parser_create(struct kvm *kvm) > +{ > + struct kvm_ptdump_guest_state *st; > + struct kvm_s2_mmu *mmu = &kvm->arch.mmu; > + struct kvm_pgtable *pgtable = mmu->pgt; > + int ret; > + > + st = kzalloc(sizeof(struct kvm_ptdump_guest_state), GFP_KERNEL_ACCOUNT); > + if (!st) > + return ERR_PTR(-ENOMEM); > + > + ret = kvm_ptdump_build_levels(&st->level[0], pgtable->start_level); > + if (ret) { > + kfree(st); > + return ERR_PTR(ret); > + } > + > + st->ipa_marker[0].name = "Guest IPA"; > + st->ipa_marker[1].start_address = BIT(pgtable->ia_bits); > + st->range[0].end = BIT(pgtable->ia_bits); > + > + st->kvm = kvm; > + st->parser_state = (struct ptdump_pg_state) { > + .marker = &st->ipa_marker[0], > + .level = -1, > + .pg_level = &st->level[0], > + .ptdump.range = &st->range[0], > + .start_address = 0, > + }; > + > + return st; > +} > + > +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 ptdump_pg_state *parser_state = &st->parser_state; > + struct kvm_pgtable_walker walker = (struct kvm_pgtable_walker) { > + .cb = kvm_ptdump_visitor, > + .arg = parser_state, > + .flags = KVM_PGTABLE_WALK_LEAF, > + }; > + > + parser_state->seq = m; > + > + write_lock(&kvm->mmu_lock); > + ret = kvm_pgtable_walk(mmu->pgt, 0, BIT(mmu->pgt->ia_bits), &walker); > + write_unlock(&kvm->mmu_lock); > + > + return ret; > +} > + > +static int kvm_ptdump_guest_open(struct inode *m, struct file *file) > +{ > + struct kvm *kvm = m->i_private; > + struct kvm_ptdump_guest_state *st; > + int ret; > + > + if (!kvm_get_kvm_safe(kvm)) > + return -ENOENT; > + > + st = kvm_ptdump_parser_create(kvm); > + if (IS_ERR(st)) { > + ret = PTR_ERR(st); > + goto free_with_kvm_ref; > + } > + > + ret = single_open(file, kvm_ptdump_guest_show, st); > + if (!ret) > + return 0; > + > + kfree(st); > +free_with_kvm_ref: nit: I believe kfree understands IS_ERR() so you could have a simple "err:" label covering all the error path. > + kvm_put_kvm(kvm); > + return ret; > +} > + > +static int kvm_ptdump_guest_close(struct inode *m, struct file *file) > +{ > + struct kvm *kvm = m->i_private; > + void *st = ((struct seq_file *)file->private_data)->private; > + > + kfree(st); > + kvm_put_kvm(kvm); > + > + return single_release(m, file); > +} > + > +static const struct file_operations kvm_ptdump_guest_fops = { > + .open = kvm_ptdump_guest_open, > + .read = seq_read, > + .llseek = seq_lseek, > + .release = kvm_ptdump_guest_close, > +}; > + > +static int kvm_pgtable_debugfs_show(struct seq_file *m, void *unused) > +{ > + const struct file *file = m->file; > + struct kvm_pgtable *pgtable = m->private; > + > + if (!strcmp(file_dentry(file)->d_iname, "ipa_range")) > + seq_printf(m, "%2u\n", pgtable->ia_bits); > + else if (!strcmp(file_dentry(file)->d_iname, "stage2_levels")) > + seq_printf(m, "%1d\n", KVM_PGTABLE_LAST_LEVEL - pgtable->start_level + 1); nit: KVM_PGTABLE_MAX_LEVELS - pgtable->start_level ? > + return 0; > +} > + > +static int kvm_pgtable_debugfs_open(struct inode *m, struct file *file) > +{ > + struct kvm *kvm = m->i_private; > + struct kvm_pgtable *pgtable; > + int ret; > + > + if (!kvm_get_kvm_safe(kvm)) > + return -ENOENT; > + > + pgtable = kvm->arch.mmu.pgt; > + > + ret = single_open(file, kvm_pgtable_debugfs_show, pgtable); > + if (ret < 0) > + kvm_put_kvm(kvm); > + return ret; > +} > + > +static int kvm_pgtable_debugfs_close(struct inode *m, struct file *file) > +{ > + struct kvm *kvm = m->i_private; > + > + kvm_put_kvm(kvm); > + return single_release(m, file); > +} > + > +static const struct file_operations kvm_pgtable_debugfs_fops = { > + .open = kvm_pgtable_debugfs_open, > + .read = seq_read, > + .llseek = seq_lseek, > + .release = kvm_pgtable_debugfs_close, > +}; > + > +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_debugfs_fops); > + debugfs_create_file("stage2_levels", 0400, kvm->debugfs_dentry, > + kvm, &kvm_pgtable_debugfs_fops); > +} > -- > 2.46.0.295.g3b9ea8a38a-goog >