From: Wanlong Gao <gaowanlong@cn•fujitsu.com>
To: Jason Wang <jasowang@redhat•com>
Cc: mst@redhat•com, netdev@vger•kernel.org,
linux-kernel@vger•kernel.org,
virtualization@lists•linux-foundation.org
Subject: Re: [PATCH net 1/2] virtio-net: don't respond to cpu hotplug notifier if we're not ready
Date: Tue, 15 Oct 2013 08:18:32 +0800 [thread overview]
Message-ID: <525C89D8.4020306@cn.fujitsu.com> (raw)
In-Reply-To: <1381744595-26881-1-git-send-email-jasowang@redhat.com>
On 10/14/2013 05:56 PM, Jason Wang wrote:
> We're trying to re-configure the affinity unconditionally in cpu hotplug
> callback. This may lead the issue during resuming from s3/s4 since
>
> - virt queues haven't been allocated at that time.
> - it's unnecessary since thaw method will re-configure the affinity.
>
> Fix this issue by checking the config_enable and do nothing is we're not ready.
>
> The bug were introduced by commit 8de4b2f3ae90c8fc0f17eeaab87d5a951b66ee17
> (virtio-net: reset virtqueue affinity when doing cpu hotplug).
>
> Cc: Rusty Russell <rusty@rustcorp•com.au>
> Cc: Michael S. Tsirkin <mst@redhat•com>
> Cc: Wanlong Gao <gaowanlong@cn•fujitsu.com>
> Signed-off-by: Jason Wang <jasowang@redhat•com>
Thank you.
Reviewed-by: Wanlong Gao <gaowanlong@cn•fujitsu.com>
> ---
> The patch is need for 3.8 and above.
> ---
> drivers/net/virtio_net.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index defec2b..c4bc1cc 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -1116,6 +1116,11 @@ static int virtnet_cpu_callback(struct notifier_block *nfb,
> {
> struct virtnet_info *vi = container_of(nfb, struct virtnet_info, nb);
>
> + mutex_lock(&vi->config_lock);
> +
> + if (!vi->config_enable)
> + goto done;
> +
> switch(action & ~CPU_TASKS_FROZEN) {
> case CPU_ONLINE:
> case CPU_DOWN_FAILED:
> @@ -1128,6 +1133,9 @@ static int virtnet_cpu_callback(struct notifier_block *nfb,
> default:
> break;
> }
> +
> +done:
> + mutex_unlock(&vi->config_lock);
> return NOTIFY_OK;
> }
>
>
prev parent reply other threads:[~2013-10-15 0:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-14 9:56 [PATCH net 1/2] virtio-net: don't respond to cpu hotplug notifier if we're not ready Jason Wang
2013-10-14 9:56 ` [PATCH net 2/2] virtio-net: refill only when device is up during setting queues Jason Wang
2013-10-14 11:09 ` Michael S. Tsirkin
2013-10-15 3:15 ` Jason Wang
2013-10-14 11:06 ` [PATCH net 1/2] virtio-net: don't respond to cpu hotplug notifier if we're not ready Michael S. Tsirkin
2013-10-15 0:18 ` Wanlong Gao [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=525C89D8.4020306@cn.fujitsu.com \
--to=gaowanlong@cn$(echo .)fujitsu.com \
--cc=jasowang@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=mst@redhat$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=virtualization@lists$(echo .)linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox