From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH] net: use raw_cpu ops in snmp stats bh Date: Thu, 06 Mar 2014 15:03:37 -0500 (EST) Message-ID: <20140306.150337.187768633462445082.davem@davemloft.net> References: <1394110536-4532-1-git-send-email-sergey.senozhatsky@gmail.com> <1394117074.27473.29.camel@edumazet-glaptop2.roam.corp.google.com> <1394118272.27473.36.camel@edumazet-glaptop2.roam.corp.google.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: sergey.senozhatsky@gmail.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org To: eric.dumazet@gmail.com Return-path: In-Reply-To: <1394118272.27473.36.camel@edumazet-glaptop2.roam.corp.google.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org From: Eric Dumazet Date: Thu, 06 Mar 2014 07:04:32 -0800 > On Thu, 2014-03-06 at 06:44 -0800, Eric Dumazet wrote: > >> I think you missed a lot of mails sent by Chrisoph Lameter recently... > > s/Chrisoph/Christoph/ > > Appropriate fix would be the following one, please submit this formally. > > > Fixes: f19c29e3e391 ("tcp: snmp stats for Fast Open, SYN rtx, and data pkts") > > diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c > index 5286228679bd..df063a32a177 100644 > --- a/net/ipv4/tcp_output.c > +++ b/net/ipv4/tcp_output.c > @@ -87,7 +87,7 @@ static void tcp_event_new_data_sent(struct sock *sk, const struct sk_buff *skb) > tcp_rearm_rto(sk); > } > > - NET_ADD_STATS_BH(sock_net(sk), LINUX_MIB_TCPORIGDATASENT, > + NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPORIGDATASENT, > tcp_skb_pcount(skb)); > } I'll take care of this, as follows: ==================== >>From 2997439191bc16340abcf51b18a7152b372a057e Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 6 Mar 2014 15:03:17 -0500 Subject: [PATCH] tcp: Use NET_ADD_STATS instead of NET_ADD_STATS_BH in tcp_event_new_data_sent() Can be invoked from non-BH context. Based upon a patch by Eric Dumazet. Fixes: f19c29e3e391 ("tcp: snmp stats for Fast Open, SYN rtx, and data pkts") Reported-by: Sergey Senozhatsky Signed-off-by: David S. Miller --- include/net/ip.h | 1 + net/ipv4/tcp_output.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/net/ip.h b/include/net/ip.h index b885d75..25064c2 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -187,6 +187,7 @@ void ip_send_unicast_reply(struct net *net, struct sk_buff *skb, __be32 daddr, #define NET_INC_STATS(net, field) SNMP_INC_STATS((net)->mib.net_statistics, field) #define NET_INC_STATS_BH(net, field) SNMP_INC_STATS_BH((net)->mib.net_statistics, field) #define NET_INC_STATS_USER(net, field) SNMP_INC_STATS_USER((net)->mib.net_statistics, field) +#define NET_ADD_STATS(net, field, adnd) SNMP_ADD_STATS((net)->mib.net_statistics, field, adnd) #define NET_ADD_STATS_BH(net, field, adnd) SNMP_ADD_STATS_BH((net)->mib.net_statistics, field, adnd) #define NET_ADD_STATS_USER(net, field, adnd) SNMP_ADD_STATS_USER((net)->mib.net_statistics, field, adnd) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 5286228..a02c884 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -87,8 +87,8 @@ static void tcp_event_new_data_sent(struct sock *sk, const struct sk_buff *skb) tcp_rearm_rto(sk); } - NET_ADD_STATS_BH(sock_net(sk), LINUX_MIB_TCPORIGDATASENT, - tcp_skb_pcount(skb)); + NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPORIGDATASENT, + tcp_skb_pcount(skb)); } /* SND.NXT, if window was not shrunk. -- 1.7.11.7