From: Satoshi OSHIMA <satoshi.oshima.fk@hitachi.com>
To: David Miller <davem@davemloft.net>, netdev <netdev@vger.kernel.org>
Cc: "Hideo AOKI" <hideo.aoki.tk@hitachi.com>,
"Yumiko SUGITA" <yumiko.sugita.yf@hitachi.com>,
"\"??@RedHat\"" <haoki@redhat.com>,
"Andi Kleen" <andi@firstfloor.org>,
"Evgeniy Polyakov" <johnpol@2ka.mipt.ru>,
"Herbert Xu" <herbert@gondor.apana.org.au>,
"Stephen Hemminger" <shemminger@linux-foundation.org>,
"?? ??" <yoshfuji@linux-ipv6.org>
Subject: [PATCH 1/4] UDP memory accounting and limitation(take 5): fix send buffer check
Date: Fri, 12 Oct 2007 21:01:53 +0900 [thread overview]
Message-ID: <470F6231.5020408@hitachi.com> (raw)
In-Reply-To: <470F61D4.6040808@hitachi.com>
This patch introduces sndbuf size check before
memory allcation for send buffer.
signed-off-by: Satoshi Oshima <satoshi.oshima.fk@hitachi.com>
signed-off-by: Hideo Aoki <haoki@redhat.com>
Index: 2.6.23-rc7-udp_limit/net/ipv4/ip_output.c
===================================================================
--- 2.6.23-rc7-udp_limit.orig/net/ipv4/ip_output.c
+++ 2.6.23-rc7-udp_limit/net/ipv4/ip_output.c
@@ -1004,6 +1004,11 @@ alloc_new_skb:
frag = &skb_shinfo(skb)->frags[i];
}
} else if (i < MAX_SKB_FRAGS) {
+ if (atomic_read(&sk->sk_wmem_alloc) + PAGE_SIZE
+ > 2 * sk->sk_sndbuf) {
+ err = -ENOBUFS;
+ goto error;
+ }
if (copy > PAGE_SIZE)
copy = PAGE_SIZE;
page = alloc_pages(sk->sk_allocation, 0);
next prev parent reply other threads:[~2007-10-12 12:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-12 12:00 [PATCH 0/4]UDP memory accounting and limitation(take 5) Satoshi OSHIMA
2007-10-12 12:01 ` Satoshi OSHIMA [this message]
2007-10-12 12:07 ` [PATCH 2/4] UDP memory accounting and limitation(take 5): accounting unit and variable Satoshi OSHIMA
2007-10-12 12:10 ` [PATCH 3/4] UDP memory accounting and limitation(take 5): memory accounting Satoshi OSHIMA
2007-10-12 12:11 ` [PATCH 4/4] UDP memory accounting and limitation(take 5): memory limitation Satoshi OSHIMA
2007-10-15 10:43 ` Herbert Xu
2007-10-17 4:06 ` Hideo AOKI
2007-10-17 4:23 ` Herbert Xu
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=470F6231.5020408@hitachi.com \
--to=satoshi.oshima.fk@hitachi.com \
--cc=andi@firstfloor.org \
--cc=davem@davemloft.net \
--cc=haoki@redhat.com \
--cc=herbert@gondor.apana.org.au \
--cc=hideo.aoki.tk@hitachi.com \
--cc=johnpol@2ka.mipt.ru \
--cc=netdev@vger.kernel.org \
--cc=shemminger@linux-foundation.org \
--cc=yoshfuji@linux-ipv6.org \
--cc=yumiko.sugita.yf@hitachi.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).