Attachment 183961 Details for Bug 251978 – patch to serialize netpoll code

[patch] patch to serialize netpoll code

linux-kernel-test.patch (text/plain), 1.90 KB, created by Neil Horman on 2007-08-31 20:41:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-08-31 20:41:39 UTC

Size: 1.90 KB

patch

obsolete

>--- linux-2.6.9/net/core/dev.c.orig	2007-08-31 15:01:01.000000000 -0400
>+++ linux-2.6.9/net/core/dev.c	2007-08-31 15:03:17.000000000 -0400
>@@ -233,6 +233,8 @@ extern void netdev_unregister_sysfs(stru
> #endif
> 
> 
>+extern rwlock_t netpoll_poll_list_lock;
>+
> /*******************************************************************************
> 
> 		Protocol management and registration routines
>@@ -1820,8 +1822,9 @@ static void net_rx_action(struct softirq
> 	unsigned long start_time = jiffies;
> 	int budget = netdev_max_backlog;
> 	void *have;
>+	unsigned long flags;
> 	
>-	local_irq_disable();
>+	read_lock_irqsave(&netpoll_poll_list_lock, flags);
> 
> 	while (!list_empty(&queue->poll_list)) {
> 		struct net_device *dev;
>@@ -1852,7 +1855,7 @@ static void net_rx_action(struct softirq
> 		}
> 	}
> out:
>-	local_irq_enable();
>+	read_unlock_irqrestore(&netpoll_poll_list_lock, flags);
> 	return;
> 
> softnet_break:
>--- linux-2.6.9/net/core/netpoll.c.orig	2007-08-31 14:53:49.000000000 -0400
>+++ linux-2.6.9/net/core/netpoll.c	2007-08-31 15:01:56.000000000 -0400
>@@ -52,6 +52,7 @@ static atomic_t trapped;
> 
> static void zap_completion_queue(void);
> static void arp_reply(struct sk_buff *skb);
>+rwlock_t netpoll_poll_list_lock = RW_LOCK_UNLOCKED;
> 
> static int checksum_udp(struct sk_buff *skb, struct udphdr *uh,
> 			     unsigned short ulen, u32 saddr, u32 daddr)
>@@ -126,6 +127,7 @@ static void service_arp_queue(struct net
> 
> void netpoll_poll_dev(struct net_device *dev)
> {
>+	unsigned long flags;
> 	struct netpoll_info *npi = dev_wrapper(dev)->npinfo;
> 
> 	if(!netif_running(dev) || !dev->poll_controller)
>@@ -133,6 +135,10 @@ void netpoll_poll_dev(struct net_device 
> 
> 	/* Process pending work on NIC */
> 	dev->poll_controller(dev);
>+	write_lock_irqsave(&netpoll_poll_list_lock, flags);
>+	if (!list_empty(&dev->poll_list))
>+		list_del_init(&dev->poll_list);
>+	write_unlock_irqrestore(&netpoll_poll_list_lock, flags);
> 	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