-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
#undef TRACE_SYSTEM
#define TRACE_SYSTEM net
#if !defined(LTTNG_TRACE_NET_H) || defined(TRACE_HEADER_MULTI_READ)
#define LTTNG_TRACE_NET_H
-#include <probes/lttng-tracepoint-event.h>
+#include <lttng/tracepoint-event.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <linux/ip.h>
#include <linux/ipv6.h>
#include <linux/tcp.h>
+#include <linux/udp.h>
+#include <linux/icmp.h>
#include <linux/version.h>
#include <lttng-endian.h>
#include <net/sock.h>
},
};
+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 = 0,
TH_TCP = 1,
+ TH_UDP = 2,
+ TH_ICMP = 3,
};
+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)) {
* 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 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",
},
.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 = {
[7] = {
.name = "protocol",
.type = {
- .atype = atype_enum,
- .u.basic.enumeration.desc =
+ .atype = atype_enum_nestable,
+ .u.enum_nestable.desc =
&proto_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,
- },
+ .u.enum_nestable.container_type =
+ __LTTNG_COMPOUND_LITERAL(struct lttng_type,
+ __type_integer(uint8_t, 0, 0, -1,
+ __BIG_ENDIAN, 10, none)),
},
},
[8] = {
[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,
- .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,
- },
+ .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 = "transport_header_type",
- .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,
},
},
};
[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] = {
[4] = {
.name = "nexthdr",
.type = {
- .atype = atype_enum,
- .u.basic.enumeration.desc =
+ .atype = atype_enum_nestable,
+ .u.enum_nestable.desc =
&proto_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,
- },
+ .u.enum_nestable.container_type =
+ __LTTNG_COMPOUND_LITERAL(struct lttng_type,
+ __type_integer(uint8_t, 0, 0, -1,
+ __BIG_ENDIAN, 10, none)),
},
},
[5] = {
[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,
- .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,
- },
+ .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 = "transport_header_type",
- .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,
},
},
};
[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,
},
},
};
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(
ctf_integer_type(unsigned char, th_type)
/* Copy the transport header. */
- if (th_type == TH_TCP) {
+ 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.
- */
}
)
)
#endif /* LTTNG_TRACE_NET_H */
/* This part must be outside protection */
-#include <probes/define_trace.h>
+#include <lttng/define_trace.h>