diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2011-12-28 19:43:15 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-29 16:44:29 -0500 |
commit | f1776dade17cd54562f4bc1d01de89c4908b4dd0 (patch) | |
tree | f598aa5a7e2c9922a0031b0ced571d92fcca1f62 | |
parent | b2baed69e605c3e57d28940cc7aaae908d61f769 (diff) |
virtio_net: use non-reentrant workqueue.
Michael S. Tsirkin also noticed that we could run the refill work
multiple CPUs: if we kick off a refill on one CPU and then on another,
they would both manipulate the queue at the same time (they use
napi_disable to avoid racing against the receive handler itself).
Tejun points out that this is what the WQ_NON_REENTRANT flag is for,
and that there is a convenient system kthread we can use.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/virtio_net.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 07ca150a5ca6..2055386eda58 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
@@ -508,7 +508,7 @@ static void refill_work(struct work_struct *work) | |||
508 | /* In theory, this can happen: if we don't get any buffers in | 508 | /* In theory, this can happen: if we don't get any buffers in |
509 | * we will *never* try to fill again. */ | 509 | * we will *never* try to fill again. */ |
510 | if (still_empty) | 510 | if (still_empty) |
511 | schedule_delayed_work(&vi->refill, HZ/2); | 511 | queue_delayed_work(system_nrt_wq, &vi->refill, HZ/2); |
512 | } | 512 | } |
513 | 513 | ||
514 | static int virtnet_poll(struct napi_struct *napi, int budget) | 514 | static int virtnet_poll(struct napi_struct *napi, int budget) |
@@ -527,7 +527,7 @@ again: | |||
527 | 527 | ||
528 | if (vi->num < vi->max / 2) { | 528 | if (vi->num < vi->max / 2) { |
529 | if (!try_fill_recv(vi, GFP_ATOMIC)) | 529 | if (!try_fill_recv(vi, GFP_ATOMIC)) |
530 | schedule_delayed_work(&vi->refill, 0); | 530 | queue_delayed_work(system_nrt_wq, &vi->refill, 0); |
531 | } | 531 | } |
532 | 532 | ||
533 | /* Out of packets? */ | 533 | /* Out of packets? */ |
@@ -729,7 +729,7 @@ static int virtnet_open(struct net_device *dev) | |||
729 | 729 | ||
730 | /* Make sure we have some buffers: if oom use wq. */ | 730 | /* Make sure we have some buffers: if oom use wq. */ |
731 | if (!try_fill_recv(vi, GFP_KERNEL)) | 731 | if (!try_fill_recv(vi, GFP_KERNEL)) |
732 | schedule_delayed_work(&vi->refill, 0); | 732 | queue_delayed_work(system_nrt_wq, &vi->refill, 0); |
733 | 733 | ||
734 | virtnet_napi_enable(vi); | 734 | virtnet_napi_enable(vi); |
735 | return 0; | 735 | return 0; |