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 0C5E6C3DA4A for ; Tue, 20 Aug 2024 14:14: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:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From: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=e23Hu8+Z1sCUC2nCZq+qZMQygcSEW/P8er1otbAoihc=; b=jhK+TqYYdYwoLYlxkYwgT6wNCo H35D0UF04pd70a/PTki7aCrAfa1EQjCv4ZMmDnF4WjULosDu59idqkwm6J/sdMJzktvchxQ6oIGRG ZDCyPjQYK6TwPVaIAW8puSv2nS996CKWhLp9RYhrnAoSHz4n5+8sP0OdGCZqPuHKwKLODToZPIitk BI7aX5FltvW2UUQK1ivV1mCzoS/C49OPif+1kquDZr3A7S2RlPxzxYol29mXcStQq+R9JpCuhAo+1 0Eb0LIJ3WTtXrIFtJZuNUcA1ZTCxPQwTukh66Yacbl0A7uqh1ccXSpEFyUOoSU2Fwo5rykjiJNrtm +lfLA+/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgPcp-00000005VPV-1hRz; Tue, 20 Aug 2024 14:14:19 +0000 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgPc7-00000005VJ4-2mKl for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2024 14:13:37 +0000 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5bebc830406so8401a12.0 for ; Tue, 20 Aug 2024 07:13:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1724163212; x=1724768012; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=e23Hu8+Z1sCUC2nCZq+qZMQygcSEW/P8er1otbAoihc=; b=B7d9wCgWlZv7jold1bVjaJFo3Ukbiy7K4Qj5iOAHttSRQwb779q2v/HRGslTWAY1Ez L13Dr8dEQIUWCk6nI1IWqAGNmxKIPF8DhB5JMPUFvXYZvyD7bbUt9c5/HpvTWEPN1K5c yabBW+LFdQ0RY1KjIZn5W1g4Ttdm7fVaV1R2zRU4h+XN4v/wFGWbslAEuwgWWXtvdfYK 6EwOo5ZeP2RKbeh21VGdYHR4anfVpB3LGJxaRTDR8lTlt9hDKtTO+cQOkJD4eQ6j7o+v YHuDeTk3i4AaT0D2Sj7W9LVDyQQe+YNS4YEbOlsFbse/Jvx6U1nbqaSMo2Td6TH6fUSb pQHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724163212; x=1724768012; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=e23Hu8+Z1sCUC2nCZq+qZMQygcSEW/P8er1otbAoihc=; b=ZTYFmSg0wxB36ewgJKi4fzg5RQ/Z7J38yZzH6A4qO8Y38yG+WWy5BSymHDHs1oCAch mcxs6ieNQ1Xov4TYx/MhU/XCdJfO4pPNkZMCOioKAQSswlodOjxuF+GvLzkMFAKRawvO yqxchf7w5FHfejpAUyh/70OjPSuFlhT7/Bowh1GzIpnK/mVVfXg6NVJs1Nq8iGJudws/ gW91uBzlXasEmEPLSGhTM8iwLD0qIlX8RlyMfN/34q9GL2NyWLuA5XPlISQofJBXpwge 6Wa9/Bj8Zk8L9CH+wuYtIhgP07a4W4bIvXpCDnOi9z4O43sWtZck1QOOi4OKkVa0Uqv0 ctRA== X-Forwarded-Encrypted: i=1; AJvYcCVN6uiPar6CsrgYfmwKpFf99Ou7mukKDOq831tWBxffAAkkUGad0qKP8zpK8MihkxAk3+pcggqbAA8w/27g8X9h@lists.infradead.org X-Gm-Message-State: AOJu0Yw9Jl56hyNKmoyTZfKgZSawAYTKJWQmazTkH/SlQxtkLg6TLYgj nXwwozXBdztwPfLRNUXawZ8q4AVpRoqy/my9yc9YmvBbX89y7siy0etnoRegag== X-Google-Smtp-Source: AGHT+IH6v5g16+oGR8+nvA7bQYPp8gwjKoUxL4x3NW45RWOQa0iz4Xar7ykgmKpu8OpJ6xRVSzRb1A== X-Received: by 2002:a05:6402:3546:b0:5be:c28a:97cf with SMTP id 4fb4d7f45d1cf-5bf0e5a28eemr65188a12.5.1724163212081; Tue, 20 Aug 2024 07:13:32 -0700 (PDT) Received: from google.com (44.232.78.34.bc.googleusercontent.com. [34.78.232.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429ded364fesm195663365e9.27.2024.08.20.07.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2024 07:13:31 -0700 (PDT) Date: Tue, 20 Aug 2024 14:13:27 +0000 From: Sebastian Ene To: Marc Zyngier Cc: 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, oliver.upton@linux.dev, rananta@google.com, ryan.roberts@arm.com, shahuang@redhat.com, suzuki.poulose@arm.com, will@kernel.org, yuzenghui@huawei.com, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Subject: Re: [PATCH v8 3/6] arm64: ptdump: Use the mask from the state structure Message-ID: References: <20240816123906.3683425-1-sebastianene@google.com> <20240816123906.3683425-4-sebastianene@google.com> <86seuzxq27.wl-maz@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <86seuzxq27.wl-maz@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240820_071335_725281_DD7BF324 X-CRM114-Status: GOOD ( 38.69 ) 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 On Tue, Aug 20, 2024 at 02:49:04PM +0100, Marc Zyngier wrote: > On Fri, 16 Aug 2024 13:39:03 +0100, > Sebastian Ene wrote: > > > > 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/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 = { Hi Marc, > Do you actually need this sort of renaming? Given that it is static, > this looks like some slightly abusive repainting which isn't warranted > here. I applied Will's suggestion from https://lore.kernel.org/all/20240705111229.GB9231@willie-the-truck/ > > > I also didn't understand the commit message: you're not tracking any > mask here, but a page table level. You are also not using it for > anything yet, see below. and I missed updating the commit message. > > > > { /* 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; > > This is what I mean. What is this pg_level used for? I make use of it to extract the name based on the level. The suggestion that Will made allowed me to keep the code with less changes. Thanks, Seb > > > 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 = { > > Thanks, > > M. > > -- > Without deviation from the norm, progress is not possible.