rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add virtio_net-add-schedule-check-to-napi_enable-call.patch

This commit is contained in:
Kyle McMartin 2011-03-23 12:38:11 -04:00
parent e372080592
commit 21c6036496
2 changed files with 83 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel.spec
View File

@ -851,6 +851,8 @@ Patch13711: md-fix-regression-resulting-in-delays-in-clearing-bits-in-a-bitmap.p
# rhbz#671514
Patch13712: cfg80211-fix-can_beacon_sec_chan-reenable-ht40.patch
Patch13713: virtio_net-add-schedule-check-to-napi_enable-call.patch
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@ -1607,6 +1609,8 @@ ApplyPatch md-fix-regression-resulting-in-delays-in-clearing-bits-in-a-bitmap.pa
# rhbz#671514
ApplyPatch cfg80211-fix-can_beacon_sec_chan-reenable-ht40.patch
ApplyPatch virtio_net-add-schedule-check-to-napi_enable-call.patch
# END OF PATCH APPLICATIONS
%endif
@ -2193,6 +2197,9 @@ fi
# and build.
%changelog
* Wed Mar 23 2011 Kyle McMartin <kmcmartin@redhat.com>
- Backport 3e9d08e: "virtio_net: Add schedule check to napi_enable call"
* Wed Mar 23 2011 Ben Skeggs <bskeggs@redhat.com> 2.6.35.11-87
- nouveau: fix s/r on some boards (f14 port of #688569)

76
virtio_net-add-schedule-check-to-napi_enable-call.patch Normal file
View File

@ -0,0 +1,76 @@
From b5740f0377e4fb924517b68f9a7ad7f5647fe8ac Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers@novell.com>
Date: Thu, 10 Feb 2011 11:03:31 -0800
Subject: [PATCH] virtio_net: Add schedule check to napi_enable call
Under harsh testing conditions, including low memory, the guest would
stop receiving packets. With this patch applied we no longer see any
problems in the driver while performing these tests for extended periods
of time.
Make sure napi is scheduled subsequent to each napi_enable.
Signed-off-by: Bruce Rogers <brogers@novell.com>
Signed-off-by: Olaf Kirch <okir@suse.de>
Cc: stable@kernel.org
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/net/virtio_net.c | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index bb6b67f..1cf8da8 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -446,6 +446,20 @@ static void skb_recv_done(struct virtqueue *rvq)
}
}
+static void virtnet_napi_enable(struct virtnet_info *vi)
+{
+ napi_enable(&vi->napi);
+
+ /* If all buffers were filled by other side before we napi_enabled, we
+ * won't get another interrupt, so process any outstanding packets
+ * now. virtnet_poll wants re-enable the queue, so we disable here.
+ * We synchronize against interrupts via NAPI_STATE_SCHED */
+ if (napi_schedule_prep(&vi->napi)) {
+ virtqueue_disable_cb(vi->rvq);
+ __napi_schedule(&vi->napi);
+ }
+}
+
static void refill_work(struct work_struct *work)
{
struct virtnet_info *vi;
@@ -454,7 +468,7 @@ static void refill_work(struct work_struct *work)
vi = container_of(work, struct virtnet_info, refill.work);
napi_disable(&vi->napi);
still_empty = !try_fill_recv(vi, GFP_KERNEL);
- napi_enable(&vi->napi);
+ virtnet_napi_enable(vi);
/* In theory, this can happen: if we don't get any buffers in
* we will *never* try to fill again. */
@@ -638,16 +652,7 @@ static int virtnet_open(struct net_device *dev)
{
struct virtnet_info *vi = netdev_priv(dev);
- napi_enable(&vi->napi);
-
- /* If all buffers were filled by other side before we napi_enabled, we
- * won't get another interrupt, so process any outstanding packets
- * now. virtnet_poll wants re-enable the queue, so we disable here.
- * We synchronize against interrupts via NAPI_STATE_SCHED */
- if (napi_schedule_prep(&vi->napi)) {
- virtqueue_disable_cb(vi->rvq);
- __napi_schedule(&vi->napi);
- }
+ virtnet_napi_enable(vi);
return 0;
}
--
1.7.4.1