X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fnet.h;h=7dd68957be97f793c31cd88f5616421c722bd80c;hb=9eae8438a31af1a91f73436f8383e2a8b3d162a3;hp=19a22a844e9d046e318d03b6eb95326d55bdc105;hpb=aa900596dfbca642c2074734d14cea9b5439ad76;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/net.h b/instrumentation/events/lttng-module/net.h index 19a22a84..7dd68957 100644 --- a/instrumentation/events/lttng-module/net.h +++ b/instrumentation/events/lttng-module/net.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #undef TRACE_SYSTEM #define TRACE_SYSTEM net @@ -104,11 +105,11 @@ static struct lttng_event_field transport_fields[] = { }; enum transport_header_types { - TH_NONE, - TH_TCP, + TH_NONE = 0, + TH_TCP = 1, }; -static inline unsigned char __get_transport_header_type(struct sk_buff *skb) +static inline enum transport_header_types __get_transport_header_type(struct sk_buff *skb) { if (__has_network_hdr(skb)) { /* @@ -133,7 +134,7 @@ static inline unsigned char __get_transport_header_type(struct sk_buff *skb) return TH_NONE; } -static struct lttng_enum_entry transport_enum_entries[] = { +static struct lttng_enum_entry proto_transport_enum_entries[] = { [0] = { .start = { .value = 0, .signedness = 0, }, .end = { .value = IPPROTO_TCP - 1, .signedness = 0, }, @@ -151,6 +152,25 @@ static struct lttng_enum_entry transport_enum_entries[] = { }, }; +static const struct lttng_enum_desc proto_transport_header_type = { + .name = "proto_transport_header_type", + .entries = proto_transport_enum_entries, + .nr_entries = ARRAY_SIZE(proto_transport_enum_entries), +}; + +static struct lttng_enum_entry transport_enum_entries[] = { + [0] = { + .start = { .value = TH_NONE, .signedness = 0, }, + .end = { .value = TH_NONE, .signedness = 0, }, + .string = "_unknown", + }, + [1] = { + .start = { .value = TH_TCP, .signedness = 0, }, + .end = { .value = TH_TCP, .signedness = 0, }, + .string = "_tcp", + }, +}; + static const struct lttng_enum_desc transport_header_type = { .name = "transport_header_type", .entries = transport_enum_entries, @@ -199,7 +219,8 @@ static struct lttng_event_field ipv4fields[] = { .name = "protocol", .type = { .atype = atype_enum, - .u.basic.enumeration.desc = &transport_header_type, + .u.basic.enumeration.desc = + &proto_transport_header_type, .u.basic.enumeration.container_type = { .size = 8, .alignment = 8, @@ -239,10 +260,25 @@ static struct lttng_event_field ipv4fields[] = { }, }, [11] = { + .name = "transport_header_type", + .type = { + .atype = atype_enum, + .u.basic.enumeration.desc = &transport_header_type, + .u.basic.enumeration.container_type = { + .size = 8, + .alignment = 8, + .signedness = 0, + .reverse_byte_order = 0, + .base = 10, + .encoding = lttng_encode_none, + }, + }, + }, + [12] = { .name = "transport_header", .type = { .atype = atype_variant, - .u.variant.tag_name = "protocol", + .u.variant.tag_name = "transport_header_type", .u.variant.choices = transport_fields, .u.variant.nr_choices = ARRAY_SIZE(transport_fields), }, @@ -280,7 +316,8 @@ static struct lttng_event_field ipv6fields[] = { .name = "nexthdr", .type = { .atype = atype_enum, - .u.basic.enumeration.desc = &transport_header_type, + .u.basic.enumeration.desc = + &proto_transport_header_type, .u.basic.enumeration.container_type = { .size = 8, .alignment = 8, @@ -320,10 +357,25 @@ static struct lttng_event_field ipv6fields[] = { }, }, [8] = { + .name = "transport_header_type", + .type = { + .atype = atype_enum, + .u.basic.enumeration.desc = &transport_header_type, + .u.basic.enumeration.container_type = { + .size = 8, + .alignment = 8, + .signedness = 0, + .reverse_byte_order = 0, + .base = 10, + .encoding = lttng_encode_none, + }, + }, + }, + [9] = { .name = "transport_header", .type = { .atype = atype_variant, - .u.variant.tag_name = "nexthdr", + .u.variant.tag_name = "transport_header_type", .u.variant.choices = transport_fields, .u.variant.nr_choices = ARRAY_SIZE(transport_fields), }, @@ -387,30 +439,18 @@ LTTNG_TRACEPOINT_ENUM(net_network_header, LTTNG_TRACEPOINT_EVENT(net_dev_xmit, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40)) TP_PROTO(struct sk_buff *skb, int rc, struct net_device *dev, unsigned int skb_len), TP_ARGS(skb, rc, dev, skb_len), -#else - TP_PROTO(struct sk_buff *skb, - int rc), - - TP_ARGS(skb, rc), -#endif TP_FIELDS( ctf_integer_hex(void *, skbaddr, skb) ctf_integer(int, rc, rc) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40)) ctf_integer(unsigned int, len, skb_len) ctf_string(name, dev->name) -#else - ctf_integer(unsigned int, len, skb->len) - ctf_string(name, skb->dev->name) -#endif ) ) @@ -436,18 +476,22 @@ LTTNG_TRACEPOINT_EVENT_CLASS(net_dev_template, ), network_header, ctf_custom_code( + bool has_network_header = false; + /* Copy the network header. */ switch (__get_network_header_type(skb)) { case NH_IPV4: { ctf_align(uint16_t) ctf_array_type(uint8_t, ip_hdr(skb), sizeof(struct iphdr)) + has_network_header = true; break; } case NH_IPV6: { ctf_align(uint16_t) ctf_array_type(uint8_t, ipv6_hdr(skb), sizeof(struct ipv6hdr)) + has_network_header = true; break; } default: @@ -458,17 +502,24 @@ LTTNG_TRACEPOINT_EVENT_CLASS(net_dev_template, break; } - /* Copy the transport header. */ - if (__get_transport_header_type(skb) - == TH_TCP) { - ctf_align(uint32_t) - ctf_array_type(uint8_t, tcp_hdr(skb), - sizeof(struct tcphdr)) + if (has_network_header) { + enum transport_header_types th_type = + __get_transport_header_type(skb); + + /* Transport header type field. */ + ctf_integer_type(unsigned char, th_type) + + /* Copy the transport header. */ + if (th_type == TH_TCP) { + ctf_align(uint32_t) + ctf_array_type(uint8_t, tcp_hdr(skb), + sizeof(struct tcphdr)) + } + /* + * For any other transport header type, + * there is nothing to do. + */ } - /* - * For any other transport header type, - * there is nothing to do. - */ ) ) ) @@ -502,6 +553,175 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_template, TP_ARGS(skb) ) + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) + +/* Trace events for the receive entry points */ +LTTNG_TRACEPOINT_EVENT_CLASS(net_dev_receive_entry_template, + + TP_PROTO(const struct sk_buff *skb), + + TP_ARGS(skb), + + TP_FIELDS( + ctf_integer_hex(const void *, skbaddr, skb) + ) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_entry_template, + + napi_gro_frags_entry, + + net_napi_gro_frags_entry, + + TP_PROTO(const struct sk_buff *skb), + + TP_ARGS(skb) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_entry_template, + + napi_gro_receive_entry, + + net_napi_gro_receive_entry, + + TP_PROTO(const struct sk_buff *skb), + + TP_ARGS(skb) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_entry_template, + + netif_receive_skb_entry, + + net_if_receive_skb_entry, + + TP_PROTO(const struct sk_buff *skb), + + TP_ARGS(skb) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_entry_template, + + netif_rx_entry, + + net_if_rx_entry, + + TP_PROTO(const struct sk_buff *skb), + + TP_ARGS(skb) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_entry_template, + + netif_rx_ni_entry, + + net_if_rx_ni_entry, + + TP_PROTO(const struct sk_buff *skb), + + TP_ARGS(skb) +) + +#endif /* kernel > 3.14 */ + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0)) + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_entry_template, + + netif_receive_skb_list_entry, + + net_if_receive_skb_list_entry, + + TP_PROTO(const struct sk_buff *skb), + + TP_ARGS(skb) +) + +#endif /* kernel > 4.19 */ + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0)) + +/* Trace events for the receive exit points */ +LTTNG_TRACEPOINT_EVENT_CLASS(net_dev_receive_exit_template, + + TP_PROTO(int ret), + + TP_ARGS(ret), + + TP_FIELDS( + ctf_integer(int, ret, ret) + ) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_exit_template, + + napi_gro_frags_exit, + + net_napi_gro_frags_exit, + + TP_PROTO(int ret), + + TP_ARGS(ret) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_exit_template, + + napi_gro_receive_exit, + + net_napi_gro_receive_exit, + + TP_PROTO(int ret), + + TP_ARGS(ret) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_exit_template, + + netif_receive_skb_exit, + + net_if_receive_skb_exit, + + TP_PROTO(int ret), + + TP_ARGS(ret) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_exit_template, + + netif_rx_exit, + + net_if_rx_exit, + + TP_PROTO(int ret), + + TP_ARGS(ret) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_exit_template, + + netif_rx_ni_exit, + + net_if_rx_ni_exit, + + TP_PROTO(int ret), + + TP_ARGS(ret) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(net_dev_receive_exit_template, + + netif_receive_skb_list_exit, + + net_if_receive_skb_list_exit, + + TP_PROTO(int ret), + + TP_ARGS(ret) +) + +#endif /* kernel > 5.0.0 */ + #endif /* LTTNG_TRACE_NET_H */ /* This part must be outside protection */