From nobody Tue Dec 16 13:25:32 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 C48F2153503 for ; Fri, 21 Jun 2024 12:32:40 +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=1718973162; cv=none; b=avdGbfQDlM8uu7P8TgzVKBqpSTKPczTnYRdeHarQhlsNpkAtBbpxprzW4U1N0Xnw4ifg1uVi2o9suKLI7n1ebujz0mPCkL7UcEJ6vPrGPrd3FDyKNM/xCxKOtXVXZutOgND0ALmzSzfEnePCUxV/GvNCibdv15nWzVvaQjWZ7u0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718973162; c=relaxed/simple; bh=mWLp97bnyLJ2+7AavbpyV1/kRZY65jdnzLdcMXTuA4c=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=YUikw/9OccIXxi516rjUdE72eWyY3AW4nlOtyvdk5bMS4alRAXa0mR1bogRaSSRM7qvNSp2ovwmBHCaDhsLan8A76ziVP9i3d07GV5upFifeD5wr4mOSIkbJblgN9kfG/Tp00IrcqUGts4hFlzvVIdJPmMU7Ew3QV/VwGT0dsCk= 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=bYjKGybd; 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="bYjKGybd" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6311e0f4db4so35045197b3.3 for ; Fri, 21 Jun 2024 05:32:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718973160; x=1719577960; 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=25Ic4MRU2k7NJP2f+gMGQe2Juiq+UKR6YPOc7ZYN4C4=; b=bYjKGybd1ESlGOHIQCSQS3SnINTZbTd5kR3MWottsJePzpw8KgcpcQEnV4/sIMqZM6 A3hcrqJ2FgVSVuSEpm0y1nnYHFPreRBVOJy5VddViWSvvPhTlOiZ9stWdskQhArV1zbm 4oHPp8mCkElBSsVeC9gYLEnDIGNK7OLkEDJpQuKMa2a2crP8CLjQ5lgsmrXObbtjznnI DUM8uZaJM+z1dZe29936DFRF1n628sIzJKktWHI2PCG4LuNQ3uHkhNtVr4009S6AzkKk S4jbRmZJQePiA7Fgd43+pM7A8rFojh5xWqhHCnDvnoDol+bwCoMP5s6PpmCbjC/p7G5q ogjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718973160; x=1719577960; 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=25Ic4MRU2k7NJP2f+gMGQe2Juiq+UKR6YPOc7ZYN4C4=; b=XGYOO97EHyi4IH0+Ajj6amwhGuNLBbD94ugqVT1IQ6s5/CmS98juB3/LQUeKgs3bP5 Gf5a/p3Tbu1Mi90fMDgbyLneKjGD534PPF4BgRvk9oK++9E+c7mtM44pw865kIXhzRO2 KmmvT7H3urkIXAN01dBkXjFInoBoS01DSVSfcx2ey9xBw70+oDwsRJFzUy5iny9pjobw bxMCYxAIIyOBzHMg12OVRV2XC2G+8Ge4iHuGsYkhR0kRjj62BP7z0eTbQjyiIK0axRiS /TwU2lQ94ESqIYwa0CORnQLsS46q18lJhzVYc7Z9/XTcH+UHrWxS+/3b74vkBgK1zLG3 qhtg== X-Forwarded-Encrypted: i=1; AJvYcCUXNbju3pzkiqScS6XqRPztSH6URnuPDXOaT5eGPSgE3h2HudzsqSOkUXMCAkWqyY3ipjHPMXbM1DWX+cOqKlyZK7rk8q4DrXnFx3/j X-Gm-Message-State: AOJu0YzBfc5iNxOlF7qQMkvTmUchhDOcBFFWT6WDjdhBoZIFztluvWuu FURAL+cH+htm0dB1WglEIRDzJKQAzk3E/xDfZu4Pg+RO8CBGZUcGgDPytncCLp/EpayV8Tegd+E 41h5kfZnPkJYREqrODzTbtwK+DA== X-Google-Smtp-Source: AGHT+IH53+5umEtnQUZLfthMpVgy/4eLzcSoA4+oyiYt9jWf+dLgnKlVM+ZCqYhVt+ZaBFR3R5+UiqwV2rm52Qcsq78= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:690c:7441:b0:627:c0ac:a9e7 with SMTP id 00721157ae682-63a8f5246b3mr17861817b3.5.1718973159572; Fri, 21 Jun 2024 05:32:39 -0700 (PDT) Date: Fri, 21 Jun 2024 12:32:25 +0000 In-Reply-To: <20240621123230.1085265-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: <20240621123230.1085265-1-sebastianene@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Message-ID: <20240621123230.1085265-2-sebastianene@google.com> Subject: [PATCH v7 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.45.2.741.gdbec12cfda-goog From nobody Tue Dec 16 13:25:32 2025 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 05A1F154BFE for ; Fri, 21 Jun 2024 12:32:42 +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=1718973164; cv=none; b=bt17U0znEP5NE6ARJd9LTG2MdF3SN9G8PelpBu8CKgZnTKxwvklDNPpf4hI/VJeHxhHs7H13GEgNvfKgDjLfzMko5EZty5jkIxp8DZBSXUnLAA1fJL9TKoUVhNtjI1pb/fQ0EWNomyQDdvQ+dkYUZN4hpiUCgBUlkRVQogxEj0Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718973164; c=relaxed/simple; bh=aaHqMZaKmKl+99lxeCDfmjo1TD3ti8HIan82O3ewXag=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=DgZ8a/nKnZBF7WRXzv2JfP9nFt7jg1XzDeH6qr6ObYoKfCw21DTtYKhGKVE6YRtpqO15IQ7HDeYFSsyY0rTtVn2jq5DoieOj53vJoUYaX6jPy66QUHq1t+ZwUKvpxRVtAwR4MEk8vrYK9BCwvSil/kxo96GFttdAugUuafOAnkE= 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=wAVzoT2t; 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="wAVzoT2t" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dfeff1ae480so3326336276.2 for ; Fri, 21 Jun 2024 05:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718973162; x=1719577962; 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=EzGBq5ThBYn0maeOuexDoW9RxvarTIzzo7wMG3lfRiU=; b=wAVzoT2tZWndW6xM9mkoVb4SYPY455J+rAqm4HcuYVjAsedcJyMJu8UhRyayoJi7rN cuQbnoS5tYZuvd7pUZY8s0NW0fFGIJ1nMyNROSdYaeJ0esHq7uC92OpYeTStHmUfnMy/ dXPOsGzglfAQvyLbxvg4rs8cz0o8VEmOsGLBBDFunHNkaeV02vGBy+nluM2GedueZN8N nTF80+OnvMkpBr4Mpk01WGEV29wPWiGqyi12G3FSMkdfMmtpfqxo45Nj3NabV3j4QLG4 TfG7om5U/cDoPT++znB3gW2zFjTwmdgH9Aj+2W4rGBero+pQ2rMmz7oBSPR1jWAZH0FW 0iRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718973162; x=1719577962; 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=EzGBq5ThBYn0maeOuexDoW9RxvarTIzzo7wMG3lfRiU=; b=UCQAPn7+2s1OrddXLMi/GJSoRm7bbotvnM/Z8/mStyqzrYJMWce6EP5Tnlvp1SoHxJ Ggmt877Puui/bZ0BlICyKntU6s+tW9rQBgga0W4WKcyeb7cndlW+vTXgKRhkwyt1pIIK xrebjJpLkCcQY6+dE0h1Sd2AaCNv5GRT95h1rbjg3jYny5cZQTslA74OyotVPcARQXJ4 PllVZqMXiwGoa/OvtjHJvVsPsairJo6sRViUk5nYbPLaJIsgpH/xT1cFXo1/cF2xRq2l Mm5Q7e5Gse7UKKxaxZZvjqq4V9I0KzNvgA16/MPjCIDQ0Aj82PvbtyE1A+sMIepxHMpX eyJA== X-Forwarded-Encrypted: i=1; AJvYcCWf2VZ9MhWHp8YV2gyl5DQFsimRBxmo0jnSMDlEoUBYbMn/oxRYpCDCJik5lddjhhoLrUTKNdUZaR/ZYi2hem40itjNetAdlZHy3dCx X-Gm-Message-State: AOJu0YwbRDWMej66PqUD96IPqwaPIXTKPa+faI/h2sCOEweCnzz76fv8 BMi1KiuA4/gwQz9cXkyQL2Moo9sJChUUuDCymWi0lRGgEYSqRUaNT/Ozp4k2PAWGwd25zLJssit bkyNtTfCyXsSWEYXD1XysZFcEqA== X-Google-Smtp-Source: AGHT+IEHWLyl6fNJBxDvAZcuJW3n20nBcPn6CejMK+alB517jSqTAiCeKZNxc0fP6fdgpnKzvHbq34eXpiFJ6ppcopE= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a25:943:0:b0:dff:2f78:a5d7 with SMTP id 3f1490d57ef6-e02be130582mr1340535276.5.1718973162032; Fri, 21 Jun 2024 05:32:42 -0700 (PDT) Date: Fri, 21 Jun 2024 12:32:26 +0000 In-Reply-To: <20240621123230.1085265-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: <20240621123230.1085265-1-sebastianene@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Message-ID: <20240621123230.1085265-3-sebastianene@google.com> Subject: [PATCH v7 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 | 37 ++--------------------------- 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/arch/arm64/include/asm/ptdump.h b/arch/arm64/include/asm/ptdum= p.h index 5b1701c76d1c..c550b2afcab7 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 prot_bits { + u64 mask; + u64 val; + const char *set; + const char *clear; +}; + +struct pg_level { + const struct 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 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..e370b7a945de 100644 --- a/arch/arm64/mm/ptdump.c +++ b/arch/arm64/mm/ptdump.c @@ -38,32 +38,6 @@ 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 { { .mask =3D PTE_VALID, @@ -143,13 +117,6 @@ 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 { { /* pgd */ .name =3D "PGD", @@ -221,8 +188,8 @@ static void note_prot_wx(struct pg_state *st, unsigned = 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); static const char units[] =3D "KMGTPE"; --=20 2.45.2.741.gdbec12cfda-goog From nobody Tue Dec 16 13:25:32 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 EF9E1155399 for ; Fri, 21 Jun 2024 12:32:45 +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=1718973167; cv=none; b=QALBrHJRVvqGCiKO80c/AjcQTIVePq+dlM0cXCSm4rUdsMp9OhISql2uMmOu29SEAo4q5LUi7KXM9+cJKtUnc6nrH+a6hmn37fxII2Iu5YoEg28GpJ7F0Jpwj6TyMdK3VThXUQrqy4d+wDOThhnMeB3+SC9m9ivdsIPfW0AMqwc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718973167; c=relaxed/simple; bh=XvKH8yB7+J6NL1xJMHOJ0ToppJXlMKTu2n7fXKk/DyQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=m0kVWq1H8GCv0h7Qv9vUstg4JJB7WvDA6e+Cpnz+dzV81emNiwMmG2kO3Sz16z75VrKGwV9+kXJXD3l2Rd8Tud+gpD7zpHgZNcWWf/LsqrXU/EOTTSOYSf4+c3Hgeb65a1ru7e0lBkOf846yk+xXnyHduu9kL4RTWzT7xxWOYuw= 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=wON6V2kI; 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="wON6V2kI" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4229bde57easo13529805e9.3 for ; Fri, 21 Jun 2024 05:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718973164; x=1719577964; 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=CfipnPazTooSWljHtj0QKg/sbCS/LwM8w5FGtvn8eIw=; b=wON6V2kInKCFlMJE3PIYMoLSpyWBgZKa0j+ILw4wAJHu45WQZVrFpHMAk3egQIaeWH iIdaoGdBN8NIPo9dN3ov6UJbed3B5m1saxiWIUchiyyAC3Ly9MDHavYprgTqNAIREoGr T/n5SPyNxLoiTB2yNH3XbFmJCzIzcrEKl9hzTgbzSN3KLESM5wWMilvX05qTgnF7GgUU SbhK/Mp1SB+rF1XeKMgT0Tyg+MubjF9CsmFff4XMugq7EGRhjchLDlvSUEsSjYKGhPxk pqV5OrQ3IVaQVKjCcQIAlDMdZNlym6A/q3wAZaZIOxDl0aVDSHGPNgrMgJ8rqmRkWU75 kxOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718973164; x=1719577964; 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=CfipnPazTooSWljHtj0QKg/sbCS/LwM8w5FGtvn8eIw=; b=Hv3xbwL0qtMjawPlseu0GZPqkyr6mjuPtDJtobIoE+Y++TuFMp7jG4cvUWGMQ05o8o jB31duTm/1Dtscnx5Lt/F41DBDmA27h3rTS4kbHQSM73QQsrnpijihD9bs08ZnLpwlHg 7zFLcCPsFtO90cfUoVHs17JK3IAmCjtQzPvPrNkYWiTMqZQ3re6IJFIT0U6sKafE+rsh B7k7wUqRVoPLN9zoMFlrQrrmsparFzVQi4BfmKBjSO2QEh8nIiU9L5M+Z6XpoyMheume 9negRVdR6JGksw2LaXK3J6X0V7Z9h9CmOeJPnavoQxUIDaHKkM88+wUhycs9p4d4Raux PDdw== X-Forwarded-Encrypted: i=1; AJvYcCXhqNK2vcIaXrTdkPL+yIW/78yxkL+YmlnyEcMa4MSN8Bx3QtCIIRUY0WbQarHoe0FxSrQCRe3oBScsdOOzOrxHJNeDc8+hbhp1zuCR X-Gm-Message-State: AOJu0YzVS86CNRcmKiZ9qJSEs7Ocj6tmpsqFyggO/NoIJCY0KG3KYtEZ t32WeyTWRelIdHYn8zn7YEOtZu+ZfmP8/z+FzWUdbhRj8WwWN5rkAEUJWhir6AdfeMcz7T8qLY+ QE7a9nKR2gnuf081WML1rWyB8hg== X-Google-Smtp-Source: AGHT+IGRdi8iCVedSAjQTPJq6auLk/a0anHCRS31CgRh12LvFMpWeGYnx6ArZlAwPEeWqjlBpzoOnFCppGjHDAYrqfw= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:600c:3b9f:b0:421:7dc3:9a0c with SMTP id 5b1f17b1804b1-4247529a86bmr593065e9.3.1718973164436; Fri, 21 Jun 2024 05:32:44 -0700 (PDT) Date: Fri, 21 Jun 2024 12:32:27 +0000 In-Reply-To: <20240621123230.1085265-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: <20240621123230.1085265-1-sebastianene@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Message-ID: <20240621123230.1085265-4-sebastianene@google.com> Subject: [PATCH v7 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 c550b2afcab7..a4125d8d5a32 100644 --- a/arch/arm64/include/asm/ptdump.h +++ b/arch/arm64/include/asm/ptdump.h @@ -44,6 +44,7 @@ struct pg_level { */ struct pg_state { struct ptdump_state ptdump; + struct 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 e370b7a945de..9637a6415ea7 100644 --- a/arch/arm64/mm/ptdump.c +++ b/arch/arm64/mm/ptdump.c @@ -192,6 +192,7 @@ void note_page(struct ptdump_state *pt_st, unsigned lon= g addr, int level, u64 val) { struct pg_state *st =3D container_of(pt_st, struct pg_state, ptdump); + struct pg_level *pg_info =3D st->pg_level; static const char units[] =3D "KMGTPE"; u64 prot =3D 0; =20 @@ -201,7 +202,7 @@ void note_page(struct ptdump_state *pt_st, unsigned lon= g addr, int level, level =3D 0; =20 if (level >=3D 0) - prot =3D val & pg_level[level].mask; + prot =3D val & pg_info[level].mask; =20 if (st->level =3D=3D -1) { st->level =3D level; @@ -227,10 +228,10 @@ void note_page(struct ptdump_state *pt_st, unsigned l= ong addr, int level, unit++; } pt_dump_seq_printf(st->seq, "%9lu%c %s", delta, *unit, - pg_level[st->level].name); - if (st->current_prot && pg_level[st->level].bits) - dump_prot(st, pg_level[st->level].bits, - pg_level[st->level].num); + pg_info[st->level].name); + if (st->current_prot && pg_info[st->level].bits) + dump_prot(st, pg_info[st->level].bits, + pg_info[st->level].num); pt_dump_seq_puts(st->seq, "\n"); =20 if (addr >=3D st->marker[1].start_address) { @@ -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 &pg_level[0], .level =3D -1, .ptdump =3D { .note_page =3D note_page, @@ -297,6 +299,7 @@ bool ptdump_check_wx(void) { 0, NULL}, { -1, NULL}, }, + .pg_level =3D &pg_level[0], .level =3D -1, .check_wx =3D true, .ptdump =3D { --=20 2.45.2.741.gdbec12cfda-goog From nobody Tue Dec 16 13:25:32 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 69703155758 for ; Fri, 21 Jun 2024 12:32:48 +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=1718973170; cv=none; b=ryNboNE9RwLy10v5d1oWpkyLmqAJWCqpYHrRCW1HBTuztkFI0Wi0DVO7GxTNmmLe/O7l6eaxhDua/jNpldl9EcpLvc8G8zx3ZVTFJSZWoDE8pwT0CAKbBhR/iUh2GXD7AxZ1KqMbuFaXg+bkDZmELzRq0im7gILpgvtuasDhPtQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718973170; c=relaxed/simple; bh=gZiZQA10hsX/A8UdCM913FUy2l9+6hDOMmJ2u3LLsII=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=IHtgtGlBXPzRKcfoc6gBgI/r9v6e3Fd99XUjHRL1A/0RrHuAphPYi7agYS3s7NvKb2TrroreS6B9+OTTuOb4g3agZecBRArgXIHUVTK72P2nmPxbzz9bQCn/ufdmbaGnvyiK/eMh1YqARKglCpQ31DC/5zXx5gQzPw2oNfU6130= 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=LPzZdzJq; 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="LPzZdzJq" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-42476eda16cso17273785e9.2 for ; Fri, 21 Jun 2024 05:32:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718973167; x=1719577967; 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=9U3k9tuiLiLPQI9AWIU2sX6N77nYvdH988sCBf+PvC0=; b=LPzZdzJqgBFwWb6lTnaepoUDXuzhCe/ETdq/4OC5VDVmXEIvJFZEeJZBPLKpOx+6M6 M0heA690Cf7cyYKe2qnYCc3BlAiRO6dzhC3r8lnHk1DAAvg/8b09tSqZy8tDj/M/1lse TV9gj1OBoFTEPPNI6L1nBov1CsnzYdGrFh0B1Kodio27OEg3ZSdR4hNszAwzN+WPgLek 4T0NfSm7K+T3aFPsWB6qg5hh5NWedhM1DMSSa/Ia+lPF1cQVcES6GLeCZG119nhSLU4M jmZQ0q8oU2oHX0pGF1JZLmuloYiC+WE2SROPXS8g8IVeajjemsak7racaplXgVeCoDu1 kyjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718973167; x=1719577967; 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=9U3k9tuiLiLPQI9AWIU2sX6N77nYvdH988sCBf+PvC0=; b=llLFf6K1GhhqeUd5XwTv5afKfs9BTTXk9oq+vIrQU/3nnwTTQwbXGpPHmX7GMIMLeZ WK58Xq6v62pWaYo47OUBCabMe0H9ShXf2Z8tSW1t9Lc7M8PupLmTQPrbuLF4hCSiJUI/ VGJmgAD4ZtKnTaPhU5A6EhfT0AuyqeMYegXP+J9Y5M1CrzvpAFx1z47xmaHYGNKHl0gA hcDKQCudo22EXPRHQhIv1Eds6T/U/BEnSaot0QKO2xFleOf9AZAx3tQmT6zbYknmJImN FWLY3y1fWifGNjKRFZ/IG6BGBP0zLwlNfQHBUGWUiPBcadzyKEYXPYcTSIbzzUkKlnUQ CEZQ== X-Forwarded-Encrypted: i=1; AJvYcCVqkgt+1V6reEN/JUQx1h03knlKRuT7RVyMtR3Vt4PWqEs/LkasJKyVxuz1PCiw1Sjheht+ALw9YKOEubAP4QEgeRTEKu8ygn4fh5bc X-Gm-Message-State: AOJu0YxontPNsZ8PhPoIMekl5Ea6sj4bca339E2cZMnd1hPGSEA1YfW8 wB2n2y9Z5PoNpB5c6N3EwnfVM1GtdADEAtx3ycfZ1YeqNblOFbUU7JmEiIh90oWaE3MLbpkWKxg vaGt5xvg2Jki9XeQbN6Q/DwSLlQ== X-Google-Smtp-Source: AGHT+IG3jjLLcKVegMc4vyKOfpAyq0Mm/2rzRvjshonLnHB/hIPzh7SyEtIPV2JFArbLo1dzzIgE39ZKxihe/rCGybM= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:600c:1c01:b0:424:813e:73c7 with SMTP id 5b1f17b1804b1-424813e750emr123495e9.2.1718973166688; Fri, 21 Jun 2024 05:32:46 -0700 (PDT) Date: Fri, 21 Jun 2024 12:32:28 +0000 In-Reply-To: <20240621123230.1085265-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: <20240621123230.1085265-1-sebastianene@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Message-ID: <20240621123230.1085265-5-sebastianene@google.com> Subject: [PATCH v7 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 58f09370d17e..99e4a82e141d 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -65,4 +65,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 a6497228c5a8..f6ef4140b20a 100644 --- a/arch/arm64/kvm/Makefile +++ b/arch/arm64/kvm/Makefile @@ -24,6 +24,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 59716789fe0f..310abc612965 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 @@ -216,6 +217,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..36dc7662729f --- /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 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 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 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.45.2.741.gdbec12cfda-goog From nobody Tue Dec 16 13:25:32 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 8CB56155C9E for ; Fri, 21 Jun 2024 12:32:50 +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=1718973172; cv=none; b=P/2K45ttskR3m9syXwliiUAPbmspCzlMEAznJwFk3pu9rsIlj7RTJurSLBAgiNmiMH7q5nZ83UMvCUyr6LdhII0FuRVSuP2ZUi9vnuJbX9o5a9iaaeiSSz8j3RJ3XRAwcNcHRCZGQYeb8X/S62wCDd9OqX6s2nEhk84uvZGAZ/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718973172; c=relaxed/simple; bh=q7cmS7gvGT06Vyut3Tk2BvR446OmDqE4CKGPTHaUrAI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=iStV9W1Mcj91t70u6cgsbS9TZgKo8w/U0tX2U73IT/dgBbZ+zwtvQWwsB7nJcs7g8BiAEqcbwt0pwcAuIK3DLvtUNLQpUi0C6HWgznt6vZy/LfaD8Ee3q+93rEEGC17DnGlJqp73XUKFLBgmeBBa4yTEoxLm6hPfk7RTTDxK2T0= 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=JhCMMFTu; 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="JhCMMFTu" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-421eed70e30so15577315e9.1 for ; Fri, 21 Jun 2024 05:32:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718973169; x=1719577969; 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=deelu2OWT9FEv+OHF2wJoMlx2ZjM7Mxt+Yz0Us1bWBA=; b=JhCMMFTu8uGAVKYIfPAOScUST3VkjxWfMogbkVcaYPn8+/xeJdWcREXCZICnChKfSD +uubgsVZgKpaIoZm/YzGNKjQlTqgq7929QDBS6IuMVDqo4IGnETVapvRLhIGbueXQOYc 5cELOedO0IS3kxZGTylZBuB/OnFloRCMcsplFoTwdX/c0TL99aFg/oa58RVlPtw487NF agHOwM5B+TVNsCNU9L7+c7oUkAJ5xa+S0O5IxXTcZi6Btlki1DeWEvUQ4lRr67rOL16T wKYZYUVHRgaSuZ/oz7ltq50+F7cq8YCPobUgpE+MA2oofqmH1q+Am+wtbWtgCLbMKO9n GQeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718973169; x=1719577969; 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=deelu2OWT9FEv+OHF2wJoMlx2ZjM7Mxt+Yz0Us1bWBA=; b=HejWuDzCdTMXfGPDZCEIjoDDGUi1vgSn+/3P5aEr+yN55kJox1z9+ixmN9xybFBN0F nhnWI6vNArQ1CBNlmREmqsr2BT0fheZtdJuixkVcpEaoWLIMgqzVRADMoYHDWiSOrC4A NDj+cUl+aQQpFA9yQOt6s2fFpNcV6x354D+VbMs82epLXY7zDq8xyDIFxgqe/Z4MwOxb 4mEpwmbbMqyoe//tfbLx4xQVTea9mhcS2ZdgSg+QOYUg57wM/8K8wCJgtesvl+jaWBvE sd7eewoTTFZtw4Dsp7DmIuZ1rsGNvdgrAPKgwY66bcP9szOQ/Bpq8G/M5dHAI6IDNHEh 9r6g== X-Forwarded-Encrypted: i=1; AJvYcCVtAWtkMzPTNplKuLLZ1aiM0Et2rbWk8/7JazUhzv2gOhlXUbqTWMiHZqWTJE5o+6uig8eHbUx9hIo9085QTaQcWveoJ3g1/Zfd0M4X X-Gm-Message-State: AOJu0YwIG6xxqdOAjvqdq700HltAhRE3uCSgVWsd+vTBBodKk4oQpytb hjgOGac8BU1htpgPQoThoYwzLrnOroBxK/JRzsm2sRHzdU8k3tDsztoWXZNfCDLZuedytTjrzlH xUKtAUTZVa50UyY6cQYAEMsEdug== X-Google-Smtp-Source: AGHT+IHdWV0c0tNGcbnVQuL2QhywOpmCGIzwP0O008XRxIGeQJFB+pSrOMj5h9yiI1GGvgsz9dT8lw3c+AUlnHcJArc= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:600c:3582:b0:424:7669:910a with SMTP id 5b1f17b1804b1-4247669952amr1919215e9.2.1718973169043; Fri, 21 Jun 2024 05:32:49 -0700 (PDT) Date: Fri, 21 Jun 2024 12:32:29 +0000 In-Reply-To: <20240621123230.1085265-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: <20240621123230.1085265-1-sebastianene@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Message-ID: <20240621123230.1085265-6-sebastianene@google.com> Subject: [PATCH v7 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 | 143 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 137 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/ptdump.c b/arch/arm64/kvm/ptdump.c index 36dc7662729f..cc1d4fdddc6e 100644 --- a/arch/arm64/kvm/ptdump.c +++ b/arch/arm64/kvm/ptdump.c @@ -14,6 +14,61 @@ #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 pg_state parser_state; + struct addr_marker ipa_marker[MARKERS_LEN]; + struct pg_level level[KVM_PGTABLE_MAX_LEVELS]; + struct ptdump_range range[MARKERS_LEN]; +}; + +static const struct 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_HI_S2_XN | PTE_VALID, + .val =3D KVM_PTE_LEAF_ATTR_HI_S2_XN | PTE_VALID, + .set =3D "XN", + .clear =3D " ", + }, { + .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_LO_S2_AF | PTE_VALID, + .val =3D KVM_PTE_LEAF_ATTR_LO_S2_AF | PTE_VALID, + .set =3D "AF", + .clear =3D " ", + }, { + .mask =3D PTE_NG, + .val =3D PTE_NG, + .set =3D "FnXS", + .clear =3D " ", + }, { + .mask =3D PTE_CONT | PTE_VALID, + .val =3D PTE_CONT | PTE_VALID, + .set =3D "CON", + .clear =3D " ", + }, { + .mask =3D PTE_TABLE_BIT, + .val =3D PTE_TABLE_BIT, + .set =3D " ", + .clear =3D "BLK", + }, +}; + static int kvm_ptdump_visitor(const struct kvm_pgtable_visit_ctx *ctx, enum kvm_pgtable_walk_flags visit) { @@ -40,15 +95,79 @@ 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 pg_level *level, u32 start_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; + } + + 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, level_names[0], sizeof(level_names[0])); + + 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) + goto free_with_state; + + 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 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; +free_with_state: + kfree(st); + return NULL; +} + 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 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 +176,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 (!st) { + ret =3D -ENOMEM; + 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.45.2.741.gdbec12cfda-goog From nobody Tue Dec 16 13:25:32 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 9BDCA153BDB for ; Fri, 21 Jun 2024 12:32:52 +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=1718973174; cv=none; b=FmYt0Pok/P/tlsl5X2ervdp3pU1jBefC9CunCdEN3mm5bYRIlWjsOA6WHUXtrP38JxBzpdCwcQ9N1yOo9FMmgN2MjZbKwCEvuAHAykTkWV/NwDLyot7/UMtjFnALbB1EKl+i9BnxUP1CBU3MiqnaoAxiXeyCvdxQ6sL9UmH7Lww= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718973174; c=relaxed/simple; bh=VKEiAQ5rnCpzkwoGU9Kf5JbSpYjqjdSM0fujBxiasBI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=isyMV7LdiwePaImRstNKy+Yaot/T8SV+dyCRV4IYF3+gjIvcb2vs3JhJi8FHUhTvVhxmALHfKoCQoAoqcA3slFMjGqXh6hgLeqLd9YuXI7ju126fsvRQIjoh5fA+VGWFYHLq5ZuAdPjQyenMFAWjwW3kqlO2C0s9MVwsp7G8shw= 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=bvNZB+KW; 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="bvNZB+KW" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6344d164c35so37049557b3.1 for ; Fri, 21 Jun 2024 05:32:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718973171; x=1719577971; 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=GaoTyRJP5MVoQ4Wx1amDUxzz/OCpulWviUJ5XDAG08I=; b=bvNZB+KW73KMmH6h1kj+OE2phQv4hP/7MXLjqRbASZSPYqr+OJTkXPtHUY1ZWIlxRb yaP6B1vSTafRNqhBByk7MlhL4+2k4+Lmce9WkK+JE5FnSylsgzJvcTbzR0XkPOp5yMim XxNHPrUbPDuqiuYOSMduAd6wXtpQG2xLpsf6rMDAywkjC2JtG+KlUThiT5Haav1kz2t3 rftV8vrfFcdtPXP/9VYzy+tI7pyxDjTCAwCtR8fZvO9VCfXV6WKwq601erxtQsrGGmQE uuiyK3IKDbMrSlaGAacxGQwKKFb3KzytwrWY0tUxDk+PxrUj8XH7ApFj+MeIK0SJL79N uwAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718973171; x=1719577971; 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=GaoTyRJP5MVoQ4Wx1amDUxzz/OCpulWviUJ5XDAG08I=; b=qvGpZWjHrCODouZMimzYiv0OfH1ohUXseGx2eMgfO+GULh84mr4CNvpg+z2X14whBA m5kfMTx07OTkgjIQ5JiyCw06rmZ31IBV7lzF7n3f/gE/07WMrrj2SHnhbcF+3oghDC/5 YY4i9/RkIpaaZ1DN5lDrZi5jyv7uA4AwaS7Sdm17OSZEqGuQW2AwkgzhTfkla8CDnPIq z33qu40tUtjDA4Yz7WRNhLTkbXIW3urojFM8LlfX9NBJJTryPE5FN1E8F4T9hkR+MqU+ mO2LthAe0P5IG4RdW0KC/PkTDnn7EB8qcluDvc+nCBFLsW2d8kqhPCNHNMqZJZO8vkBg x+sQ== X-Forwarded-Encrypted: i=1; AJvYcCWSGdmc4CdR3R60NwaQQvTjO32+705ptCOQPgrWHDNwfyvao+1JxBBtz/O1Wo0WiiekwS5s0HDEtYYkCrbhCXEapARr5XFB+MdSJMmz X-Gm-Message-State: AOJu0Ywmt7s8NjSMqULkZW+c2qIfk7kVld2q+6NURpERn1hXEgfYeW5k 2zLwuSgwL5i6yTdvteVLSbL7y9nwSPTXyWxI/HuWBtNesagKpMPKY+4Il35u73IVsoxJ2kfZ0eZ YV5zULiLMJDUSZ8TcWQlHbPf5Sw== X-Google-Smtp-Source: AGHT+IGj7AHqrKDUhBWO+SmknG8+pCJKbMlt4EBG61XGF63G72cpdFy+hwEXTIOexf21bNWp4h0sUsTwv0bTgFiHF64= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:cd5]) (user=sebastianene job=sendgmr) by 2002:a05:6902:2b12:b0:dfa:7278:b4c4 with SMTP id 3f1490d57ef6-e02be18dd87mr1713995276.4.1718973171319; Fri, 21 Jun 2024 05:32:51 -0700 (PDT) Date: Fri, 21 Jun 2024 12:32:30 +0000 In-Reply-To: <20240621123230.1085265-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: <20240621123230.1085265-1-sebastianene@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Message-ID: <20240621123230.1085265-7-sebastianene@google.com> Subject: [PATCH v7 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 | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/arch/arm64/kvm/ptdump.c b/arch/arm64/kvm/ptdump.c index cc1d4fdddc6e..17649e3cbc8f 100644 --- a/arch/arm64/kvm/ptdump.c +++ b/arch/arm64/kvm/ptdump.c @@ -215,8 +215,58 @@ 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", pgtable->start_level); + return 0; +} + +static int kvm_pgtable_debugfs_open(struct inode *m, struct file *file) +{ + struct kvm *kvm =3D m->i_private; + struct kvm_s2_mmu *mmu; + struct kvm_pgtable *pgtable; + int ret; + + if (!kvm_get_kvm_safe(kvm)) + return -ENOENT; + + mmu =3D &kvm->arch.mmu; + pgtable =3D 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.45.2.741.gdbec12cfda-goog