Skip to content

Commit de0744a

Browse files
xemuldavem330
xemul
authored and
davem330
committed
mib: add net to NET_INC_STATS_BH
Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 4e67344 commit de0744a

File tree

18 files changed

+84
-81
lines changed

18 files changed

+84
-81
lines changed

‎include/net/ip.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ DECLARE_SNMP_STAT(struct ipstats_mib, ip_statistics);
162162
#define IP_ADD_STATS_BH(net, field, val) SNMP_ADD_STATS_BH(ip_statistics, field, val)
163163
DECLARE_SNMP_STAT(struct linux_mib, net_statistics);
164164
#define NET_INC_STATS(net, field) do { (void)net; SNMP_INC_STATS(net_statistics, field); } while (0)
165-
#define NET_INC_STATS_BH(field) SNMP_INC_STATS_BH(net_statistics, field)
165+
#define NET_INC_STATS_BH(net, field) do { (void)net; SNMP_INC_STATS_BH(net_statistics, field); } while (0)
166166
#define NET_INC_STATS_USER(field) SNMP_INC_STATS_USER(net_statistics, field)
167167
#define NET_ADD_STATS_BH(field, adnd) SNMP_ADD_STATS_BH(net_statistics, field, adnd)
168168
#define NET_ADD_STATS_USER(field, adnd) SNMP_ADD_STATS_USER(net_statistics, field, adnd)

‎include/net/tcp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ static inline int tcp_prequeue(struct sock *sk, struct sk_buff *skb)
894894

895895
while ((skb1 = __skb_dequeue(&tp->ucopy.prequeue)) != NULL) {
896896
sk->sk_backlog_rcv(sk, skb1);
897-
NET_INC_STATS_BH(LINUX_MIB_TCPPREQUEUEDROPPED);
897+
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPPREQUEUEDROPPED);
898898
}
899899

900900
tp->ucopy.memory = 0;

‎net/dccp/ipv4.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
230230
* servers this needs to be solved differently.
231231
*/
232232
if (sock_owned_by_user(sk))
233-
NET_INC_STATS_BH(LINUX_MIB_LOCKDROPPEDICMPS);
233+
NET_INC_STATS_BH(net, LINUX_MIB_LOCKDROPPEDICMPS);
234234

235235
if (sk->sk_state == DCCP_CLOSED)
236236
goto out;
@@ -239,7 +239,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
239239
seq = dccp_hdr_seq(dh);
240240
if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING | DCCPF_LISTEN) &&
241241
!between48(seq, dp->dccps_swl, dp->dccps_swh)) {
242-
NET_INC_STATS_BH(LINUX_MIB_OUTOFWINDOWICMPS);
242+
NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);
243243
goto out;
244244
}
245245

@@ -286,7 +286,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
286286
BUG_TRAP(!req->sk);
287287

288288
if (seq != dccp_rsk(req)->dreq_iss) {
289-
NET_INC_STATS_BH(LINUX_MIB_OUTOFWINDOWICMPS);
289+
NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);
290290
goto out;
291291
}
292292
/*
@@ -409,9 +409,9 @@ struct sock *dccp_v4_request_recv_sock(struct sock *sk, struct sk_buff *skb,
409409
return newsk;
410410

411411
exit_overflow:
412-
NET_INC_STATS_BH(LINUX_MIB_LISTENOVERFLOWS);
412+
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);
413413
exit:
414-
NET_INC_STATS_BH(LINUX_MIB_LISTENDROPS);
414+
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
415415
dst_release(dst);
416416
return NULL;
417417
}

‎net/dccp/ipv6.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
111111

112112
bh_lock_sock(sk);
113113
if (sock_owned_by_user(sk))
114-
NET_INC_STATS_BH(LINUX_MIB_LOCKDROPPEDICMPS);
114+
NET_INC_STATS_BH(net, LINUX_MIB_LOCKDROPPEDICMPS);
115115

116116
if (sk->sk_state == DCCP_CLOSED)
117117
goto out;
@@ -189,7 +189,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
189189
BUG_TRAP(req->sk == NULL);
190190

191191
if (seq != dccp_rsk(req)->dreq_iss) {
192-
NET_INC_STATS_BH(LINUX_MIB_OUTOFWINDOWICMPS);
192+
NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);
193193
goto out;
194194
}
195195

@@ -630,9 +630,9 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
630630
return newsk;
631631

632632
out_overflow:
633-
NET_INC_STATS_BH(LINUX_MIB_LISTENOVERFLOWS);
633+
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);
634634
out:
635-
NET_INC_STATS_BH(LINUX_MIB_LISTENDROPS);
635+
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
636636
if (opt != NULL && opt != np->opt)
637637
sock_kfree_s(sk, opt, opt->tot_len);
638638
dst_release(dst);

‎net/dccp/timer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ static void dccp_delack_timer(unsigned long data)
224224
if (sock_owned_by_user(sk)) {
225225
/* Try again later. */
226226
icsk->icsk_ack.blocked = 1;
227-
NET_INC_STATS_BH(LINUX_MIB_DELAYEDACKLOCKED);
227+
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_DELAYEDACKLOCKED);
228228
sk_reset_timer(sk, &icsk->icsk_delack_timer,
229229
jiffies + TCP_DELACK_MIN);
230230
goto out;
@@ -254,7 +254,7 @@ static void dccp_delack_timer(unsigned long data)
254254
icsk->icsk_ack.ato = TCP_ATO_MIN;
255255
}
256256
dccp_send_ack(sk);
257-
NET_INC_STATS_BH(LINUX_MIB_DELAYEDACKS);
257+
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_DELAYEDACKS);
258258
}
259259
out:
260260
bh_unlock_sock(sk);

‎net/ipv4/arp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ static int arp_filter(__be32 sip, __be32 tip, struct net_device *dev)
426426
if (ip_route_output_key(net, &rt, &fl) < 0)
427427
return 1;
428428
if (rt->u.dst.dev != dev) {
429-
NET_INC_STATS_BH(LINUX_MIB_ARPFILTER);
429+
NET_INC_STATS_BH(net, LINUX_MIB_ARPFILTER);
430430
flag = 1;
431431
}
432432
ip_rt_put(rt);

‎net/ipv4/inet_hashtables.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,11 +312,11 @@ static int __inet_check_established(struct inet_timewait_death_row *death_row,
312312

313313
if (twp) {
314314
*twp = tw;
315-
NET_INC_STATS_BH(LINUX_MIB_TIMEWAITRECYCLED);
315+
NET_INC_STATS_BH(net, LINUX_MIB_TIMEWAITRECYCLED);
316316
} else if (tw) {
317317
/* Silly. Should hash-dance instead... */
318318
inet_twsk_deschedule(tw, death_row);
319-
NET_INC_STATS_BH(LINUX_MIB_TIMEWAITRECYCLED);
319+
NET_INC_STATS_BH(net, LINUX_MIB_TIMEWAITRECYCLED);
320320

321321
inet_twsk_put(tw);
322322
}

‎net/ipv4/syncookies.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ __u32 cookie_v4_init_sequence(struct sock *sk, struct sk_buff *skb, __u16 *mssp)
173173
;
174174
*mssp = msstab[mssind] + 1;
175175

176-
NET_INC_STATS_BH(LINUX_MIB_SYNCOOKIESSENT);
176+
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_SYNCOOKIESSENT);
177177

178178
return secure_tcp_syn_cookie(iph->saddr, iph->daddr,
179179
th->source, th->dest, ntohl(th->seq),
@@ -269,11 +269,11 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
269269

270270
if (time_after(jiffies, tp->last_synq_overflow + TCP_TIMEOUT_INIT) ||
271271
(mss = cookie_check(skb, cookie)) == 0) {
272-
NET_INC_STATS_BH(LINUX_MIB_SYNCOOKIESFAILED);
272+
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_SYNCOOKIESFAILED);
273273
goto out;
274274
}
275275

276-
NET_INC_STATS_BH(LINUX_MIB_SYNCOOKIESRECV);
276+
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_SYNCOOKIESRECV);
277277

278278
/* check for timestamp cookie support */
279279
memset(&tcp_opt, 0, sizeof(tcp_opt));

‎net/ipv4/tcp.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1871,7 +1871,8 @@ void tcp_close(struct sock *sk, long timeout)
18711871
if (tp->linger2 < 0) {
18721872
tcp_set_state(sk, TCP_CLOSE);
18731873
tcp_send_active_reset(sk, GFP_ATOMIC);
1874-
NET_INC_STATS_BH(LINUX_MIB_TCPABORTONLINGER);
1874+
NET_INC_STATS_BH(sock_net(sk),
1875+
LINUX_MIB_TCPABORTONLINGER);
18751876
} else {
18761877
const int tmo = tcp_fin_time(sk);
18771878

@@ -1893,7 +1894,8 @@ void tcp_close(struct sock *sk, long timeout)
18931894
"sockets\n");
18941895
tcp_set_state(sk, TCP_CLOSE);
18951896
tcp_send_active_reset(sk, GFP_ATOMIC);
1896-
NET_INC_STATS_BH(LINUX_MIB_TCPABORTONMEMORY);
1897+
NET_INC_STATS_BH(sock_net(sk),
1898+
LINUX_MIB_TCPABORTONMEMORY);
18971899
}
18981900
}
18991901

0 commit comments

Comments
 (0)