Attachment 183141 Details for Bug 251978 – new patch to test

[patch] new patch to test

oracle.patch (text/plain), 1.99 KB, created by Neil Horman on 2007-08-31 12:14:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-08-31 12:14:25 UTC

Size: 1.99 KB

patch

obsolete

>diff -up linux-2.6.9/net/core/dev.c.orc linux-2.6.9/net/core/dev.c
>--- linux-2.6.9/net/core/dev.c.orc	2007-08-31 07:57:31.000000000 -0400
>+++ linux-2.6.9/net/core/dev.c	2007-08-31 08:02:25.000000000 -0400
>@@ -1808,6 +1808,8 @@ job_done:
> 	return 0;
> }
> 
>+extern spinlock_t np_poll_list_lock;
>+
> static void net_rx_action(struct softirq_action *h)
> {
> 	struct softnet_data *queue = &__get_cpu_var(softnet_data);
>@@ -1815,6 +1817,7 @@ static void net_rx_action(struct softirq
> 	int budget = netdev_max_backlog;
> 	void *have;
> 	
>+	spin_lock(&np_poll_list_lock);	
> 	local_irq_disable();
> 
> 	while (!list_empty(&queue->poll_list)) {
>@@ -1847,6 +1850,7 @@ static void net_rx_action(struct softirq
> 	}
> out:
> 	local_irq_enable();
>+	spin_unlock(&np_poll_list_lock);
> 	return;
> 
> softnet_break:
>diff -up linux-2.6.9/net/core/netpoll.c.orc linux-2.6.9/net/core/netpoll.c
>--- linux-2.6.9/net/core/netpoll.c.orc	2007-08-30 14:43:35.000000000 -0400
>+++ linux-2.6.9/net/core/netpoll.c	2007-08-31 07:59:54.000000000 -0400
>@@ -24,6 +24,7 @@
> #include <linux/reboot.h>
> #include <linux/rcupdate.h>
> #include <linux/workqueue.h>
>+#include <linux/list.h>
> #include <net/tcp.h>
> #include <net/udp.h>
> #include <asm/unaligned.h>
>@@ -50,6 +51,8 @@ static atomic_t trapped;
> 		(MAX_UDP_CHUNK + sizeof(struct udphdr) + \
> 				sizeof(struct iphdr) + sizeof(struct ethhdr))
> 
>+spinlock_t np_poll_list_lock = SPIN_LOCK_UNLOCKED;
>+
> static void zap_completion_queue(void);
> static void arp_reply(struct sk_buff *skb);
> 
>@@ -133,6 +136,17 @@ void netpoll_poll_dev(struct net_device 
> 
> 	/* Process pending work on NIC */
> 	dev->poll_controller(dev);
>+	/*
>+	 * Check to see if we added ourselves to the poll 
>+	 * list from the poll controller.  If we did
>+	 * lets remove it again to avoid a race with net_rx_action
>+	 * here. yes, a bit of a hack but neat and self contained
>+	 */
>+	spin_lock_bh(&np_poll_list_lock);
>+	if (!list_empty(&dev->poll_list)) {
>+		list_del_init(&dev->poll_list);
>+	}
>+	spin_unlock_bh(&np_poll_list_lock);
> 	if (dev->poll)
> 		poll_napi(dev);
>

Actions: View | Diff

Attachments on bug 251978: 161198 | 181601 | 183141 | 183961 | 185531 | 185541 | 186681 | 187461 | 187831 | 189261 | 190311 | 190351 | 194551