From: Zhu Yi <yi.zhu@intel.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Zhu Yi <yi.zhu@intel.com>,
Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
"Pekka Savola (ipv6)" <pekkas@netcore.fi>,
Patrick McHardy <kaber@trash.net>
Subject: [PATCH V3 3/8] udp: use limited socket backlog
Date: Fri, 5 Mar 2010 12:01:42 +0800 [thread overview]
Message-ID: <1267761707-15605-3-git-send-email-yi.zhu@intel.com> (raw)
In-Reply-To: <1267761707-15605-2-git-send-email-yi.zhu@intel.com>
Make udp adapt to the limited socket backlog change.
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: "Pekka Savola (ipv6)" <pekkas@netcore.fi>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
---
net/ipv4/udp.c | 6 ++++--
net/ipv6/udp.c | 28 ++++++++++++++++++----------
2 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 608a544..e7eb47f 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1371,8 +1371,10 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
bh_lock_sock(sk);
if (!sock_owned_by_user(sk))
rc = __udp_queue_rcv_skb(sk, skb);
- else
- sk_add_backlog(sk, skb);
+ else if (sk_add_backlog_limited(sk, skb)) {
+ bh_unlock_sock(sk);
+ goto drop;
+ }
bh_unlock_sock(sk);
return rc;
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 52b8347..6480491 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -583,16 +583,20 @@ static void flush_stack(struct sock **stack, unsigned int count,
bh_lock_sock(sk);
if (!sock_owned_by_user(sk))
udpv6_queue_rcv_skb(sk, skb1);
- else
- sk_add_backlog(sk, skb1);
+ else if (sk_add_backlog_limited(sk, skb1)) {
+ kfree_skb(skb1);
+ bh_unlock_sock(sk);
+ goto drop;
+ }
bh_unlock_sock(sk);
- } else {
- atomic_inc(&sk->sk_drops);
- UDP6_INC_STATS_BH(sock_net(sk),
- UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk));
- UDP6_INC_STATS_BH(sock_net(sk),
- UDP_MIB_INERRORS, IS_UDPLITE(sk));
+ continue;
}
+drop:
+ atomic_inc(&sk->sk_drops);
+ UDP6_INC_STATS_BH(sock_net(sk),
+ UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk));
+ UDP6_INC_STATS_BH(sock_net(sk),
+ UDP_MIB_INERRORS, IS_UDPLITE(sk));
}
}
/*
@@ -754,8 +758,12 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
bh_lock_sock(sk);
if (!sock_owned_by_user(sk))
udpv6_queue_rcv_skb(sk, skb);
- else
- sk_add_backlog(sk, skb);
+ else if (sk_add_backlog_limited(sk, skb)) {
+ atomic_inc(&sk->sk_drops);
+ bh_unlock_sock(sk);
+ sock_put(sk);
+ goto discard;
+ }
bh_unlock_sock(sk);
sock_put(sk);
return 0;
--
1.6.3.3
next prev parent reply other threads:[~2010-03-05 4:00 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1267761707-15605-1-git-send-email-yi.zhu@intel.com>
2010-03-05 4:01 ` [PATCH V3 2/8] tcp: use limited socket backlog Zhu Yi
2010-03-05 4:01 ` Zhu Yi [this message]
2010-03-05 4:01 ` [PATCH V3 4/8] llc: " Zhu Yi
2010-03-05 4:01 ` [PATCH V3 5/8] sctp: " Zhu Yi
2010-03-05 6:28 ` Eric Dumazet
2010-03-05 11:05 ` Zhu, Yi
2010-03-05 13:24 ` Eric Dumazet
2010-03-05 13:30 ` Vlad Yasevich
[not found] ` <1267761707-15605-6-git-send-email-yi.zhu@intel.com>
2010-03-05 4:01 ` [PATCH V3 7/8] x25: " Zhu Yi
2010-03-05 4:01 ` [PATCH V3 8/8] net: backlog functions rename Zhu Yi
2010-03-05 6:32 ` Eric Dumazet
2010-03-05 21:36 ` David Miller
2010-03-05 6:30 ` [PATCH V3 7/8] x25: use limited socket backlog Eric Dumazet
2010-03-05 6:30 ` [PATCH V3 6/8] tipc: " Eric Dumazet
2010-03-05 20:48 ` Stephens, Allan
2010-03-05 6:22 ` [PATCH V3 4/8] llc: " Eric Dumazet
2010-03-05 13:00 ` Arnaldo Carvalho de Melo
2010-03-05 6:21 ` [PATCH V3 3/8] udp: " Eric Dumazet
2010-03-05 6:19 ` [PATCH V3 2/8] tcp: " Eric Dumazet
2010-03-08 9:21 ` Eric Dumazet
2010-03-08 18:46 ` David Miller
2010-03-05 13:00 ` [PATCH V3 1/8] net: add limit for " Arnaldo Carvalho de Melo
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=1267761707-15605-3-git-send-email-yi.zhu@intel.com \
--to=yi.zhu@intel.com \
--cc=davem@davemloft.net \
--cc=kaber@trash.net \
--cc=kuznet@ms2.inr.ac.ru \
--cc=netdev@vger.kernel.org \
--cc=pekkas@netcore.fi \
/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).