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 X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40324C47093 for ; Wed, 2 Jun 2021 09:26:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B3BEC60FF3 for ; Wed, 2 Jun 2021 09:26:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B3BEC60FF3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=axis.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 3A8566B006C; Wed, 2 Jun 2021 05:26:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 331926B006E; Wed, 2 Jun 2021 05:26:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 184836B0070; Wed, 2 Jun 2021 05:26:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0118.hostedemail.com [216.40.44.118]) by kanga.kvack.org (Postfix) with ESMTP id D67AD6B006C for ; Wed, 2 Jun 2021 05:26:33 -0400 (EDT) Received: from smtpin34.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 6DE42D235 for ; Wed, 2 Jun 2021 09:26:33 +0000 (UTC) X-FDA: 78208253466.34.C4DF6D7 Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by imf10.hostedemail.com (Postfix) with ESMTP id 1E61F4202A1C for ; Wed, 2 Jun 2021 09:26:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1622625993; x=1654161993; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=i3LI9KmR0eUSwkVrHTC0g2VV05FuH9FIa/Rx3igcP/E=; b=YuU0ZfcpqvZVNYOegUbrtHLulkq1FNyPJu7JT90G01Opc99d5Jz6K/kQ ErHet96QrLZhYL9a+eQTn4i7ppJz2NQvAjbnStTZUI+JGhRJ8ivEafCks imgoaUtYHhzrTmKOvWKokSU4iQokDhDTp2sg4+ew3dsOXIfOWdgyRWuI9 3icMK7VXeEOccaSyTW3Sj8x3K34REUSHfX5LyKkwnBokc9qWMANGw01tX HJDkSrnumAgAV/KLBm1vn4eVNH9MvTUfqvchAKoEmmFCxbux2IFJiUpyp S9X0R1+ylSy9jqn4yKOUFXxsE5VwfXeznU9lV8rPI5SZ+kL9SGWIFBqHd g==; From: Vincent Whitchurch To: CC: , , , , , , , , Vincent Whitchurch Subject: [PATCH] mm, tracing: Unify PFN format strings Date: Wed, 2 Jun 2021 11:26:08 +0200 Message-ID: <20210602092608.1493-1-vincent.whitchurch@axis.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Type: text/plain Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=axis.com header.s=axis-central1 header.b=YuU0Zfcp; spf=pass (imf10.hostedemail.com: domain of Vincent.Whitchurch@axis.com designates 195.60.68.18 as permitted sender) smtp.mailfrom=Vincent.Whitchurch@axis.com; dmarc=pass (policy=none) header.from=axis.com X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 1E61F4202A1C X-Stat-Signature: irhb58ibqn7rxkchh1emma796fm34p6d X-HE-Tag: 1622625979-325054 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Some trace event formats print PFNs as hex while others print them as decimal. This is rather annoying when attempting to grep through traces to understand what's going on with a particular page. $ git grep -ho 'pfn=3D[0x%lu]\+' include/trace/events/ | sort | uniq -c 11 pfn=3D0x%lx 12 pfn=3D%lu 2 pfn=3D%lx Printing as hex is in the majority in the trace events, and all the normal printks in mm/ also print PFNs as hex, so change all the PFN formats in the trace events to use 0x%lx. Signed-off-by: Vincent Whitchurch --- include/trace/events/cma.h | 4 ++-- include/trace/events/filemap.h | 2 +- include/trace/events/kmem.h | 12 ++++++------ include/trace/events/page_pool.h | 4 ++-- include/trace/events/pagemap.h | 4 ++-- include/trace/events/vmscan.h | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/trace/events/cma.h b/include/trace/events/cma.h index c3d354702cb0..3d708dae1542 100644 --- a/include/trace/events/cma.h +++ b/include/trace/events/cma.h @@ -31,7 +31,7 @@ DECLARE_EVENT_CLASS(cma_alloc_class, __entry->align =3D align; ), =20 - TP_printk("name=3D%s pfn=3D%lx page=3D%p count=3D%lu align=3D%u", + TP_printk("name=3D%s pfn=3D0x%lx page=3D%p count=3D%lu align=3D%u", __get_str(name), __entry->pfn, __entry->page, @@ -60,7 +60,7 @@ TRACE_EVENT(cma_release, __entry->count =3D count; ), =20 - TP_printk("name=3D%s pfn=3D%lx page=3D%p count=3D%lu", + TP_printk("name=3D%s pfn=3D0x%lx page=3D%p count=3D%lu", __get_str(name), __entry->pfn, __entry->page, diff --git a/include/trace/events/filemap.h b/include/trace/events/filema= p.h index 796053e162d2..c47b63db124e 100644 --- a/include/trace/events/filemap.h +++ b/include/trace/events/filemap.h @@ -36,7 +36,7 @@ DECLARE_EVENT_CLASS(mm_filemap_op_page_cache, __entry->s_dev =3D page->mapping->host->i_rdev; ), =20 - TP_printk("dev %d:%d ino %lx page=3D%p pfn=3D%lu ofs=3D%lu", + TP_printk("dev %d:%d ino %lx page=3D%p pfn=3D0x%lx ofs=3D%lu", MAJOR(__entry->s_dev), MINOR(__entry->s_dev), __entry->i_ino, pfn_to_page(__entry->pfn), diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h index 829a75692cc0..ddc8c944f417 100644 --- a/include/trace/events/kmem.h +++ b/include/trace/events/kmem.h @@ -173,7 +173,7 @@ TRACE_EVENT(mm_page_free, __entry->order =3D order; ), =20 - TP_printk("page=3D%p pfn=3D%lu order=3D%d", + TP_printk("page=3D%p pfn=3D0x%lx order=3D%d", pfn_to_page(__entry->pfn), __entry->pfn, __entry->order) @@ -193,7 +193,7 @@ TRACE_EVENT(mm_page_free_batched, __entry->pfn =3D page_to_pfn(page); ), =20 - TP_printk("page=3D%p pfn=3D%lu order=3D0", + TP_printk("page=3D%p pfn=3D0x%lx order=3D0", pfn_to_page(__entry->pfn), __entry->pfn) ); @@ -219,7 +219,7 @@ TRACE_EVENT(mm_page_alloc, __entry->migratetype =3D migratetype; ), =20 - TP_printk("page=3D%p pfn=3D%lu order=3D%d migratetype=3D%d gfp_flags=3D= %s", + TP_printk("page=3D%p pfn=3D0x%lx order=3D%d migratetype=3D%d gfp_flags=3D= %s", __entry->pfn !=3D -1UL ? pfn_to_page(__entry->pfn) : NULL, __entry->pfn !=3D -1UL ? __entry->pfn : 0, __entry->order, @@ -245,7 +245,7 @@ DECLARE_EVENT_CLASS(mm_page, __entry->migratetype =3D migratetype; ), =20 - TP_printk("page=3D%p pfn=3D%lu order=3D%u migratetype=3D%d percpu_refil= l=3D%d", + TP_printk("page=3D%p pfn=3D0x%lx order=3D%u migratetype=3D%d percpu_ref= ill=3D%d", __entry->pfn !=3D -1UL ? pfn_to_page(__entry->pfn) : NULL, __entry->pfn !=3D -1UL ? __entry->pfn : 0, __entry->order, @@ -278,7 +278,7 @@ TRACE_EVENT(mm_page_pcpu_drain, __entry->migratetype =3D migratetype; ), =20 - TP_printk("page=3D%p pfn=3D%lu order=3D%d migratetype=3D%d", + TP_printk("page=3D%p pfn=3D0x%lx order=3D%d migratetype=3D%d", pfn_to_page(__entry->pfn), __entry->pfn, __entry->order, __entry->migratetype) ); @@ -312,7 +312,7 @@ TRACE_EVENT(mm_page_alloc_extfrag, get_pageblock_migratetype(page)); ), =20 - TP_printk("page=3D%p pfn=3D%lu alloc_order=3D%d fallback_order=3D%d pag= eblock_order=3D%d alloc_migratetype=3D%d fallback_migratetype=3D%d fragme= nting=3D%d change_ownership=3D%d", + TP_printk("page=3D%p pfn=3D0x%lx alloc_order=3D%d fallback_order=3D%d p= ageblock_order=3D%d alloc_migratetype=3D%d fallback_migratetype=3D%d frag= menting=3D%d change_ownership=3D%d", pfn_to_page(__entry->pfn), __entry->pfn, __entry->alloc_order, diff --git a/include/trace/events/page_pool.h b/include/trace/events/page= _pool.h index ad0aa7f31675..ca534501158b 100644 --- a/include/trace/events/page_pool.h +++ b/include/trace/events/page_pool.h @@ -60,7 +60,7 @@ TRACE_EVENT(page_pool_state_release, __entry->pfn =3D page_to_pfn(page); ), =20 - TP_printk("page_pool=3D%p page=3D%p pfn=3D%lu release=3D%u", + TP_printk("page_pool=3D%p page=3D%p pfn=3D0x%lx release=3D%u", __entry->pool, __entry->page, __entry->pfn, __entry->release) ); =20 @@ -85,7 +85,7 @@ TRACE_EVENT(page_pool_state_hold, __entry->pfn =3D page_to_pfn(page); ), =20 - TP_printk("page_pool=3D%p page=3D%p pfn=3D%lu hold=3D%u", + TP_printk("page_pool=3D%p page=3D%p pfn=3D0x%lx hold=3D%u", __entry->pool, __entry->page, __entry->pfn, __entry->hold) ); =20 diff --git a/include/trace/events/pagemap.h b/include/trace/events/pagema= p.h index e1735fe7c76a..1d28431e85bd 100644 --- a/include/trace/events/pagemap.h +++ b/include/trace/events/pagemap.h @@ -46,7 +46,7 @@ TRACE_EVENT(mm_lru_insertion, ), =20 /* Flag format is based on page-types.c formatting for pagemap */ - TP_printk("page=3D%p pfn=3D%lu lru=3D%d flags=3D%s%s%s%s%s%s", + TP_printk("page=3D%p pfn=3D0x%lx lru=3D%d flags=3D%s%s%s%s%s%s", __entry->page, __entry->pfn, __entry->lru, @@ -75,7 +75,7 @@ TRACE_EVENT(mm_lru_activate, ), =20 /* Flag format is based on page-types.c formatting for pagemap */ - TP_printk("page=3D%p pfn=3D%lu", __entry->page, __entry->pfn) + TP_printk("page=3D%p pfn=3D0x%lx", __entry->page, __entry->pfn) =20 ); =20 diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.= h index 2070df64958e..00d1180527d8 100644 --- a/include/trace/events/vmscan.h +++ b/include/trace/events/vmscan.h @@ -330,7 +330,7 @@ TRACE_EVENT(mm_vmscan_writepage, page_is_file_lru(page)); ), =20 - TP_printk("page=3D%p pfn=3D%lu flags=3D%s", + TP_printk("page=3D%p pfn=3D0x%lx flags=3D%s", pfn_to_page(__entry->pfn), __entry->pfn, show_reclaim_flags(__entry->reclaim_flags)) --=20 2.28.0