From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 43A0634FF6C for ; Thu, 12 Mar 2026 15:31:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773329512; cv=none; b=DyovkTNHfTpje7iAjsuj/vmO8wuMhJy4QRGdExo9Q1ItDnpwH0GERwZRbWnvPoqX86EG2MbvkJspTblVAKrXMConvUO+tIwH0TNrvL28on/bPZWxUFNwIbvqdb5eSVfSGDx74lFSUeBC7Fe+FKoECOEQlASukYlMw2n2Z2cyotI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773329512; c=relaxed/simple; bh=XCaPE1E8Ln72TvA9xF4vbjC8fq5dJK5AF+ax/VMd8aI=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=jJBjU47965bPIvu3eM2G7qnhzIqKj2FpFbn4HAi0Ov2F2DUkZtpPRLmMTGJUNnq0GwzwG3dIprM1yxNOMj0qunpsCeLDngih5A5nkJIQ7B5guY0cneMF+Z8AX/PMO8S04P96ZmpKpRinOaoPTg+1LRrQSUnK1n/eakNQH4LfiC0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=RL9A5CPP; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RL9A5CPP" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773329510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=BU2rUT8edFCLGPjzUjZ1JXoUnILoe7G6urJyRRvW2UQ=; b=RL9A5CPP2dX3cHm+9j8YPBA8cywAr9LGGxd3TJxd3tyHz4uifyXpSl/uNpwbDZZI0L911w 88jud9ac/3kB9H/u3UIfgxMPUMGOBi8zHRdexEkNgyDfQjP0TnUTAt2fZ7NikUR1bdVpfK jkPq6iIALbK9o+sJgYoc/jIQEy2X9lI= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-140-JVYyrUTUOPKR5K4JobgdKQ-1; Thu, 12 Mar 2026 11:31:46 -0400 X-MC-Unique: JVYyrUTUOPKR5K4JobgdKQ-1 X-Mimecast-MFC-AGG-ID: JVYyrUTUOPKR5K4JobgdKQ_1773329503 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E55A318002CD; Thu, 12 Mar 2026 15:31:42 +0000 (UTC) Received: from RHTRH0061144 (unknown [10.22.88.168]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 82C1A1800756; Thu, 12 Mar 2026 15:31:38 +0000 (UTC) From: Aaron Conole To: "Vineeth Pillai (Google)" Cc: Steven Rostedt , Peter Zijlstra , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , Eelco Chaudron , Ilya Maximets , Marcelo Ricardo Leitner , Xin Long , Jon Maloy , Kuniyuki Iwashima , Samiullah Khawaja , Hangbin Liu , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, dev@openvswitch.org, linux-sctp@vger.kernel.org, tipc-discussion@lists.sourceforge.net, linux-trace-kernel@vger.kernel.org Subject: Re: [PATCH 04/15] net: Use trace_invoke_##name() at guarded tracepoint call sites In-Reply-To: <20260312150523.2054552-5-vineeth@bitbyteword.org> (Vineeth Pillai's message of "Thu, 12 Mar 2026 11:04:59 -0400") References: <20260312150523.2054552-1-vineeth@bitbyteword.org> <20260312150523.2054552-5-vineeth@bitbyteword.org> Date: Thu, 12 Mar 2026 11:31:37 -0400 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 "Vineeth Pillai (Google)" writes: > 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 > --- > net/core/dev.c | 2 +- > net/core/xdp.c | 2 +- > net/openvswitch/actions.c | 2 +- > net/openvswitch/datapath.c | 2 +- > net/sctp/outqueue.c | 2 +- > net/tipc/node.c | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/net/core/dev.c b/net/core/dev.c > index 14a83f2035b93..a48fae2bbf57e 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c > @@ -6444,7 +6444,7 @@ void netif_receive_skb_list(struct list_head *head) > return; > if (trace_netif_receive_skb_list_entry_enabled()) { > list_for_each_entry(skb, head, list) > - trace_netif_receive_skb_list_entry(skb); > + trace_invoke_netif_receive_skb_list_entry(skb); > } > netif_receive_skb_list_internal(head); > trace_netif_receive_skb_list_exit(0); > diff --git a/net/core/xdp.c b/net/core/xdp.c > index 9890a30584ba7..53acc887c3434 100644 > --- a/net/core/xdp.c > +++ b/net/core/xdp.c > @@ -362,7 +362,7 @@ int xdp_rxq_info_reg_mem_model(struct xdp_rxq_info *xdp_rxq, > xsk_pool_set_rxq_info(allocator, xdp_rxq); > > if (trace_mem_connect_enabled() && xdp_alloc) > - trace_mem_connect(xdp_alloc, xdp_rxq); > + trace_invoke_mem_connect(xdp_alloc, xdp_rxq); > return 0; > } > > diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c > index 792ca44a461da..420eb19322e85 100644 > --- a/net/openvswitch/actions.c > +++ b/net/openvswitch/actions.c > @@ -1259,7 +1259,7 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb, > int err = 0; > > if (trace_ovs_do_execute_action_enabled()) > - trace_ovs_do_execute_action(dp, skb, key, a, rem); > + trace_invoke_ovs_do_execute_action(dp, skb, key, a, rem); Maybe we should just remove the guard here instead of calling the invoke. That seems better to me. It wouldn't need to belong to this series. > /* Actions that rightfully have to consume the skb should do it > * and return directly. > diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c > index e209099218b41..02451629e888e 100644 > --- a/net/openvswitch/datapath.c > +++ b/net/openvswitch/datapath.c > @@ -335,7 +335,7 @@ int ovs_dp_upcall(struct datapath *dp, struct sk_buff *skb, > int err; > > if (trace_ovs_dp_upcall_enabled()) > - trace_ovs_dp_upcall(dp, skb, key, upcall_info); > + trace_invoke_ovs_dp_upcall(dp, skb, key, upcall_info); Same as above. Seems OVS tracepoints are the only ones that include the guard without any real reason. > if (upcall_info->portid == 0) { > err = -ENOTCONN; > diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c > index f6b8c13dafa4a..9831afbff070f 100644 > --- a/net/sctp/outqueue.c > +++ b/net/sctp/outqueue.c > @@ -1267,7 +1267,7 @@ int sctp_outq_sack(struct sctp_outq *q, struct sctp_chunk *chunk) > /* SCTP path tracepoint for congestion control debugging. */ > if (trace_sctp_probe_path_enabled()) { > list_for_each_entry(transport, transport_list, transports) > - trace_sctp_probe_path(transport, asoc); > + trace_invoke_sctp_probe_path(transport, asoc); > } > > sack_ctsn = ntohl(sack->cum_tsn_ack); > diff --git a/net/tipc/node.c b/net/tipc/node.c > index af442a5ef8f3d..01e07ec18c56c 100644 > --- a/net/tipc/node.c > +++ b/net/tipc/node.c > @@ -1943,7 +1943,7 @@ static bool tipc_node_check_state(struct tipc_node *n, struct sk_buff *skb, > > if (trace_tipc_node_check_state_enabled()) { > trace_tipc_skb_dump(skb, false, "skb for node state check"); > - trace_tipc_node_check_state(n, true, " "); > + trace_invoke_tipc_node_check_state(n, true, " "); > } > l = n->links[bearer_id].link; > if (!l)