From nobody Sat Feb 7 08:27:23 2026 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 914451AE87B for ; Fri, 16 Aug 2024 12:39:17 +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=1723811959; cv=none; b=f/bT1y/DMx1CrpYbfWj2YV5n+KYsrD1Xjsx/Q6CwEsod18Vz+f1s74jQRW4v3MWIjME+EVpJNXIyua0hNWfMNb0RonRfpdAHhnE8N6dDmBUHCzZgLXaHyolv9jZlDml7y58/FOu5tv/pMENulsPL59clr4Fmt9oy7qxwkHcCwMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811959; c=relaxed/simple; bh=mc+7e6AhIbB/zISdvS6jolgkLJQbBVfZdKZ8MqRkIps=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=NcTVxSdVxGeqWqA6AWj5YOYGcC8UsA4MZ0jo51jBbVkwdlAg53tQN1XNlDFPUfd6sdd6HsLlp7j+97lbZHas2+OZE9YWbC41S9mMPoYLKlUSOdQQM7T3V4osVQBEzuL3DIKblCkwvTr5ik2fs/wWnlzG2QY/xQ5STEEbLPRAZMo= 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=EWf3/f7I; 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="EWf3/f7I" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6ad660add0fso24255727b3.0 for ; Fri, 16 Aug 2024 05:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1723811956; x=1724416756; 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=nI6i7YX14nljpUXmJtSY/UgyOMgnkcqXo7+aUg8YmfE=; b=EWf3/f7IpJULGqYvAbzMGG5/awLKGfm6Vs2xVBx+qRdZEN4Z+kVFgDrOJ+Q6McI7ja 1Cp7pPG1/rq0ZtfAKuAEd8eQzeeT3xLvJCvuIJf277abHDZW847hEeFm5xL0UDmES8GC jRaNEhzUflttSseulO/5boOPATYC03DwFbV2zUVBBpac9ZJFb3n9Yni+vCCsyGiTn4Fz fruqAl7/sqjuDbG/57VFIzbuid6GgiN9UA0SaX9lGSpLCV7xMftDaA3Yi9myVcnIxvNj rZosKngWYLT6ZaqKay/1HInMxsCX7DaqJhSZNLFvl333o5pv8jfyEoB3QNgUKGQw4VgD U+VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723811956; x=1724416756; 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=nI6i7YX14nljpUXmJtSY/UgyOMgnkcqXo7+aUg8YmfE=; b=OsLE1oVq3pjZYsvJV0YRyRcpFKt5E5sc14knq4PiGxy1KkUXdAr99eQKiaduk/iEIm w8hn+5xvVn+uBb084Ov+/xTtl5uW1Tnsl4mc1ruYwjsYW5RhshC6E0VNppAK7L3RQePC MB8CmBitvr5yNClvW4zkD/zHfqnoa3VVscbBqyqlRCjbwi+wWxcVvvpKOVn5YegwRUkU Q3nSVI2YZotyq7hbKnDnw2hKErwvAPNDM5wXlrLZvPVxzP2jQW21iuIcLs4WBkcEeTcr +7XVRH03SCrxZ0h1D78iUYVuTbRYYwhyFq/umx/pwTt8azuMriJ7EqszxYK+DIcbTJDB AjaQ== X-Forwarded-Encrypted: i=1; AJvYcCVmjhFZq7RexYk3mpsJBgBEWZrno7eS9Xk2K+51f4MwXQ8UUl33Uz82dhBAW15w2/5wFtMdRifup2ci5E9/U3sWwv7uA/wVKx2Cn5vv X-Gm-Message-State: AOJu0YylJ2M6CB0C3u7qEiMC1KPKpB/8XAmpvb+FfrYGReemGPiTZpWk vKgYnxNmMPnB+uRNMQw6f89Y/UeC7wQX7xqWejBucbYFeSC53JkNKnp1cXH27zpKOtBg6Um7V63 RJmiXhRpCND/zkYmld2GYICNGvQ== X-Google-Smtp-Source: AGHT+IGBZXo0joGkpRiMwmJyr97s6u1s6BZU4K3nLmENh0HF/8kX9FtEm3bAcQpjCF+W1kNezc9xW+sgWbb25EB7K5s= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:690c:3405:b0:691:a38c:a61d with SMTP id 00721157ae682-6b1d7ef3527mr730297b3.3.1723811956425; Fri, 16 Aug 2024 05:39:16 -0700 (PDT) Date: Fri, 16 Aug 2024 12:39:01 +0000 In-Reply-To: <20240816123906.3683425-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: <20240816123906.3683425-1-sebastianene@google.com> X-Mailer: git-send-email 2.46.0.184.g6999bdac58-goog Message-ID: <20240816123906.3683425-2-sebastianene@google.com> Subject: [PATCH v8 1/6] 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.184.g6999bdac58-goog From nobody Sat Feb 7 08:27:23 2026 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 752741B86C2 for ; Fri, 16 Aug 2024 12:39:20 +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=1723811962; cv=none; b=VshpxiIWqIGwZUvxIt+VmTWfJTfY8azLJ9Fqf5Zmn9ul34VuRVc54xb9Yg2t1L/w4RJsHIzaDGkO9zkDuYMKGANxvX4jOzQrA3m8cJC5Ndkr6gDBrG2tJjwFthHt8BpZm8SI83K+Yw0iaLcXOxsolZbQ+4+oNclvHFKBB2KhBRc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811962; c=relaxed/simple; bh=y70w3NBhBN5fs+GL9wdFhOe2sHLvfu6UQ316Ye80lco=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=FC1bMw8m1SF4BULR2IEyDwPkLdFtR0/kBkKmV1Btx7ZpkSVXzRN41jaJ7YAezINVUWvXGNC8iNVVdVvG8C5Ab5t18pOpkasgbSLPI13QBwFWLcYHFJV9FVOQvCVAFylK+yeVoLj1hAqDTI0+VBta4bg9L3MDOieTzyAwE5EmuZU= 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=lZj0Y4Kn; 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="lZj0Y4Kn" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4280cf2be19so13549675e9.3 for ; Fri, 16 Aug 2024 05:39:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1723811959; x=1724416759; 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=j47oMByzJ24KyTFsD9yy6iWyScsZt9QoCMZTVk2qdfo=; b=lZj0Y4KnA13bu7VO/KDnThXCSwXAiCotnJ2A221uY74PvWjnVSGuClh9jBxJlTJ4+f D/AFv3HcX1snkVo01UxZFZ6WfvVbcX4dSYRQC7gcHg1njDLF4pjiW92rP8RkhQxSHz11 h1HSAljEMFPBgndj8c8gyeSqUJgAn5IKY+w9R3RPF/oMGi+hEdySrsilcCZ6vt0lEYkE Nffsrqy+htuhcJWPOYVHKQQJwHwY5nQnivHnj9Onz/FdeNh9vRwQ+Anc8N/Vfd8vYeRx 4XLEQbryNubEe7lK6Ws+m4JSAf4eXqkAR9VA+bE96YIQx9saK3v9lJW2XuTL0CU4KaHu 9CvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723811959; x=1724416759; 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=j47oMByzJ24KyTFsD9yy6iWyScsZt9QoCMZTVk2qdfo=; b=krjGBEecX37FhwFsel9rJvhLbExkZ2/oCnaKMU/NXTGB4ss1CRj1kOab2cVl504Xgs vz99B/y/1Ie6UN5xwrk2+zi6h2P9gTnaHgjkLuzQ+Ba5AkkEYhSjfqp99UAvjS7m9snP 0ntfpYpBzTH7oeeTVPwhMe1owRn18pAPONI3ZG0AWtq6VliPejK2w19uhm72xvaLZF9a K7PXjj4IJ6jF5jA131ZYRG/1KVy433DbecbzjkgFUKOT+aWbwELh4ZfJTJfbtQSjiCW0 /RJDyMdCp4fTLJRjnIucPs/7/U3t8Bx1oz87ThJyA7zYQ3Og2cB1qQD9GvHZDm8cDxk6 7VQw== X-Forwarded-Encrypted: i=1; AJvYcCUDG6w+UBbtoH2I5NrTdY7WZBQTXsphVKqfzOy49kATjSQulNz2PvEFf65pieHHnqDoF0vtzzi6ZNf2SEW2+upWUhoSEUTJZcosgIEM X-Gm-Message-State: AOJu0YyMiUGG1BNYTqGr0iRHL0PKX9fpnUetYdjfAKFyY/xYkTw3gLgl G0pRg8GEBzBH1mOvfrEHS3u8etXuQatBkcFfFHzOx8cY3GvEr0igyUxAmO+7p1cNvpXxNZ/A0Tk mSuRP9HKF6RKGtQN6H2HfynFAdw== X-Google-Smtp-Source: AGHT+IHY+evZi+M0pBKraTT8P2CDheqGUjf1GzHxhiMrm6b9MgqKZzrCDiy/xU7sxesCTtcgx0h+YUSn4Xyp/2hiU3k= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:600c:3b09:b0:429:d0bb:e3f3 with SMTP id 5b1f17b1804b1-429ed7e38d2mr149595e9.7.1723811958600; Fri, 16 Aug 2024 05:39:18 -0700 (PDT) Date: Fri, 16 Aug 2024 12:39:02 +0000 In-Reply-To: <20240816123906.3683425-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: <20240816123906.3683425-1-sebastianene@google.com> X-Mailer: git-send-email 2.46.0.184.g6999bdac58-goog Message-ID: <20240816123906.3683425-3-sebastianene@google.com> Subject: [PATCH v8 2/6] 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.184.g6999bdac58-goog From nobody Sat Feb 7 08:27:23 2026 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.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 08FFE1B8E85 for ; Fri, 16 Aug 2024 12:39:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811964; cv=none; b=GlyDvN04tIzylB5u33VeXSLKCeNbXvq01RD6acd34pamBY3ctthZowHZ0UXAld8NykpcidXQ4JFeKySwMX7vRFIk/YN6j1qM1p6uQ87qm7lSD5Euw8X/BycuN5HeS3k+Yj7vJ1vsFF/n9XiLSUyVP+87rW+rFjJbtBxWPegUKvk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811964; c=relaxed/simple; bh=eGtEtPkxRm/Bp/1pUnIw1ZGoSEo/VchDZHTGqv1Cie0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=P2pWftGEqq8342t8ckg8rK5Zo0RPxF0Db5utZ13qSSNTymm75JOJh6gjnHHj/wwPvcIzV2DNeFHJbNFDvhYUi0wtUzq1x3tVIArInPgAvs/JfKxdRx/dSnA2ZRIqZVrb6aw6f8hxSBirMqCt7lmOBG7pGheQ7OHz63NM+7VNdeE= 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=IpJqwvCe; arc=none smtp.client-ip=209.85.221.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="IpJqwvCe" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-37188f68116so821364f8f.3 for ; Fri, 16 Aug 2024 05:39:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1723811961; x=1724416761; 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=TOVsSjbkFKkupVHDdUClsSrj3QZ/4GeILHKaUawEmW8=; b=IpJqwvCe090M9m+hp+O1Io0ePqnkjgIB2ISub8a9H42bIRcfwBCpJCLpHAlwJ3P0U/ eqDajzY8YZSDeWhgKWEWL1iGL3eGTqVZ9z0DOGuyNwCPxH5Nnl0t+Hbp/WGQNJURXubE hpTy2Nv/sxAEheJosgsSB0DEErHZsEGfbEuPpJDpRQuem3g37spLN7BCfIQTKN+0hQb3 6PDtDIO+wWsjSbIr8X4L79dJtUXLbEKLn2bVaBPAQMlhgDQo9y2mSH1BPQRsSVm9TyBq pnXYEnRPnXWXI8cV59xpcubzrWSSvaOCkviW8QwAxWvJlL5kphqGsCyaTGrYMkysPHX3 mwAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723811961; x=1724416761; 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=TOVsSjbkFKkupVHDdUClsSrj3QZ/4GeILHKaUawEmW8=; b=qUdXT+kj25pgvJ8TJfIgTBbmT36rXyHHOF20Z8oIoN9Qe4VmqY2WRsNzXW1wmmzdk1 0qhwvjq0dek/NV/lJ3dWPIZON6qT7PMDfeB4wJ3rbXwUZ48xUZOb6GTJ9oHfS2wI71t1 +9h/jVJgDaYsIGFeEvQtGEcNrLHWCD3Z3EWj59OXWh97SDiP92UIsqJDmUbz60shW2s2 o9ilbeqYjDtW998ED+uDZL/0nU0NpdeU3jl1wDD6KcmtdqPgTaZU5VzlnsOyln+DQtyc vTxydOJHSKFHKDuhDtugTPnzi2dLVSZfRH8BqAQOZ7EIrVsD21cxoQvuwJ9xjLv1WVq5 e1ZA== X-Forwarded-Encrypted: i=1; AJvYcCWaa5vmubUWEh59v84T30MZ8hCRY5I9XTitm/aJflM1eIdD59au4RzUGizjwyn+LUtVqNAlumQOuf12A4dKFEw33wmgDoBG34YngAzB X-Gm-Message-State: AOJu0YyDLboTHcAAGPttDI5n9Q+dFxTQMF7Jg+vPwKkQYK7MgGox3lgJ JCeeTVTWxz5aEUhRsmch4rv8VV1zSVISe6g7UH430o3u0y042+Osaeat8pgLq+PaDtLcfLy1a0s bfMaB9HTLoW4Sr7cy0VR+zn9lNQ== X-Google-Smtp-Source: AGHT+IHcICbWJmK89n8rtw3CIsZCVnNXfh2Wfm6YpkzCdhB56aOnbSeNarXn8GFhkvmcCHzcvJ1/hlKucHN9pFgTZco= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a5d:6449:0:b0:371:8685:846 with SMTP id ffacd0b85a97d-3719465d24fmr4614f8f.8.1723811960947; Fri, 16 Aug 2024 05:39:20 -0700 (PDT) Date: Fri, 16 Aug 2024 12:39:03 +0000 In-Reply-To: <20240816123906.3683425-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: <20240816123906.3683425-1-sebastianene@google.com> X-Mailer: git-send-email 2.46.0.184.g6999bdac58-goog Message-ID: <20240816123906.3683425-4-sebastianene@google.com> Subject: [PATCH v8 3/6] arm64: ptdump: Use the mask from the state structure 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" Printing the descriptor attributes requires accessing a mask which has a different set of attributes for stage-2. In preparation for adding support for the stage-2 pagetables dumping, use the mask from the local context and not from the globally defined pg_level array. Store a pointer to the pg_level array in the ptdump state structure. This will allow us to extract the mask which is wrapped in the pg_level array and use it for descriptor parsing in the note_page. 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.184.g6999bdac58-goog From nobody Sat Feb 7 08:27:23 2026 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.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 E73771AE87B for ; Fri, 16 Aug 2024 12:39:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811966; cv=none; b=mAmah2o6cM1IU4YkBEvK/h5JTAfqADiculW3kv1GCdW9dIG0yZ75JoJUtx4PnYe4gz7asVOr00q8DfPLYuRqFOfaN3QyDDY51tnCaqokeYZ4QZn0WSb/IXWJb5l383ociNVuaTpptFcCfpravkHBKsuf8Ayyxk9XTKBGTSfrF1c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811966; c=relaxed/simple; bh=8Cexea0dzRdr47M50Br5yJsGcLhFPUvBxCXJPUnZwzA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nvALs+EgRwVK1rFEybjb7Kmtc1Nc9TM5Yq00EIcW58VZ46OoZS3nucnbCSzzNsztg/TrEyCRw6XSfraFdfJevb6Vcm73tg3rGqwusA/sJfXSUIDWPAPdK0c/jqso1sq2MZobGZBOFRqcep8kdjaS37BqeYRdxMvXxHyKkcOEqhg= 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=z/zksaoL; arc=none smtp.client-ip=209.85.219.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="z/zksaoL" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e1159fb161fso2892523276.1 for ; Fri, 16 Aug 2024 05:39:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1723811964; x=1724416764; 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=czjtgk0THntC/xnLf2aWE5vi1aKv5GZ9fmo01l7czSk=; b=z/zksaoLlv50W6c9qqfYFfBbplZ6GGQ9Orkil5kBlIycOjcF9sil3H3a0F5ssdCns3 Sv4CWxx7j2h/jN3PpWj2S+ua0VemDDpvoHD0LWuZ4zi/Sc2Rouug8b3BQSGlv39irpAb ppH1KjvNjK6s4r6q5adsTl0XiL2zXfuPXbDNAWVQAJ9HenTBoc2DzAdtN0SgBLKTyWuq 3WmwQQDtf+ZrkYmsRqWrauGE820/sdKPLOHxXDtfLczA86rvjfIBNL+om+3lIQRDlTA2 KTma1FeEA2/60+wJa+PCnJ1eG+DkZcD2cQswWACqLkuKoteOAgu3iTlrzQjfs3UoDyQt mbpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723811964; x=1724416764; 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=czjtgk0THntC/xnLf2aWE5vi1aKv5GZ9fmo01l7czSk=; b=agMgq1OwkT64hFxNIVfT/F+ZdkzJFqpYKvVOTmTfYN8YcA+75e73+snDvJquLIzzH0 VaBxBU1VaDpA838hUNoSmLLMLunPiiRNy1HsGOJGPJSnS5Hy1HDw+dfpra5XOwrMka3q EbUiH7EKdJn13HszKoM9glRM+E8md88grZBRk0KCLwTYEFXGq+wzSp74lYiMo9nNfxp/ u+PqIemXpPO4E0pVCsU8FXqKYNhpPUXqvClE/GrWYHJvNinSumzXZiEhiaIg4OhePymv 7WK2vHb1cnOD9rXkO167v+lsG2TEayAD/JPWftV8PnZcABqS+1PJfXIDO6krspRJYEO1 OTjA== X-Forwarded-Encrypted: i=1; AJvYcCX6D9TZZMmPaH5EVoFVhAZG2f8ykc1Y78XLxo6e+GL4+WNaBymIlT7+h042gAy9VYw9ckW4hZ+fAaR5KqpK1A9Vi+ErM2LHHywROITh X-Gm-Message-State: AOJu0YxfpSa/4x+5fuqMN7dAywVFdSKE+NZVTAbDAkQi3TEljT5M6OsR wrDML0xs1eVk/xA9LwZiwn4piusylpMa+H2P0TcZKxaqL7sMT+KlFp6dCqwPEKobMJDdoCu4fC/ HGsNL4mLcsoXeeZicI14fbDM1nw== X-Google-Smtp-Source: AGHT+IEBl2Jwr492NkaB67XJngVIdAPNlygBC/0Vw/Bc+AHOUtSwJrRm/7vBBySziaJP1f/tml+FbOFt7tZsvUVVL0c= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a25:910e:0:b0:e03:59e2:e82 with SMTP id 3f1490d57ef6-e1180fb2b4dmr4115276.10.1723811963785; Fri, 16 Aug 2024 05:39:23 -0700 (PDT) Date: Fri, 16 Aug 2024 12:39:04 +0000 In-Reply-To: <20240816123906.3683425-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: <20240816123906.3683425-1-sebastianene@google.com> X-Mailer: git-send-email 2.46.0.184.g6999bdac58-goog Message-ID: <20240816123906.3683425-5-sebastianene@google.com> Subject: [PATCH v8 4/6] 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 which shows 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 --- arch/arm64/kvm/Kconfig | 14 ++++++ arch/arm64/kvm/Makefile | 1 + arch/arm64/kvm/arm.c | 2 + arch/arm64/kvm/kvm_ptdump.h | 20 ++++++++ arch/arm64/kvm/ptdump.c | 91 +++++++++++++++++++++++++++++++++++++ 5 files changed, 128 insertions(+) create mode 100644 arch/arm64/kvm/kvm_ptdump.h create mode 100644 arch/arm64/kvm/ptdump.c diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 8304eb342be9..fcc41e58ede6 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -66,4 +66,18 @@ 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 + 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 ker= nel developers + who are working in architecture specific areas of the kernel. + It is probably not a good idea to enable this feature in a produc= tion + kernel. + + If in doubt, say N. + endif # VIRTUALIZATION 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..60fed2146763 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -45,6 +45,7 @@ #include #include #include +#include =20 static enum kvm_mode kvm_mode =3D KVM_MODE_DEFAULT; =20 @@ -228,6 +229,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_ptdump_guest_register(kvm); } =20 static void kvm_destroy_mpidr_data(struct kvm *kvm) diff --git a/arch/arm64/kvm/kvm_ptdump.h b/arch/arm64/kvm/kvm_ptdump.h new file mode 100644 index 000000000000..0a62b0e2908c --- /dev/null +++ b/arch/arm64/kvm/kvm_ptdump.h @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) Google, 2024 + * Author: Sebastian Ene + */ + +#ifndef __KVM_PTDUMP_H +#define __KVM_PTDUMP_H + +#include +#include + + +#ifdef CONFIG_PTDUMP_STAGE2_DEBUGFS +void kvm_ptdump_guest_register(struct kvm *kvm); +#else +static inline void kvm_ptdump_guest_register(struct kvm *kvm) {} +#endif /* CONFIG_PTDUMP_STAGE2_DEBUGFS */ + +#endif /* __KVM_PTDUMP_H */ diff --git a/arch/arm64/kvm/ptdump.c b/arch/arm64/kvm/ptdump.c new file mode 100644 index 000000000000..52483d56be2e --- /dev/null +++ b/arch/arm64/kvm/ptdump.c @@ -0,0 +1,91 @@ +// 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 + + +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_show_common(struct seq_file *m, + struct kvm_pgtable *pgtable, + struct ptdump_pg_state *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->level =3D -1; + parser_state->start_address =3D 0; + + return kvm_pgtable_walk(pgtable, 0, BIT(pgtable->ia_bits), &walker); +} + +static int kvm_ptdump_guest_show(struct seq_file *m, void *unused) +{ + struct kvm *kvm =3D m->private; + struct kvm_s2_mmu *mmu =3D &kvm->arch.mmu; + struct ptdump_pg_state parser_state =3D {0}; + int ret; + + write_lock(&kvm->mmu_lock); + ret =3D kvm_ptdump_show_common(m, mmu->pgt, &parser_state); + 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; + int ret; + + if (!kvm_get_kvm_safe(kvm)) + return -ENOENT; + + ret =3D single_open(file, kvm_ptdump_guest_show, m->i_private); + if (ret < 0) + 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; + + 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, +}; + +void kvm_ptdump_guest_register(struct kvm *kvm) +{ + debugfs_create_file("stage2_page_tables", 0400, kvm->debugfs_dentry, + kvm, &kvm_ptdump_guest_fops); +} --=20 2.46.0.184.g6999bdac58-goog From nobody Sat Feb 7 08:27:23 2026 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 DE5941BB694 for ; Fri, 16 Aug 2024 12:39:27 +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=1723811969; cv=none; b=e6DoLD+okYhJCMExP3LN9R55nipcjf4FrMd6TP+by3vrcFchpnhUrPNzKQbxzfpUWR+Sn297fmSpbUBjqDJTaEA5SW5qEvxZaXT+mRuTkXVuShsPg3gHhhZQ6tFEYQMqlVhzpKB/2uBtypXGm4eGnfR/g68SRqEe6d46T0gk68Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811969; c=relaxed/simple; bh=rUTR5Uw2CU6HdDslJgJgvaaNW9+0iMJMSD2PvX3S4Mc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=j8z/MzZ/zVZyw0b/OiGOFaXiDODpdMX3YB24o9B4PmviqmG311mOCLcINTZ7UOSk9qZagHOEp+tJq7YiNZQgwV5dhhUiAQBgjRG4rqO3bMNJ2dwOdQ/vM26nOkeXs3NmihpASeXTiVmXTDi1zmqegnlF4buB1FaOSwPsVbVz1EE= 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=RWF8zlFi; 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="RWF8zlFi" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4280e1852f3so14598915e9.3 for ; Fri, 16 Aug 2024 05:39:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1723811966; x=1724416766; 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=i5eauNhTcQzE72bplFQ4XGy8D3RpEmD9MyGnD7LBaN4=; b=RWF8zlFiG6Rbc+VGZHS+uUhNi7AGrgFGm58vDUzPdRfs4UHIWH53uEFbNUkqGBNdwS sIeCRH+2fCpfd7h13ZZ1l39C0lR5MD0AICVsAt33OCfCsj2NJLAmShDPhexSunowaeiF ODd5k+fYvIQBYNOochkOJGdJcYmHhPXJfxjK/hVX1EXAqhcEpSvIRuS8Ik7bSs2uAtsY gAKcxyc8IOtaSdhucgV/rsCd7nDqPksUiLyebNs9gX+7ku1srwHzgRs+dtAa10LDrKV9 IaPntptI6s3/UlZl9bIooaD+LTzB0h1w40oFdxIZ6NX74p2SNcaWcqYkRImnSdOeD8j0 TLsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723811966; x=1724416766; 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=i5eauNhTcQzE72bplFQ4XGy8D3RpEmD9MyGnD7LBaN4=; b=At6gRTCyglU8vIzSRByQpExLTAUCxNFeWLt/WNeKfpHcVbiJbMTRQO3pW8gPd2XW2e GT324y88XBYR5T3NZyZzoZi7Cjd2JNbhj8v89Go0qRbKds0R4NpAWNnveojB2af8vsL6 fY0DG9UGP2JZZkjrlWl4lsog1K9YvGt11ELTKCdfEbin2oSGUUBGCL+NyZT2tsUY09Xc Doq2nkBIq4yVYLo9Hf2Tw4Q6WzcL9HVUCaZVYpSol5eHRzb0XrIWYypxqtuz4xUTIz7K 0n+xyvsWnFvij/v5PCQTfleOZwBecymLwv+DB+qVtAFZl7EkRWzTTw/4AO7FbSDrwsl8 ZA0A== X-Forwarded-Encrypted: i=1; AJvYcCWMMZXxY/3TeiRJIC7pZuRKDhJ/cc7V9B8GkX87HSIGyDI4ld1jwiWIM2o2xSWc22Ulqbyg1p19qT/qrjxR/OoTiUlDWOuYC2+OoGZO X-Gm-Message-State: AOJu0YwvBge5RjDAbpFXyxqnZJmGq9iQt6qTJEzAsvWTAIAwqKFzX+W0 5cln1ef2Lf9Uo6091SBO9WgCXrQFPZ4lA7J/a/PoPVV6Iw48aJbBfqop02yuBcc5GLW7GZe8PXA WiR3ssC94UM9MT9NyEr+hYr3dNg== X-Google-Smtp-Source: AGHT+IG1VARFxBSm1/RC48H0ZjztqDQmLfmamJgW5HCygZC+rMZkIMsZGB0I2wgNiB3LORe0b8lZmKSxQJdbF5eeByQ= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a5d:6691:0:b0:366:ec30:add3 with SMTP id ffacd0b85a97d-37194314665mr4594f8f.1.1723811966138; Fri, 16 Aug 2024 05:39:26 -0700 (PDT) Date: Fri, 16 Aug 2024 12:39:05 +0000 In-Reply-To: <20240816123906.3683425-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: <20240816123906.3683425-1-sebastianene@google.com> X-Mailer: git-send-email 2.46.0.184.g6999bdac58-goog Message-ID: <20240816123906.3683425-6-sebastianene@google.com> Subject: [PATCH v8 5/6] KVM: arm64: Initialize the ptdump parser with stage-2 attributes 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" Define a set of attributes used by the ptdump parser to display the properties of a guest memory region covered by a pagetable descriptor. Build a description of the pagetable levels and initialize the parser with this configuration. Signed-off-by: Sebastian Ene --- arch/arm64/kvm/ptdump.c | 135 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 129 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/ptdump.c b/arch/arm64/kvm/ptdump.c index 52483d56be2e..79be07ec3c3c 100644 --- a/arch/arm64/kvm/ptdump.c +++ b/arch/arm64/kvm/ptdump.c @@ -14,6 +14,51 @@ #include =20 =20 +#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) { @@ -40,15 +85,81 @@ static int kvm_ptdump_show_common(struct seq_file *m, return kvm_pgtable_walk(pgtable, 0, BIT(pgtable->ia_bits), &walker); } =20 +static int kvm_ptdump_build_levels(struct ptdump_pg_level *level, u32 star= t_lvl) +{ + static const char * const level_names[] =3D {"PGD", "PUD", "PMD", "PTE"}; + u32 i =3D 0; + u64 mask =3D 0; + + if (start_lvl > 2) { + pr_err("invalid start_lvl %u\n", start_lvl); + return -EINVAL; + } + + if (WARN_ON_ONCE(start_lvl >=3D KVM_PGTABLE_LAST_LEVEL)) + return -EINVAL; + + 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++) { + strscpy(level[i].name, level_names[i], sizeof(level[i].name)); + + level[i].num =3D ARRAY_SIZE(stage2_pte_bits); + level[i].bits =3D stage2_pte_bits; + level[i].mask =3D mask; + } + + if (start_lvl > 0) + strscpy(level[start_lvl].name, "PGD", sizeof(level[start_lvl].name)); + + return 0; +} + +static struct kvm_ptdump_guest_state +*kvm_ptdump_parser_init(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 NULL; + + 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], + }; + + return st; +} + static int kvm_ptdump_guest_show(struct seq_file *m, void *unused) { - struct kvm *kvm =3D m->private; + 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 {0}; int ret; =20 + st->parser_state.seq =3D m; + write_lock(&kvm->mmu_lock); - ret =3D kvm_ptdump_show_common(m, mmu->pgt, &parser_state); + ret =3D kvm_ptdump_show_common(m, mmu->pgt, &st->parser_state); write_unlock(&kvm->mmu_lock); =20 return ret; @@ -57,22 +168,34 @@ static int kvm_ptdump_guest_show(struct seq_file *m, v= oid *unused) 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; =20 if (!kvm_get_kvm_safe(kvm)) return -ENOENT; =20 - ret =3D single_open(file, kvm_ptdump_guest_show, m->i_private); - if (ret < 0) - kvm_put_kvm(kvm); + st =3D kvm_ptdump_parser_init(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; =20 + kfree(st); +free_with_kvm_ref: + kvm_put_kvm(kvm); return ret; } =20 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; =20 + kfree(st); kvm_put_kvm(kvm); return single_release(m, file); } --=20 2.46.0.184.g6999bdac58-goog From nobody Sat Feb 7 08:27:23 2026 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.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 855191BBBC4 for ; Fri, 16 Aug 2024 12:39:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811972; cv=none; b=p48buAFMjg1U28itNb1uJjNBeQg797c6nGijtEoBtwPcCBQzj52frkNYJz8J0BDmBwIbce+n8CyPjtxkh6hXJChkNu+XcWjlUCi9C36GlEQsZgwVC4mXviNQWECNiXusCnvIlB3hqgb/5UmhUwVP2AEILVirWP4nSn6vMMESkJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723811972; c=relaxed/simple; bh=mY6xy3N+Ro6xX5leeMZAa8gpa+1gdMNp/aUTBfJ3SK0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=rkLNtFiYm9gGAjaX8KJi5CZ65c5C9V7nOUCJGgTBB3xg7+Ogf+YCJVFlAMEXkIueF5FjyD0uX2mp9+RmSZMwcTPUlRpRoS3d1jSWhQCeNDSU6fShi268/5Ww1afjp2ohU4m5TBYHLC+y3ebzOYe+IsLz/d7q1hC0ItPtTJluFP8= 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=v41VPMJY; arc=none smtp.client-ip=209.85.221.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="v41VPMJY" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-36848f30d39so1062143f8f.3 for ; Fri, 16 Aug 2024 05:39:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1723811969; x=1724416769; 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=fVLGFavEAQJdYF6sohZy6GLteiKbgm4SNZHa6M3Hrik=; b=v41VPMJYC6FYdkj+ltH/baTPMUoGuQBzxWrwfrBRjf3c7nmmiO+05/h42B6+ceWqT7 DqfYzLqzs1fFImfQf7UQwh+TZvhtSWDppwxGgFz7tTz4fF/k1rUf/pOUymZiqCpjR58n mdMXGUkodton7U139AalbDzmDDsyPhKbo9aQKwGQSs7PLUSyJGGJCsvSf76WQxPEJwXq lyAv6RBSsiapSFPnmTQwap9qBra8L5Hj2z8zNsJjxym4OhRvW90AfZMRW66g0aKWQ4wY Gye1E6b8O53WN+ocwLqcpnW7OzX8piP/FJfv4MOjYHNr55ad8xqhGg96QeHk2Flcs95d S4oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723811969; x=1724416769; 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=fVLGFavEAQJdYF6sohZy6GLteiKbgm4SNZHa6M3Hrik=; b=slt3h/vL/OFdyXMyLMk3Y8C24v2JCbUXER95fgRp0CDxSQ/T/VCThACmPyRig2l/5A YtXoKzKm8S/Ugnxm1wN8CDKEtu5tblU4fE4AZ7qMvTpL3P6OhyVfC/MGTZOL6Xp4/QK5 gU5NeWmaIr5DzF6wRxiMXG6tvvcMy4+8zb78E8kBnetpVAfBn7p/jicJGIxJeHdv0M2S cLhNFvvklUHgRhBrIyRbEBfRc4a9nVng42dilVIxlXo71ypZrRV/ksKmqfXn6Mh2mAr9 lfpBJzlDBzJ4+z+xMOzK/diCC77C+/SgIt8oPs1WCZCA/bFtn7gkA3Drv3cVpsDyHaI2 pVEg== X-Forwarded-Encrypted: i=1; AJvYcCVuEa8gJrTeUaflB7ZhkOhnqcIELa22953BWGrbD+52FP2OBolB2s2L1BMBDoGrZ+MKPUizycvTvBJoeSzPhuekC+c/LjdrfrbAOjos X-Gm-Message-State: AOJu0YxEAzLpFZt4it/vjFEGVuq1aOjHM7rU2g0rfuQrMDVCfsWLd4lj t+FZvkjtR9i3d2sjA6YHFgqpBIMN4Zt0EHO5uAjUdoXeIA9XsHme+eHlElVjOEDjE6Q1Pz6x7R7 rtCRElsXka7Gbo9lLQDQAo9IsVg== X-Google-Smtp-Source: AGHT+IFGgP1UpKc1nFsMN2cnAW/WNRr3YojR2uI15QJjFmnongfC+MYnDiKQo3s4RWZo8/KjRQyeYn/x04TBgYlZR34= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:6000:1e81:b0:366:ea7c:bed1 with SMTP id ffacd0b85a97d-371943164fbmr3636f8f.1.1723811968492; Fri, 16 Aug 2024 05:39:28 -0700 (PDT) Date: Fri, 16 Aug 2024 12:39:06 +0000 In-Reply-To: <20240816123906.3683425-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: <20240816123906.3683425-1-sebastianene@google.com> X-Mailer: git-send-email 2.46.0.184.g6999bdac58-goog Message-ID: <20240816123906.3683425-7-sebastianene@google.com> Subject: [PATCH v8 6/6] KVM: arm64: Expose guest stage-2 pagetable config to debugfs 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" Make the start level and the IPA bits properties available in the virtual machine debugfs directory. Make sure that the KVM structure doesn't disappear behind our back and keep a reference to the KVM struct while these files are opened. Signed-off-by: Sebastian Ene --- arch/arm64/kvm/ptdump.c | 48 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/arch/arm64/kvm/ptdump.c b/arch/arm64/kvm/ptdump.c index 79be07ec3c3c..b0d55ea3fb2a 100644 --- a/arch/arm64/kvm/ptdump.c +++ b/arch/arm64/kvm/ptdump.c @@ -207,8 +207,56 @@ static const struct file_operations kvm_ptdump_guest_f= ops =3D { .release =3D kvm_ptdump_guest_close, }; =20 +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_ptdump_guest_register(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.184.g6999bdac58-goog