X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fnet.h;h=81045a620d1579235fe9d1a7c498266790eae682;hb=360d3efee55154a55c18be32175bee608dcb21df;hp=b3b050738898b8f6db63d3bb3b77927316b80c7a;hpb=9cf9736a1715a1fec4857fac2784a12596675ce2;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/net.h b/instrumentation/events/lttng-module/net.h index b3b05073..81045a62 100644 --- a/instrumentation/events/lttng-module/net.h +++ b/instrumentation/events/lttng-module/net.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include @@ -20,8 +20,8 @@ static inline unsigned char __has_network_hdr(struct sk_buff *skb) { /* - * If the header is not set yet, - * the network header will point to the head. + * If the header is not set yet, the network header will point + * to the head. */ return skb_network_header(skb) != skb->head; } @@ -34,43 +34,53 @@ static struct lttng_event_field emptyfields[] = { static struct lttng_event_field tcpfields[] = { [0] = { .name = "source_port", - .type = __type_integer(uint16_t, 0, 0, 0, __BIG_ENDIAN, 10, none), + .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), + .type = __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), }, [2] = { .name = "seq", - .type = __type_integer(uint32_t, 0, 0, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint32_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), }, [3] = { .name = "ack_seq", - .type = __type_integer(uint32_t, 0, 0, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint32_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), }, [4] = { .name = "data_offset", - .type = __type_integer(uint8_t, 4, 4, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint8_t, 4, 4, 0, + __BIG_ENDIAN, 10, none), }, [5] = { .name = "reserved", - .type = __type_integer(uint8_t, 3, 1, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint8_t, 3, 1, 0, + __BIG_ENDIAN, 10, none), }, [6] = { .name = "flags", - .type = __type_integer(uint8_t, 9, 1, 0, __BIG_ENDIAN, 16, none), + .type = __type_integer(uint8_t, 9, 1, 0, + __BIG_ENDIAN, 16, none), }, [7] = { .name = "window_size", - .type = __type_integer(uint16_t, 0, 0, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), }, [8] = { .name = "checksum", - .type = __type_integer(uint16_t, 0, 0, 0, __BIG_ENDIAN, 16, none), + .type = __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 16, none), }, [9] = { .name = "urg_ptr", - .type = __type_integer(uint16_t, 0, 0, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), }, }; @@ -94,21 +104,23 @@ 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)) { /* - * When both transport and network header are set, transport header - * is greater than network header, otherwise it points to head. + * When both transport and network headers are set, + * transport header is greater than network header, + * otherwise it points to head. */ if (skb->transport_header > skb->network_header) { /* - * Get the transport protocol from the network header's data. - * This method works both for sent and received packets. + * Get the transport protocol from the network + * 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) || @@ -121,7 +133,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, }, @@ -139,6 +151,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, @@ -150,42 +181,51 @@ static const struct lttng_enum_desc transport_header_type = { static struct lttng_event_field ipv4fields[] = { [0] = { .name = "version", - .type = __type_integer(uint8_t, 4, 4, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint8_t, 4, 4, 0, + __BIG_ENDIAN, 10, none), }, [1] = { .name = "ihl", - .type = __type_integer(uint8_t, 4, 4, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint8_t, 4, 4, 0, + __BIG_ENDIAN, 10, none), }, [2] = { .name = "tos", - .type = __type_integer(uint8_t, 0, 0, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint8_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), }, [3] = { .name = "tot_len", - .type = __type_integer(uint16_t, 0, 0, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), }, [4] = { .name = "id", - .type = __type_integer(uint16_t, 0, 0, 0, __BIG_ENDIAN, 16, none), + .type = __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 16, none), }, [5] = { .name = "frag_off", - .type = __type_integer(uint16_t, 0, 0, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), }, [6] = { .name = "ttl", - .type = __type_integer(uint8_t, 0, 0, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint8_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), }, [7] = { .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, .signedness = 0, - .reverse_byte_order = __BIG_ENDIAN != __BYTE_ORDER, + .reverse_byte_order = + __BIG_ENDIAN != __BYTE_ORDER, .base = 10, .encoding = lttng_encode_none, }, @@ -193,13 +233,16 @@ static struct lttng_event_field ipv4fields[] = { }, [8] = { .name = "checksum", - .type = __type_integer(uint16_t, 0, 0, 0, __BIG_ENDIAN, 16, none), + .type = __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 16, none), }, [9] = { .name = "saddr", .type = { .atype = atype_array, - .u.array.elem_type = __type_integer(uint8_t, 0, 0, 0, __BIG_ENDIAN, 10, none), + .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), }, @@ -208,16 +251,33 @@ static struct lttng_event_field ipv4fields[] = { .name = "daddr", .type = { .atype = atype_array, - .u.array.elem_type = __type_integer(uint8_t, 0, 0, 0, __BIG_ENDIAN, 10, none), + .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), }, }, [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), }, @@ -227,35 +287,42 @@ static struct lttng_event_field ipv4fields[] = { static struct lttng_event_field ipv6fields[] = { [0] = { .name = "version", - .type = __type_integer(uint8_t, 4, 4, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint8_t, 4, 4, 0, + __BIG_ENDIAN, 10, none), }, [1] = { .name = "prio", - .type = __type_integer(uint8_t, 4, 4, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint8_t, 4, 4, 0, + __BIG_ENDIAN, 10, none), }, [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.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), }, }, [3] = { .name = "payload_len", - .type = __type_integer(uint16_t, 0, 0, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint16_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), }, [4] = { .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, .signedness = 0, - .reverse_byte_order = __BIG_ENDIAN != __BYTE_ORDER, + .reverse_byte_order = + __BIG_ENDIAN != __BYTE_ORDER, .base = 10, .encoding = lttng_encode_none, }, @@ -263,13 +330,16 @@ static struct lttng_event_field ipv6fields[] = { }, [5] = { .name = "hop_limit", - .type = __type_integer(uint8_t, 0, 0, 0, __BIG_ENDIAN, 10, none), + .type = __type_integer(uint8_t, 0, 0, 0, + __BIG_ENDIAN, 10, none), }, [6] = { .name = "saddr", .type = { .atype = atype_array, - .u.array.elem_type = __type_integer(uint16_t, 0, 0, 0, __BIG_ENDIAN, 16, none), + .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), }, @@ -278,16 +348,33 @@ static struct lttng_event_field ipv6fields[] = { .name = "daddr", .type = { .atype = atype_array, - .u.array.elem_type = __type_integer(uint16_t, 0, 0, 0, __BIG_ENDIAN, 16, none), + .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), }, }, [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), }, @@ -351,7 +438,7 @@ LTTNG_TRACEPOINT_ENUM(net_network_header, LTTNG_TRACEPOINT_EVENT(net_dev_xmit, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,40)) TP_PROTO(struct sk_buff *skb, int rc, struct net_device *dev, @@ -361,14 +448,14 @@ LTTNG_TRACEPOINT_EVENT(net_dev_xmit, #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)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,40)) ctf_integer(unsigned int, len, skb_len) ctf_string(name, dev->name) #else @@ -395,36 +482,55 @@ LTTNG_TRACEPOINT_EVENT_CLASS(net_dev_template, .atype = atype_variant, .u.variant.tag_name = "network_header_type", .u.variant.choices = network_fields, - .u.variant.nr_choices = ARRAY_SIZE(network_fields), + .u.variant.nr_choices = + ARRAY_SIZE(network_fields), ), network_header, ctf_custom_code( - /* Copy the network header */ + 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: - /* For any other header type, there is nothing to do. */ + /* + * For any other network header + * type, there is nothing to do. + */ 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 header type, there is nothing to do. */ ) ) )