From: Wanlong Gao <gaowanlong@cn.fujitsu.com> To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-scsi@vger.kernel.org, virtualization@lists.linux-foundation.org, rusty@rustcorp.com.au, mst@redhat.com, asias@redhat.com, JBottomley@parallels.com, venkateshs@google.com, pbonzini@redhat.com, gaowanlong@cn.fujitsu.com Subject: [PATCH V6 5/5] virtio-scsi: reset virtqueue affinity when doing cpu hotplug Date: Wed, 20 Mar 2013 15:01:24 +0800 [thread overview] Message-ID: <1363762884-11000-6-git-send-email-gaowanlong@cn.fujitsu.com> (raw) In-Reply-To: <1363762884-11000-1-git-send-email-gaowanlong@cn.fujitsu.com> Add hot cpu notifier to reset the request virtqueue affinity when doing cpu hotplug. Cc: linux-scsi@vger.kernel.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> Reviewed-by: Asias He <asias@redhat.com> --- drivers/scsi/virtio_scsi.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index 13d7672..0ad9017 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c @@ -110,6 +110,9 @@ struct virtio_scsi { /* if the affinity hint is set for virtqueues */ bool affinity_hint_set; + /* CPU hotplug notifier */ + struct notifier_block nb; + struct virtio_scsi_vq ctrl_vq; struct virtio_scsi_vq event_vq; struct virtio_scsi_vq req_vqs[]; @@ -762,6 +765,23 @@ static void virtscsi_set_affinity(struct virtio_scsi *vscsi, bool affinity) put_online_cpus(); } +static int virtscsi_cpu_callback(struct notifier_block *nfb, + unsigned long action, void *hcpu) +{ + struct virtio_scsi *vscsi = container_of(nfb, struct virtio_scsi, nb); + switch(action) { + case CPU_ONLINE: + case CPU_ONLINE_FROZEN: + case CPU_DEAD: + case CPU_DEAD_FROZEN: + __virtscsi_set_affinity(vscsi, true); + break; + default: + break; + } + return NOTIFY_OK; +} + static void virtscsi_init_vq(struct virtio_scsi_vq *virtscsi_vq, struct virtqueue *vq) { @@ -884,6 +904,13 @@ static int virtscsi_probe(struct virtio_device *vdev) if (err) goto virtscsi_init_failed; + vscsi->nb.notifier_call = &virtscsi_cpu_callback; + err = register_hotcpu_notifier(&vscsi->nb); + if (err) { + pr_err("registering cpu notifier failed\n"); + goto scsi_add_host_failed; + } + cmd_per_lun = virtscsi_config_get(vdev, cmd_per_lun) ?: 1; shost->cmd_per_lun = min_t(u32, cmd_per_lun, shost->can_queue); shost->max_sectors = virtscsi_config_get(vdev, max_sectors) ?: 0xFFFF; @@ -921,6 +948,8 @@ static void virtscsi_remove(struct virtio_device *vdev) scsi_remove_host(shost); + unregister_hotcpu_notifier(&vscsi->nb); + virtscsi_remove_vqs(vdev); scsi_host_put(shost); } -- 1.8.2.rc2
WARNING: multiple messages have this Message-ID (diff)
From: Wanlong Gao <gaowanlong@cn.fujitsu.com> To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-scsi@vger.kernel.org, mst@redhat.com, JBottomley@parallels.com, virtualization@lists.linux-foundation.org, pbonzini@redhat.com Subject: [PATCH V6 5/5] virtio-scsi: reset virtqueue affinity when doing cpu hotplug Date: Wed, 20 Mar 2013 15:01:24 +0800 [thread overview] Message-ID: <1363762884-11000-6-git-send-email-gaowanlong@cn.fujitsu.com> (raw) In-Reply-To: <1363762884-11000-1-git-send-email-gaowanlong@cn.fujitsu.com> Add hot cpu notifier to reset the request virtqueue affinity when doing cpu hotplug. Cc: linux-scsi@vger.kernel.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> Reviewed-by: Asias He <asias@redhat.com> --- drivers/scsi/virtio_scsi.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index 13d7672..0ad9017 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c @@ -110,6 +110,9 @@ struct virtio_scsi { /* if the affinity hint is set for virtqueues */ bool affinity_hint_set; + /* CPU hotplug notifier */ + struct notifier_block nb; + struct virtio_scsi_vq ctrl_vq; struct virtio_scsi_vq event_vq; struct virtio_scsi_vq req_vqs[]; @@ -762,6 +765,23 @@ static void virtscsi_set_affinity(struct virtio_scsi *vscsi, bool affinity) put_online_cpus(); } +static int virtscsi_cpu_callback(struct notifier_block *nfb, + unsigned long action, void *hcpu) +{ + struct virtio_scsi *vscsi = container_of(nfb, struct virtio_scsi, nb); + switch(action) { + case CPU_ONLINE: + case CPU_ONLINE_FROZEN: + case CPU_DEAD: + case CPU_DEAD_FROZEN: + __virtscsi_set_affinity(vscsi, true); + break; + default: + break; + } + return NOTIFY_OK; +} + static void virtscsi_init_vq(struct virtio_scsi_vq *virtscsi_vq, struct virtqueue *vq) { @@ -884,6 +904,13 @@ static int virtscsi_probe(struct virtio_device *vdev) if (err) goto virtscsi_init_failed; + vscsi->nb.notifier_call = &virtscsi_cpu_callback; + err = register_hotcpu_notifier(&vscsi->nb); + if (err) { + pr_err("registering cpu notifier failed\n"); + goto scsi_add_host_failed; + } + cmd_per_lun = virtscsi_config_get(vdev, cmd_per_lun) ?: 1; shost->cmd_per_lun = min_t(u32, cmd_per_lun, shost->can_queue); shost->max_sectors = virtscsi_config_get(vdev, max_sectors) ?: 0xFFFF; @@ -921,6 +948,8 @@ static void virtscsi_remove(struct virtio_device *vdev) scsi_remove_host(shost); + unregister_hotcpu_notifier(&vscsi->nb); + virtscsi_remove_vqs(vdev); scsi_host_put(shost); } -- 1.8.2.rc2
next prev parent reply other threads:[~2013-03-20 7:00 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-03-20 7:01 [PATCH V6 0/5] virtio-scsi multiqueue Wanlong Gao 2013-03-20 7:01 ` Wanlong Gao 2013-03-20 7:01 ` [PATCH V6 1/5] virtio-scsi: redo allocation of target data Wanlong Gao 2013-03-20 7:01 ` Wanlong Gao 2013-03-20 7:33 ` Asias He 2013-03-20 7:33 ` Asias He 2013-03-20 7:01 ` [PATCH V6 2/5] virtio-scsi: pass struct virtio_scsi to virtqueue completion function Wanlong Gao 2013-03-20 7:01 ` Wanlong Gao 2013-03-20 7:01 ` [PATCH V6 3/5] virtio-scsi: push vq lock/unlock into virtscsi_vq_done Wanlong Gao 2013-03-20 7:01 ` Wanlong Gao 2013-03-20 7:01 ` [PATCH V6 4/5] virtio-scsi: introduce multiqueue support Wanlong Gao 2013-03-20 7:01 ` Wanlong Gao 2013-03-20 21:22 ` Venkatesh Srinivas 2013-03-20 21:22 ` Venkatesh Srinivas 2013-03-20 7:01 ` Wanlong Gao [this message] 2013-03-20 7:01 ` [PATCH V6 5/5] virtio-scsi: reset virtqueue affinity when doing cpu hotplug Wanlong Gao 2013-03-20 7:24 ` Asias He 2013-03-20 7:24 ` Asias He 2013-03-20 7:33 ` Wanlong Gao 2013-03-20 7:33 ` Wanlong Gao 2013-03-20 7:56 ` Wanlong Gao 2013-03-20 7:56 ` Wanlong Gao 2013-03-23 6:36 ` Paolo Bonzini 2013-03-23 6:36 ` Paolo Bonzini 2013-03-23 11:16 ` Wanlong Gao 2013-03-23 11:16 ` Wanlong Gao
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=1363762884-11000-6-git-send-email-gaowanlong@cn.fujitsu.com \ --to=gaowanlong@cn.fujitsu.com \ --cc=JBottomley@parallels.com \ --cc=asias@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ --cc=mst@redhat.com \ --cc=pbonzini@redhat.com \ --cc=rusty@rustcorp.com.au \ --cc=venkateshs@google.com \ --cc=virtualization@lists.linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.