Home » Mailing list archives » linux-kernel » 2010 » July » 13

[PATCH -mmotm 20/30] netfilter: NF_QUEUE vs emergency skbs

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Xiaotian Feng
Subject: [PATCH -mmotm 20/30] netfilter: NF_QUEUE vs emergency skbs
Date: Tuesday, July 13, 2010 - 3:20 am

From 6c5ccad4c45a73a6d9ebecbfcb1bce8ff3ca462f Mon Sep 17 00:00:00 2001
From: Xiaotian Feng <dfeng@redhat.com>
Date: Tue, 13 Jul 2010 11:38:29 +0800
Subject: [PATCH 20/30] netfilter: NF_QUEUE vs emergency skbs

Avoid memory getting stuck waiting for userspace, drop all emergency packets.
This of course requires the regular storage route to not include an NF_QUEUE
target ;-)

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
---
 net/netfilter/core.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index 78b505d..cc04549 100644
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -176,9 +176,12 @@ next_hook:
 	if (verdict == NF_ACCEPT || verdict == NF_STOP) {
 		ret = 1;
 	} else if (verdict == NF_DROP) {
+drop:
 		kfree_skb(skb);
 		ret = -EPERM;
 	} else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE) {
+		if (skb_emergency(skb))
+			goto drop;
 		if (!nf_queue(skb, elem, pf, hook, indev, outdev, okfn,
 			      verdict >> NF_VERDICT_BITS))
 			goto next_hook;
-- 
1.7.1.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH -mmotm 00/30] [RFC] swap over nfs -v21, Xiaotian Feng, (Tue Jul 13, 3:16 am)
[PATCH -mmotm 01/30] mm: serialize access to min_free_kbytes, Xiaotian Feng, (Tue Jul 13, 3:17 am)
[PATCH -mmotm 02/30] Swap over network documentation, Xiaotian Feng, (Tue Jul 13, 3:17 am)
[PATCH -mmotm 03/30] mm: expose gfp_to_alloc_flags(), Xiaotian Feng, (Tue Jul 13, 3:17 am)
[PATCH -mmotm 04/30] mm: tag reseve pages, Xiaotian Feng, (Tue Jul 13, 3:17 am)
[PATCH -mmotm 05/30] mm: sl[au]b: add knowledge of reserve ..., Xiaotian Feng, (Tue Jul 13, 3:17 am)
[PATCH -mmotm 06/30] mm: kmem_alloc_estimate(), Xiaotian Feng, (Tue Jul 13, 3:17 am)
[PATCH -mmotm 07/30] mm: allow PF_MEMALLOC from softirq co ..., Xiaotian Feng, (Tue Jul 13, 3:18 am)
[PATCH -mmotm 08/30] mm: emergency pool, Xiaotian Feng, (Tue Jul 13, 3:18 am)
[PATCH -mmotm 09/30] mm: system wide ALLOC_NO_WATERMARK, Xiaotian Feng, (Tue Jul 13, 3:18 am)
[PATCH -mmotm 10/30] mm: __GFP_MEMALLOC, Xiaotian Feng, (Tue Jul 13, 3:18 am)
[PATCH -mmotm 11/30] mm: memory reserve management, Xiaotian Feng, (Tue Jul 13, 3:18 am)
[PATCH -mmotm 12/30] selinux: tag avc cache alloc as non-c ..., Xiaotian Feng, (Tue Jul 13, 3:19 am)
[PATCH -mmotm 13/30] net: packet split receive api, Xiaotian Feng, (Tue Jul 13, 3:19 am)
[PATCH -mmotm 14/30] net: sk_allocation() - concentrate so ..., Xiaotian Feng, (Tue Jul 13, 3:19 am)
[PATCH -mmotm 15/30] netvm: network reserve infrastructure, Xiaotian Feng, (Tue Jul 13, 3:19 am)
[PATCH -mmotm 16/30] netvm: INET reserves, Xiaotian Feng, (Tue Jul 13, 3:19 am)
[PATCH -mmotm 17/30] netvm: hook skb allocation to reserves, Xiaotian Feng, (Tue Jul 13, 3:20 am)
[PATCH -mmotm 18/30] netvm: filter emergency skbs, Xiaotian Feng, (Tue Jul 13, 3:20 am)
[PATCH -mmotm 19/30] netvm: prevent a stream specific deadlock, Xiaotian Feng, (Tue Jul 13, 3:20 am)
[PATCH -mmotm 20/30] netfilter: NF_QUEUE vs emergency skbs, Xiaotian Feng, (Tue Jul 13, 3:20 am)
[PATCH -mmotm 21/30] netvm: skb processing, Xiaotian Feng, (Tue Jul 13, 3:20 am)
[PATCH -mmotm 22/30] mm: add support for non block device ..., Xiaotian Feng, (Tue Jul 13, 3:20 am)
[PATCH -mmotm 23/30] mm: methods for teaching filesystems ..., Xiaotian Feng, (Tue Jul 13, 3:21 am)
[PATCH -mmotm 24/30] nfs: teach the NFS client how to trea ..., Xiaotian Feng, (Tue Jul 13, 3:21 am)
[PATCH -mmotm 25/30] nfs: disable data cache revalidation ..., Xiaotian Feng, (Tue Jul 13, 3:21 am)
[PATCH -mmotm 26/30] nfs: enable swap on NFS, Xiaotian Feng, (Tue Jul 13, 3:21 am)
[PATCH -mmotm 27/30] nfs: fix various memory recursions po ..., Xiaotian Feng, (Tue Jul 13, 3:21 am)
[PATCH -mmotm 28/30] build fix for skb_emergency_protocol, Xiaotian Feng, (Tue Jul 13, 3:22 am)
[PATCH -mmotm 29/30] fix null pointer deref in swap_entry_free, Xiaotian Feng, (Tue Jul 13, 3:22 am)
[PATCH -mmotm 30/30] fix mess up on swap with multi files ..., Xiaotian Feng, (Tue Jul 13, 3:22 am)
Re: [PATCH -mmotm 12/30] selinux: tag avc cache alloc as n ..., Mitchell Erblich, (Tue Jul 13, 3:55 am)
Re: [PATCH -mmotm 00/30] [RFC] swap over nfs -v21, Américo Wang, (Tue Jul 13, 5:53 am)
Re: [PATCH -mmotm 05/30] mm: sl[au]b: add knowledge of res ..., Pekka Enberg, (Tue Jul 13, 1:33 pm)
Re: [PATCH -mmotm 12/30] selinux: tag avc cache alloc as n ..., Xiaotian Feng, (Thu Jul 15, 4:51 am)
Re: [PATCH -mmotm 05/30] mm: sl[au]b: add knowledge of res ..., Xiaotian Feng, (Thu Jul 15, 5:37 am)