From nobody Tue Dec 2 02:49:44 2025 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E07E129E10F for ; Tue, 18 Nov 2025 06:21:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763446910; cv=none; b=kD09HjjQnTsjfmrnvidDoyZW+jZZ5CF+5ZKqzchePCd3cFUEAH0LuSGi8JXKdfZf9a8hh4dfHGNLnz+A2AWXpNLrfKKDUgeipi0KNpWMOOthYTXRF2EkC08xnPVaAH0Jf2N8lpvekOmYPfX07hfjxeEks+wT/8+nR2Mf99JWm3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763446910; c=relaxed/simple; bh=cIb4Lragr4Rt/3f0JkwO0+aZtQDG7sdU1iLTonS9xeA=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=BSjVAZCRnrl1Z7I6fb3jqWh5sTjpz56HBMLDUV8HoVuWeTkOwXXiVXWp4ZnDsM0SSGr5e0sMksWYtfdiN5BP88QDVzckBWTrlo8NbVg96HK5vbe/wvk2paa9nyNf5R2IxwSazj6KpPVe4isZ/5rV1zjoU5jVKxzdUZeO7sC96Do= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--yhli.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=cH/R4VXc; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--yhli.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="cH/R4VXc" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-7bf15b82042so3257159b3a.1 for ; Mon, 17 Nov 2025 22:21:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763446907; x=1764051707; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=ht0bGJ+qMeoh2nKXD0gUXCN3fVl6s6OTYvnWp4jySD0=; b=cH/R4VXc/w4LDCZY+OXZygatc/QwBuxzweWogjemiatfadiFl2k0iQoiBQdGe6jr+X 6B7ynNFkNERDG+yP+qQHJVmKtwqRyXamGqhPvfsJAWzsoGUkgR2p2OrbpzRyatuhrgvr XcEX8DpTmnn1sJLFV2/SR3NEegJQOXythONiIyECtIV8RATK4wyCXqEJ06jDaNKAaJnC Jxbr4lPG2Plj8dqetSPF0dE/Ozw4ZShX3QYnbXAfwIqYoLokhidDNK3bvhSvCyXE6QPN 6mW9xwmXgOi6Y/CR7VFhds8RTLD1Ouo34u2AvUBGtHU8YIhIrgDnfggQsExTlFzXzNTc u7sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763446907; x=1764051707; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ht0bGJ+qMeoh2nKXD0gUXCN3fVl6s6OTYvnWp4jySD0=; b=XOVDoQtV8IsWviQIHkCXmbF+B5ee/x5RIMDiiT/WQ28bfBUD1M8eXvElfEpfDYrros zgntZR8Ia95k3ZHmNMpHsMZoxNrcGikHxTrk/BBSRk9YZ2jLIQvBpaijI/zvsCu6lFif y9ogJxRmISl5vCtc6giaRFrnUtW5kwycIWs6RzWA+Ihv4ddILy7JzI57O06K22epWhZi dzJcFth8G6UDbPpUdY/Hnirdv1nrwODubrXvnCxxQ57Q0lzoWzPoGUzufJDoafwtB92W gvKQIckJ1WIU3GfeKhlh2iUFJPyoKJ4UuEXTG8YE7HaR3QjTASUNdDdDpkZpVjma79eo Qd4w== X-Forwarded-Encrypted: i=1; AJvYcCXKwHuspyhqt+DNZwtFkSmBmlMpQda8RMkAfjSphcVWYbSgFW18h3sKzaYq2Hka6JkXUIIFbEf+Qfb6c70=@vger.kernel.org X-Gm-Message-State: AOJu0YxmUsv4V4Zulyxaf22wqAALWQYe13SHXFD6hFtHKZBr4Voipq9S MhLD5Pdd8MNDqqToZAEvPab5nPElrxk7s/ugrbmnAXVgVoyEnpnAo4lJUu2x9opFHEsKt/9QoQ= = X-Google-Smtp-Source: AGHT+IG4lunFThAtiGTvAVuvfp+1YhoKbyAo8dba1DkSZ/pQCkz4PLegWIzFsFufPnDN4ny5AWU4BtGG X-Received: from pfblh5.prod.google.com ([2002:a05:6a00:7105:b0:7b2:129d:2cc1]) (user=yhli job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:33a4:b0:35f:7431:5d98 with SMTP id adf61e73a8af0-35f74316cb8mr7492913637.15.1763446907068; Mon, 17 Nov 2025 22:21:47 -0800 (PST) Date: Tue, 18 Nov 2025 14:21:32 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.52.0.rc1.455.g30608eb744-goog Message-ID: <20251118062132.678025-1-yhli@google.com> Subject: [PATCH] f2fs: optimize trace_f2fs_write_checkpoint with enums From: YH Lin To: jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Cc: yhli@google.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch optimizes the tracepoint by replacing these hardcoded strings with a new enumeration f2fs_cp_phase. 1.Defines enum f2fs_cp_phase with values for each checkpoint phase. 2.Updates trace_f2fs_write_checkpoint to accept a u16 phase argument instead of a string pointer. 3.Uses __print_symbolic in TP_printk to convert the enum values back to their corresponding strings for human-readable trace output. This change reduces the storage overhead for each trace event by replacing a variable-length string with a 2-byte integer, while maintaining the same readable output in ftrace. Signed-off-by: YH Lin --- fs/f2fs/checkpoint.c | 6 +++--- include/trace/events/f2fs.h | 28 +++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index bbe07e3a6c75..b04f82fdd143 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -1673,7 +1673,7 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, s= truct cp_control *cpc) goto out; } =20 - trace_f2fs_write_checkpoint(sbi->sb, cpc->reason, "start block_ops"); + trace_f2fs_write_checkpoint(sbi->sb, cpc->reason, CP_PHASE_START_BLOCK_OP= S); =20 err =3D block_operations(sbi); if (err) @@ -1681,7 +1681,7 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, s= truct cp_control *cpc) =20 stat_cp_time(cpc, CP_TIME_OP_LOCK); =20 - trace_f2fs_write_checkpoint(sbi->sb, cpc->reason, "finish block_ops"); + trace_f2fs_write_checkpoint(sbi->sb, cpc->reason, CP_PHASE_FINISH_BLOCK_O= PS); =20 f2fs_flush_merged_writes(sbi); =20 @@ -1747,7 +1747,7 @@ int f2fs_write_checkpoint(struct f2fs_sb_info *sbi, s= truct cp_control *cpc) =20 /* update CP_TIME to trigger checkpoint periodically */ f2fs_update_time(sbi, CP_TIME); - trace_f2fs_write_checkpoint(sbi->sb, cpc->reason, "finish checkpoint"); + trace_f2fs_write_checkpoint(sbi->sb, cpc->reason, CP_PHASE_FINISH_CHECKPO= INT); out: if (cpc->reason !=3D CP_RESIZE) f2fs_up_write(&sbi->cp_global_sem); diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h index e00611ead024..a87aab397457 100644 --- a/include/trace/events/f2fs.h +++ b/include/trace/events/f2fs.h @@ -11,6 +11,15 @@ #define show_dev(dev) MAJOR(dev), MINOR(dev) #define show_dev_ino(entry) show_dev(entry->dev), (unsigned long)entry->ino =20 +#ifndef _TRACE_F2FS_ENUM_H +#define _TRACE_F2FS_ENUM_H +enum f2fs_cp_phase { + CP_PHASE_START_BLOCK_OPS, + CP_PHASE_FINISH_BLOCK_OPS, + CP_PHASE_FINISH_CHECKPOINT, +}; +#endif /* _TRACE_F2FS_ENUM_H */ + TRACE_DEFINE_ENUM(NODE); TRACE_DEFINE_ENUM(DATA); TRACE_DEFINE_ENUM(META); @@ -50,6 +59,9 @@ TRACE_DEFINE_ENUM(CP_PAUSE); TRACE_DEFINE_ENUM(CP_RESIZE); TRACE_DEFINE_ENUM(EX_READ); TRACE_DEFINE_ENUM(EX_BLOCK_AGE); +TRACE_DEFINE_ENUM(CP_PHASE_START_BLOCK_OPS); +TRACE_DEFINE_ENUM(CP_PHASE_FINISH_BLOCK_OPS); +TRACE_DEFINE_ENUM(CP_PHASE_FINISH_CHECKPOINT); =20 #define show_block_type(type) \ __print_symbolic(type, \ @@ -175,6 +187,12 @@ TRACE_DEFINE_ENUM(EX_BLOCK_AGE); #define S_ALL_PERM (S_ISUID | S_ISGID | S_ISVTX | \ S_IRWXU | S_IRWXG | S_IRWXO) =20 +#define show_cp_phase(phase) \ + __print_symbolic(phase, \ + { CP_PHASE_START_BLOCK_OPS, "start block_ops" }, \ + { CP_PHASE_FINISH_BLOCK_OPS, "finish block_ops" }, \ + { CP_PHASE_FINISH_CHECKPOINT, "finish checkpoint" }) + struct f2fs_sb_info; struct f2fs_io_info; struct extent_info; @@ -1573,26 +1591,26 @@ TRACE_EVENT(f2fs_readpages, =20 TRACE_EVENT(f2fs_write_checkpoint, =20 - TP_PROTO(struct super_block *sb, int reason, const char *msg), + TP_PROTO(struct super_block *sb, int reason, u16 phase), =20 - TP_ARGS(sb, reason, msg), + TP_ARGS(sb, reason, phase), =20 TP_STRUCT__entry( __field(dev_t, dev) __field(int, reason) - __string(dest_msg, msg) + __field(u16, phase) ), =20 TP_fast_assign( __entry->dev =3D sb->s_dev; __entry->reason =3D reason; - __assign_str(dest_msg); + __entry->phase =3D phase; ), =20 TP_printk("dev =3D (%d,%d), checkpoint for %s, state =3D %s", show_dev(__entry->dev), show_cpreason(__entry->reason), - __get_str(dest_msg)) + show_cp_phase(__entry->phase)) ); =20 DECLARE_EVENT_CLASS(f2fs_discard, --=20 2.52.0.rc1.455.g30608eb744-goog