From patchwork Fri Mar 14 14:13:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Mladek X-Patchwork-Id: 14016935 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 DACC3C35FF1 for ; Fri, 14 Mar 2025 14:13:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 25110280002; Fri, 14 Mar 2025 10:13:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2004E280001; Fri, 14 Mar 2025 10:13:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A202280002; Fri, 14 Mar 2025 10:13:16 -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 DFAAF280001 for ; Fri, 14 Mar 2025 10:13:15 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 8E6781CB763 for ; Fri, 14 Mar 2025 14:13:17 +0000 (UTC) X-FDA: 83220348834.25.DEEA440 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by imf22.hostedemail.com (Postfix) with ESMTP id 84BB4C0010 for ; Fri, 14 Mar 2025 14:13:15 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b=d+r1XxhD; spf=pass (imf22.hostedemail.com: domain of pmladek@suse.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=pmladek@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741961595; 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:in-reply-to:references:references:dkim-signature; bh=0Ev7Ui75IuuSIPWk86Wm5e6FobvO+1G5BN5BqKHdtAI=; b=JfHmyWr5knj5mot/m5+aXp+bn3DjnBPEGCsRIWt3Crcjz+7nfLHiOPkTuQtuRD70HavB+k wvfWnd0rauqYcycASv8DziHaXWOgW2By+cR7dwoCogqdPcJSs3RnrHlL43uhRUfIOt4HNo 6c+pJODGlvpdPup8jRHanqBZaWKVeZA= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b=d+r1XxhD; spf=pass (imf22.hostedemail.com: domain of pmladek@suse.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=pmladek@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741961595; a=rsa-sha256; cv=none; b=ty5mZHRhXCv7Jda8IfSN3T+OEJG0J9R3wOi/JpXSazhaha1u5xI4vkA47pGtxXeA3hOC/C d92v6vyI9XGmpYi6nST0bpScoOa/fk6DLGX8oF61booy6U71mA5428Phla3SiRFIOxdncB WfKrVzYcOVqYmWcv2TtQ2P6yMD7xWf0= Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-43cf848528aso20485535e9.2 for ; Fri, 14 Mar 2025 07:13:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741961594; x=1742566394; darn=kvack.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=0Ev7Ui75IuuSIPWk86Wm5e6FobvO+1G5BN5BqKHdtAI=; b=d+r1XxhD6WA1HUxDaNCBJXbc9nW2l9ZqNejRcmIGeqAVy853rfwP0iEY4d9JQ+p6IH zavtEFEfz5YWa2GfwPuBqpsceLt7mCYIDS3h+J6IKdsmG7Ojc0FtjXPnpROK6CvjkIbl SUEqD+c0NnS6eZPy0A0ghb2fZGQuueFObl674N+LUN4/BQ5v/lrFLmySajSZMRBIJT8k Zzb8eZf9P35/5s4zkSU5nqOqKfX1aUAe2PAZSfJ4Val9M19AlU+wGXeASeX9MR/Ir5ze VC+I96X8t83D1/NrGN+euGjbpkdzXnUkfqlTE2q9X8Yk1v5ybo7DiIa2f4rBGwPGpzHY tx1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741961594; x=1742566394; 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=0Ev7Ui75IuuSIPWk86Wm5e6FobvO+1G5BN5BqKHdtAI=; b=WFCKRPQUlyxI+13IwnkTETrrtuLyMZkAV/2fDnosZUoPdczb+pmhZL5LcbTX9e8MmZ OWLIiaTChL68KylTmQp2fx1XlD8/2nArjq6C8Qm7XofC+pgZEDJOh6k946YJN1mSDA5b GDSs1gUpLOB9mc/vMNqRyQcys10HXAEGpsCD6WSDlloabZgheBJ7P/rO3VsuRwKQMPaO CLwU//SwMMmYMuWEHIG+dof69S9tEWB34gt7AiYRhFrTINouj2WfCaMo/PPFFedXCdhl iW9a0iwJl+KIb/WvZ74T1+ec2bja084aqMOgHhn6syt6JEhiJ6k/AGfw0ZDf4LOCsJf0 Bikw== X-Forwarded-Encrypted: i=1; AJvYcCVuNlrzmeB6g0a9mPnS+SQFe4Ym71NsMAp3XcER5Woog/ooCI3FafSNcTUw0yUNJkPEUCb9lw7BdQ==@kvack.org X-Gm-Message-State: AOJu0Yx/G+Xmd0X7N/teDImq3Nfmt+peK8sZeHS5XYmHendzcszIkCP0 cZGAaKbZcJXeWib1s9XG9QC7mESei6J5DQuOdeqZrfM72HAwtAcXK31PI2OSFps= X-Gm-Gg: ASbGncsOttJw5CNr/g5FJZjAqqlwQgcI0MkBYGN/iAb7sCeP8/kvm35OCsk9LSbEYBv TssOcVw215bnnwvlFh5ZKZXhyPMK3yhVVYM5JXigHTgvmeQZTL4yNggQhvpZqEacuElfahVr02u evs2uuEHLUeKAnB/kz1x6EuVOMN/HFIMCnGSJqxrEdVtLJtnXYiABUrLA7KfZ3MH77VQIaTFc3M zXHfkzvhxw2OxmlU5US2zPL3Tld3fHfUcpQPDBWxEU6QtRuOQqTnyc8u9bcd8heckf9SYiibCxM KPkA8E0H0PBDHl8jUCuGkhWaPnY4FGkwyyVcAbG0akc5soeNGkunqq9d2A== X-Google-Smtp-Source: AGHT+IHwozIbGl0OHOmEZQ3S3NFp6KYWrzBJ9oVTGXL5DC16G6oKXkM7tqtYNlSXL2GE2j1zPhB1Og== X-Received: by 2002:a05:600c:1c86:b0:43c:f4b3:b0ad with SMTP id 5b1f17b1804b1-43d1ecd0f21mr32888105e9.19.1741961593813; Fri, 14 Mar 2025 07:13:13 -0700 (PDT) Received: from pathway.suse.cz ([176.114.240.130]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-395c7df34eesm5761373f8f.18.2025.03.14.07.13.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 07:13:13 -0700 (PDT) Date: Fri, 14 Mar 2025 15:13:11 +0100 From: Petr Mladek To: Steven Rostedt Cc: LKML , Linux Trace Kernel , linux-mm@kvack.org, Masami Hiramatsu , Mathieu Desnoyers , Andrew Morton , Michael Petlan , Veronika Molnarova , Suren Baghdasaryan , Rasmus Villemoes , Andy Shevchenko , Tamir Duberstein , Linus Torvalds Subject: [PATCH] tracing: gfp: vsprintf: Do not print "none" when using %pGg printf format Message-ID: References: <20250225135611.1942b65c@gandalf.local.home> <20250313125313.4f3d98f4@batman.local.home> <20250314082534.57ef07c4@batman.local.home> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20250314082534.57ef07c4@batman.local.home> X-Rspam-User: X-Rspamd-Queue-Id: 84BB4C0010 X-Rspamd-Server: rspam03 X-Stat-Signature: ysfoode811yw3nqauxkwsh4mkgg8o4xc X-HE-Tag: 1741961595-227275 X-HE-Meta: U2FsdGVkX18948tu3BI5n2r4kjstplKd4zc1HdwLswCGVUyATRjjuIIytEplhcMQzI/JpZfC1VpP+qEEZfbn+RbMW1iiy4cmqVkBSwvpMpvnf7olbiNR9HmPAODey9oi619CBgpLOeBIdllIxTv2MduzHoNP2bFxxitXMMclxd1FaIrYCWN3LnYD96NioFfeKkgBiWqJbU1xr47DbEpY0u4hcZ/6tqmcmsks3IyfJxk8LwV4cz5BIn13y6xGKuZCFgI+4793cPoiICMVEnZktbl4KZ4ExHRbPn1g9bQzn/FKGvmrhCZcqZEqYQH/QcOzimQ4VU3wJapqktZdhBpSHHjw3UUqiXHLUeS4WZfUKMo6sGK6Qmp+35kHJwK6OwscgkOOv8p+OQFWsVRznX+HlRPIVrufNG2iMduptjTVXNvEnv+eR0+LTVCIOveRTkG2tq++lQORIaHXG7TcSQvpJz9xMryEkSrN/I3uH5M4oS9JIJnN9UhO98zUv5vFzwAdplpHai861MokOAgC1/+ds/Afm6sVzC3xHc9K10q4b7OyRKzJt+qHsBuGrUD15c6nXzPFroMaeyUZg6aaoKjv/vK+QSDi3ivkPB/6My8NqwiYqgZwitOzMDCAaKn5gogkS0vX2gZngbTvwYhW5ZBYbSXxteYsj2MmvWQQwXM1iYJU3c61XZZONAnTSOdR7YbqXIG2DE+SnJF3Kr75guQmGn7ct1GBjN9GC5ysBRirvb5JuKTwMAktw1GjLu4S1qLUQRbtLLwYS1dyeNOjVhW7uTr9vyb6I2W0wYAZESeWnaNGIGvtWLdvvwccLya+SeLNyIabvFtXcesKYzHzTfJcZkuh7Uy8q0fg09bU9qrI5YjLGyBdweNBexltNxs/mFMQ6TQg1221pidGmgwHJl//6zJttaQiA8LMstlUH4qy+T3jpkOBCrM7mvEOBYFVMtmqvR/0dt1P2o3v30MrmIx N/UhoN47 ltzbGzNyb7f35HXOJd+Was23MjpZMmqZpWtr5z0FI0uUIFoDG6zjLVN4Kx9sB7l/zLU5+JAajUr7JBZHx5Y8Hy7UvCUQwbNmgiWDZTDd3HICQKJuMOxFGFSIUNEguv0oUSpHMxqf7bfONaj1Ia1xJfAGREWx6h6GxSj/FnTpDI6yiH14OtPm9cbFclYdod39UIWdbJS73p7EZTD6BrxiZ3U/SNYDMPwX0xgOmXkoLMaP718hNvoYN2O+z1kPL3XMibpZ7l/CuM7E/AqPQg6EO/EyrRdRfI4+09wdCN6ag5gSTGkpmlUzkOmN2B4lmCxk82QqkZv7AR17iARs= 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: List-Subscribe: List-Unsubscribe: The commit ca29a0bf122145 ("tracing: gfp: Remove duplication of recording GFP flags") caused the following regression in printf_test selftest: [ 46.208199] test_printf: kvasprintf(..., "%pGg", ...) returned 'none|0xfc000000', expected '0xfc000000' [ 46.208209] test_printf: kvasprintf(..., "%pGg", ...) returned '__GFP_HIGH|none|0xfc000000', expected '__GFP_HIGH|0xfc000000' The problem is the new '{ 0, "none" }' entry in __def_gfpflag_names macro and the following code: char *format_flags(char *buf, char *end, unsigned long flags, const struct trace_print_flags *names) { [...] if ((flags & mask) != mask) continue; [...] } The purpose of the code is to print the name of a mask instead of bits, for example, printk "GFP_ZONEMASK", instead of "__GFP_DMA|__GFP_HIGHMEM|__GFP_DMA32|__GFP_MOVABLE". Unfortunately, the mask "0" pass this check and "none" is always printed. A solution would be to move TRACE_GFP_FLAGS up so that it is not the last entry. But it breaks the rule that named masks must be defined before names of single bytes. Otherwise, it would print the names of the bytes instead of the mask. Instead, replace '{ 0, "none" }' with '{ 0, NULL }'. It works because __def_gfpflag_names defines a standalone array and this is the standard trailing entry. The code processing these arrays always ends the cycle when flag->name == NULL. Fixes: ca29a0bf122145 ("tracing: gfp: Remove duplication of recording GFP flags") Signed-off-by: Petr Mladek --- include/trace/events/mmflags.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h index 82371177ef79..15aae955a10b 100644 --- a/include/trace/events/mmflags.h +++ b/include/trace/events/mmflags.h @@ -101,7 +101,7 @@ TRACE_DEFINE_ENUM(___GFP_LAST_BIT); gfpflag_string(GFP_DMA32), \ gfpflag_string(__GFP_RECLAIM), \ TRACE_GFP_FLAGS \ - { 0, "none" } + { 0, NULL } #define show_gfp_flags(flags) \ (flags) ? __print_flags(flags, "|", __def_gfpflag_names \