From patchwork Tue Feb 25 18:56:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 13990551 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 AC316C021B2 for ; Tue, 25 Feb 2025 18:55:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2AC0C28000A; Tue, 25 Feb 2025 13:55:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 25AA2280003; Tue, 25 Feb 2025 13:55:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0FBBC28000A; Tue, 25 Feb 2025 13:55:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id C5477280003 for ; Tue, 25 Feb 2025 13:55:38 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 94C8781CEC for ; Tue, 25 Feb 2025 18:55:37 +0000 (UTC) X-FDA: 83159370714.09.ECC9049 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf23.hostedemail.com (Postfix) with ESMTP id CA988140004 for ; Tue, 25 Feb 2025 18:55:35 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=none; spf=pass (imf23.hostedemail.com: domain of "SRS0=XlUg=VQ=goodmis.org=rostedt@kernel.org" designates 172.105.4.254 as permitted sender) smtp.mailfrom="SRS0=XlUg=VQ=goodmis.org=rostedt@kernel.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740509735; 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:content-transfer-encoding:in-reply-to: references; bh=C8DyvxR1dtxSU91Bg7xlD4SemqGPn3Vq5Afhq7GENaA=; b=wKfvDf/i3U6L1u+CtyYZmTBHec51aTTKGjnyBockwcWJGTkNAcMr2p/R7Dmg6DG97fvObJ Po375rJJVb1zOZDrRJudJza5xnYAIhMvddG9282vz6+Oht325eAVPPU6SXhvw9XxPUxjjY N7qIwDIDcV5mAuk1h5TZsbUAQIS3TT0= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=none; spf=pass (imf23.hostedemail.com: domain of "SRS0=XlUg=VQ=goodmis.org=rostedt@kernel.org" designates 172.105.4.254 as permitted sender) smtp.mailfrom="SRS0=XlUg=VQ=goodmis.org=rostedt@kernel.org"; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740509735; a=rsa-sha256; cv=none; b=hU5h6nI/MMBL6r2A+KzmdWU2SEdGwsv+0U3imLGLznoJ3IJ9nl5Q5c4tZvIOS+2Eiiw6KB oKuzRBDXxZaKPb7GXS2CJdpPbQKrYAreMVsa/WuxOOfgcDlKIkyYeX2LBeZyQiCq3w7qYN 0ZpXvB8WSJ7c8cvGZ5j1ixPxSADCaR8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 11C43612AE; Tue, 25 Feb 2025 18:55:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7482AC4CEDD; Tue, 25 Feb 2025 18:55:33 +0000 (UTC) Date: Tue, 25 Feb 2025 13:56:11 -0500 From: Steven Rostedt To: LKML , Linux Trace Kernel , linux-mm@kvack.org Cc: Masami Hiramatsu , Mathieu Desnoyers , Andrew Morton , Michael Petlan , Veronika Molnarova , Suren Baghdasaryan , Linus Torvalds Subject: [RESEND][PATCH] tracing: gfp: Remove duplication of recording GFP flags Message-ID: <20250225135611.1942b65c@gandalf.local.home> X-Mailer: Claws Mail 3.20.0git84 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: CA988140004 X-Stat-Signature: jc3yhjd56xr6j3teuij11ddomon66b81 X-HE-Tag: 1740509735-108984 X-HE-Meta: U2FsdGVkX1+q8xvyqIr79PTeOkcVGJeZF1De5dSBwUxC+6zSrLMcPqPBu8cec19PFBUqGyj74aWZ1D9o6bHy6QL2UbGBU5RobEZxh9Y0FEqTDj022wPCuAKhfLv6XqllTCXBU6NwSXCgt0PIcpk/TPPnpTZIIVkoQJ5utkNCsEVaJSAr6WL8Cid/SZdgpTDgfM1+KeAwiwoezfTHZK7wZpgAfMAAEmEJo3oyrp65zxoy+eJzB0iDG915pDQ4DdN7kAaZ+JCIv3XAd3d3YMxpt7OMmR8bjFY2BX+v9XLG3sJe8eLnKec3j26AfAHwwcxbF3ySKgMFWgEYFkwqKdynzBooLIbi5aaInduhE7nh6vtBzURLETYnaiEze4tWlMS7xRETXz9+5Vv0MITE+afEKs3WXbAXzaDwTl3KwM2u1bNnd0NvwCtPR9oYIwqTBaINKNVQ3Jq6twX/xpjv4rvlgBdgO3GY40rYBqwcrYXKzJxTt571fTPbgk36089Y3EvHoi12b4xlM+tJo5jbNIMOOrC38vhupnesIaqh3/4UxnuwPwz6ZQimbCpVZsyN8x+MbFPxzQ2J7cuz0tWUJ4anI92fWsDWwgOLbje0ySI99JDsToxHyqTw/z3E9JHJtPz9WN7rVwfCNcbIU6+HgtIvfUzGKee09nx+2yxVePj+2xw+zgIqcsg5DRgPr0jIYy1q39xSzzv3CxOtbnJDI0+4LwFI6JHXLlISemYcXoBvDwButYzU8Bd3fJVWWpJnoCsZSsXIkBIE93bnJ0knFW1kLkqamES1Rv6AnZZPWXMK/lmcfhYTUp5eUn1mKAv9flwnAzGjnyL6mHSfV+00/kY5zLetXXb/0vlWtWZTeSo2DY3b/H6QXRhAkT7bwA/zQw8BerzJmXusZ1VJF6i38pWH2lp4uGHJw4wyXrg3uirwGtZzBVfyP9YRFii31+Be2Sg7dfUqSyubCfQgiWVrTgD tgPKaJ0b MkpTGB5+STgk1xumUnnR7TvAEnZ7vQK6l8DwhrSiaG90WJN7ZS+4CzToY+q0HJ5lwZZRBQGi946nHr/skCQ7BUx06WgvuyhIIfS+B+rABrpDilo55xrSXwOnbaUzYVm+OVAwA4lFvVcb2jNwKG5AylsIq9JDdpIBSwAz4SBIYFnT8aCtuXpW7X8r+gTnPF6yHlBLHQDZil3lIGAb+8CLsE9ftnS3vRlvhSvKCo1JAiX9XvQo/TiUbs0G+enKtYGMo7sfLvavGX1pEGF9E0wUBCWhKt6EXUYJQgVq7VxGLhraOmYddhiIli7lFtKVnA/IEcYaTaQ95XzzXcxQ= 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: From: Steven Rostedt The gfp_flags when recorded in the trace require being converted from their numbers to values. Various macros are used to help facilitate this, but there's two sets of macros that need to keep track of the same GFP flags to stay in sync. Commit 60295b944ff68 ("tracing: gfp: Fix the GFP enum values shown for user space tracing tools") added a TRACE_GFP_FLAGS macro that holds the enum ___GFP_*_BIT defined bits, and creates the TRACE_DEFINE_ENUM() wrapper around them. The __def_gfpflag_names() macro creates the mapping of various flags or multiple flags to give them human readable names via the __print_flags() tracing helper macro. As the TRACE_GFP_FLAGS is a subset of the __def_gfpflags_names(), it can be used to cover the individual bit names, by redefining the internal macro TRACE_GFP_EM(): #undef TRACE_GFP_EM #define TRACE_GFP_EM(a) gfpflag_string(__GFP_##a), This will remove the bits that are duplicate between the two macros. If a new bit is created, only the TRACE_GFP_FLAGS needs to be updated and that will also update the __def_gfpflags_names() macro. Signed-off-by: Steven Rostedt (Google) --- Last version: https://lore.kernel.org/20250116214439.046082618@goodmis.org This was originally sent with a patch that fixed the output of gfp flags in trace events to show human readable flags and not hex numbers. This patch on the other hand is a clean up as the there's now two macros that define the bits to print. This makes the one macro use the other macro that is a subset of the first. Can someone in the memory management subsystem either give me an acked-by and I can take this through my tree, or you can just take this through the memory management tree. Either way works for me. include/trace/events/mmflags.h | 41 +++++++++------------------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h index 72fbfe3caeaf..82371177ef79 100644 --- a/include/trace/events/mmflags.h +++ b/include/trace/events/mmflags.h @@ -78,6 +78,13 @@ TRACE_DEFINE_ENUM(___GFP_LAST_BIT); #define gfpflag_string(flag) {(__force unsigned long)flag, #flag} +/* + * For the values that match the bits, use the TRACE_GFP_FLAGS + * which will allow any updates to be included automatically. + */ +#undef TRACE_GFP_EM +#define TRACE_GFP_EM(a) gfpflag_string(__GFP_##a), + #define __def_gfpflag_names \ gfpflag_string(GFP_TRANSHUGE), \ gfpflag_string(GFP_TRANSHUGE_LIGHT), \ @@ -91,41 +98,13 @@ TRACE_DEFINE_ENUM(___GFP_LAST_BIT); gfpflag_string(GFP_NOIO), \ gfpflag_string(GFP_NOWAIT), \ gfpflag_string(GFP_DMA), \ - gfpflag_string(__GFP_HIGHMEM), \ gfpflag_string(GFP_DMA32), \ - gfpflag_string(__GFP_HIGH), \ - gfpflag_string(__GFP_IO), \ - gfpflag_string(__GFP_FS), \ - gfpflag_string(__GFP_NOWARN), \ - gfpflag_string(__GFP_RETRY_MAYFAIL), \ - gfpflag_string(__GFP_NOFAIL), \ - gfpflag_string(__GFP_NORETRY), \ - gfpflag_string(__GFP_COMP), \ - gfpflag_string(__GFP_ZERO), \ - gfpflag_string(__GFP_NOMEMALLOC), \ - gfpflag_string(__GFP_MEMALLOC), \ - gfpflag_string(__GFP_HARDWALL), \ - gfpflag_string(__GFP_THISNODE), \ - gfpflag_string(__GFP_RECLAIMABLE), \ - gfpflag_string(__GFP_MOVABLE), \ - gfpflag_string(__GFP_ACCOUNT), \ - gfpflag_string(__GFP_WRITE), \ gfpflag_string(__GFP_RECLAIM), \ - gfpflag_string(__GFP_DIRECT_RECLAIM), \ - gfpflag_string(__GFP_KSWAPD_RECLAIM), \ - gfpflag_string(__GFP_ZEROTAGS) - -#ifdef CONFIG_KASAN_HW_TAGS -#define __def_gfpflag_names_kasan , \ - gfpflag_string(__GFP_SKIP_ZERO), \ - gfpflag_string(__GFP_SKIP_KASAN) -#else -#define __def_gfpflag_names_kasan -#endif + TRACE_GFP_FLAGS \ + { 0, "none" } #define show_gfp_flags(flags) \ - (flags) ? __print_flags(flags, "|", \ - __def_gfpflag_names __def_gfpflag_names_kasan \ + (flags) ? __print_flags(flags, "|", __def_gfpflag_names \ ) : "none" #ifdef CONFIG_MMU