From nobody Tue Apr 7 16:20:26 2026 Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) (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 EF6CF3CCFAA for ; Thu, 12 Mar 2026 15:06:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773327980; cv=none; b=BIwsqmka19MrzlAn4J1cg8IA7m2ex5UN3B3fOH5UZEAot8mj/odLoNfJgsD5Mo9s/rFZPZdw5chnOFVrRF9Sil3uZNvIJvZ2WMnIvE/MuSvrZJCu3K1zIUcFg3474/lLexXLbm4UxImU0gI3FYmhlhNrGeuN5j6p76Y4kP98VCY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773327980; c=relaxed/simple; bh=GV/uBOcBqntPAApAc0QTyoHwJkme8YR9+aADyAzFTy0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P0GeDJqkFm0e0pkZlowK8CAcdlyKSS3qE6ERD6GbNkWL6E5ogmFNsUViFiraQehE212AOcnvfbziWQ7YOKWp4LnFcPCZ5Eyg3Zgr8eT4qkrND5Z7cdq/tS4/XFmeh6IImsdlBhjdJ/5tvmgHeJP4XHJMQrg1TF7Z51bVqSCVduk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bitbyteword.org; spf=pass smtp.mailfrom=bitbyteword.org; dkim=pass (2048-bit key) header.d=bitbyteword.org header.i=@bitbyteword.org header.b=AeEDQTCg; arc=none smtp.client-ip=209.85.167.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bitbyteword.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bitbyteword.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bitbyteword.org header.i=@bitbyteword.org header.b="AeEDQTCg" Received: by mail-oi1-f175.google.com with SMTP id 5614622812f47-4670bcc40d7so456874b6e.2 for ; Thu, 12 Mar 2026 08:06:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bitbyteword.org; s=google; t=1773327977; x=1773932777; darn=vger.kernel.org; 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=6Zkmp0oJNKpSbul8J/Gx58ohXxqsVTLVowypwRZJ2Ic=; b=AeEDQTCg4aLcYlKo4ASJ8EjfwE+MFEs877o9gs1JqRIK/JJYDOkK4Af4QvmkyYn097 Rvvg350bwAQz+VEhkBBBJ3FlNdvs042mshOsNkHJyYhxjM1kpe7LxB3rIkuNOVqa994J sDTjqRUzuaOPgBCY8zgVRr/lz8rgjE+VlZqX5OQLxb6A/5OJMmueBTgsCmMokgXxfusZ ItbIU1O56oFsE6lmOhXmBkE4+4ILa+KGeQOCFh/5juMS/VLU8mbrpIwiPcg3uvoU1dWH dCA5bGceQC5nkDw+q66ucJh6Sya18kXjKhSoH+vnZ3zbBJPlsLboI+Jr1YjujYhwk8OY zp/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773327977; x=1773932777; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=6Zkmp0oJNKpSbul8J/Gx58ohXxqsVTLVowypwRZJ2Ic=; b=Vuh/JBgRIMQQdAI6o9aNKVZShvFHLgsPU7JgKx8+CfqqnUKkTOPGRWQ+6Ydca2Jqe+ 0bUuBQYemS6aB6sRZBm8YDGr95EVIgIeyBIvAxDj6xKCw+qNRa7pAuEyPUx6xZXflRTJ PCuYU8/19IYBMeBIDik/1muIq0Ya+hbyQDEj6RK3NeNfWTydlWarNRLwQFsZcDIWrMKR ErXeG8A/YnP/LnYAD4hVbz2qC8KDJYezrqO8NyOU21scu2E8/eOKGOVbnrOv5DrWKy6x SCyEbIfb5JojTa4hJzOpjtBb+JyOUjU0wRh5trXePYWREvc2CrkdhSlG261FbrQSLS9v 8Jmg== X-Forwarded-Encrypted: i=1; AJvYcCWlOXwPXQGp1HXO8B5cCpwpqcbEl1V3Ke176WgOqacmAtxX9M2TbULZsAYaLQCNPwBLEKT3HPYTVEInt74=@vger.kernel.org X-Gm-Message-State: AOJu0YxHMI3eTWQD5TT5qyiwYeK1vjLqm74WtejyW6N2Glki85zSn/fv 4ZRRY893uGuqAzuHD7tGR4D+ThTGSX1HkYe6QklFDreSzm0DTkERg3i7oxsa2mNCQoc= X-Gm-Gg: ATEYQzyYH6YREKNcTSr8d5DWtXpzsqtAFFkvN+mvQCEad0YQvol+izYwscX292hlMj3 QN6nn8pl19lPrK8b+PWFDBU5lmJ3OxFmyooZ9M4OyoJPxKQYAh/DAQUSyvIYfXcY75AKfNrj7yd 3AJzhAbLhPFPUkPlVGn+2denly7qzXkJlumdt26gpzxHnaT9V5sk9e2qxY2pXJA9Y6siiwcMBZw pmmIsX47O1t0TieJViw4oUQJ17raW5H/vkVgAdixURZt87jyMCGFB+dyh59VxjJgVE2TYcdv6KA d7uWTu8up0BSzvl/nbDooTtoH/6UJp0JxkeOEMRCT4dwtGxWKX6J6RLIrjqzziOvqTWSAfnzlsj LZuJ3v2vAg1MJ2kZLbKTq65UM5EwViXMdQ2jEVyt3bdI4J4tjhAyBAyJhgckxdrl0rHzKPXQ7gK EB6HdfdRz/GIsBmLLuJkLba4ADSSlGHTfQePAoVAWqNszGuQ0yVG4u6pxIv1R/LASPSod58ZJCJ iMI X-Received: by 2002:a05:6808:2225:b0:467:1e5:6764 with SMTP id 5614622812f47-467335bf7f2mr3426441b6e.54.1773327976888; Thu, 12 Mar 2026 08:06:16 -0700 (PDT) Received: from vinmini.lan (c-73-143-21-186.hsd1.vt.comcast.net. [73.143.21.186]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7d76aedae57sm4321776a34.28.2026.03.12.08.06.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 08:06:16 -0700 (PDT) From: "Vineeth Pillai (Google)" To: Cc: "Vineeth Pillai (Google)" , Steven Rostedt , Peter Zijlstra , Chris Mason , David Sterba , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH 15/15] btrfs: Use trace_invoke_##name() at guarded tracepoint call sites Date: Thu, 12 Mar 2026 11:05:10 -0400 Message-ID: <20260312150523.2054552-16-vineeth@bitbyteword.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260312150523.2054552-1-vineeth@bitbyteword.org> References: <20260312150523.2054552-1-vineeth@bitbyteword.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace trace_foo() with the new trace_invoke_foo() at sites already guarded by trace_foo_enabled(), avoiding a redundant static_branch_unlikely() re-evaluation inside the tracepoint. trace_invoke_foo() calls the tracepoint callbacks directly without utilizing the static branch again. Suggested-by: Steven Rostedt Suggested-by: Peter Zijlstra Signed-off-by: Vineeth Pillai (Google) Assisted-by: Claude:claude-sonnet-4-6 Acked-by: David Sterba --- fs/btrfs/extent_map.c | 4 ++-- fs/btrfs/raid56.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index 095a561d733f0..fadb676fc4e90 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c @@ -1318,7 +1318,7 @@ static void btrfs_extent_map_shrinker_worker(struct w= ork_struct *work) if (trace_btrfs_extent_map_shrinker_scan_enter_enabled()) { s64 nr =3D percpu_counter_sum_positive(&fs_info->evictable_extent_maps); =20 - trace_btrfs_extent_map_shrinker_scan_enter(fs_info, nr); + trace_invoke_btrfs_extent_map_shrinker_scan_enter(fs_info, nr); } =20 while (ctx.scanned < ctx.nr_to_scan && !btrfs_fs_closing(fs_info)) { @@ -1358,7 +1358,7 @@ static void btrfs_extent_map_shrinker_worker(struct w= ork_struct *work) if (trace_btrfs_extent_map_shrinker_scan_exit_enabled()) { s64 nr =3D percpu_counter_sum_positive(&fs_info->evictable_extent_maps); =20 - trace_btrfs_extent_map_shrinker_scan_exit(fs_info, nr_dropped, nr); + trace_invoke_btrfs_extent_map_shrinker_scan_exit(fs_info, nr_dropped, nr= ); } =20 atomic64_set(&fs_info->em_shrinker_nr_to_scan, 0); diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index b4511f560e929..c6de0c5bd6ef6 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -1743,7 +1743,7 @@ static void submit_read_wait_bio_list(struct btrfs_ra= id_bio *rbio, struct raid56_bio_trace_info trace_info =3D { 0 }; =20 bio_get_trace_info(rbio, bio, &trace_info); - trace_raid56_read(rbio, bio, &trace_info); + trace_invoke_raid56_read(rbio, bio, &trace_info); } submit_bio(bio); } @@ -2420,7 +2420,7 @@ static void submit_write_bios(struct btrfs_raid_bio *= rbio, struct raid56_bio_trace_info trace_info =3D { 0 }; =20 bio_get_trace_info(rbio, bio, &trace_info); - trace_raid56_write(rbio, bio, &trace_info); + trace_invoke_raid56_write(rbio, bio, &trace_info); } submit_bio(bio); } --=20 2.53.0