From: Satoshi OSHIMA <satoshi.oshima.fk@hitachi.com>
To: Andi Kleen <andi@firstfloor.org>,
David Miller <davem@davemloft.net>,
Evgeniy Polyakov <johnpol@2ka.mipt.ru>,
Herbert Xu <herbert@gondor.apana.org.au>,
netdev <netdev@vger.kernel.org
Cc: Yumiko SUGITA <yumiko.sugita.yf@hitachi.com>,
"??@RedHat" <haoki@redhat.com>
Subject: [RFC/PATCH 1/4] UDP memory usage accounting (take 4): fix send buffer check
Date: Sat, 06 Oct 2007 00:00:18 +0900 [thread overview]
Message-ID: <47065182.7080803@hitachi.com> (raw)
In-Reply-To: <47065139.5030402@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-05 15:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-05 14:59 [RFC/PATCH 0/4]UDP memory accounting (take 4) Satoshi OSHIMA
2007-10-05 15:00 ` Satoshi OSHIMA [this message]
2007-10-05 15:01 ` [RFC/PATCH 2/4] UDP memory usage accounting (take 4): accounting unit and variable Satoshi OSHIMA
2007-10-07 10:09 ` Evgeniy Polyakov
2007-10-10 8:14 ` Satoshi OSHIMA
2007-10-05 15:02 ` [RFC/PATCH 3/4] UDP memory usage accounting (take 4): memory usage accounting Satoshi OSHIMA
2007-10-05 15:02 ` [RFC/PATCH 4/4] UDP memory usage accounting (take 4): memory limitation Satoshi OSHIMA
2007-10-05 15:52 ` Stephen Hemminger
2007-10-11 12:51 ` Satoshi OSHIMA
2007-10-11 19:46 ` Stephen Hemminger
2007-10-12 11:58 ` Satoshi OSHIMA
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=47065182.7080803@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=johnpol@2ka.mipt.ru \
--cc=netdev@vger.kernel.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).