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,
neilb@suse.de, miklos@szeredi.hu, penberg@cs.helsinki.fi,
a.p.zijlstra@chello.nl
Subject: [PATCH 14/30] net: wrap sk->sk_backlog_rcv()
Date: Thu, 20 Mar 2008 21:10:56 +0100 [thread overview]
Message-ID: <20080320202123.467542000@chello.nl> (raw)
In-Reply-To: <20080320201042.675090000@chello.nl>
[-- Attachment #1: net-backlog.patch --]
[-- Type: text/plain, Size: 3134 bytes --]
Wrap calling sk->sk_backlog_rcv() in a function. This will allow extending the
generic sk_backlog_rcv behaviour.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
include/net/sock.h | 5 +++++
include/net/tcp.h | 2 +-
net/core/sock.c | 4 ++--
net/ipv4/tcp.c | 2 +-
net/ipv4/tcp_timer.c | 2 +-
5 files changed, 10 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
@@ -475,6 +475,11 @@ static inline void sk_add_backlog(struct
skb->next = NULL;
}
+static inline int sk_backlog_rcv(struct sock *sk, struct sk_buff *skb)
+{
+ return sk->sk_backlog_rcv(sk, skb);
+}
+
#define sk_wait_event(__sk, __timeo, __condition) \
({ int __rc; \
release_sock(__sk); \
Index: linux-2.6/net/core/sock.c
===================================================================
--- linux-2.6.orig/net/core/sock.c
+++ linux-2.6/net/core/sock.c
@@ -325,7 +325,7 @@ int sk_receive_skb(struct sock *sk, stru
*/
mutex_acquire(&sk->sk_lock.dep_map, 0, 1, _RET_IP_);
- rc = sk->sk_backlog_rcv(sk, skb);
+ rc = sk_backlog_rcv(sk, skb);
mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
} else
@@ -1360,7 +1360,7 @@ static void __release_sock(struct sock *
struct sk_buff *next = skb->next;
skb->next = NULL;
- sk->sk_backlog_rcv(sk, skb);
+ sk_backlog_rcv(sk, skb);
/*
* We are in process context here with softirqs
Index: linux-2.6/net/ipv4/tcp.c
===================================================================
--- linux-2.6.orig/net/ipv4/tcp.c
+++ linux-2.6/net/ipv4/tcp.c
@@ -1158,7 +1158,7 @@ static void tcp_prequeue_process(struct
* necessary */
local_bh_disable();
while ((skb = __skb_dequeue(&tp->ucopy.prequeue)) != NULL)
- sk->sk_backlog_rcv(sk, skb);
+ sk_backlog_rcv(sk, skb);
local_bh_enable();
/* Clear memory counter. */
Index: linux-2.6/net/ipv4/tcp_timer.c
===================================================================
--- linux-2.6.orig/net/ipv4/tcp_timer.c
+++ linux-2.6/net/ipv4/tcp_timer.c
@@ -203,7 +203,7 @@ static void tcp_delack_timer(unsigned lo
NET_INC_STATS_BH(LINUX_MIB_TCPSCHEDULERFAILED);
while ((skb = __skb_dequeue(&tp->ucopy.prequeue)) != NULL)
- sk->sk_backlog_rcv(sk, skb);
+ sk_backlog_rcv(sk, skb);
tp->ucopy.memory = 0;
}
Index: linux-2.6/include/net/tcp.h
===================================================================
--- linux-2.6.orig/include/net/tcp.h
+++ linux-2.6/include/net/tcp.h
@@ -879,7 +879,7 @@ static inline int tcp_prequeue(struct so
BUG_ON(sock_owned_by_user(sk));
while ((skb1 = __skb_dequeue(&tp->ucopy.prequeue)) != NULL) {
- sk->sk_backlog_rcv(sk, skb1);
+ sk_backlog_rcv(sk, skb1);
NET_INC_STATS_BH(LINUX_MIB_TCPPREQUEUEDROPPED);
}
--
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2008-03-20 20:10 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-20 20:10 [PATCH 00/30] Swap over NFS -v17 Peter Zijlstra
2008-03-20 20:10 ` [PATCH 01/30] swap over network documentation Peter Zijlstra, Neil Brown
2008-03-20 21:20 ` Randy Dunlap
2008-03-20 20:10 ` [PATCH 02/30] mm: gfp_to_alloc_flags() Peter Zijlstra
2008-03-20 20:10 ` [PATCH 03/30] mm: tag reseve pages Peter Zijlstra
2008-03-20 20:10 ` [PATCH 04/30] mm: slub: trivial cleanups Peter Zijlstra
2008-03-20 20:10 ` [PATCH 05/30] mm: slb: add knowledge of reserve pages Peter Zijlstra
2008-03-20 20:10 ` [PATCH 06/30] mm: kmem_alloc_estimate() Peter Zijlstra
2008-03-20 20:10 ` [PATCH 07/30] mm: allow PF_MEMALLOC from softirq context Peter Zijlstra
2008-03-20 20:10 ` [PATCH 08/30] mm: serialize access to min_free_kbytes Peter Zijlstra
2008-03-20 20:10 ` [PATCH 09/30] mm: emergency pool Peter Zijlstra
2008-03-20 20:10 ` [PATCH 10/30] mm: system wide ALLOC_NO_WATERMARK Peter Zijlstra
2008-03-20 20:10 ` [PATCH 11/30] mm: __GFP_MEMALLOC Peter Zijlstra
2008-03-20 20:10 ` [PATCH 12/30] mm: memory reserve management Peter Zijlstra
2008-03-20 20:10 ` [PATCH 13/30] selinux: tag avc cache alloc as non-critical Peter Zijlstra
2008-03-20 20:10 ` Peter Zijlstra [this message]
2008-03-20 20:10 ` [PATCH 15/30] net: packet split receive api Peter Zijlstra
2008-03-20 20:10 ` [PATCH 16/30] net: sk_allocation() - concentrate socket related allocations Peter Zijlstra
2008-03-20 20:10 ` [PATCH 17/30] netvm: network reserve infrastructure Peter Zijlstra
2008-03-20 20:11 ` [PATCH 18/30] netvm: INET reserves Peter Zijlstra
2008-03-20 20:11 ` [PATCH 19/30] netvm: hook skb allocation to reserves Peter Zijlstra
2008-03-20 20:11 ` [PATCH 20/30] netvm: filter emergency skbs Peter Zijlstra
2008-03-20 20:11 ` [PATCH 21/30] netvm: prevent a stream specific deadlock Peter Zijlstra
2008-03-20 20:11 ` [PATCH 22/30] netfilter: NF_QUEUE vs emergency skbs Peter Zijlstra
2008-03-20 20:11 ` [PATCH 23/30] netvm: skb processing Peter Zijlstra
2008-03-20 20:11 ` [PATCH 24/30] mm: add support for non block device backed swap files Peter Zijlstra
2008-03-20 20:11 ` [PATCH 25/30] mm: methods for teaching filesystems about PG_swapcache pages Peter Zijlstra
2008-03-20 20:11 ` [PATCH 26/30] nfs: remove mempools Peter Zijlstra
2008-03-20 20:11 ` [PATCH 27/30] nfs: teach the NFS client how to treat PG_swapcache pages Peter Zijlstra
2008-03-20 20:11 ` [PATCH 28/30] nfs: disable data cache revalidation for swapfiles Peter Zijlstra
2008-03-20 20:11 ` [PATCH 29/30] nfs: enable swap on NFS Peter Zijlstra
2008-03-20 20:11 ` [PATCH 30/30] nfs: fix various memory recursions possible with swap over NFS Peter Zijlstra
2008-07-24 14:00 [PATCH 00/30] Swap over NFS -v18 Peter Zijlstra
2008-07-24 14:00 ` [PATCH 14/30] net: wrap sk->sk_backlog_rcv() 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=20080320202123.467542000@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=miklos@szeredi.hu \
--cc=neilb@suse.de \
--cc=netdev@vger.kernel.org \
--cc=penberg@cs.helsinki.fi \
--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