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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBC61C77B73 for ; Sat, 27 May 2023 16:48:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 066EB900002; Sat, 27 May 2023 12:48:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F31146B0072; Sat, 27 May 2023 12:48:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1E7F900002; Sat, 27 May 2023 12:48:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id CEEFC6B0071 for ; Sat, 27 May 2023 12:48:41 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 989A380264 for ; Sat, 27 May 2023 16:48:41 +0000 (UTC) X-FDA: 80836618842.30.EDE6EAE Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id 1E4604000F for ; Sat, 27 May 2023 16:48:38 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=dP3XXW9e; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685206119; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=DEEWw3gYs8aoDG6e/VgZRQtgOC9+nAjAe49b1JU0UGc=; b=1M/M1L1DVABOktfUcYE4uLLvk75kaW4iuzinI1AYmDIPod9MlxH+znsqZ8j86jyHXkHzmp moOTurZLpVhV1qELLcMWIqpuHt2LLpbqmT1s4YmTFrxhE4rKpqB45zT9/2lQz04rOKQWyZ 1fWGxiupYDZTuImVXC8L/+lxjhw2lZU= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=dP3XXW9e; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685206119; a=rsa-sha256; cv=none; b=BXVFp0MPXEjOOZ9HiDWRDMRvfMpVYciy9S1HnDm3VvRtCnsVw+y7LvsY7fjAe6M7F3utT/ MroarTWlQrnfINn5LjAIpZeOAqHkKrF0SrDtToCsjHQqNF7baAlUpMBs5pRhvRnM8SDOyA pIsU7wordZVV11c5DV0p5YLiLgq04CU= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:Message-ID: Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:In-Reply-To:References; bh=DEEWw3gYs8aoDG6e/VgZRQtgOC9+nAjAe49b1JU0UGc=; b=dP3XXW9eqaHnUEkLaXr1tPARHV XWF9eIh1K5EJYckSou9rCiLotWCB0UcazS9C/d6/l3nrE6HiyGzQK2dWCBb5AZAHY8s0dzWuMKehy xe3qIQe4trRXmJvMOWJm0qQC2747pfmkC2O1vKr5bXGmfrfDAup/98LJ2rdoYZoNGgucLXt0VNE5G rtq0/pUlx3DwrVrfxwD8Bzz5Ga7z5XNPxowuMNNgheLIBTFInsHaZH2rWv4G67ZVAVraYJmSj66k1 tL811TUZk7ebcFO5azeTmtslDP3/hH+cXjgIiP85smSBBYFey2tlY4qjSt9aTW1MdXUdM5OLACLYe TR+FNc6g==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1q2x5k-003x0b-8D; Sat, 27 May 2023 16:48:32 +0000 Date: Sat, 27 May 2023 17:48:32 +0100 From: Matthew Wilcox To: Hyeonggon Yoo <42.hyeyoo@gmail.com>, Andrew Morton , Petr Mladek Cc: linux-mm@kvack.org Subject: [PATCH] Do not print page type when the page has no type Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 1E4604000F X-Stat-Signature: k8hbef3o8a7wwhbxpzie4xbt3bfkxyem X-HE-Tag: 1685206118-863531 X-HE-Meta: U2FsdGVkX1/JBWcXDmrrcGm40TLp6FXdtamM7ZBgfvA3dx6ZjQbBqLtm4ye6dwUdKY07C48yFsRteZlnb8gYFSnxsS5GxEhFMnB+Hie0COVoJWGPaAv208CTSbJuFTwEAtN5KPxVN1ygBbMbCvkkjbpxDSVZcvhLdpzUYHaQ/tMPGQJtG9u/C8cUwAa7WC2Jx1r8XRpsk+RZPiFqhcx+mSBSXswgObN/y3JjlRzd00UrU+3PzHVEvuzQPCvG7Z2WOFdDz08fPgJZueLIGVYT+6pORjDrpJqcQhAIPVwpahCLz0CQ+baflKf66QCLe12nO9HsFPUoEewBSF7I4TsBCJP/gb/s6QkBU/Y9piliSDqDns64BFFsRrZ0C2+OEx5APTzzUAUP556KT5mcAsbmUJayrZAhOuAzBxzgFpgqazRtJVpdHZmxORHdBcJN2LhLNwp/gS1+tZofoFgEcE5euQYi/CDqjBvdj0LBRcb04Rl+QNxuhPBTo0t/vkdDG8/rKl1eSpr9nN8f5ciF7bbaCffugJjH71s/MBtKnYqFltUsEb0aZYhT7SxDpB1t3NkFdPDgUh99wDGJEYP6AhZcv9UzgKubpYq/kUlMkk9siA5vPBZXlz/lsOL74Mu3e1ly80O13UXT1C1Zp8Lqc3OnhriHuytwP0CFEggjrvTQI/RUsejxocybuZcJwVcTG1YLEExJQvEZPEwRXutUh6nJ5zdeRDesDBIqe0m6Bp5pNhl/zHd78OwKthJicvSKBSVUjXKmaGI5yGaoQ94S88H+BBHkUfPFNaw7+fCqVJwgHXu+oN+pdjrRKJq0KtF0T97SLs2/atWCGbBqUhMbd0hxQhVzThIWEkVtxILWjsTFvoukcHJtjCydxAvqAOHKXJlc5Ous7lkdcas7gF8yy1OeqKQzW0BlVS7xHoOgOtSl3KjXyNocYBzB8JhflM4HRpULXw5S8owAqADa6LqF65C h+jKH3wB xALmNkkMsmPACnYZ1Kv93xP+LkBfmBJzJ1XyMHXfjjQerBFvoEG7IX4KAH2jByIkD7QT1EG89pqT9p5C2JuoqxCbvzShpHIvkn9vWnGsj+UyfitLZaZePrandE0bkgVmlROrrlc7FxhfLfehLH97s7uekEE97W59ExKb4somFRLHk8MgTQK2KqR4DFCGnWSYhekCEqOeHA+/N3j4jkfaH/VosnAONhKdHmmzIo84RMFzRmdHjUWehDSh7O3rrZy0gwVVS1OEJSpwsbHNJ8vKo99TNkIc//CFDIiL/cOQzhOKmFt8SECuMLtcvTi06gEFseRm3paLLCWJAinw= 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: It is confusing and unnecessary to print the page type when the page has no type. Signed-off-by: Matthew Wilcox (Oracle) --- I did not run the test-suite. I'm in the middle of debugging something else and this is an unwelcome distraction. If this doesn't work quite right, please fix it. diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 1c68d67b832f..3ac7b7e697a3 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -903,14 +903,9 @@ static inline bool is_page_hwpoison(struct page *page) #define PageType(page, flag) \ ((page->page_type & (PAGE_TYPE_BASE | flag)) == PAGE_TYPE_BASE) -static inline int page_type_has_type(unsigned int page_type) -{ - return (int)page_type < PAGE_MAPCOUNT_RESERVE; -} - static inline int page_has_type(struct page *page) { - return page_type_has_type(page->page_type); + return (int)page->page_type < PAGE_MAPCOUNT_RESERVE; } #define PAGE_TYPE_OPS(uname, lname) \ diff --git a/lib/test_printf.c b/lib/test_printf.c index 7677ebccf3c3..442e4c41bccb 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -648,9 +648,7 @@ static void __init page_type_test(unsigned int page_type, const char *name, unsigned long size; size = scnprintf(cmp_buf, BUF_SIZE, "%#x(", page_type); - if (page_type_has_type(page_type)) - size += scnprintf(cmp_buf + size, BUF_SIZE - size, "%s", name); - + size += scnprintf(cmp_buf + size, BUF_SIZE - size, "%s", name); snprintf(cmp_buf + size, BUF_SIZE - size, ")"); test(cmp_buf, "%pGt", &page_type); } diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 40f560959b16..0a0e5c4cffc9 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -2061,8 +2061,7 @@ char *format_page_type(char *buf, char *end, unsigned int page_type) *buf = '('; buf++; - if (page_type_has_type(page_type)) - buf = format_flags(buf, end, ~page_type, pagetype_names); + buf = format_flags(buf, end, ~page_type, pagetype_names); if (buf < end) *buf = ')'; diff --git a/mm/debug.c b/mm/debug.c index c7b228097bd9..6eb0ecb9b368 100644 --- a/mm/debug.c +++ b/mm/debug.c @@ -120,7 +120,8 @@ static void __dump_page(struct page *page) pr_warn("%sflags: %pGp%s\n", type, &head->flags, page_cma ? " CMA" : ""); - pr_warn("page_type: %pGt\n", &head->page_type); + if (page_has_type(head)) + pr_warn("page_type: %pGt\n", &head->page_type); print_hex_dump(KERN_WARNING, "raw: ", DUMP_PREFIX_NONE, 32, sizeof(unsigned long), page,