From patchwork Mon Jan 30 04:25:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hyeonggon Yoo <42.hyeyoo@gmail.com> X-Patchwork-Id: 13120406 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 7F1AAC54EAA for ; Mon, 30 Jan 2023 04:25:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1E48A900002; Sun, 29 Jan 2023 23:25:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 194BB8E0002; Sun, 29 Jan 2023 23:25:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 03521900002; Sun, 29 Jan 2023 23:25:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id E5CBF8E0002 for ; Sun, 29 Jan 2023 23:25:48 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B257480ACA for ; Mon, 30 Jan 2023 04:25:48 +0000 (UTC) X-FDA: 80410177176.05.9C06A2F Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf02.hostedemail.com (Postfix) with ESMTP id DFEA980002 for ; Mon, 30 Jan 2023 04:25:46 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=RfLhOWGi; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf02.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675052746; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LwwzdAzQtrDpCWVBIKiBhOmPzUd7VlYgWQiD6C21IJ0=; b=VgEhJz5tF+mQhqhSpdjDvpQnWFrQ+gvYxUOvT0KWpXWkqRjQyXhRoBgR2KNsHNFBfNavs1 frMhPEAURzqDEaEuAetF5Q1+gRjXCpbyHdsP34FDyTu/Tn0/wBNtEy4Z2cp3IRB4ycPEKa PB22P9OHngV+JFRISKudjgoKjqZS47g= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=RfLhOWGi; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf02.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675052746; a=rsa-sha256; cv=none; b=QMAkcMXCcp9pF0HCkn/GmVEL0F5eS3BU84gpSyyDAuoJ6AmxfMZ1v8oV92KoyTo0sU2NCQ 4agamb3fdoFGDMyrJgrw0LoP+eqEy/7SzJrVdkNo3o3tOBilweV47fjBEZ1Jx/tXnSvVhO HlGQfPvZlC/bAN/uteijsdaPxaB2afo= Received: by mail-pj1-f44.google.com with SMTP id e8-20020a17090a9a8800b0022c387f0f93so9146935pjp.3 for ; Sun, 29 Jan 2023 20:25:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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; bh=LwwzdAzQtrDpCWVBIKiBhOmPzUd7VlYgWQiD6C21IJ0=; b=RfLhOWGiR1DflwvehJodiK8eZGsp/vBq6+Phyd26hga+7Av2OBhSct+0XSH2B9FRzM p1m4/SQPUKR7nuT6kdKVjud9HnaisdGTqP1VRrO/3BwlrFVhBImkRKsi4K4VVNzjcjdn RAqpjAGeRVnTJPYjcazViD5yOdR3PZhnv4z0CbFzR6dqDpSAxiypyotLgJEFeCyZce89 UyYEt7oiwQTWtM1yzJ0MzCOp3gSP1mICANOrnWpW0e2bnbSjr6gncWosiiu1EbAiAlHa 2AcRJ8BLB3xryqSf4gogQqDj0vhzoMOIBasWKNCWxcwFhQCtBWdHd/KLlRPfEhnd3xb7 dQqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LwwzdAzQtrDpCWVBIKiBhOmPzUd7VlYgWQiD6C21IJ0=; b=tK6a00rOugOZsjUeCVq8QQ18DlmpW5TWkay0U7XVr5mW2Hbb59RjMMJb0RNKxQGFPS p1eXOZXA0eMTbSux9GoBbXLY2PDj34B2DBJKsz8y0P1pGFo7SBwikeGMTO4goHN8dLTi v7HsYNYvkko7x63nJiwxCCbt6ugSs9e3RWKaBNl8KRUZVPUlDPujcoACUJyVQdiuzd0G z4PIlbCdLBZsO+TiH/wCz48g76Qjw1uYNOa2Ji9OmEKTqruVZPLyJg7qZtuwjpWXt2ss AOx+Wz+W1yhstb70NbtuvA9QsV95Knp30dL4vjbuaO68/34URx9s2RXf/H6FAdwRhBLk 6XGA== X-Gm-Message-State: AFqh2kqY4hZg3NNi0xQpVYZ4/23SoOXYfbkTeW5ybKPQX8Qt9GMUbj1+ A0uCER1dK59y+UBhZsodpoI= X-Google-Smtp-Source: AMrXdXv0rqldkq324IZrmBFFJnO7fSD5oeWo9f+jtU8Ml/KRwPeLY0lgIYkFlO23Jcdrd2YCCrAdqA== X-Received: by 2002:a05:6a20:3d86:b0:b8:d032:6486 with SMTP id s6-20020a056a203d8600b000b8d0326486mr67733142pzi.16.1675052745607; Sun, 29 Jan 2023 20:25:45 -0800 (PST) Received: from localhost.localdomain ([114.29.91.56]) by smtp.gmail.com with ESMTPSA id 138-20020a621790000000b0059312530b54sm4275969pfx.180.2023.01.29.20.25.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 20:25:44 -0800 (PST) From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Andrew Morton Cc: Joe Perches , Petr Mladek , Andy Shevchenko , Steven Rostedt , Vlastimil Babka , Matthew WilCox , David Hildenbrand , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH mm-unstable v4 2/3] mm, printk: introduce new format %pGt for page_type Date: Mon, 30 Jan 2023 13:25:13 +0900 Message-Id: <20230130042514.2418-3-42.hyeyoo@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230130042514.2418-1-42.hyeyoo@gmail.com> References: <20230130042514.2418-1-42.hyeyoo@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: DFEA980002 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: nkatnbmodssnqytdncmi9ceypccknr99 X-HE-Tag: 1675052746-726143 X-HE-Meta: U2FsdGVkX19LUEqI18kybcPXn7H1//7bbRerqmXgg/2P8qDstWfe89jgGwKAzPuccyyCaMHmoMEUMDHcye6eQZjBqjSafMd6VjkXV9UhAvLrM2kep/CW/5rVYQe4KPPwQPe/xy6XAjrMa00D11l/41xAASUSIuK/bKMEAw1z4SwWB9glhQvMYrWXpwFU+28qMmZCnZ7OLPuZszW3WDfH7G5XSx0HAxY/3xqVeLG4fPxF/CHso1HyEc5fJPhh4oL8bJB7QpuLBi77O7g4tX8ophU4zHoZrUuAQnxaJUdLauqUJ8ahDBlE4NYnhfexJ1yZ03FryaNH+bWah6uNCscgMJAm+fgTmlb8BwOzWuTPaUdnDKwfUlqaSRJXhnP4g/Q2M77v/cqB8hmlNDBXG8326Yp6xpBbhSpFpsvUsk5pke+7tcNiettT3wXiNy3BWnfJHlExLsK1DYPz2cle2Tgezssftgi3A0BtqKHwLGwGTY5qPrJXPJBQaAxNMmj/NRUx/vIsnNZK+9CAj2llaB7yCjvXlDgo7Rd5HGnWXNqB+BSt6FZGzcMoBEaChGTE/7LX8v63DA9mlDmz7zi3jiSoVJkE1V00xxkLuc8QKXUTYp8ihb+KV1p4IZjUfDWpasw65WxXPTWJaEcrvJcEAGgLJGNieuz6Bl2dZWTDJ09+y5rPdX+qSK/5Gt7YKs+NbmT/9xMVM52Pf+Jf/HQZV0OaKoyRsNM19cwEfbleSQg1FMGWe0xcKM+Frc7giDUIOlJmI0l0MKdI93/yikkfmlDLwfHfVpbB1Mj5Gfks44ex4vJuhWzA0pA8TwvLUgnWRu+YTEevCQV1NP+h30qwBCWatz3ZEpJrDRMaOM0eOi2wRnD8c96IcKbrFc1b1vDKjc4HtbrvjJXftWT4n2kesGJtk/7UFEBctoBwrqPmsiBP7y6waUwVIwSwOKqomtvLzZnpZEWV4JvCqZN8jDwYQV8 q+rJy6Tr LXJHcuw+G+j3eTSYBEetzyb7513mKxx9fOyTRZkR56nWu2lvwXTTZR3smKs3b0ajyW0Nrl/0V4YAWBMkwwmUuvZWAXP7xcflCzIWWKWyd7x/PWEp25MRbTjnBIH/+M1IOBw3wzq7nstQKsYhgXdMvdgHizRmwEar9cdwIAx+Pkyo9KcsBi3Yv4nmROXsK5xzJIki2YHcOZnCAQx9JwOGsXBq3JJjOpcJeLRHv8Un7JPxTepfb8Mq/5w558jRthvp2V406DptFND8UcRX3uYzLT1U3b0kVY5kQgKShndlKlrVIQMogjAX7PyzgoIRtJiZ2yZkgKX4QspZkzDRSHUSsf69Mq298wMnWVfKJ+202Xz8q2CBq5Aidg2A0wl04Q2NVSPI9Zu/Z0hIg7nukgOlBwtkTamWry8vYxRdDeydaW/jeDn1y0MesiO6TgjKDMpGiWZQPEeQDHJtmi8I5e7pnch7NvwS7WNUvN1Yg4YOqMUo/vQ6I8kGEvK5G4PMXPuhUvHtsnruV7Q/p0f81P2u1qfykCiwmqQ5yKbb/ukkCdZhGJv7jeeALCQxWW3Vs1CVLaM5GbuDhFyD7q9w8y85Q31VSqb+vzfAcpvXCgPVt27wTRwA= 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: %pGp format is used to display 'flags' field of a struct page. However, some page flags (i.e. PG_buddy, see page-flags.h for more details) are stored in page_type field. To display human-readable output of page_type, introduce %pGt format. It is important to note the meaning of bits are different in page_type. if page_type is 0xffffffff, no flags are set. Setting PG_buddy (0x00000080) flag results in a page_type of 0xffffff7f. Clearing a bit actually means setting a flag. Bits in page_type are inverted when displaying type names. Only values for which page_type_has_type() returns true are considered as page_type, to avoid confusion with mapcount values. if it returns false, only raw values are displayed and not page type names. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Reviewed-by: Petr Mladek # for vsprintf part --- Documentation/core-api/printk-formats.rst | 16 +++++++++----- include/linux/page-flags.h | 7 +++++- include/trace/events/mmflags.h | 8 +++++++ lib/test_printf.c | 26 +++++++++++++++++++++++ lib/vsprintf.c | 21 ++++++++++++++++++ mm/debug.c | 5 +++++ mm/internal.h | 1 + 7 files changed, 78 insertions(+), 6 deletions(-) diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst index dbe1aacc79d0..dfe7e75a71de 100644 --- a/Documentation/core-api/printk-formats.rst +++ b/Documentation/core-api/printk-formats.rst @@ -575,20 +575,26 @@ The field width is passed by value, the bitmap is passed by reference. Helper macros cpumask_pr_args() and nodemask_pr_args() are available to ease printing cpumask and nodemask. -Flags bitfields such as page flags, gfp_flags ---------------------------------------------- +Flags bitfields such as page flags, page_type, gfp_flags +-------------------------------------------------------- :: %pGp 0x17ffffc0002036(referenced|uptodate|lru|active|private|node=0|zone=2|lastcpupid=0x1fffff) + %pGt 0xffffff7f(buddy) %pGg GFP_USER|GFP_DMA32|GFP_NOWARN %pGv read|exec|mayread|maywrite|mayexec|denywrite For printing flags bitfields as a collection of symbolic constants that would construct the value. The type of flags is given by the third -character. Currently supported are [p]age flags, [v]ma_flags (both -expect ``unsigned long *``) and [g]fp_flags (expects ``gfp_t *``). The flag -names and print order depends on the particular type. +character. Currently supported are: + + - p - [p]age flags, expects value of type (``unsigned long *``) + - t - page [t]ype, expects value of type (``unsigned int *``) + - v - [v]ma_flags, expects value of type (``unsigned long *``) + - g - [g]fp_flags, expects value of type (``gfp_t *``) + +The flag names and print order depends on the particular type. Note that this format should not be used directly in the :c:func:`TP_printk()` part of a tracepoint. Instead, use the show_*_flags() diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index a7e3a3405520..57287102c5bd 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -926,9 +926,14 @@ 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 (int)page->page_type < PAGE_MAPCOUNT_RESERVE; + return page_type_has_type(page->page_type); } #define PAGE_TYPE_OPS(uname, lname) \ diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h index f453babe29b3..b28218b7998e 100644 --- a/include/trace/events/mmflags.h +++ b/include/trace/events/mmflags.h @@ -141,6 +141,14 @@ IF_HAVE_PG_SKIP_KASAN_POISON(skip_kasan_poison) __def_pageflag_names \ ) : "none" +#define DEF_PAGETYPE_NAME(_name) { PG_##_name, __stringify(_name) } + +#define __def_pagetype_names \ + DEF_PAGETYPE_NAME(offline), \ + DEF_PAGETYPE_NAME(guard), \ + DEF_PAGETYPE_NAME(table), \ + DEF_PAGETYPE_NAME(buddy) + #if defined(CONFIG_X86) #define __VM_ARCH_SPECIFIC_1 {VM_PAT, "pat" } #elif defined(CONFIG_PPC) diff --git a/lib/test_printf.c b/lib/test_printf.c index 46b4e6c414a3..7677ebccf3c3 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -642,12 +642,26 @@ page_flags_test(int section, int node, int zone, int last_cpupid, test(cmp_buf, "%pGp", &flags); } +static void __init page_type_test(unsigned int page_type, const char *name, + char *cmp_buf) +{ + 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); + + snprintf(cmp_buf + size, BUF_SIZE - size, ")"); + test(cmp_buf, "%pGt", &page_type); +} + static void __init flags(void) { unsigned long flags; char *cmp_buffer; gfp_t gfp; + unsigned int page_type; cmp_buffer = kmalloc(BUF_SIZE, GFP_KERNEL); if (!cmp_buffer) @@ -687,6 +701,18 @@ flags(void) gfp |= __GFP_HIGH; test(cmp_buffer, "%pGg", &gfp); + page_type = ~0; + page_type_test(page_type, "", cmp_buffer); + + page_type = 10; + page_type_test(page_type, "", cmp_buffer); + + page_type = ~PG_buddy; + page_type_test(page_type, "buddy", cmp_buffer); + + page_type = ~(PG_table | PG_buddy); + page_type_test(page_type, "table|buddy", cmp_buffer); + kfree(cmp_buffer); } diff --git a/lib/vsprintf.c b/lib/vsprintf.c index be71a03c936a..fbe320b5e89f 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -2052,6 +2052,25 @@ char *format_page_flags(char *buf, char *end, unsigned long flags) return buf; } +static +char *format_page_type(char *buf, char *end, unsigned int page_type) +{ + buf = number(buf, end, page_type, default_flag_spec); + + if (buf < end) + *buf = '('; + buf++; + + if (page_type_has_type(page_type)) + buf = format_flags(buf, end, ~page_type, pagetype_names); + + if (buf < end) + *buf = ')'; + buf++; + + return buf; +} + static noinline_for_stack char *flags_string(char *buf, char *end, void *flags_ptr, struct printf_spec spec, const char *fmt) @@ -2065,6 +2084,8 @@ char *flags_string(char *buf, char *end, void *flags_ptr, switch (fmt[1]) { case 'p': return format_page_flags(buf, end, *(unsigned long *)flags_ptr); + case 't': + return format_page_type(buf, end, *(unsigned int *)flags_ptr); case 'v': flags = *(unsigned long *)flags_ptr; names = vmaflag_names; diff --git a/mm/debug.c b/mm/debug.c index 96d594e16292..01cf0435723b 100644 --- a/mm/debug.c +++ b/mm/debug.c @@ -36,6 +36,11 @@ const struct trace_print_flags pageflag_names[] = { {0, NULL} }; +const struct trace_print_flags pagetype_names[] = { + __def_pagetype_names, + {0, NULL} +}; + const struct trace_print_flags gfpflag_names[] = { __def_gfpflag_names, {0, NULL} diff --git a/mm/internal.h b/mm/internal.h index 90bb2078444c..11c3258809a9 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -802,6 +802,7 @@ static inline void flush_tlb_batched_pending(struct mm_struct *mm) #endif /* CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH */ extern const struct trace_print_flags pageflag_names[]; +extern const struct trace_print_flags pagetype_names[]; extern const struct trace_print_flags vmaflag_names[]; extern const struct trace_print_flags gfpflag_names[];