mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
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>
This commit is contained in:
parent
96642d42f0
commit
3e9d08ec0a
1 changed files with 16 additions and 11 deletions
|
@ -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)
|
static void refill_work(struct work_struct *work)
|
||||||
{
|
{
|
||||||
struct virtnet_info *vi;
|
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);
|
vi = container_of(work, struct virtnet_info, refill.work);
|
||||||
napi_disable(&vi->napi);
|
napi_disable(&vi->napi);
|
||||||
still_empty = !try_fill_recv(vi, GFP_KERNEL);
|
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
|
/* In theory, this can happen: if we don't get any buffers in
|
||||||
* we will *never* try to fill again. */
|
* 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);
|
struct virtnet_info *vi = netdev_priv(dev);
|
||||||
|
|
||||||
napi_enable(&vi->napi);
|
virtnet_napi_enable(vi);
|
||||||
|
|
||||||
/* 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);
|
|
||||||
}
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue