.. | .. |
---|
19 | 19 | #define inet_protocol_names \ |
---|
20 | 20 | EM(IPPROTO_TCP) \ |
---|
21 | 21 | EM(IPPROTO_DCCP) \ |
---|
22 | | - EMe(IPPROTO_SCTP) |
---|
| 22 | + EM(IPPROTO_SCTP) \ |
---|
| 23 | + EMe(IPPROTO_MPTCP) |
---|
23 | 24 | |
---|
24 | 25 | #define tcp_state_names \ |
---|
25 | 26 | EM(TCP_ESTABLISHED) \ |
---|
.. | .. |
---|
82 | 83 | TP_fast_assign( |
---|
83 | 84 | __entry->rmem_alloc = atomic_read(&sk->sk_rmem_alloc); |
---|
84 | 85 | __entry->truesize = skb->truesize; |
---|
85 | | - __entry->sk_rcvbuf = sk->sk_rcvbuf; |
---|
| 86 | + __entry->sk_rcvbuf = READ_ONCE(sk->sk_rcvbuf); |
---|
86 | 87 | ), |
---|
87 | 88 | |
---|
88 | 89 | TP_printk("rmem_alloc=%d truesize=%u sk_rcvbuf=%d", |
---|
.. | .. |
---|
97 | 98 | |
---|
98 | 99 | TP_STRUCT__entry( |
---|
99 | 100 | __array(char, name, 32) |
---|
100 | | - __field(long *, sysctl_mem) |
---|
| 101 | + __array(long, sysctl_mem, 3) |
---|
101 | 102 | __field(long, allocated) |
---|
102 | 103 | __field(int, sysctl_rmem) |
---|
103 | 104 | __field(int, rmem_alloc) |
---|
.. | .. |
---|
109 | 110 | |
---|
110 | 111 | TP_fast_assign( |
---|
111 | 112 | strncpy(__entry->name, prot->name, 32); |
---|
112 | | - __entry->sysctl_mem = prot->sysctl_mem; |
---|
| 113 | + __entry->sysctl_mem[0] = READ_ONCE(prot->sysctl_mem[0]); |
---|
| 114 | + __entry->sysctl_mem[1] = READ_ONCE(prot->sysctl_mem[1]); |
---|
| 115 | + __entry->sysctl_mem[2] = READ_ONCE(prot->sysctl_mem[2]); |
---|
113 | 116 | __entry->allocated = allocated; |
---|
114 | 117 | __entry->sysctl_rmem = sk_get_rmem0(sk, prot); |
---|
115 | 118 | __entry->rmem_alloc = atomic_read(&sk->sk_rmem_alloc); |
---|
116 | 119 | __entry->sysctl_wmem = sk_get_wmem0(sk, prot); |
---|
117 | 120 | __entry->wmem_alloc = refcount_read(&sk->sk_wmem_alloc); |
---|
118 | | - __entry->wmem_queued = sk->sk_wmem_queued; |
---|
| 121 | + __entry->wmem_queued = READ_ONCE(sk->sk_wmem_queued); |
---|
119 | 122 | __entry->kind = kind; |
---|
120 | 123 | ), |
---|
121 | 124 | |
---|
.. | .. |
---|
147 | 150 | __field(__u16, sport) |
---|
148 | 151 | __field(__u16, dport) |
---|
149 | 152 | __field(__u16, family) |
---|
150 | | - __field(__u8, protocol) |
---|
| 153 | + __field(__u16, protocol) |
---|
151 | 154 | __array(__u8, saddr, 4) |
---|
152 | 155 | __array(__u8, daddr, 4) |
---|
153 | 156 | __array(__u8, saddr_v6, 16) |
---|