From c75ab913567399a8c41390966b0175c8d98976c5 Mon Sep 17 00:00:00 2001 From: bwzhou Date: Fri, 15 Feb 2008 09:53:49 +0000 Subject: [PATCH] Branch b1_6 b=13380 r=adilger, johann fix a potential deadlock condition in netpoll code of the sles9 kernel --- .../patches/netpoll_xmit_lock-2.6-suse.patch | 14 ++++++++++++++ lustre/kernel_patches/series/2.6-suse-newer.series | 1 + 2 files changed, 15 insertions(+) create mode 100644 lustre/kernel_patches/patches/netpoll_xmit_lock-2.6-suse.patch diff --git a/lustre/kernel_patches/patches/netpoll_xmit_lock-2.6-suse.patch b/lustre/kernel_patches/patches/netpoll_xmit_lock-2.6-suse.patch new file mode 100644 index 0000000..ec28f18 --- /dev/null +++ b/lustre/kernel_patches/patches/netpoll_xmit_lock-2.6-suse.patch @@ -0,0 +1,14 @@ +--- linux-2.6.orig/net/core/netpoll.c 2007-12-18 21:58:41.000000000 +0800 ++++ linux-2.6/net/core/netpoll.c 2007-12-18 21:59:01.000000000 +0800 +@@ -160,6 +160,11 @@ repeat: + return; + } + ++ if(np->dev->xmit_lock_owner == smp_processor_id()) { ++ __kfree_skb(skb); ++ return; ++ } ++ + spin_lock(&np->dev->xmit_lock); + np->dev->xmit_lock_owner = smp_processor_id(); + diff --git a/lustre/kernel_patches/series/2.6-suse-newer.series b/lustre/kernel_patches/series/2.6-suse-newer.series index 90ede2d..1f092e8 100644 --- a/lustre/kernel_patches/series/2.6-suse-newer.series +++ b/lustre/kernel_patches/series/2.6-suse-newer.series @@ -14,3 +14,4 @@ bitops_ext2_find_next_le_bit-2.6.patch vfs_intent-reduce-stack-usage-2.6-suse-newer.patch atomic_add_return-sles9.patch modpost_external_module_updates_sles9.patch +netpoll_xmit_lock-2.6-suse.patch -- 1.8.3.1