Fix: Move pipe override to the arch specific pointers_override.h

[lttng-modules.git] / instrumentation / syscalls / headers / x86-64-syscalls-3.10.0-rc7_pointers_override.h

diff --git a/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h b/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h
index efdfc37c991527473108eae9237cc9d1c52d4c61..702cfb5d710b835896f86ffc5482d998896e69b8 100644 (file)
--- a/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h
+++ b/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers_override.h
@@ -1,7 +1,7 @@
 #ifndef CREATE_SYSCALL_TABLE
 
 #define OVERRIDE_64_connect
-SC_LTTNG_TRACE_EVENT(connect,
+SC_LTTNG_TRACEPOINT_EVENT_CODE(connect,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * uservaddr, int addrlen),
        TP_ARGS(sc_exit(ret,) fd, uservaddr, addrlen),
        TP_locvar(
@@ -9,7 +9,7 @@ SC_LTTNG_TRACE_EVENT(connect,
                uint16_t dport;
                uint32_t v4addr;
                uint16_t v6addr[8];
-               int v4addr_len, v6addr_len;
+               unsigned int v4addr_len, v6addr_len;
        ),
        TP_code(
                sc_in(
@@ -29,40 +29,30 @@ SC_LTTNG_TRACE_EVENT(connect,
                                if (addrlen < sizeof(struct sockaddr_in6))
                                        goto skip_code;
                                (void) get_user(tp_locvar->dport, &((struct sockaddr_in6 *) uservaddr)->sin6_port);
-                               (void) copy_from_user(tp_locvar->v6addr,
+                               if (copy_from_user(tp_locvar->v6addr,
                                                &((struct sockaddr_in6 *) uservaddr)->sin6_addr.in6_u.u6_addr8,
-                                               sizeof(tp_locvar->v6addr));
+                                               sizeof(tp_locvar->v6addr)))
+                                       memset(tp_locvar->v6addr, 0, sizeof(tp_locvar->v6addr));
                                tp_locvar->v6addr_len = 8;
                                break;
                        }
                skip_code:
                )
        ),
-       TP_STRUCT__entry(
-               sc_exit(__field(long, ret))
-               sc_in(__field(int, fd))
-               sc_in(__field_hex(struct sockaddr *, uservaddr))
-               sc_in(__field_hex(int, addrlen))
-               sc_in(__field(int, family))
-               sc_in(__field_network(uint16_t, dport))
-               sc_in(__dynamic_array_network(uint8_t, v4addr, tp_locvar->v4addr_len))
-               sc_in(__dynamic_array_network_hex(uint16_t, v6addr, tp_locvar->v6addr_len))
-       ),
-       TP_fast_assign(
-               sc_exit(tp_assign(ret, ret))
-               sc_in(tp_assign(fd, fd))
-               sc_in(tp_assign(uservaddr, uservaddr))
-               sc_in(tp_assign(addrlen, addrlen))
-               sc_in(tp_assign(family, tp_locvar->sa_family))
-               sc_in(tp_assign(dport, tp_locvar->dport))
-               sc_in(tp_memcpy_dyn(v4addr, &tp_locvar->v4addr))
-               sc_in(tp_memcpy_dyn(v6addr, &tp_locvar->v6addr))
-       ),
-       TP_printk()
+       TP_FIELDS(
+               sc_exit(ctf_integer(long, ret, ret))
+               sc_in(ctf_integer(int, fd, fd))
+               sc_in(ctf_integer_hex(struct sockaddr *, uservaddr, uservaddr))
+               sc_in(ctf_integer_hex(int, addrlen, addrlen))
+               sc_in(ctf_integer(int, family, tp_locvar->sa_family))
+               sc_in(ctf_integer_network(uint16_t, dport, tp_locvar->dport))
+               sc_in(ctf_sequence_network(uint8_t, v4addr, &tp_locvar->v4addr, unsigned int, tp_locvar->v4addr_len))
+               sc_in(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, unsigned int, tp_locvar->v6addr_len))
+       )
 )
 
 #define OVERRIDE_64_accept
-SC_LTTNG_TRACE_EVENT(accept,
+SC_LTTNG_TRACEPOINT_EVENT_CODE(accept,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * upeer_sockaddr, int * upeer_addrlen),
        TP_ARGS(sc_exit(ret,) fd, upeer_sockaddr, upeer_addrlen),
        TP_locvar(
@@ -94,36 +84,35 @@ SC_LTTNG_TRACE_EVENT(accept,
                                if (tp_locvar->uaddr_len < sizeof(struct sockaddr_in6))
                                        goto skip_code;
                                (void) get_user(tp_locvar->sport, &((struct sockaddr_in6 *) upeer_sockaddr)->sin6_port);
-                               (void) copy_from_user(tp_locvar->v6addr,
+                               if (copy_from_user(tp_locvar->v6addr,
                                                &((struct sockaddr_in6 *) upeer_sockaddr)->sin6_addr.in6_u.u6_addr8,
-                                               sizeof(tp_locvar->v6addr));
+                                               sizeof(tp_locvar->v6addr)))
+                                       memset(tp_locvar->v6addr, 0, sizeof(tp_locvar->v6addr));
                                tp_locvar->v6addr_len = 8;
                                break;
                        }
                skip_code:
                )
        ),
-       TP_STRUCT__entry(
-               sc_exit(__field(long, ret))
-               sc_in(__field(int, fd))
-               sc_in(__field_hex(struct sockaddr *, upeer_sockaddr))
-               sc_inout(__field(int, upeer_addrlen))
-               sc_out(__field(int, family))
-               sc_out(__field_network(uint16_t, sport))
-               sc_out(__dynamic_array_network(uint8_t, v4addr, tp_locvar->v4addr_len))
-               sc_out(__dynamic_array_network_hex(uint16_t, v6addr, tp_locvar->v6addr_len))
-       ),
-       TP_fast_assign(
-               sc_exit(tp_assign(ret, ret))
-               sc_in(tp_assign(fd, fd))
-               sc_in(tp_assign(upeer_sockaddr, upeer_sockaddr))
-               sc_inout(tp_assign(upeer_addrlen, tp_locvar->uaddr_len))
-               sc_out(tp_assign(family, tp_locvar->sa_family))
-               sc_out(tp_assign(sport, tp_locvar->sport))
-               sc_out(tp_memcpy_dyn(v4addr, &tp_locvar->v4addr))
-               sc_out(tp_memcpy_dyn(v6addr, &tp_locvar->v6addr))
-       ),
-       TP_printk()
+       TP_FIELDS(
+               sc_exit(ctf_integer(long, ret, ret))
+               sc_in(ctf_integer(int, fd, fd))
+               sc_in(ctf_integer_hex(struct sockaddr *, upeer_sockaddr, upeer_sockaddr))
+               sc_inout(ctf_integer(int, upeer_addrlen, tp_locvar->uaddr_len))
+               sc_out(ctf_integer(int, family, tp_locvar->sa_family))
+               sc_out(ctf_integer_network(uint16_t, sport, tp_locvar->sport))
+               sc_in(ctf_sequence_network(uint8_t, v4addr, &tp_locvar->v4addr, unsigned int, tp_locvar->v4addr_len))
+               sc_in(ctf_sequence_network(uint16_t, v6addr, &tp_locvar->v6addr, unsigned int, tp_locvar->v6addr_len))
+       )
+)
+
+#define OVERRIDE_64_pipe
+SC_LTTNG_TRACEPOINT_EVENT(pipe,
+       TP_PROTO(sc_exit(long ret,) int * fildes),
+       TP_ARGS(sc_exit(ret,) fildes),
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret))
+               sc_out(ctf_user_array(int, fildes, fildes, 2))
+       )
 )
 
 #else  /* CREATE_SYSCALL_TABLE */