From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8B485ECE579 for ; Mon, 9 Sep 2024 12:54:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=z5YaerhLrnlA1kDn0gvbQTCDMMWwt29NrOwuLXna95M=; b=iMXfBFmsBEvm0AexE6pG2lsiof iWaeUTVrtnCXq6zTNeNAgprVpGiCuaN1av07mFcUiU+scblOOTnL9KaeKsIJTG9a9oqkSG6LmVUkx TS7tFz2RJdko5L8pmO9Z1C+ciauY5apK5Aw6td00aahYxPC4xTZMukHIwMvqqvxPr85mEDNEOXxs1 LqxVTSASIcV0dRx3oDc+14WFTJQDaEZEPoUVhOKmWLKuC2BQyecqXiSDNdrH+SHZlfARYumexF+UC 5OZ6hINvgnZOAtY+Lrzl9bnEoaxnujzQ+jDeMMjo3vVVwh+zl+djFGwjceHvI54pMX/Z46W+n8vXi sqSDXNjA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1snduR-00000001wsG-127S; Mon, 09 Sep 2024 12:54:23 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sndnv-00000001ubf-0IBc for linux-arm-kernel@bombadil.infradead.org; Mon, 09 Sep 2024 12:47:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Cc:To:From:Subject: Message-ID:References:Mime-Version:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=z5YaerhLrnlA1kDn0gvbQTCDMMWwt29NrOwuLXna95M=; b=N8OLSpHBrtzkRtxnDeKQ+JSAcI XEzBrgKIHlaWfGMjtY+iHOO/eayBwZSfsews1Sg6HiSKBOaRsRJTrF1gYprMMRTDKEgNUlOOSiRKr kTGbURcjJOV8qPrN1Aul7AUuZN/GfZtOElxGv96xyoZu4/Mifh5/RqTmJ0eZ9W5TAlQe2wb2LYvR8 6Y8YAXYoOWTbfolHrLhER8hQhzEcFFsvX3zyNOFJDHkMSOlnEybh9Hv2sURX4Em0mqIHvI55C7Oo4 DIyZTtGNbk7Dp0OAgcax+75sCCbvuzwq0bqfS2xPG8GZKR1MZyE5dJBdlr6/dMpAaqyZ4neNdbHcu XnlLdlIg==; Received: from mail-wm1-x349.google.com ([2a00:1450:4864:20::349]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1sndnr-00000000Qot-2SMW for linux-arm-kernel@lists.infradead.org; Mon, 09 Sep 2024 12:47:37 +0000 Received: by mail-wm1-x349.google.com with SMTP id 5b1f17b1804b1-42cb857fc7dso6363975e9.0 for ; Mon, 09 Sep 2024 05:47:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1725886052; x=1726490852; darn=lists.infradead.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=z5YaerhLrnlA1kDn0gvbQTCDMMWwt29NrOwuLXna95M=; b=m/u7mkVXp0JPw9CaCTTbMlmsnEMhLHwrosSwVn8lgVDLob3l2DQf28bUHgiqUenXiW u5KVqvbf0m1IMfwkY5bSZREGK832RLK53DVpo7wJGUJtooGmWPIKJQKPCtxbDoN3EWNO rQ63MDSKyornrfAqw06G3zAzqo7P4sTjPImOQ0jWnp7TwFLXHGJOX3W6TCe18eQ1ydPu oYDx9T+MLptvaDI26f3kbjoMwjWuW1DZCJjrJT3gtPDu9gvqj5Npaw+CkijR4l1ZbOP1 9iPdlx1fWim5m/un9NbNe6oN8mdup0yTPe7LgQ/eh1tCMiqH1E/Jp0bmx8rEhvyIGMry LZmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725886052; x=1726490852; 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=z5YaerhLrnlA1kDn0gvbQTCDMMWwt29NrOwuLXna95M=; b=s+YBpHwU5ZcUPPcvf0LnFy1f62ILCrzia0hau2gvjTjIuVVpTsUP99oOI9YhchXUeg 5hG/7iYowNi7I0o1IHD2Q6ftAUqvH3ZbT/bBsfH7+jdghy+Ty16sW7mj8ZgT/8yhFBKo fiD6LYOhuEgdQTWbTX4T+shC4hkBptrSpbxmGDiH01hONzlXEKtVIflk0yQuM5gmeXuJ GwnBU3zBenD7jdQvkkUHnApFf8DFgDRXOJkXjBnfj/dkJ3kq5KsvjqShqqJh3/ZBDbWb 8wP5tf9oF/4uYX1P1XAzxk7egwNHUEkPBYHmguQ37El6e8iLmGF6v4k7BFqZuiUQxtTk 3QnQ== X-Forwarded-Encrypted: i=1; AJvYcCXhRw25Ft1i1+xtBa0txHVFJiG9nEIoadLPxs0fQIiSrShsGLqWyiUw6omBiBSINPT79TJ2T5FozYwU5icJ62nP@lists.infradead.org X-Gm-Message-State: AOJu0Yx5+QsmPGqsZaZAv8pWgZE/X3IEwWzHwiInFU4gXwYgqZuouWdB YrEq+g3VDJ1+zObhoQJMVNoeiLZIGwR4NTWn355k5r49aAcBA6yX/RUwk+4wLxYwdxm+woJlV89 2y0cP8tI0VutwmfMrs0XJs8ILlw== X-Google-Smtp-Source: AGHT+IHvFQbj0rKg0Z2E+lg4FZtxEigwOSWg+BND77qixGLBIzbCZ5lpRaiz0wEgqDC0ZzG+egBczPT3YnPFvCYHpdQ= X-Received: from sebkvm.c.googlers.com ([fda3:e722:ac3:cc00:68:fe9:ac10:f1b7]) (user=sebastianene job=sendgmr) by 2002:a05:600c:6b6d:b0:42c:8875:95da with SMTP id 5b1f17b1804b1-42c9f9e090emr259485e9.7.1725886051855; Mon, 09 Sep 2024 05:47:31 -0700 (PDT) Date: Mon, 9 Sep 2024 12:47:19 +0000 In-Reply-To: <20240909124721.1672199-1-sebastianene@google.com> Mime-Version: 1.0 References: <20240909124721.1672199-1-sebastianene@google.com> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog Message-ID: <20240909124721.1672199-4-sebastianene@google.com> Subject: [PATCH v10 3/5] arm64: ptdump: Use the ptdump description from a local context From: Sebastian Ene To: akpm@linux-foundation.org, alexghiti@rivosinc.com, ankita@nvidia.com, ardb@kernel.org, catalin.marinas@arm.com, christophe.leroy@csgroup.eu, james.morse@arm.com, vdonnefort@google.com, mark.rutland@arm.com, maz@kernel.org, oliver.upton@linux.dev, rananta@google.com, ryan.roberts@arm.com, sebastianene@google.com, shahuang@redhat.com, suzuki.poulose@arm.com, will@kernel.org, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240909_134735_702033_80D79AE6 X-CRM114-Status: GOOD ( 20.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Rename the attributes description array to allow the parsing method to use the description from a local context. To be able to do this, store a pointer to the description array in the state structure. This will allow for the later introduced callers (stage_2 ptdump) to specify their own page table description format to the ptdump parser. Signed-off-by: Sebastian Ene --- arch/arm64/include/asm/ptdump.h | 1 + arch/arm64/mm/ptdump.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/ptdump.h b/arch/arm64/include/asm/ptdump.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[] = { } }; -static struct ptdump_pg_level pg_level[] __ro_after_init = { +static struct ptdump_pg_level kernel_pg_levels[] __ro_after_init = { { /* pgd */ .name = "PGD", .bits = pte_bits, @@ -192,6 +192,7 @@ void note_page(struct ptdump_state *pt_st, unsigned long addr, int level, u64 val) { struct ptdump_pg_state *st = container_of(pt_st, struct ptdump_pg_state, ptdump); + struct ptdump_pg_level *pg_level = st->pg_level; static const char units[] = "KMGTPE"; u64 prot = 0; @@ -262,6 +263,7 @@ void ptdump_walk(struct seq_file *s, struct ptdump_info *info) .seq = s, .marker = info->markers, .mm = info->mm, + .pg_level = &kernel_pg_levels[0], .level = -1, .ptdump = { .note_page = note_page, @@ -279,10 +281,10 @@ static void __init ptdump_initialize(void) { unsigned i, j; - for (i = 0; i < ARRAY_SIZE(pg_level); i++) - if (pg_level[i].bits) - for (j = 0; j < pg_level[i].num; j++) - pg_level[i].mask |= pg_level[i].bits[j].mask; + for (i = 0; i < ARRAY_SIZE(kernel_pg_levels); i++) + if (kernel_pg_levels[i].bits) + for (j = 0; j < kernel_pg_levels[i].num; j++) + kernel_pg_levels[i].mask |= kernel_pg_levels[i].bits[j].mask; } static struct ptdump_info kernel_ptdump_info __ro_after_init = { @@ -297,6 +299,7 @@ bool ptdump_check_wx(void) { 0, NULL}, { -1, NULL}, }, + .pg_level = &kernel_pg_levels[0], .level = -1, .check_wx = true, .ptdump = { -- 2.46.0.469.g59c65b2a67-goog