From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f10.google.com (mail-pj2-f10.google.com [74.125.227.138]) (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 DCCD2409635 for ; Mon, 27 Jul 2026 12:30:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.138 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785155450; cv=none; b=iuiYLxLdvln5qWsHFSicFd/b9wm/8munvGjic2CrtgsFZBD5LBLyeZ/yLr08ZRoxldl31bGd6u65JasMCtLp5qGGrQKX1c5C1drx2Ycf++QbR/pH5fYx38AnwgJx2tsTsSPScGxVwyGc224DmE08quWBoqkUceMZamckdQlmlvA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785155450; c=relaxed/simple; bh=YDei/BK0ALoj1ZjXXkbJtn2RX0gFBgCu8VTA53Qpxag=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WcSqfAIZRnN0ZlS4qFSz6wzTbhnDnfQsFDO/9yNS6ysnLRElCpHqCYAQKRuE4KBmLQ3uBr7HB3gOP7iJMGg0FWP/AvqGcfxpA8lBICCUUhuE0tqp5mBANqWWBUTPzhQ4PU+HWVkFwk63lD6Smi1PB6PmifWh9deIETmu7Sf795g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FjQL3tfq; arc=none smtp.client-ip=74.125.227.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FjQL3tfq" Received: by mail-pj2-f10.google.com with SMTP id d9443c01a7336-2cf5e516e67so16545795ad.1 for ; Mon, 27 Jul 2026 05:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785155448; x=1785760248; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Y8pTPbeEWjqJ3+0nUuuuXn5xR6k5GcUeJgsv7M+Os0c=; b=FjQL3tfq1IqZzTJhdlbZzgCEVpLnlppeaw98qneN6BmoaMhVlZkCrtPAJopfXRlN2c 3BdJSDanYG8V6/QknSsilA4Wnv73nAgpfEkzImzKSDCkbfwUywZ8RJwwh9SDRgzCF3Rv vTL66M7ln/fGpST1JnoGhCy20PDRetRacGONIjUrrbxDcE2bid2czf2Lx1/YKgPYIQGh ihdXcsk9/XEBlztbvuEpOHLpmWk2k3HQUNQJRD795OGxsUFJKPZOkmzsC2n0AP55arM7 Ur1Sb59FCMbXF4kasPfRGX2lAYgD4rp3jUU8efX7QYTSawxY+SGBFr4yvkJ6Uob6sRrX 1rAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785155448; x=1785760248; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Y8pTPbeEWjqJ3+0nUuuuXn5xR6k5GcUeJgsv7M+Os0c=; b=C75y7EFYInjMMkS9nfJb+aFNjyW8KuI+lTRw4l+cDgCBajs0Wdr2kBZxMdHR6qN+nl h2TZqf63gkP/CdwBjJqK5SmWz5n/7CInHMSH3yh1omvvuARTjP69IGgLAYO7kCzqNF0X 5LtrmwyCvQ6cbYIybfuukUtz2pOLVkNuMApwdaswF/aqk3fLQXZ46dB6WaT9LU5ciC6g OEGmKRZIeoNL2Qf5tT7gt+GpFYTXAPk9Oeegnze1uR228CCzz02Jf/5U2HuGIDYv/n+A 1PeFNJtNc5xkYimAG6Uy49YNYM+LbEzsoJcyJUNPD6eT/cNnVeTvFoV2NNwwN/wkzs3i 0XgA== X-Forwarded-Encrypted: i=1; AHgh+RqVj8ffFpbaP83MwqhAW4WK3yJr7fy0Gd+T+nYNbSag0JVoSBDZacSv49r+fKo36QWEO+67z4irFrMkRxs=@vger.kernel.org X-Gm-Message-State: AOJu0YyuizAJ8yfCa/MoKLDUTgXhB8+jiuZCpeDbm2XBUpFUmrK7lnft WcTnFIpq7jAL57AOmbuW12Opm4hUROi6zvgfmQT6xqKtVuz0DIEk9nir X-Gm-Gg: AR+sD12bGhxPyKzJMwlhbWu9t6Dqx0237TPhzSqhcGjkwIjP4wVy0s7G07lK4w7wh4S dYrtxemU/xVnWIMMtTlpn2amzT/ztTw7Z1h6Cn+zXbVaiGvhpjmpKSf+/n43FN6+TyUZXlVpQvf F5c08m7h6iJJehU7vNnvy4Ja0TXRBf98jcuJWgUaXtIiHkuPFDfUOBwJsMvDdF4KuRnjhQVzHdX CxfAnhAwaZ94h6cVS77cKpW8w413x7FoAKHgXWHVr2I8hdYG9cBXyhJYsoT8UlGgJHivCK8ma4T d0N4yzC0B8sp/GlkThA9W0mUJGuu4vmmF6cUCz7b8m1Rr8cNq98jHb2kiqrKmsuXVs5Vp1wTSlm 7m4UnQC9VGxCzsYfx+et4gZRVP8gwtj2U7aZbyFdKkSOmJAQrHXOYypdP5Bm1HlNlvW9h7n4= X-Received: by 2002:a17:903:468c:b0:2c9:aae1:a61a with SMTP id d9443c01a7336-2cfde7b3a14mr78013425ad.14.1785155445847; Mon, 27 Jul 2026 05:30:45 -0700 (PDT) Received: from wud.. ([218.194.32.52]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfe1ab9c71sm30679775ad.73.2026.07.27.05.30.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2026 05:30:45 -0700 (PDT) From: "Dylan.Wu" To: palmer@dabbelt.com, pjw@kernel.org, aou@eecs.berkeley.edu, anup@brainfault.org Cc: alex@ghiti.fr, atish.patra@linux.dev, zhouquan@iscas.ac.cn, linux-riscv@lists.infradead.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, "Dylan.Wu" Subject: [PATCH v2 2/3] riscv: ptdump: Use per-level attribute bits for parsing Date: Mon, 27 Jul 2026 08:30:12 -0400 Message-Id: <20260727123013.118984-3-fredwudi0305@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260727123013.118984-1-fredwudi0305@gmail.com> References: <20260727123013.118984-1-fredwudi0305@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Instead of using the global pte_bits array in dump_prot(), use the per-level bits and num from the associated pg_level entry passed via ptdump_pg_state. This makes the attribute parsing logic fully driven by the per-level configuration, which allows KVM (and other future users) to plug in their own set of protection bits for their pagetable levels. Rename the local pg_level[] array to kernel_pg_levels[] to avoid shadowing the pg_level pointer in struct ptdump_pg_state. Assisted-by: YuanSheng: deepseek-v4-pro Co-developed-by: Quan Zhou Signed-off-by: Quan Zhou Signed-off-by: Dylan.Wu --- arch/riscv/include/asm/ptdump.h | 1 + arch/riscv/mm/ptdump.c | 48 +++++++++++++++++++++------------ 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/arch/riscv/include/asm/ptdump.h b/arch/riscv/include/asm/ptdump.h index eb9d11dab..14a262bd0 100644 --- a/arch/riscv/include/asm/ptdump.h +++ b/arch/riscv/include/asm/ptdump.h @@ -28,6 +28,7 @@ struct ptdump_pg_state { struct seq_file *seq; const struct addr_marker *marker; unsigned long start_address; + const struct ptdump_pg_level *pg_level; unsigned long start_pa; unsigned long last_pa; int level; diff --git a/arch/riscv/mm/ptdump.c b/arch/riscv/mm/ptdump.c index 63655a9c8..06c0217f0 100644 --- a/arch/riscv/mm/ptdump.c +++ b/arch/riscv/mm/ptdump.c @@ -152,46 +152,58 @@ static const struct ptdump_prot_bits pte_bits[] = { } }; -static struct ptdump_pg_level pg_level[] = { +static struct ptdump_pg_level kernel_pg_levels[] = { { /* pgd */ + .bits = pte_bits, + .num = ARRAY_SIZE(pte_bits), .name = "PGD", }, { /* p4d */ + .bits = pte_bits, + .num = ARRAY_SIZE(pte_bits), .name = (CONFIG_PGTABLE_LEVELS > 4) ? "P4D" : "PGD", }, { /* pud */ + .bits = pte_bits, + .num = ARRAY_SIZE(pte_bits), .name = (CONFIG_PGTABLE_LEVELS > 3) ? "PUD" : "PGD", }, { /* pmd */ + .bits = pte_bits, + .num = ARRAY_SIZE(pte_bits), .name = (CONFIG_PGTABLE_LEVELS > 2) ? "PMD" : "PGD", }, { /* pte */ + .bits = pte_bits, + .num = ARRAY_SIZE(pte_bits), .name = "PTE", }, }; static void dump_prot(struct ptdump_pg_state *st) { + const struct ptdump_pg_level *lvl = &st->pg_level[st->level]; + const struct ptdump_prot_bits *bits = lvl->bits; unsigned int i; - for (i = 0; i < ARRAY_SIZE(pte_bits); i++) { + for (i = 0; i < lvl->num; i++) { char s[7]; unsigned long val; - val = st->current_prot & pte_bits[i].mask; + val = st->current_prot & bits[i].mask; if (val) { - if (pte_bits[i].mask == _PAGE_SOFT) - snprintf(s, sizeof(s), pte_bits[i].set, val >> 8); + if (bits[i].mask == _PAGE_SOFT) + snprintf(s, sizeof(s), bits[i].set, val >> 8); #ifdef CONFIG_64BIT - else if (pte_bits[i].mask == _PAGE_MTMASK_SVPBMT) { + else if (bits[i].mask == _PAGE_MTMASK_SVPBMT) { if (val == _PAGE_NOCACHE_SVPBMT) - snprintf(s, sizeof(s), pte_bits[i].set, "NC"); + snprintf(s, sizeof(s), bits[i].set, "NC"); else if (val == _PAGE_IO_SVPBMT) - snprintf(s, sizeof(s), pte_bits[i].set, "IO"); + snprintf(s, sizeof(s), bits[i].set, "IO"); else - snprintf(s, sizeof(s), pte_bits[i].set, "??"); + snprintf(s, sizeof(s), bits[i].set, "??"); } #endif else - strscpy(s, pte_bits[i].set); + strscpy(s, bits[i].set); } else { - strscpy(s, pte_bits[i].clear); + strscpy(s, bits[i].clear); } pt_dump_seq_printf(st->seq, " %s", s); @@ -221,7 +233,7 @@ static void dump_addr(struct ptdump_pg_state *st, unsigned long addr) } pt_dump_seq_printf(st->seq, "%9lu%c %s", delta, *unit, - pg_level[st->level].name); + kernel_pg_levels[st->level].name); } static void note_prot_wx(struct ptdump_pg_state *st, unsigned long addr) @@ -247,7 +259,7 @@ void note_page(struct ptdump_state *pt_st, unsigned long addr, u64 prot = 0; if (level >= 0) - prot = val & pg_level[level].mask; + prot = val & kernel_pg_levels[level].mask; if (st->level == -1) { st->level = level; @@ -320,6 +332,7 @@ static void ptdump_walk(struct seq_file *s, struct ptd_mm_info *pinfo) .seq = s, .marker = pinfo->markers, .level = -1, + .pg_level = kernel_pg_levels, .ptdump = { .note_page_pte = note_page_pte, .note_page_pmd = note_page_pmd, @@ -346,6 +359,7 @@ bool ptdump_check_wx(void) {-1, NULL}, }, .level = -1, + .pg_level = kernel_pg_levels, .check_wx = true, .ptdump = { .note_page_pte = note_page_pte, @@ -410,12 +424,12 @@ static int __init ptdump_init(void) kernel_ptd_info.base_addr = KERN_VIRT_START; - pg_level[1].name = pgtable_l5_enabled ? "P4D" : "PGD"; - pg_level[2].name = pgtable_l4_enabled ? "PUD" : "PGD"; + kernel_pg_levels[1].name = pgtable_l5_enabled ? "P4D" : "PGD"; + kernel_pg_levels[2].name = pgtable_l4_enabled ? "PUD" : "PGD"; - for (i = 0; i < ARRAY_SIZE(pg_level); i++) + for (i = 0; i < ARRAY_SIZE(kernel_pg_levels); i++) for (j = 0; j < ARRAY_SIZE(pte_bits); j++) - pg_level[i].mask |= pte_bits[j].mask; + kernel_pg_levels[i].mask |= pte_bits[j].mask; debugfs_create_file("kernel_page_tables", 0400, NULL, &kernel_ptd_info, &ptdump_fops); -- 2.34.1