[kernel] r16344 - in dists/sid/linux-2.6/debian: . patches/features/all/xen patches/series

[Ian Campbell]

Author: ijc-guest
Date: Thu Sep 23 18:47:45 2010
New Revision: 16344

Log:
Import xen.git patch "xen/netfront: make smartpoll optional, and default off"
fixes random loss of domU connectivity. Only effects the xen flavour, base
xen flavours do not contain smartpoll.

Added:
   dists/sid/linux-2.6/debian/patches/features/all/xen/xen-netfront-make-smartpoll-optional-and-default-off.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/24-extra

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Sep 22 10:49:56 2010	(r16343)
+++ dists/sid/linux-2.6/debian/changelog	Thu Sep 23 18:47:45 2010	(r16344)
@@ -17,6 +17,9 @@
   * ARM: update mach types.
   * [armel/config.kirkwood] Enable MACH_DOCKSTAR.
 
+  [ Ian Campbell ]
+  * [x86/xen] Disable netfront's smartpoll mode by default. (Closes: #596635)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 18 Sep 2010 17:29:34 +0100
 
 linux-2.6 (2.6.32-23) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/features/all/xen/xen-netfront-make-smartpoll-optional-and-default-off.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/xen-netfront-make-smartpoll-optional-and-default-off.patch	Thu Sep 23 18:47:45 2010	(r16344)
@@ -0,0 +1,60 @@
+From d2312863e180f8058533776c0b78da6fed0c2346 Mon Sep 17 00:00:00 2001
+From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
+Date: Fri, 10 Sep 2010 11:01:49 +1000
+Subject: [PATCH] xen/netfront: make smartpoll optional, and default off
+
+Smartpoll seems to have some reliability problems, so make it default
+to off for now.
+
+Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
+---
+ drivers/net/xen-netfront.c |   19 +++++++++++++------
+ 1 files changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
+index 1a2811e..6426bb8 100644
+--- a/drivers/net/xen-netfront.c
++++ b/drivers/net/xen-netfront.c
+@@ -53,6 +53,10 @@
+ 
+ static const struct ethtool_ops xennet_ethtool_ops;
+ 
++static int use_smartpoll = 0;
++module_param(use_smartpoll, int, 0600);
++MODULE_PARM_DESC (use_smartpoll, "Use smartpoll mechanism if available");
++
+ struct netfront_cb {
+ 	struct page *page;
+ 	unsigned offset;
+@@ -1538,7 +1542,7 @@ again:
+ 		goto abort_transaction;
+ 	}
+ 
+-	err = xenbus_printf(xbt, dev->nodename, "feature-smart-poll", "%d", 1);
++	err = xenbus_printf(xbt, dev->nodename, "feature-smart-poll", "%d", use_smartpoll);
+ 	if (err) {
+ 		message = "writing feature-smart-poll";
+ 		goto abort_transaction;
+@@ -1631,11 +1635,14 @@ static int xennet_connect(struct net_device *dev)
+ 		return -ENODEV;
+ 	}
+ 
+-	err = xenbus_scanf(XBT_NIL, np->xbdev->otherend,
+-			   "feature-smart-poll", "%u",
+-			   &np->smart_poll.feature_smart_poll);
+-	if (err != 1)
+-		np->smart_poll.feature_smart_poll = 0;
++	np->smart_poll.feature_smart_poll = 0;
++	if (use_smartpoll) {
++		err = xenbus_scanf(XBT_NIL, np->xbdev->otherend,
++				   "feature-smart-poll", "%u",
++				   &np->smart_poll.feature_smart_poll);
++		if (err != 1)
++			np->smart_poll.feature_smart_poll = 0;
++	}
+ 
+ 	if (np->smart_poll.feature_smart_poll) {
+ 		hrtimer_init(&np->smart_poll.timer, CLOCK_MONOTONIC,
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/24-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/24-extra	Wed Sep 22 10:49:56 2010	(r16343)
+++ dists/sid/linux-2.6/debian/patches/series/24-extra	Thu Sep 23 18:47:45 2010	(r16344)
@@ -10,3 +10,4 @@
 + features/all/vserver/ia64-buildfix.patch featureset=vserver
 
 + features/all/xen/pvops.patch featureset=xen
++ features/all/xen/xen-netfront-make-smartpoll-optional-and-default-off.patch featureset=xen