mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-28 16:52:18 +00:00
2c92ca849f
With the rework of how the __string() handles dynamic strings where it
saves off the source string in field in the helper structure[1], the
assignment of that value to the trace event field is stored in the helper
value and does not need to be passed in again.
This means that with:
__string(field, mystring)
Which use to be assigned with __assign_str(field, mystring), no longer
needs the second parameter and it is unused. With this, __assign_str()
will now only get a single parameter.
There's over 700 users of __assign_str() and because coccinelle does not
handle the TRACE_EVENT() macro I ended up using the following sed script:
git grep -l __assign_str | while read a ; do
sed -e 's/\(__assign_str([^,]*[^ ,]\) *,[^;]*/\1)/' $a > /tmp/test-file;
mv /tmp/test-file $a;
done
I then searched for __assign_str() that did not end with ';' as those
were multi line assignments that the sed script above would fail to catch.
Note, the same updates will need to be done for:
__assign_str_len()
__assign_rel_str()
__assign_rel_str_len()
I tested this with both an allmodconfig and an allyesconfig (build only for both).
[1] https://lore.kernel.org/linux-trace-kernel/20240222211442.634192653@goodmis.org/
Link: https://lore.kernel.org/linux-trace-kernel/20240516133454.681ba6a0@rorschach.local.home
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Julia Lawall <Julia.Lawall@inria.fr>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Christian König <christian.koenig@amd.com> for the amdgpu parts.
Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> #for
Acked-by: Rafael J. Wysocki <rafael@kernel.org> # for thermal
Acked-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Darrick J. Wong <djwong@kernel.org> # xfs
Tested-by: Guenter Roeck <linux@roeck-us.net>
159 lines
5.5 KiB
C
159 lines
5.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM openvswitch
|
|
|
|
#if !defined(_TRACE_OPENVSWITCH_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_OPENVSWITCH_H
|
|
|
|
#include <linux/tracepoint.h>
|
|
|
|
#include "datapath.h"
|
|
|
|
TRACE_EVENT(ovs_do_execute_action,
|
|
|
|
TP_PROTO(struct datapath *dp, struct sk_buff *skb,
|
|
struct sw_flow_key *key, const struct nlattr *a, int rem),
|
|
|
|
TP_ARGS(dp, skb, key, a, rem),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( void *, dpaddr )
|
|
__string( dp_name, ovs_dp_name(dp) )
|
|
__string( dev_name, skb->dev->name )
|
|
__field( void *, skbaddr )
|
|
__field( unsigned int, len )
|
|
__field( unsigned int, data_len )
|
|
__field( unsigned int, truesize )
|
|
__field( u8, nr_frags )
|
|
__field( u16, gso_size )
|
|
__field( u16, gso_type )
|
|
__field( u32, ovs_flow_hash )
|
|
__field( u32, recirc_id )
|
|
__field( void *, keyaddr )
|
|
__field( u16, key_eth_type )
|
|
__field( u8, key_ct_state )
|
|
__field( u8, key_ct_orig_proto )
|
|
__field( u16, key_ct_zone )
|
|
__field( unsigned int, flow_key_valid )
|
|
__field( u8, action_type )
|
|
__field( unsigned int, action_len )
|
|
__field( void *, action_data )
|
|
__field( u8, is_last )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->dpaddr = dp;
|
|
__assign_str(dp_name);
|
|
__assign_str(dev_name);
|
|
__entry->skbaddr = skb;
|
|
__entry->len = skb->len;
|
|
__entry->data_len = skb->data_len;
|
|
__entry->truesize = skb->truesize;
|
|
__entry->nr_frags = skb_shinfo(skb)->nr_frags;
|
|
__entry->gso_size = skb_shinfo(skb)->gso_size;
|
|
__entry->gso_type = skb_shinfo(skb)->gso_type;
|
|
__entry->ovs_flow_hash = key->ovs_flow_hash;
|
|
__entry->recirc_id = key->recirc_id;
|
|
__entry->keyaddr = key;
|
|
__entry->key_eth_type = key->eth.type;
|
|
__entry->key_ct_state = key->ct_state;
|
|
__entry->key_ct_orig_proto = key->ct_orig_proto;
|
|
__entry->key_ct_zone = key->ct_zone;
|
|
__entry->flow_key_valid = !(key->mac_proto & SW_FLOW_KEY_INVALID);
|
|
__entry->action_type = nla_type(a);
|
|
__entry->action_len = nla_len(a);
|
|
__entry->action_data = nla_data(a);
|
|
__entry->is_last = nla_is_last(a, rem);
|
|
),
|
|
|
|
TP_printk("dpaddr=%p dp_name=%s dev=%s skbaddr=%p len=%u data_len=%u truesize=%u nr_frags=%d gso_size=%d gso_type=%#x ovs_flow_hash=0x%08x recirc_id=0x%08x keyaddr=%p eth_type=0x%04x ct_state=%02x ct_orig_proto=%02x ct_Zone=%04x flow_key_valid=%d action_type=%u action_len=%u action_data=%p is_last=%d",
|
|
__entry->dpaddr, __get_str(dp_name), __get_str(dev_name),
|
|
__entry->skbaddr, __entry->len, __entry->data_len,
|
|
__entry->truesize, __entry->nr_frags, __entry->gso_size,
|
|
__entry->gso_type, __entry->ovs_flow_hash,
|
|
__entry->recirc_id, __entry->keyaddr, __entry->key_eth_type,
|
|
__entry->key_ct_state, __entry->key_ct_orig_proto,
|
|
__entry->key_ct_zone,
|
|
__entry->flow_key_valid,
|
|
__entry->action_type, __entry->action_len,
|
|
__entry->action_data, __entry->is_last)
|
|
);
|
|
|
|
TRACE_EVENT(ovs_dp_upcall,
|
|
|
|
TP_PROTO(struct datapath *dp, struct sk_buff *skb,
|
|
const struct sw_flow_key *key,
|
|
const struct dp_upcall_info *upcall_info),
|
|
|
|
TP_ARGS(dp, skb, key, upcall_info),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( void *, dpaddr )
|
|
__string( dp_name, ovs_dp_name(dp) )
|
|
__string( dev_name, skb->dev->name )
|
|
__field( void *, skbaddr )
|
|
__field( unsigned int, len )
|
|
__field( unsigned int, data_len )
|
|
__field( unsigned int, truesize )
|
|
__field( u8, nr_frags )
|
|
__field( u16, gso_size )
|
|
__field( u16, gso_type )
|
|
__field( u32, ovs_flow_hash )
|
|
__field( u32, recirc_id )
|
|
__field( const void *, keyaddr )
|
|
__field( u16, key_eth_type )
|
|
__field( u8, key_ct_state )
|
|
__field( u8, key_ct_orig_proto )
|
|
__field( u16, key_ct_zone )
|
|
__field( unsigned int, flow_key_valid )
|
|
__field( u8, upcall_cmd )
|
|
__field( u32, upcall_port )
|
|
__field( u16, upcall_mru )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->dpaddr = dp;
|
|
__assign_str(dp_name);
|
|
__assign_str(dev_name);
|
|
__entry->skbaddr = skb;
|
|
__entry->len = skb->len;
|
|
__entry->data_len = skb->data_len;
|
|
__entry->truesize = skb->truesize;
|
|
__entry->nr_frags = skb_shinfo(skb)->nr_frags;
|
|
__entry->gso_size = skb_shinfo(skb)->gso_size;
|
|
__entry->gso_type = skb_shinfo(skb)->gso_type;
|
|
__entry->ovs_flow_hash = key->ovs_flow_hash;
|
|
__entry->recirc_id = key->recirc_id;
|
|
__entry->keyaddr = key;
|
|
__entry->key_eth_type = key->eth.type;
|
|
__entry->key_ct_state = key->ct_state;
|
|
__entry->key_ct_orig_proto = key->ct_orig_proto;
|
|
__entry->key_ct_zone = key->ct_zone;
|
|
__entry->flow_key_valid = !(key->mac_proto & SW_FLOW_KEY_INVALID);
|
|
__entry->upcall_cmd = upcall_info->cmd;
|
|
__entry->upcall_port = upcall_info->portid;
|
|
__entry->upcall_mru = upcall_info->mru;
|
|
),
|
|
|
|
TP_printk("dpaddr=%p dp_name=%s dev=%s skbaddr=%p len=%u data_len=%u truesize=%u nr_frags=%d gso_size=%d gso_type=%#x ovs_flow_hash=0x%08x recirc_id=0x%08x keyaddr=%p eth_type=0x%04x ct_state=%02x ct_orig_proto=%02x ct_zone=%04x flow_key_valid=%d upcall_cmd=%u upcall_port=%u upcall_mru=%u",
|
|
__entry->dpaddr, __get_str(dp_name), __get_str(dev_name),
|
|
__entry->skbaddr, __entry->len, __entry->data_len,
|
|
__entry->truesize, __entry->nr_frags, __entry->gso_size,
|
|
__entry->gso_type, __entry->ovs_flow_hash,
|
|
__entry->recirc_id, __entry->keyaddr, __entry->key_eth_type,
|
|
__entry->key_ct_state, __entry->key_ct_orig_proto,
|
|
__entry->key_ct_zone,
|
|
__entry->flow_key_valid,
|
|
__entry->upcall_cmd, __entry->upcall_port,
|
|
__entry->upcall_mru)
|
|
);
|
|
|
|
#endif /* _TRACE_OPENVSWITCH_H */
|
|
|
|
/* This part must be outside protection */
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH .
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_FILE openvswitch_trace
|
|
#include <trace/define_trace.h>
|