From: Eric Dumazet <edumazet@google.com>
To: "David S . Miller" <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>,
Eric Dumazet <edumazet@google.com>,
Soheil Hassas Yeganeh <soheil@google.com>,
Alexei Starovoitov <ast@fb.com>,
Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>,
Eric Dumazet <eric.dumazet@gmail.com>
Subject: [PATCH v3 net-next 4/7] udp: prepare for non BH masking at backlog processing
Date: Fri, 29 Apr 2016 14:16:50 -0700 [thread overview]
Message-ID: <1461964613-4872-5-git-send-email-edumazet@google.com> (raw)
In-Reply-To: <1461964613-4872-1-git-send-email-edumazet@google.com>
UDP uses the generic socket backlog code, and this will soon
be changed to not disable BH when protocol is called back.
We need to use appropriate SNMP accessors.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
---
net/ipv4/udp.c | 4 ++--
net/ipv6/udp.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 093284c5c03b..f67f52ba4809 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1514,9 +1514,9 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
/* Note that an ENOMEM error is charged twice */
if (rc == -ENOMEM)
- __UDP_INC_STATS(sock_net(sk), UDP_MIB_RCVBUFERRORS,
+ UDP_INC_STATS(sock_net(sk), UDP_MIB_RCVBUFERRORS,
is_udplite);
- __UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
+ UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
kfree_skb(skb);
trace_udp_fail_queue_rcv_skb(rc, sk);
return -1;
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 1ba5a74ac18f..f911c63f79e6 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -570,9 +570,9 @@ static int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
/* Note that an ENOMEM error is charged twice */
if (rc == -ENOMEM)
- __UDP6_INC_STATS(sock_net(sk),
+ UDP6_INC_STATS(sock_net(sk),
UDP_MIB_RCVBUFERRORS, is_udplite);
- __UDP6_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
+ UDP6_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
kfree_skb(skb);
return -1;
}
--
2.8.0.rc3.226.g39d4020
next prev parent reply other threads:[~2016-04-29 21:17 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-29 21:16 [PATCH v2 net-next 0/7] net: make TCP preemptible Eric Dumazet
2016-04-29 21:16 ` [PATCH v3 net-next 1/7] tcp: do not assume TCP code is non preemptible Eric Dumazet
2016-04-29 21:16 ` [PATCH v3 net-next 2/7] tcp: do not block bh during prequeue processing Eric Dumazet
2016-04-29 21:47 ` Alexei Starovoitov
2016-04-29 21:16 ` [PATCH v3 net-next 3/7] dccp: do not assume DCCP code is non preemptible Eric Dumazet
2016-04-29 21:16 ` Eric Dumazet [this message]
2016-04-29 21:16 ` [PATCH v3 net-next 5/7] sctp: prepare for socket backlog behavior change Eric Dumazet
2016-04-29 22:01 ` Marcelo Ricardo Leitner
2016-04-29 21:16 ` [PATCH v3 net-next 6/7] net: do not block BH while processing socket backlog Eric Dumazet
2016-04-29 21:47 ` Alexei Starovoitov
2016-04-29 21:16 ` [PATCH v3 net-next 7/7] tcp: make tcp_sendmsg() aware of " Eric Dumazet
2016-05-03 4:49 ` [PATCH net-next] tcp: guarantee forward progress in tcp_sendmsg() Eric Dumazet
2016-05-03 4:53 ` Soheil Hassas Yeganeh
2016-05-03 20:20 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461964613-4872-5-git-send-email-edumazet@google.com \
--to=edumazet@google.com \
--cc=ast@fb.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=soheil@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).