From nobody Fri Dec 19 12:02:09 2025 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8927B197A92 for ; Tue, 27 Aug 2024 08:46:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724748364; cv=none; b=LMn/STY9KbfYqfF+oRPEDI3Op+0bYwlyrvCOvdU+haMTTPMXsZHRnc/UkRcpULAX2NoUiCur6Noojvwc3YlTx12wEIbc76vYL9qOt2VOI8R2rfn4us3dCdAiOKhogWHnx2rDh2c8B7uuof07PUeW37HMBENzrTKV+/X9G+aAyYc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724748364; c=relaxed/simple; bh=rW4KThwpJcSUGe+zBRStz3LoS+Yrc62B6qn/kvm1tnY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=UIrdIMUzQA84wJ1tQyaDL7IG59h4XMA0XjrPSWuk0L8aXMa9zYxCWMvWMNvtn2mEXKA2C7eHiyqZEcSPtNTcntKHBim53XJ6KAbZrVGlQbO5i5sT3eaVorGvyHI+BuvlilGrAeMxfCCqOt/7zcmxcphH2AHEH5D4YZSmCPUGbXA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=TzbyRZkK; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="TzbyRZkK" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-42807a05413so46737795e9.2 for ; Tue, 27 Aug 2024 01:46:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1724748361; x=1725353161; darn=vger.kernel.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=qHaBqPUlgT6qnyCbEa6vL0OJSmkVD7LDCxRnIPOMbIU=; b=TzbyRZkKstEnwTMZ5f8NiQ3B9PxP62Qs0PFM6jqRgJv7pHbfom8/X7c6u55jiS6C9h 72LzllVgcfCghBa+qcEMnfF4ShhHwAAODkbZ0LHzegNcm+0WluM9swDkgMFnInVDckOP SBiMukpR/nEurMukik7KEaif+gyut7Znp4vI7+zy/g7ikkTzKxDY3a30VYjZU8821NmB Qg1nvBoPFTX/RQOpWzpj63M5cMqvSKHsygf/rjao8Q1ltREqd8ME7xbrbjkJbSnd/8QT WWXV6s/Vx5vvRNETiNSouVuA9dAkuEVIWcpC19WB9jl0b184gDZpnQCz49pHfpS5UzYl aaew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724748361; x=1725353161; 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=qHaBqPUlgT6qnyCbEa6vL0OJSmkVD7LDCxRnIPOMbIU=; b=rdSOAd0CoEpyAjfENCnjkRqU4Bi6nKDPnhlXA9JV16ou2N2pRtLAuSqw/i0OLF5EgW SlPHmnFlPQ1s4/LLUWT87y9Rx8el8d0WMAxOZ+LcEJMneCcgakOAjKz4mzZXTsrONnLP +JTcDDoF096e89g48U7ZJ87LeXBUra8ns5LstV+vjkI7xVP9k9E1na3ZOP+v0WeNBAbv k5vwwV1pPTJugo9xNoMVaxS1zmEN0bdLM6CvDzzN5xLXOMol7m0G8nf3xNiHVrqtc3Du ZjcZwdEDClo+uXuoUgQUSBGC62oYwdLdB6mlc/S8kgQinWOBTXUHD0fB8FmIQApvxkmJ 43kw== X-Forwarded-Encrypted: i=1; AJvYcCW4t/yftglKUD1hzdi6vMai0DgxPfVbbwb5TzCLw15DtjL7EfkXWeEUxxTu1cTV61KNhtGUxm4UIRqg90I=@vger.kernel.org X-Gm-Message-State: AOJu0Yygwsa9m/P8gP9xQKV6FKic5HpTuj2xJVxwYoFehNbGviwVqXwW bpjS2kQQYLl1jKgQpNZ6t4b8UOPJ/FS94jnXHiVZCwhKjgDq2O/8huql8PGilG870nIjJXz3MH8 cc3bfojj1A/eRJq4JkXYUMS4GDA== X-Google-Smtp-Source: AGHT+IHzzuDH/k8rfAfEy4UzTB9FgnKzMzrhIE9XYpvk5ywCd80RVuOo02flrqzP8m1RupJ/VQidebZdm/+KpSkrGqw= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:600c:4f51:b0:425:7ac6:96fe with SMTP id 5b1f17b1804b1-42acc8a549fmr653265e9.0.1724748361028; Tue, 27 Aug 2024 01:46:01 -0700 (PDT) Date: Tue, 27 Aug 2024 08:45:44 +0000 In-Reply-To: <20240827084549.45731-1-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240827084549.45731-1-sebastianene@google.com> X-Mailer: git-send-email 2.46.0.295.g3b9ea8a38a-goog Message-ID: <20240827084549.45731-2-sebastianene@google.com> Subject: [PATCH v9 1/5] KVM: arm64: Move pagetable definitions to common header From: Sebastian Ene To: 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, vdonnefort@google.com, mark.rutland@arm.com, maz@kernel.org, oliver.upton@linux.dev, rananta@google.com, ryan.roberts@arm.com, sebastianene@google.com, shahuang@redhat.com, suzuki.poulose@arm.com, will@kernel.org, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In preparation for using the stage-2 definitions in ptdump, move some of these macros in the common header. Signed-off-by: Sebastian Ene --- arch/arm64/include/asm/kvm_pgtable.h | 42 ++++++++++++++++++++++++++++ arch/arm64/kvm/hyp/pgtable.c | 42 ---------------------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/= kvm_pgtable.h index 19278dfe7978..03f4c3d7839c 100644 --- a/arch/arm64/include/asm/kvm_pgtable.h +++ b/arch/arm64/include/asm/kvm_pgtable.h @@ -59,6 +59,48 @@ typedef u64 kvm_pte_t; =20 #define KVM_PHYS_INVALID (-1ULL) =20 +#define KVM_PTE_LEAF_ATTR_LO GENMASK(11, 2) + +#define KVM_PTE_LEAF_ATTR_LO_S1_ATTRIDX GENMASK(4, 2) +#define KVM_PTE_LEAF_ATTR_LO_S1_AP GENMASK(7, 6) +#define KVM_PTE_LEAF_ATTR_LO_S1_AP_RO \ + ({ cpus_have_final_cap(ARM64_KVM_HVHE) ? 2 : 3; }) +#define KVM_PTE_LEAF_ATTR_LO_S1_AP_RW \ + ({ cpus_have_final_cap(ARM64_KVM_HVHE) ? 0 : 1; }) +#define KVM_PTE_LEAF_ATTR_LO_S1_SH GENMASK(9, 8) +#define KVM_PTE_LEAF_ATTR_LO_S1_SH_IS 3 +#define KVM_PTE_LEAF_ATTR_LO_S1_AF BIT(10) + +#define KVM_PTE_LEAF_ATTR_LO_S2_MEMATTR GENMASK(5, 2) +#define KVM_PTE_LEAF_ATTR_LO_S2_S2AP_R BIT(6) +#define KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W BIT(7) +#define KVM_PTE_LEAF_ATTR_LO_S2_SH GENMASK(9, 8) +#define KVM_PTE_LEAF_ATTR_LO_S2_SH_IS 3 +#define KVM_PTE_LEAF_ATTR_LO_S2_AF BIT(10) + +#define KVM_PTE_LEAF_ATTR_HI GENMASK(63, 50) + +#define KVM_PTE_LEAF_ATTR_HI_SW GENMASK(58, 55) + +#define KVM_PTE_LEAF_ATTR_HI_S1_XN BIT(54) + +#define KVM_PTE_LEAF_ATTR_HI_S2_XN BIT(54) + +#define KVM_PTE_LEAF_ATTR_HI_S1_GP BIT(50) + +#define KVM_PTE_LEAF_ATTR_S2_PERMS (KVM_PTE_LEAF_ATTR_LO_S2_S2AP_R | \ + KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W | \ + KVM_PTE_LEAF_ATTR_HI_S2_XN) + +#define KVM_INVALID_PTE_OWNER_MASK GENMASK(9, 2) +#define KVM_MAX_OWNER_ID 1 + +/* + * Used to indicate a pte for which a 'break-before-make' sequence is in + * progress. + */ +#define KVM_INVALID_PTE_LOCKED BIT(10) + static inline bool kvm_pte_valid(kvm_pte_t pte) { return pte & KVM_PTE_VALID; diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c index 9e2bbee77491..c3e9d77bba23 100644 --- a/arch/arm64/kvm/hyp/pgtable.c +++ b/arch/arm64/kvm/hyp/pgtable.c @@ -17,48 +17,6 @@ #define KVM_PTE_TYPE_PAGE 1 #define KVM_PTE_TYPE_TABLE 1 =20 -#define KVM_PTE_LEAF_ATTR_LO GENMASK(11, 2) - -#define KVM_PTE_LEAF_ATTR_LO_S1_ATTRIDX GENMASK(4, 2) -#define KVM_PTE_LEAF_ATTR_LO_S1_AP GENMASK(7, 6) -#define KVM_PTE_LEAF_ATTR_LO_S1_AP_RO \ - ({ cpus_have_final_cap(ARM64_KVM_HVHE) ? 2 : 3; }) -#define KVM_PTE_LEAF_ATTR_LO_S1_AP_RW \ - ({ cpus_have_final_cap(ARM64_KVM_HVHE) ? 0 : 1; }) -#define KVM_PTE_LEAF_ATTR_LO_S1_SH GENMASK(9, 8) -#define KVM_PTE_LEAF_ATTR_LO_S1_SH_IS 3 -#define KVM_PTE_LEAF_ATTR_LO_S1_AF BIT(10) - -#define KVM_PTE_LEAF_ATTR_LO_S2_MEMATTR GENMASK(5, 2) -#define KVM_PTE_LEAF_ATTR_LO_S2_S2AP_R BIT(6) -#define KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W BIT(7) -#define KVM_PTE_LEAF_ATTR_LO_S2_SH GENMASK(9, 8) -#define KVM_PTE_LEAF_ATTR_LO_S2_SH_IS 3 -#define KVM_PTE_LEAF_ATTR_LO_S2_AF BIT(10) - -#define KVM_PTE_LEAF_ATTR_HI GENMASK(63, 50) - -#define KVM_PTE_LEAF_ATTR_HI_SW GENMASK(58, 55) - -#define KVM_PTE_LEAF_ATTR_HI_S1_XN BIT(54) - -#define KVM_PTE_LEAF_ATTR_HI_S2_XN BIT(54) - -#define KVM_PTE_LEAF_ATTR_HI_S1_GP BIT(50) - -#define KVM_PTE_LEAF_ATTR_S2_PERMS (KVM_PTE_LEAF_ATTR_LO_S2_S2AP_R | \ - KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W | \ - KVM_PTE_LEAF_ATTR_HI_S2_XN) - -#define KVM_INVALID_PTE_OWNER_MASK GENMASK(9, 2) -#define KVM_MAX_OWNER_ID 1 - -/* - * Used to indicate a pte for which a 'break-before-make' sequence is in - * progress. - */ -#define KVM_INVALID_PTE_LOCKED BIT(10) - struct kvm_pgtable_walk_data { struct kvm_pgtable_walker *walker; =20 --=20 2.46.0.295.g3b9ea8a38a-goog From nobody Fri Dec 19 12:02:09 2025 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D588199E9A for ; Tue, 27 Aug 2024 08:46:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724748368; cv=none; b=NZnqNbqHuKFJETBA1BjieLrhBWCRLnaJbd7Cdc0xmdlG2tWeXP9s/vVRnp3b7R7c4u1wXHPWZYDaGhm01Hrw9qAYYp1YorC4jY6mSvoeB8X56OVPlH3BL5VjsF/88CXU+ss9AmG4D3wtwnkOf8DvOBRvzAYeyZs2uVUjdm4WZeA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724748368; c=relaxed/simple; bh=Qr08QM26q8tDe51syMaE8h89/HxW9A0cYqV9q7lV/20=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=C9Ka4RlEEMrAOw487OdYpnDXJEPGV4yXIFJCbilkmUXJZank08v8JW6MGH9yOSMgOHdVWlIx417RQUc9aj/RwDdRz6L9V2XJv4O0+pqeJfio1GR63rKR1NexLGdv2uBPkpHz0tP1QyUtrQiVoupO2dNMJLoGEFf/WeIjlZBj8kk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=vPyixhA0; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="vPyixhA0" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-428fc34f41bso48933455e9.3 for ; Tue, 27 Aug 2024 01:46:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1724748363; x=1725353163; darn=vger.kernel.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=SMXEDoUiwiu4q/DZdkFbUl9+xm4eWjv4+UrgfxPU2W4=; b=vPyixhA02UoSiz0QoqBn/ZX2nYCNkeHHsjCjNY1R167fHRzoDVwlrvDArEBD8X977g hGLDAaWMukL/a2Lww9yLuNO0mTThvwTergsQqMLRcanWQiEOS6CHduD8rq7/Ry2oqrxI jw/JDYCDWAiSDpwO85isOJHIFrwWPLL/Vi5pgkv1ML4hmKD+yIQRQMH0sHArRZijnhqn ag9FY2l0D+9P9joJHWsUgNnFUy+toGnlKdOw+EU/jiBs+QT2f/hJ5x7AGzrCLTXDCdr9 yQIU5Kh8NlRgJpehvhTXnM6RK2/VZqiGsSrwBKyu1veZhWCQ/mBELFYFQtha6JaMksCQ YO+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724748363; x=1725353163; 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=SMXEDoUiwiu4q/DZdkFbUl9+xm4eWjv4+UrgfxPU2W4=; b=rD3g4Bvh4+SEXofL05FpLHucMkGN/FqyAhUZVNzyFYIoInoyQUukr2RNUMXLEDJbSD 9qJUjunFuKZ/viBrPgAPs4hLfwH+lhOviDzPlSBrLDrAnduA9tOjnZYfmBowfe3eZUvu oQqtNKb7+3AscBwih9ykeOeWoyOI5UMPSvkBv4YNsnmjbslQz50afEAw/5K0NNhghKju OeOXDB30qNqbJcSvZ73izEA4sOXnZVfQ/Isg4nMiOxFi5ccmMAakFKnOpJ12zsSwRZtZ T5Z9NK8dqDNE3Mg9PnpjfnFiTzZ39DkyG058R4CZP6JDXth3thRzQJp+t5InpYw3ZozW 8kFQ== X-Forwarded-Encrypted: i=1; AJvYcCUxYIIehTMv4WbXnux8/ws9+L0h/aZOznV0B7wX/S8Z4NO3aiPM+Z99hqlk+oMrTQf0dtkKu9vZeEx85QE=@vger.kernel.org X-Gm-Message-State: AOJu0YzOxHnBVx9g4zMy6dalFp8nW/WP8NbTgDaP/SD02o5sfX1ARxeP sbAr3QayD26hhia8s7c/hrn/iviEPE8fopDQar83gGO7XNNwHFYn8IJgy91I18ffqMBqaoasGMH Pl7PouZ1ab4aOlUP+saePw2p/oQ== X-Google-Smtp-Source: AGHT+IHY4rt/KDG8jBlRHZVjqb4Z3O2aMXhgahv4zi33s4tbXCpBDS46J6SJnoaHeJNB1+fTQfKkZHV28U+bNgbGPq8= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:600c:3b0f:b0:426:6619:943 with SMTP id 5b1f17b1804b1-42b9ae1da4dmr63725e9.3.1724748363256; Tue, 27 Aug 2024 01:46:03 -0700 (PDT) Date: Tue, 27 Aug 2024 08:45:45 +0000 In-Reply-To: <20240827084549.45731-1-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240827084549.45731-1-sebastianene@google.com> X-Mailer: git-send-email 2.46.0.295.g3b9ea8a38a-goog Message-ID: <20240827084549.45731-3-sebastianene@google.com> Subject: [PATCH v9 2/5] arm64: ptdump: Expose the attribute parsing functionality From: Sebastian Ene To: 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, vdonnefort@google.com, mark.rutland@arm.com, maz@kernel.org, oliver.upton@linux.dev, rananta@google.com, ryan.roberts@arm.com, sebastianene@google.com, shahuang@redhat.com, suzuki.poulose@arm.com, will@kernel.org, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Reuse the descriptor parsing functionality to keep the same output format as the original ptdump code. In order for this to happen, move the state tracking objects into a common header. Signed-off-by: Sebastian Ene --- arch/arm64/include/asm/ptdump.h | 41 +++++++++++++++++++++++- arch/arm64/mm/ptdump.c | 55 +++++++-------------------------- 2 files changed, 51 insertions(+), 45 deletions(-) diff --git a/arch/arm64/include/asm/ptdump.h b/arch/arm64/include/asm/ptdum= p.h index 5b1701c76d1c..bd5d3ee3e8dc 100644 --- a/arch/arm64/include/asm/ptdump.h +++ b/arch/arm64/include/asm/ptdump.h @@ -9,6 +9,7 @@ =20 #include #include +#include =20 struct addr_marker { unsigned long start_address; @@ -21,14 +22,52 @@ struct ptdump_info { unsigned long base_addr; }; =20 +struct ptdump_prot_bits { + u64 mask; + u64 val; + const char *set; + const char *clear; +}; + +struct ptdump_pg_level { + const struct ptdump_prot_bits *bits; + char name[4]; + int num; + u64 mask; +}; + +/* + * The page dumper groups page table entries of the same type into a single + * description. It uses pg_state to track the range information while + * iterating over the pte entries. When the continuity is broken it then + * dumps out a description of the range. + */ +struct ptdump_pg_state { + struct ptdump_state ptdump; + struct seq_file *seq; + const struct addr_marker *marker; + const struct mm_struct *mm; + unsigned long start_address; + int level; + u64 current_prot; + bool check_wx; + unsigned long wx_pages; + unsigned long uxn_pages; +}; + void ptdump_walk(struct seq_file *s, struct ptdump_info *info); +void note_page(struct ptdump_state *pt_st, unsigned long addr, int level, + u64 val); #ifdef CONFIG_PTDUMP_DEBUGFS #define EFI_RUNTIME_MAP_END DEFAULT_MAP_WINDOW_64 void __init ptdump_debugfs_register(struct ptdump_info *info, const char *= name); #else static inline void ptdump_debugfs_register(struct ptdump_info *info, const char *name) { } -#endif +#endif /* CONFIG_PTDUMP_DEBUGFS */ +#else +static inline void note_page(void *pt_st, unsigned long addr, + int level, u64 val) { } #endif /* CONFIG_PTDUMP_CORE */ =20 #endif /* __ASM_PTDUMP_H */ diff --git a/arch/arm64/mm/ptdump.c b/arch/arm64/mm/ptdump.c index 6986827e0d64..404751fd30fe 100644 --- a/arch/arm64/mm/ptdump.c +++ b/arch/arm64/mm/ptdump.c @@ -38,33 +38,7 @@ seq_printf(m, fmt); \ }) =20 -/* - * The page dumper groups page table entries of the same type into a single - * description. It uses pg_state to track the range information while - * iterating over the pte entries. When the continuity is broken it then - * dumps out a description of the range. - */ -struct pg_state { - struct ptdump_state ptdump; - struct seq_file *seq; - const struct addr_marker *marker; - const struct mm_struct *mm; - unsigned long start_address; - int level; - u64 current_prot; - bool check_wx; - unsigned long wx_pages; - unsigned long uxn_pages; -}; - -struct prot_bits { - u64 mask; - u64 val; - const char *set; - const char *clear; -}; - -static const struct prot_bits pte_bits[] =3D { +static const struct ptdump_prot_bits pte_bits[] =3D { { .mask =3D PTE_VALID, .val =3D PTE_VALID, @@ -143,14 +117,7 @@ static const struct prot_bits pte_bits[] =3D { } }; =20 -struct pg_level { - const struct prot_bits *bits; - char name[4]; - int num; - u64 mask; -}; - -static struct pg_level pg_level[] __ro_after_init =3D { +static struct ptdump_pg_level pg_level[] __ro_after_init =3D { { /* pgd */ .name =3D "PGD", .bits =3D pte_bits, @@ -174,7 +141,7 @@ static struct pg_level pg_level[] __ro_after_init =3D { }, }; =20 -static void dump_prot(struct pg_state *st, const struct prot_bits *bits, +static void dump_prot(struct ptdump_pg_state *st, const struct ptdump_prot= _bits *bits, size_t num) { unsigned i; @@ -192,7 +159,7 @@ static void dump_prot(struct pg_state *st, const struct= prot_bits *bits, } } =20 -static void note_prot_uxn(struct pg_state *st, unsigned long addr) +static void note_prot_uxn(struct ptdump_pg_state *st, unsigned long addr) { if (!st->check_wx) return; @@ -206,7 +173,7 @@ static void note_prot_uxn(struct pg_state *st, unsigned= long addr) st->uxn_pages +=3D (addr - st->start_address) / PAGE_SIZE; } =20 -static void note_prot_wx(struct pg_state *st, unsigned long addr) +static void note_prot_wx(struct ptdump_pg_state *st, unsigned long addr) { if (!st->check_wx) return; @@ -221,10 +188,10 @@ static void note_prot_wx(struct pg_state *st, unsigne= d long addr) st->wx_pages +=3D (addr - st->start_address) / PAGE_SIZE; } =20 -static void note_page(struct ptdump_state *pt_st, unsigned long addr, int = level, - u64 val) +void note_page(struct ptdump_state *pt_st, unsigned long addr, int level, + u64 val) { - struct pg_state *st =3D container_of(pt_st, struct pg_state, ptdump); + struct ptdump_pg_state *st =3D container_of(pt_st, struct ptdump_pg_state= , ptdump); static const char units[] =3D "KMGTPE"; u64 prot =3D 0; =20 @@ -286,12 +253,12 @@ static void note_page(struct ptdump_state *pt_st, uns= igned long addr, int level, void ptdump_walk(struct seq_file *s, struct ptdump_info *info) { unsigned long end =3D ~0UL; - struct pg_state st; + struct ptdump_pg_state st; =20 if (info->base_addr < TASK_SIZE_64) end =3D TASK_SIZE_64; =20 - st =3D (struct pg_state){ + st =3D (struct ptdump_pg_state){ .seq =3D s, .marker =3D info->markers, .mm =3D info->mm, @@ -324,7 +291,7 @@ static struct ptdump_info kernel_ptdump_info __ro_after= _init =3D { =20 bool ptdump_check_wx(void) { - struct pg_state st =3D { + struct ptdump_pg_state st =3D { .seq =3D NULL, .marker =3D (struct addr_marker[]) { { 0, NULL}, --=20 2.46.0.295.g3b9ea8a38a-goog From nobody Fri Dec 19 12:02:09 2025 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA46919AD85 for ; Tue, 27 Aug 2024 08:46:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724748368; cv=none; b=H41mHMWum3nOZVGWl7e8IRR2G3J5Mroc3aZWhpCrS92itbN7qTsNMIYvqQOXDSElQRJJzmirAYW9NaWhTZgD9ISSL+aysHP6jJYqzY4wgZrvVHJ+5YXiXZBGj+/CrenvdZy3iyiHrmP5E1fUmaoDOhOu+pGQLJtjRGiuen3mUhs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724748368; c=relaxed/simple; bh=Lw37HyF37GzltMhnte000Ty23NUQC83Fy2jc5oyK3FA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=TdUFrv/r6FjAa5hC6ht+LA2QaGc9BCAlutlXNPai3abo3yKUb+Xoj0/PAjggkLTPbvFmFYDD4VFQUmqGquwnY73OJGVrxWNn6hrDJFEBNfYCaI2SFxRHsesy8qRxYuNbC4yC8sbYI3sy5nDd3LOjP4i6Lu445rp9UWQ45ZxtXG8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=2lEIu4UO; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="2lEIu4UO" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6b2249bf2d0so109104837b3.2 for ; Tue, 27 Aug 2024 01:46:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1724748366; x=1725353166; darn=vger.kernel.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=S/4eIk6jI1tjaj4UGqml6oE2hCNIy1npmCkHCveHD80=; b=2lEIu4UOD1oOax2M+SAPnqGL/oG1Mh65bzS0Xn0m4z9px1XM8T2BIILFAvycyL47Qm xiPfLjzjqloQClxWtFwGJWraYL7KHc93E+0yac3gHP8J8qmgLR/pRncWESAFy5ulX70e VghwM6QrbpxDDQmv3Lwnq3WpsgWk9SBY2MHEULwysNY+TuTS64VKcsOqmJ7JphshpBF6 XDEarDVyo3ZiNNnE0elEVH0Y/mGk5z7E67ZxJLzL1I5UBVvWGCzaLQG4zodFVoFY0ibV 0KsyaAPAwe0LXSoUUsBX5gjOIBqcw2psOMkGeRnxCB63y6kJpkhKbFL/GrTAYo+KVoEe 1VBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724748366; x=1725353166; 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=S/4eIk6jI1tjaj4UGqml6oE2hCNIy1npmCkHCveHD80=; b=bgQ/eix6XVuURn9RfDptVCchJHL4JN5m8NWJtp4vjB5OqprLF8Qvt0YDqaZRPWS/4R 0NHlikvegc+ADxeODAHc0co/UHAMsyrsy58wBlhLLYdC3/Ih1bfnmCiKxGGBtbnqCBBe 4XtzbfJzGMViNTSbgWvXS47ZLiJ4t9oNOzeiBo5i3lWcabq27GW09NDUR2RLQUUKQAHz a6bagMuauO7JkrCoUbM2vJ3OBZCTjWyyaH7nUbJaEx2B8zpg8B60U3T07fCcUCU1dVh5 vDSUGyexOGkpL0wg3sRZphfBN/hzv59vafFHRxbZUaVx11NyE5suNmAsx0NvqPNKsxi5 a+hg== X-Forwarded-Encrypted: i=1; AJvYcCUvUyK9L73GPGGoqVt2IYXltwDxsUsoUBBavTVjbzmDGAuOz5Lj7u+at9i2T3iXziHJO8VvDWV1ti+eJzg=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2SDZ4kBkX37xgUliREkPMoonG3LtHnbQ1K5RuFXO7O6EHkSd+ lqGtOaRmMmSSq5IyPApojWKhvpX1Y6KXnxb9JTi7ABYxM7+Ris71/aOL2ZA5ZMwldpFd3Sm2FQE s26aeysEgvFnLdSYOSPQQzS9H1A== X-Google-Smtp-Source: AGHT+IH5RM7JuVVSPKnjdxxxYeoYnQeY0l7qLc/ywBgRIM547MLlZ6+2U/YgCfXhEykPoaO06zqlMD4Kq2MFsPnHn0E= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:690c:4a06:b0:62d:1142:83a5 with SMTP id 00721157ae682-6cfbbadf920mr1801177b3.8.1724748365682; Tue, 27 Aug 2024 01:46:05 -0700 (PDT) Date: Tue, 27 Aug 2024 08:45:46 +0000 In-Reply-To: <20240827084549.45731-1-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240827084549.45731-1-sebastianene@google.com> X-Mailer: git-send-email 2.46.0.295.g3b9ea8a38a-goog Message-ID: <20240827084549.45731-4-sebastianene@google.com> Subject: [PATCH v9 3/5] arm64: ptdump: Use the ptdump description from a local context From: Sebastian Ene To: 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, vdonnefort@google.com, mark.rutland@arm.com, maz@kernel.org, oliver.upton@linux.dev, rananta@google.com, ryan.roberts@arm.com, sebastianene@google.com, shahuang@redhat.com, suzuki.poulose@arm.com, will@kernel.org, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename the attributes description array to allow the parsing method to use the description from a local context. To be able to do this, store a pointer to the description array in the state structure. This will allow for the later introduced callers (stage_2 ptdump) to specify their own page table description format to the ptdump parser. Signed-off-by: Sebastian Ene --- arch/arm64/include/asm/ptdump.h | 1 + arch/arm64/mm/ptdump.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/ptdump.h b/arch/arm64/include/asm/ptdum= p.h index bd5d3ee3e8dc..71a7ed01153a 100644 --- a/arch/arm64/include/asm/ptdump.h +++ b/arch/arm64/include/asm/ptdump.h @@ -44,6 +44,7 @@ struct ptdump_pg_level { */ struct ptdump_pg_state { struct ptdump_state ptdump; + struct ptdump_pg_level *pg_level; struct seq_file *seq; const struct addr_marker *marker; const struct mm_struct *mm; diff --git a/arch/arm64/mm/ptdump.c b/arch/arm64/mm/ptdump.c index 404751fd30fe..ca53ef274a8b 100644 --- a/arch/arm64/mm/ptdump.c +++ b/arch/arm64/mm/ptdump.c @@ -117,7 +117,7 @@ static const struct ptdump_prot_bits pte_bits[] =3D { } }; =20 -static struct ptdump_pg_level pg_level[] __ro_after_init =3D { +static struct ptdump_pg_level kernel_pg_levels[] __ro_after_init =3D { { /* pgd */ .name =3D "PGD", .bits =3D pte_bits, @@ -192,6 +192,7 @@ void note_page(struct ptdump_state *pt_st, unsigned lon= g addr, int level, u64 val) { struct ptdump_pg_state *st =3D container_of(pt_st, struct ptdump_pg_state= , ptdump); + struct ptdump_pg_level *pg_level =3D st->pg_level; static const char units[] =3D "KMGTPE"; u64 prot =3D 0; =20 @@ -262,6 +263,7 @@ void ptdump_walk(struct seq_file *s, struct ptdump_info= *info) .seq =3D s, .marker =3D info->markers, .mm =3D info->mm, + .pg_level =3D &kernel_pg_levels[0], .level =3D -1, .ptdump =3D { .note_page =3D note_page, @@ -279,10 +281,10 @@ static void __init ptdump_initialize(void) { unsigned i, j; =20 - for (i =3D 0; i < ARRAY_SIZE(pg_level); i++) - if (pg_level[i].bits) - for (j =3D 0; j < pg_level[i].num; j++) - pg_level[i].mask |=3D pg_level[i].bits[j].mask; + for (i =3D 0; i < ARRAY_SIZE(kernel_pg_levels); i++) + if (kernel_pg_levels[i].bits) + for (j =3D 0; j < kernel_pg_levels[i].num; j++) + kernel_pg_levels[i].mask |=3D kernel_pg_levels[i].bits[j].mask; } =20 static struct ptdump_info kernel_ptdump_info __ro_after_init =3D { @@ -297,6 +299,7 @@ bool ptdump_check_wx(void) { 0, NULL}, { -1, NULL}, }, + .pg_level =3D &kernel_pg_levels[0], .level =3D -1, .check_wx =3D true, .ptdump =3D { --=20 2.46.0.295.g3b9ea8a38a-goog From nobody Fri Dec 19 12:02:09 2025 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5040A19D067 for ; Tue, 27 Aug 2024 08:46:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724748371; cv=none; b=T8ktedxlD9yVI0MUeh35GllLnJFMQTvxSMzNUs8I9PqWYdI3dUj4ESSl45p3AvKEp0YxP/oO5sYrYf9bT4gzffcFIC7LIxsbR1iXqkeqE4L2qsOvyMVp8x/UHWeBm/Ui1zDCtbKXY86VvzV0kIm6maLBWNBevnHIaf/G0UoA2uA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724748371; c=relaxed/simple; bh=z2p1RVuzWCFkdtKCAz/1qFqpK2ISUcxi9DnlSlJe3uo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=NvJwpA639kHe3SwZfdVBI1Ap3gAHkHPxnx/K8vDcNZuyD8Pk5j8/DvOr0KzX/TOlZ3ih+pmVNNxgTqtFsHjclf0eZugtdpeESaJsowI9II+raFdx03meZWnlCwfDaSKoKw6f0SC/VegU5bOPgauY9FdnLCcG55KJVNbIfs6thUM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=LrED6h7p; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="LrED6h7p" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6b2822668c2so103428287b3.1 for ; Tue, 27 Aug 2024 01:46:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1724748368; x=1725353168; darn=vger.kernel.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=I83ViSc79idei070aXXCqbHDAqJCF9Bk2zTKeUxiNYQ=; b=LrED6h7ptBvHIee07SAzYgYiUg5mRftORCxEFPRj8uZqw4WKIWZOmy0GyoF8CzlG1H 2GYJaHnCaeo/hRobeaoJ4z3589SSwanh3kkAcRkUk+Oo8rEOJZZOliZmAxJG5y+vmPGG TR2kbCctjRx3/mWMOtPFs3ZiKyUvYdHsbUxKRHi6RCeTFsdaOebwifrbHzP9y9SPvaIB NbHq9OEQUP0Q8WuU2IrbhlRMFLhuDV4OIiyOPeMMYzU30bhKlIzhMufOLqw+8xOwhpSL gPOnQsbYadLlOD2dhi2D+wOMCelLvcRWuSokG/lHVDu7k86yTOixokfuygkohxMPBIuW uoZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724748368; x=1725353168; 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=I83ViSc79idei070aXXCqbHDAqJCF9Bk2zTKeUxiNYQ=; b=OcN1bZ/uwkehLKvrLElvMwjKRXdkI7KJNNCbGABL3jlcl8W/X7umKR7DcB2tZnBsYO k3Djzy+XTU23tZGc1tG8TmJHHZV1noa3+OnQfkoR/feZlEoq/OZW8Ma7WAAjeoo13B3x 4LONqiSfE5kXQC5CsLs9nC4mPY8JroEgSxMCxf8O2xfOorPsBNPqjexoZUZPfnaT2W/9 8YReR6bfBQo4sTVuobUAmtFFOC6VlNudRlJg1bRma3S/9pPGG+jUfE62Vlm9xhZHXqbX DqLZvIXsH7Dr5rUwJoZ9JEDGnvucZ5tIgFRNRU/FxVPVZW7fAJAO7r/F0df4vYMRTTKo Z/xA== X-Forwarded-Encrypted: i=1; AJvYcCWYK0sA7DXWFHj/R+J3DXxML3nqFFHMfbq685VxGgestrQGwSRFheQk4M08U/PUl5QsoEX2QZwl6hoH3pM=@vger.kernel.org X-Gm-Message-State: AOJu0YztjXgLtptr5k/Cllk9f0VPHQ71q6wnenBWzuUfw3qVp5C2Vm4P Bi7yMp57JvN/1KBoLoqdIGHtsdCv/U85blTp90AOZhXMFxCcnRvBBxGgZXurJIE1gMLIFcP3DNd Vl8+QHmtuefpMstV98iCscNkxXg== X-Google-Smtp-Source: AGHT+IFxiVGmxV1SeAk+rQ6esRUKQhSaio0jNBDqtfLxXEnyCJ7jXIY6+34UXYrhIaHuXVBZH+t7RQIgxN3TiCrDbaI= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a81:7e46:0:b0:664:c5e0:6574 with SMTP id 00721157ae682-6cfbbbd63c4mr960687b3.9.1724748367933; Tue, 27 Aug 2024 01:46:07 -0700 (PDT) Date: Tue, 27 Aug 2024 08:45:47 +0000 In-Reply-To: <20240827084549.45731-1-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240827084549.45731-1-sebastianene@google.com> X-Mailer: git-send-email 2.46.0.295.g3b9ea8a38a-goog Message-ID: <20240827084549.45731-5-sebastianene@google.com> Subject: [PATCH v9 4/5] KVM: arm64: Register ptdump with debugfs on guest creation From: Sebastian Ene To: 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, vdonnefort@google.com, mark.rutland@arm.com, maz@kernel.org, oliver.upton@linux.dev, rananta@google.com, ryan.roberts@arm.com, sebastianene@google.com, shahuang@redhat.com, suzuki.poulose@arm.com, will@kernel.org, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 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) =3D=3D 1; \ }) =20 +#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 +=3D arm.o mmu.o mmio.o psci.o hypercalls.o pvtime.= o \ =20 kvm-$(CONFIG_HW_PERF_EVENTS) +=3D pmu-emul.o pmu.o kvm-$(CONFIG_ARM64_PTR_AUTH) +=3D pauth.o +kvm-$(CONFIG_PTDUMP_STAGE2_DEBUGFS) +=3D ptdump.o =20 always-y :=3D hyp_constants.h hyp-constants.s =20 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, s= truct vm_fault *vmf) void kvm_arch_create_vm_debugfs(struct kvm *kvm) { kvm_sys_regs_create_debugfs(kvm); + kvm_s2_ptdump_create_debugfs(kvm); } =20 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 +#include + + +#define MARKERS_LEN (2) +#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[] =3D { + { + .mask =3D PTE_VALID, + .val =3D PTE_VALID, + .set =3D " ", + .clear =3D "F", + }, { + .mask =3D KVM_PTE_LEAF_ATTR_LO_S2_S2AP_R | PTE_VALID, + .val =3D KVM_PTE_LEAF_ATTR_LO_S2_S2AP_R | PTE_VALID, + .set =3D "R", + .clear =3D " ", + }, { + .mask =3D KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W | PTE_VALID, + .val =3D KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W | PTE_VALID, + .set =3D "W", + .clear =3D " ", + }, { + .mask =3D KVM_PTE_LEAF_ATTR_HI_S2_XN | PTE_VALID, + .val =3D PTE_VALID, + .set =3D " ", + .clear =3D "X", + }, { + .mask =3D KVM_PTE_LEAF_ATTR_LO_S2_AF | PTE_VALID, + .val =3D KVM_PTE_LEAF_ATTR_LO_S2_AF | PTE_VALID, + .set =3D "AF", + .clear =3D " ", + }, { + .mask =3D PTE_TABLE_BIT | PTE_VALID, + .val =3D PTE_VALID, + .set =3D "BLK", + .clear =3D " ", + }, +}; + +static int kvm_ptdump_visitor(const struct kvm_pgtable_visit_ctx *ctx, + enum kvm_pgtable_walk_flags visit) +{ + struct ptdump_pg_state *st =3D ctx->arg; + struct ptdump_state *pt_st =3D &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 star= t_lvl) +{ + u32 i; + u64 mask; + + if (WARN_ON_ONCE(start_lvl >=3D KVM_PGTABLE_LAST_LEVEL)) + return -EINVAL; + + mask =3D 0; + for (i =3D 0; i < ARRAY_SIZE(stage2_pte_bits); i++) + mask |=3D stage2_pte_bits[i].mask; + + for (i =3D start_lvl; i < KVM_PGTABLE_MAX_LEVELS; i++) { + snprintf(level[i].name, sizeof(level[i].name), "%d", i); + + level[i].num =3D ARRAY_SIZE(stage2_pte_bits); + level[i].bits =3D stage2_pte_bits; + level[i].mask =3D 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 =3D &kvm->arch.mmu; + struct kvm_pgtable *pgtable =3D mmu->pgt; + int ret; + + st =3D kzalloc(sizeof(struct kvm_ptdump_guest_state), GFP_KERNEL_ACCOUNT); + if (!st) + return ERR_PTR(-ENOMEM); + + ret =3D kvm_ptdump_build_levels(&st->level[0], pgtable->start_level); + if (ret) { + kfree(st); + return ERR_PTR(ret); + } + + st->ipa_marker[0].name =3D "Guest IPA"; + st->ipa_marker[1].start_address =3D BIT(pgtable->ia_bits); + st->range[0].end =3D BIT(pgtable->ia_bits); + + st->kvm =3D kvm; + st->parser_state =3D (struct ptdump_pg_state) { + .marker =3D &st->ipa_marker[0], + .level =3D -1, + .pg_level =3D &st->level[0], + .ptdump.range =3D &st->range[0], + .start_address =3D 0, + }; + + return st; +} + +static int kvm_ptdump_guest_show(struct seq_file *m, void *unused) +{ + int ret; + struct kvm_ptdump_guest_state *st =3D m->private; + struct kvm *kvm =3D st->kvm; + struct kvm_s2_mmu *mmu =3D &kvm->arch.mmu; + struct ptdump_pg_state *parser_state =3D &st->parser_state; + struct kvm_pgtable_walker walker =3D (struct kvm_pgtable_walker) { + .cb =3D kvm_ptdump_visitor, + .arg =3D parser_state, + .flags =3D KVM_PGTABLE_WALK_LEAF, + }; + + parser_state->seq =3D m; + + write_lock(&kvm->mmu_lock); + ret =3D 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 =3D m->i_private; + struct kvm_ptdump_guest_state *st; + int ret; + + if (!kvm_get_kvm_safe(kvm)) + return -ENOENT; + + st =3D kvm_ptdump_parser_create(kvm); + if (IS_ERR(st)) { + ret =3D PTR_ERR(st); + goto free_with_kvm_ref; + } + + ret =3D single_open(file, kvm_ptdump_guest_show, st); + if (!ret) + return 0; + + kfree(st); +free_with_kvm_ref: + kvm_put_kvm(kvm); + return ret; +} + +static int kvm_ptdump_guest_close(struct inode *m, struct file *file) +{ + struct kvm *kvm =3D m->i_private; + void *st =3D ((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 =3D { + .open =3D kvm_ptdump_guest_open, + .read =3D seq_read, + .llseek =3D seq_lseek, + .release =3D kvm_ptdump_guest_close, +}; + +static int kvm_pgtable_debugfs_show(struct seq_file *m, void *unused) +{ + const struct file *file =3D m->file; + struct kvm_pgtable *pgtable =3D 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= ); + return 0; +} + +static int kvm_pgtable_debugfs_open(struct inode *m, struct file *file) +{ + struct kvm *kvm =3D m->i_private; + struct kvm_pgtable *pgtable; + int ret; + + if (!kvm_get_kvm_safe(kvm)) + return -ENOENT; + + pgtable =3D kvm->arch.mmu.pgt; + + ret =3D 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 =3D m->i_private; + + kvm_put_kvm(kvm); + return single_release(m, file); +} + +static const struct file_operations kvm_pgtable_debugfs_fops =3D { + .open =3D kvm_pgtable_debugfs_open, + .read =3D seq_read, + .llseek =3D seq_lseek, + .release =3D 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); +} --=20 2.46.0.295.g3b9ea8a38a-goog From nobody Fri Dec 19 12:02:09 2025 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E080819DF61 for ; Tue, 27 Aug 2024 08:46:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724748373; cv=none; b=BUq7UhvEa2WgO+KgatVbzqr4iHjwNavgXZ8ZqEaApSIovCp9gcqAS8To4LMd7BEuF3ugUPvxMO1r3C1mHQ8jTIhBb6a9WswpPb5Vk5vJa9v6npx4se1k7EWWSJ2xChFaVproF0s9ZetLPenhG7doInVNendezuSSwksASHIXONI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724748373; c=relaxed/simple; bh=W/gned1S2aEgveAzwGHcVts33uHXT+GTG81W6x5AeTc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=F4zCq//hxY2jJvR56xVXVUzPtKj32xemscU9W/cFYX+e7clzcpEpv005yuuXt0cSY+SA+PnfruQbThEk5w88483TEq6UCnnGaWWJZq2YXo3nRvEPSXsqUp28T96lw8lTrdhVFxaLgKFZlgn8iC2IKKY8tugLM6oSH7iLn1eZB0g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=C2Xnd+VM; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sebastianene.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="C2Xnd+VM" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6b46a237b48so111809917b3.1 for ; Tue, 27 Aug 2024 01:46:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1724748371; x=1725353171; darn=vger.kernel.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=ujfkbxajYNAV9coR+kUVXeI3lwos12vqL1v+iOvXT9g=; b=C2Xnd+VMqLKM/HQb8Nids0U6EjHRykvLQPoH3NJxao6ctN+jit9rHB4sqgPVm7UtDn pOkjdgK126GqAd3ZWiVVAcTynsh2IKaVfeqAnLuOVM0hgOXam9+oe15++rajBJu48qcV pF/K2uRiQOKXnWUE36ggzIARoi7/Wf2k1X32CNUbSCDKsP6D3ZvuVjWreJf2nO5opMLF DdBqF2lhbAdX1apkZxh2YEKPwaSwYYoB+v61/0roqZi4nwAbhD10cxX74uIIo7hVBzbt ZG91iK4VmlD8PeQ/QIpzBShH6nrtfFEjF55pviDt4/korvH73u37aK8LUyshRx3uxSOh z+og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724748371; x=1725353171; 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=ujfkbxajYNAV9coR+kUVXeI3lwos12vqL1v+iOvXT9g=; b=Hr+FDEc8BPtSjwlAw2am1TiANdbnuBEIoDgOGtM/Hz0mPZq98XmmJH6oyCdNIRymnv 6/BtoKRSV8FunRKOkLf5jIrbempVjoWeqF4yE8x3prlkI15WdtzWv62bv16jLiZMQDdi YYhYziGp6/jEpT0bkWzRAhW/wvnu8pFRdIwT5jqUExo/+Cerr4Kp/uStEiI97f749Sp4 QIOBOggkd4lPjNI+RvIU+gs+2UW3doJ8YbYy15TLKR/q/ZavdH/wX3wERXXY3lCtxpOg c0mJNtTfQvaAV0WIoiA/guy09mDx6BdJPxE0WD535bSg4XOsGpFzuXQ9gr6k8rzo5/9g UNvg== X-Forwarded-Encrypted: i=1; AJvYcCX8uvB9QiV/wsQvSHzWOQ9PiUnccm9VEOGqN7tHhekkfoZaZpkUTtmpJoCU7nzJ02nLKz2ZHtlISXRuFKo=@vger.kernel.org X-Gm-Message-State: AOJu0Yyff28AgO5V8SoZGWCCzTLbCjTccvbe21OpAZUlgyHezlje/Q8c xCHU6O/SwRwkU/ofqnxNj6VxzTJoH6Zk/natNELfpd8fHwUfIcNBUcq7X7sSZuALkIkUxT8RW/3 en3Fboj6nokvq2p5tok6KoYW8nQ== X-Google-Smtp-Source: AGHT+IHOHuHbuOJF/L350TjQeQOZv00E2Fvna1Z8JsFoQh3TFmDrKS4V7q2AmDtj+RMoJ+girhVAzT4/oTPRZmzkCgA= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a25:a4a2:0:b0:e16:6d88:b8c2 with SMTP id 3f1490d57ef6-e1a2a5a6addmr54600276.4.1724748370673; Tue, 27 Aug 2024 01:46:10 -0700 (PDT) Date: Tue, 27 Aug 2024 08:45:48 +0000 In-Reply-To: <20240827084549.45731-1-sebastianene@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240827084549.45731-1-sebastianene@google.com> X-Mailer: git-send-email 2.46.0.295.g3b9ea8a38a-goog Message-ID: <20240827084549.45731-6-sebastianene@google.com> Subject: [PATCH v9 5/5] KVM: arm64: Introduce the PTDUMP_STAGE2_DEBUGFS config From: Sebastian Ene To: 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, vdonnefort@google.com, mark.rutland@arm.com, maz@kernel.org, oliver.upton@linux.dev, rananta@google.com, ryan.roberts@arm.com, sebastianene@google.com, shahuang@redhat.com, suzuki.poulose@arm.com, will@kernel.org, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When this config is enabled, it exposes the stage-2 pagetable layout through a debugfs file. Signed-off-by: Sebastian Ene Reviewed-by: Vincent Donnefort --- arch/arm64/kvm/Kconfig | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 8304eb342be9..ead632ad01b4 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -66,4 +66,21 @@ config PROTECTED_NVHE_STACKTRACE =20 If unsure, or not using protected nVHE (pKVM), say N. =20 +config PTDUMP_STAGE2_DEBUGFS + bool "Present the stage-2 pagetables to debugfs" + depends on KVM + depends on DEBUG_KERNEL + depends on DEBUG_FS + depends on GENERIC_PTDUMP + select PTDUMP_CORE + default n + help + Say Y here if you want to show the stage-2 kernel pagetables + layout in a debugfs file. This information is only useful for kernel de= velopers + who are working in architecture specific areas of the kernel. + It is probably not a good idea to enable this feature in a production + kernel. + + If in doubt, say N. + endif # VIRTUALIZATION --=20 2.46.0.295.g3b9ea8a38a-goog