X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fnet.h;h=55aba4e0c99634d3b098957c0721f44cce4e6e0e;hb=ceabb767180e064629b5a9ab4ed14449da864763;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..55aba4e0 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-only */ #undef TRACE_SYSTEM #define TRACE_SYSTEM net @@ -10,6 +11,8 @@ #include #include #include +#include +#include #include #include #include @@ -84,31 +87,130 @@ static struct lttng_event_field tcpfields[] = { }, }; +static struct lttng_event_field udpfields[] = { + [0] = { + .name = "source_port", + .type = __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), + }, + [1] = { + .name = "dest_port", + .type = __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), + }, + [2] = { + .name = "len", + .type = __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), + }, + [3] = { + .name = "check", + .type = __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), + }, +}; + +static struct lttng_event_field icmpfields[] = { + [0] = { + .name = "type", + .type = __type_integer(uint8_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), + }, + [1] = { + .name = "code", + .type = __type_integer(uint8_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), + }, + [2] = { + .name = "checksum", + .type = __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), + }, + [3] = { + .name = "gateway", + .type = __type_integer(uint32_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), + }, +}; + + static struct lttng_event_field transport_fields[] = { [0] = { .name = "unknown", .type = { - .atype = atype_struct, - .u._struct.nr_fields = ARRAY_SIZE(emptyfields), - .u._struct.fields = emptyfields, + .atype = atype_struct_nestable, + .u.struct_nestable.nr_fields = ARRAY_SIZE(emptyfields), + .u.struct_nestable.fields = emptyfields, + .u.struct_nestable.alignment = 0, }, + .nofilter = 1, }, [1] = { .name = "tcp", .type = { - .atype = atype_struct, - .u._struct.nr_fields = ARRAY_SIZE(tcpfields), - .u._struct.fields = tcpfields, + .atype = atype_struct_nestable, + .u.struct_nestable.nr_fields = ARRAY_SIZE(tcpfields), + .u.struct_nestable.fields = tcpfields, + .u.struct_nestable.alignment = 0, + }, + .nofilter = 1, + }, + [2] = { + .name = "udp", + .type = { + .atype = atype_struct_nestable, + .u.struct_nestable.nr_fields = ARRAY_SIZE(udpfields), + .u.struct_nestable.fields = udpfields, + .u.struct_nestable.alignment = 0, + }, + .nofilter = 1, + }, + [3] = { + .name = "icmp", + .type = { + .atype = atype_struct_nestable, + .u.struct_nestable.nr_fields = ARRAY_SIZE(icmpfields), + .u.struct_nestable.fields = icmpfields, + .u.struct_nestable.alignment = 0, }, + .nofilter = 1, }, }; enum transport_header_types { - TH_NONE, - TH_TCP, + TH_NONE = 0, + TH_TCP = 1, + TH_UDP = 2, + TH_ICMP = 3, }; -static inline unsigned char __get_transport_header_type(struct sk_buff *skb) +static inline enum transport_header_types __get_transport_header_type_ip(struct sk_buff *skb) +{ + switch (ip_hdr(skb)->protocol) { + case IPPROTO_TCP: + return TH_TCP; + case IPPROTO_UDP: + return TH_UDP; + case IPPROTO_ICMP: + return TH_ICMP; + } + return TH_NONE; +} + +static inline enum transport_header_types __get_transport_header_type_ipv6(struct sk_buff *skb) +{ + switch (ipv6_hdr(skb)->nexthdr) { + case IPPROTO_TCP: + return TH_TCP; + case IPPROTO_UDP: + return TH_UDP; + case IPPROTO_ICMP: + return TH_ICMP; + } + return TH_NONE; +} + +static inline enum transport_header_types __get_transport_header_type(struct sk_buff *skb) { if (__has_network_hdr(skb)) { /* @@ -122,35 +224,84 @@ static inline unsigned char __get_transport_header_type(struct sk_buff *skb) * header's data. This method works both for * sent and received packets. */ - if ((skb->protocol == htons(ETH_P_IP) && - ip_hdr(skb)->protocol == IPPROTO_TCP) || - (skb->protocol == htons(ETH_P_IPV6) && - ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)) - return TH_TCP; + if (skb->protocol == htons(ETH_P_IP)) { + return __get_transport_header_type_ip(skb); + } else if(skb->protocol == htons(ETH_P_IPV6)) { + return __get_transport_header_type_ipv6(skb); + } } - /* Fallthrough for other cases where header is not TCP. */ + /* Fallthrough for other cases where header is not recognized. */ } 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, }, + .end = { .value = IPPROTO_ICMP - 1, .signedness = 0, }, .string = "_unknown", }, [1] = { + .start = { .value = IPPROTO_ICMP, .signedness = 0, }, + .end = { .value = IPPROTO_ICMP, .signedness = 0, }, + .string = "_icmp", + }, + [2] = { + .start = { .value = IPPROTO_ICMP + 1, .signedness = 0, }, + .end = { .value = IPPROTO_TCP - 1, .signedness = 0, }, + .string = "_unknown", + }, + [3] = { .start = { .value = IPPROTO_TCP, .signedness = 0, }, .end = { .value = IPPROTO_TCP, .signedness = 0, }, .string = "_tcp", }, - [2] = { + [4] = { .start = { .value = IPPROTO_TCP + 1, .signedness = 0, }, + .end = { .value = IPPROTO_UDP - 1, .signedness = 0, }, + .string = "_unknown", + }, + [5] = { + .start = { .value = IPPROTO_UDP, .signedness = 0, }, + .end = { .value = IPPROTO_UDP, .signedness = 0, }, + .string = "_udp", + }, + [6] = { + .start = { .value = IPPROTO_UDP + 1, .signedness = 0, }, .end = { .value = 255, .signedness = 0, }, .string = "_unknown", }, }; +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", + }, + [2] = { + .start = { .value = TH_UDP, .signedness = 0, }, + .end = { .value = TH_UDP, .signedness = 0, }, + .string = "_udp", + }, + [3] = { + .start = { .value = TH_ICMP, .signedness = 0, }, + .end = { .value = TH_ICMP, .signedness = 0, }, + .string = "_icmp", + }, +}; + static const struct lttng_enum_desc transport_header_type = { .name = "transport_header_type", .entries = transport_enum_entries, @@ -198,17 +349,13 @@ static struct lttng_event_field ipv4fields[] = { [7] = { .name = "protocol", .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 = - __BIG_ENDIAN != __BYTE_ORDER, - .base = 10, - .encoding = lttng_encode_none, - }, + .atype = atype_enum_nestable, + .u.enum_nestable.desc = + &proto_transport_header_type, + .u.enum_nestable.container_type = + __LTTNG_COMPOUND_LITERAL(struct lttng_type, + __type_integer(uint8_t, 0, 0, -1, + __BIG_ENDIAN, 10, none)), }, }, [8] = { @@ -219,32 +366,46 @@ static struct lttng_event_field ipv4fields[] = { [9] = { .name = "saddr", .type = { - .atype = atype_array, - .u.array.elem_type = - __type_integer(uint8_t, 0, 0, 0, - __BIG_ENDIAN, 10, none), - .u.array.length = 4, - .u.array.elem_alignment = lttng_alignof(uint8_t), + .atype = atype_array_nestable, + .u.array_nestable.elem_type = + __LTTNG_COMPOUND_LITERAL(struct lttng_type, + __type_integer(uint8_t, 0, 0, 0, + __BIG_ENDIAN, 10, none)), + .u.array_nestable.length = 4, + .u.array_nestable.alignment = lttng_alignof(uint8_t), }, }, [10] = { .name = "daddr", .type = { - .atype = atype_array, - .u.array.elem_type = - __type_integer(uint8_t, 0, 0, 0, - __BIG_ENDIAN, 10, none), - .u.array.length = 4, - .u.array.elem_alignment = lttng_alignof(uint8_t), + .atype = atype_array_nestable, + .u.array_nestable.elem_type = + __LTTNG_COMPOUND_LITERAL(struct lttng_type, + __type_integer(uint8_t, 0, 0, 0, + __BIG_ENDIAN, 10, none)), + .u.array_nestable.length = 4, + .u.array_nestable.alignment = lttng_alignof(uint8_t), }, }, [11] = { + .name = "transport_header_type", + .type = { + .atype = atype_enum_nestable, + .u.enum_nestable.desc = &transport_header_type, + .u.enum_nestable.container_type = + __LTTNG_COMPOUND_LITERAL(struct lttng_type, + __type_integer(uint8_t, 0, 0, -1, + __BYTE_ORDER, 10, none)), + }, + }, + [12] = { .name = "transport_header", .type = { - .atype = atype_variant, - .u.variant.tag_name = "protocol", - .u.variant.choices = transport_fields, - .u.variant.nr_choices = ARRAY_SIZE(transport_fields), + .atype = atype_variant_nestable, + .u.variant_nestable.tag_name = "transport_header_type", + .u.variant_nestable.choices = transport_fields, + .u.variant_nestable.nr_choices = ARRAY_SIZE(transport_fields), + .u.variant_nestable.alignment = 0, }, }, }; @@ -263,12 +424,13 @@ static struct lttng_event_field ipv6fields[] = { [2] = { .name = "flow_lbl", .type = { - .atype = atype_array, - .u.array.elem_type = - __type_integer(uint8_t, 0, 0, 0, - __BIG_ENDIAN, 16, none), - .u.array.length = 3, - .u.array.elem_alignment = lttng_alignof(uint8_t), + .atype = atype_array_nestable, + .u.array_nestable.elem_type = + __LTTNG_COMPOUND_LITERAL(struct lttng_type, + __type_integer(uint8_t, 0, 0, 0, + __BIG_ENDIAN, 16, none)), + .u.array_nestable.length = 3, + .u.array_nestable.alignment = lttng_alignof(uint8_t), }, }, [3] = { @@ -279,17 +441,13 @@ static struct lttng_event_field ipv6fields[] = { [4] = { .name = "nexthdr", .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 = - __BIG_ENDIAN != __BYTE_ORDER, - .base = 10, - .encoding = lttng_encode_none, - }, + .atype = atype_enum_nestable, + .u.enum_nestable.desc = + &proto_transport_header_type, + .u.enum_nestable.container_type = + __LTTNG_COMPOUND_LITERAL(struct lttng_type, + __type_integer(uint8_t, 0, 0, -1, + __BIG_ENDIAN, 10, none)), }, }, [5] = { @@ -300,32 +458,46 @@ static struct lttng_event_field ipv6fields[] = { [6] = { .name = "saddr", .type = { - .atype = atype_array, - .u.array.elem_type = - __type_integer(uint16_t, 0, 0, 0, - __BIG_ENDIAN, 16, none), - .u.array.length = 8, - .u.array.elem_alignment = lttng_alignof(uint16_t), + .atype = atype_array_nestable, + .u.array_nestable.elem_type = + __LTTNG_COMPOUND_LITERAL(struct lttng_type, + __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 16, none)), + .u.array_nestable.length = 8, + .u.array_nestable.alignment = lttng_alignof(uint16_t), }, }, [7] = { .name = "daddr", .type = { - .atype = atype_array, - .u.array.elem_type = - __type_integer(uint16_t, 0, 0, 0, - __BIG_ENDIAN, 16, none), - .u.array.length = 8, - .u.array.elem_alignment = lttng_alignof(uint16_t), + .atype = atype_array_nestable, + .u.array_nestable.elem_type = + __LTTNG_COMPOUND_LITERAL(struct lttng_type, + __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 16, none)), + .u.array_nestable.length = 8, + .u.array_nestable.alignment = lttng_alignof(uint16_t), }, }, [8] = { + .name = "transport_header_type", + .type = { + .atype = atype_enum_nestable, + .u.enum_nestable.desc = &transport_header_type, + .u.enum_nestable.container_type = + __LTTNG_COMPOUND_LITERAL(struct lttng_type, + __type_integer(uint8_t, 0, 0, -1, + __BYTE_ORDER, 10, none)), + }, + }, + [9] = { .name = "transport_header", .type = { - .atype = atype_variant, - .u.variant.tag_name = "nexthdr", - .u.variant.choices = transport_fields, - .u.variant.nr_choices = ARRAY_SIZE(transport_fields), + .atype = atype_variant_nestable, + .u.variant_nestable.tag_name = "transport_header_type", + .u.variant_nestable.choices = transport_fields, + .u.variant_nestable.nr_choices = ARRAY_SIZE(transport_fields), + .u.variant_nestable.alignment = 0, }, }, }; @@ -334,25 +506,28 @@ static struct lttng_event_field network_fields[] = { [0] = { .name = "unknown", .type = { - .atype = atype_struct, - .u._struct.nr_fields = 0, - .u._struct.fields = emptyfields, + .atype = atype_struct_nestable, + .u.struct_nestable.nr_fields = 0, + .u.struct_nestable.fields = emptyfields, + .u.struct_nestable.alignment = 0, }, }, [1] = { .name = "ipv4", .type = { - .atype = atype_struct, - .u._struct.nr_fields = ARRAY_SIZE(ipv4fields), - .u._struct.fields = ipv4fields, + .atype = atype_struct_nestable, + .u.struct_nestable.nr_fields = ARRAY_SIZE(ipv4fields), + .u.struct_nestable.fields = ipv4fields, + .u.struct_nestable.alignment = 0, }, }, [2] = { .name = "ipv6", .type = { - .atype = atype_struct, - .u._struct.nr_fields = ARRAY_SIZE(ipv6fields), - .u._struct.fields = ipv6fields, + .atype = atype_struct_nestable, + .u.struct_nestable.nr_fields = ARRAY_SIZE(ipv6fields), + .u.struct_nestable.fields = ipv6fields, + .u.struct_nestable.alignment = 0, }, }, }; @@ -387,30 +562,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 ) ) @@ -428,26 +591,33 @@ LTTNG_TRACEPOINT_EVENT_CLASS(net_dev_template, network_header_type, __get_network_header_type(skb)) ctf_custom_field( ctf_custom_type( - .atype = atype_variant, - .u.variant.tag_name = "network_header_type", - .u.variant.choices = network_fields, - .u.variant.nr_choices = - ARRAY_SIZE(network_fields), + { + .atype = atype_variant_nestable, + .u.variant_nestable.tag_name = "network_header_type", + .u.variant_nestable.choices = network_fields, + .u.variant_nestable.nr_choices = + ARRAY_SIZE(network_fields), + .u.variant_nestable.alignment = 0, + } ), 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 +628,41 @@ 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. */ + switch (th_type) { + case TH_TCP: { + ctf_align(uint32_t) + ctf_array_type(uint8_t, tcp_hdr(skb), + sizeof(struct tcphdr)) + break; + } + case TH_UDP: { + ctf_align(uint32_t) + ctf_array_type(uint8_t, udp_hdr(skb), + sizeof(struct udphdr)) + break; + } + case TH_ICMP: { + ctf_align(uint32_t) + ctf_array_type(uint8_t, icmp_hdr(skb), + sizeof(struct icmphdr)) + break; + } + default: + /* + * For any other transport header type, + * there is nothing to do. + */ + break; + } } - /* - * For any other transport header type, - * there is nothing to do. - */ ) ) ) @@ -502,6 +696,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 */