From: Peter Zijlstra <a.p.zijlstra@chello.nl>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
netdev@vger.kernel.org, trond.myklebust@fys.uio.no
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 19/29] netvm: prevent a TCP specific deadlock
Date: Fri, 14 Dec 2007 16:39:26 +0100 [thread overview]
Message-ID: <20071214154441.728241000@chello.nl> (raw)
In-Reply-To: 20071214153907.770251000@chello.nl
[-- Attachment #1: netvm-tcp-deadlock.patch --]
[-- Type: text/plain, Size: 2442 bytes --]
It could happen that all !SOCK_MEMALLOC sockets have buffered so much data
that we're over the global rmem limit. This will prevent SOCK_MEMALLOC buffers
from receiving data, which will prevent userspace from running, which is needed
to reduce the buffered data.
Fix this by exempting the SOCK_MEMALLOC sockets from the rmem limit.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
include/net/sock.h | 7 ++++---
net/core/stream.c | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
Index: linux-2.6/include/net/sock.h
===================================================================
--- linux-2.6.orig/include/net/sock.h
+++ linux-2.6/include/net/sock.h
@@ -756,7 +756,8 @@ static inline struct inode *SOCK_INODE(s
}
extern void __sk_stream_mem_reclaim(struct sock *sk);
-extern int sk_stream_mem_schedule(struct sock *sk, int size, int kind);
+extern int sk_stream_mem_schedule(struct sock *sk, struct sk_buff *skb,
+ int size, int kind);
#define SK_STREAM_MEM_QUANTUM ((int)PAGE_SIZE)
@@ -774,13 +775,13 @@ static inline void sk_stream_mem_reclaim
static inline int sk_stream_rmem_schedule(struct sock *sk, struct sk_buff *skb)
{
return (int)skb->truesize <= sk->sk_forward_alloc ||
- sk_stream_mem_schedule(sk, skb->truesize, 1);
+ sk_stream_mem_schedule(sk, skb, skb->truesize, 1);
}
static inline int sk_stream_wmem_schedule(struct sock *sk, int size)
{
return size <= sk->sk_forward_alloc ||
- sk_stream_mem_schedule(sk, size, 0);
+ sk_stream_mem_schedule(sk, NULL, size, 0);
}
/* Used by processes to "lock" a socket state, so that
Index: linux-2.6/net/core/stream.c
===================================================================
--- linux-2.6.orig/net/core/stream.c
+++ linux-2.6/net/core/stream.c
@@ -207,7 +207,7 @@ void __sk_stream_mem_reclaim(struct sock
EXPORT_SYMBOL(__sk_stream_mem_reclaim);
-int sk_stream_mem_schedule(struct sock *sk, int size, int kind)
+int sk_stream_mem_schedule(struct sock *sk, struct sk_buff *skb, int size, int kind)
{
int amt = sk_stream_pages(size);
struct proto *prot = sk->sk_prot;
@@ -225,7 +225,8 @@ int sk_stream_mem_schedule(struct sock *
/* Over hard limit. */
if (atomic_read(prot->memory_allocated) > prot->sysctl_mem[2]) {
prot->enter_memory_pressure();
- goto suppress_allocation;
+ if (!skb || (skb && !skb_emergency(skb)))
+ goto suppress_allocation;
}
/* Under pressure. */
--
next prev parent reply other threads:[~2007-12-14 19:32 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-14 15:39 [PATCH 00/29] Swap over NFS -v15 Peter Zijlstra
2007-12-14 15:39 ` [PATCH 01/29] mm: gfp_to_alloc_flags() Peter Zijlstra
2007-12-14 15:39 ` [PATCH 02/29] mm: tag reseve pages Peter Zijlstra
2007-12-14 15:39 ` [PATCH 03/29] mm: slb: add knowledge of reserve pages Peter Zijlstra
2007-12-14 22:51 ` Daniel Phillips
2007-12-15 10:10 ` Daniel Phillips
2007-12-14 15:39 ` [PATCH 04/29] mm: kmem_estimate_pages() Peter Zijlstra
2007-12-14 22:05 ` Daniel Phillips
2007-12-14 15:39 ` [PATCH 05/29] mm: allow PF_MEMALLOC from softirq context Peter Zijlstra
2007-12-14 15:39 ` [PATCH 06/29] mm: serialize access to min_free_kbytes Peter Zijlstra
2007-12-14 15:39 ` [PATCH 07/29] mm: emergency pool Peter Zijlstra
2007-12-14 15:39 ` [PATCH 08/29] mm: system wide ALLOC_NO_WATERMARK Peter Zijlstra
2007-12-14 15:39 ` [PATCH 09/29] mm: __GFP_MEMALLOC Peter Zijlstra
2007-12-14 15:39 ` [PATCH 10/29] mm: memory reserve management Peter Zijlstra
2007-12-14 15:39 ` [PATCH 11/29] selinux: tag avc cache alloc as non-critical Peter Zijlstra
2007-12-14 15:39 ` [PATCH 12/29] net: wrap sk->sk_backlog_rcv() Peter Zijlstra
2007-12-14 15:39 ` [PATCH 13/29] net: packet split receive api Peter Zijlstra
2007-12-14 15:39 ` [PATCH 14/29] net: sk_allocation() - concentrate socket related allocations Peter Zijlstra
2007-12-14 15:39 ` [PATCH 15/29] netvm: network reserve infrastructure Peter Zijlstra
2007-12-14 15:39 ` [PATCH 16/29] netvm: INET reserves Peter Zijlstra
2007-12-14 21:10 ` Daniel Phillips
2007-12-14 15:39 ` [PATCH 17/29] netvm: hook skb allocation to reserves Peter Zijlstra
2007-12-14 15:39 ` [PATCH 18/29] netvm: filter emergency skbs Peter Zijlstra
2007-12-14 15:39 ` Peter Zijlstra [this message]
2007-12-14 15:39 ` [PATCH 20/29] netfilter: NF_QUEUE vs " Peter Zijlstra
2007-12-14 15:39 ` [PATCH 21/29] netvm: skb processing Peter Zijlstra
2007-12-14 15:39 ` [PATCH 22/29] mm: prepare swap entry methods for use in page methods Peter Zijlstra
2007-12-14 15:39 ` [PATCH 23/29] mm: add support for non block device backed swap files Peter Zijlstra
2007-12-14 15:39 ` [PATCH 24/29] mm: methods for teaching filesystems about PG_swapcache pages Peter Zijlstra
2007-12-14 15:39 ` [PATCH 25/29] nfs: remove mempools Peter Zijlstra
2007-12-14 15:39 ` [PATCH 26/29] nfs: teach the NFS client how to treat PG_swapcache pages Peter Zijlstra
2007-12-14 15:39 ` [PATCH 27/29] nfs: disable data cache revalidation for swapfiles Peter Zijlstra
2007-12-14 15:39 ` [PATCH 28/29] nfs: enable swap on NFS Peter Zijlstra
2007-12-14 15:39 ` [PATCH 29/29] nfs: fix various memory recursions possible with swap over NFS Peter Zijlstra
2007-12-14 21:07 ` [PATCH 00/29] Swap over NFS -v15 Daniel Phillips
2007-12-19 22:22 ` Bill Davidsen
2007-12-20 8:00 ` Peter Zijlstra
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=20071214154441.728241000@chello.nl \
--to=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=netdev@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=trond.myklebust@fys.uio.no \
/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).