From: Paolo Bonzini <pbonzini@redhat.com> To: linux-kernel@vger.kernel.org Cc: linux-scsi@vger.kernel.org, kvm@vger.kernel.org, rusty@rustcorp.com.au, jasowang@redhat.com, mst@redhat.com, virtualization@lists.linux-foundation.org Subject: [PATCH 4/5] virtio-scsi: pass struct virtio_scsi to virtqueue completion function Date: Tue, 28 Aug 2012 13:54:16 +0200 [thread overview] Message-ID: <1346154857-12487-5-git-send-email-pbonzini@redhat.com> (raw) In-Reply-To: <1346154857-12487-1-git-send-email-pbonzini@redhat.com> This will be needed soon in order to retrieve the per-target struct. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- drivers/scsi/virtio_scsi.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index 62fec04..6414ea0 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c @@ -107,7 +107,7 @@ static void virtscsi_compute_resid(struct scsi_cmnd *sc, u32 resid) * * Called with vq_lock held. */ -static void virtscsi_complete_cmd(void *buf) +static void virtscsi_complete_cmd(struct virtio_scsi *vscsi, void *buf) { struct virtio_scsi_cmd *cmd = buf; struct scsi_cmnd *sc = cmd->sc; @@ -168,7 +168,8 @@ static void virtscsi_complete_cmd(void *buf) sc->scsi_done(sc); } -static void virtscsi_vq_done(struct virtqueue *vq, void (*fn)(void *buf)) +static void virtscsi_vq_done(struct virtio_scsi *vscsi, struct virtqueue *vq, + void (*fn)(struct virtio_scsi *vscsi, void *buf)) { void *buf; unsigned int len; @@ -176,7 +177,7 @@ static void virtscsi_vq_done(struct virtqueue *vq, void (*fn)(void *buf)) do { virtqueue_disable_cb(vq); while ((buf = virtqueue_get_buf(vq, &len)) != NULL) - fn(buf); + fn(vscsi, buf); } while (!virtqueue_enable_cb(vq)); } @@ -187,11 +188,11 @@ static void virtscsi_req_done(struct virtqueue *vq) unsigned long flags; spin_lock_irqsave(&vscsi->req_vq.vq_lock, flags); - virtscsi_vq_done(vq, virtscsi_complete_cmd); + virtscsi_vq_done(vscsi, vq, virtscsi_complete_cmd); spin_unlock_irqrestore(&vscsi->req_vq.vq_lock, flags); }; -static void virtscsi_complete_free(void *buf) +static void virtscsi_complete_free(struct virtio_scsi *vscsi, void *buf) { struct virtio_scsi_cmd *cmd = buf; @@ -208,7 +209,7 @@ static void virtscsi_ctrl_done(struct virtqueue *vq) unsigned long flags; spin_lock_irqsave(&vscsi->ctrl_vq.vq_lock, flags); - virtscsi_vq_done(vq, virtscsi_complete_free); + virtscsi_vq_done(vscsi, vq, virtscsi_complete_free); spin_unlock_irqrestore(&vscsi->ctrl_vq.vq_lock, flags); }; @@ -331,7 +332,7 @@ static void virtscsi_handle_event(struct work_struct *work) virtscsi_kick_event(vscsi, event_node); } -static void virtscsi_complete_event(void *buf) +static void virtscsi_complete_event(struct virtio_scsi *vscsi, void *buf) { struct virtio_scsi_event_node *event_node = buf; @@ -346,7 +347,7 @@ static void virtscsi_event_done(struct virtqueue *vq) unsigned long flags; spin_lock_irqsave(&vscsi->event_vq.vq_lock, flags); - virtscsi_vq_done(vq, virtscsi_complete_event); + virtscsi_vq_done(vscsi, vq, virtscsi_complete_event); spin_unlock_irqrestore(&vscsi->event_vq.vq_lock, flags); }; -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Paolo Bonzini <pbonzini@redhat.com> To: linux-kernel@vger.kernel.org Cc: linux-scsi@vger.kernel.org, kvm@vger.kernel.org, mst@redhat.com, virtualization@lists.linux-foundation.org Subject: [PATCH 4/5] virtio-scsi: pass struct virtio_scsi to virtqueue completion function Date: Tue, 28 Aug 2012 13:54:16 +0200 [thread overview] Message-ID: <1346154857-12487-5-git-send-email-pbonzini@redhat.com> (raw) In-Reply-To: <1346154857-12487-1-git-send-email-pbonzini@redhat.com> This will be needed soon in order to retrieve the per-target struct. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- drivers/scsi/virtio_scsi.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index 62fec04..6414ea0 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c @@ -107,7 +107,7 @@ static void virtscsi_compute_resid(struct scsi_cmnd *sc, u32 resid) * * Called with vq_lock held. */ -static void virtscsi_complete_cmd(void *buf) +static void virtscsi_complete_cmd(struct virtio_scsi *vscsi, void *buf) { struct virtio_scsi_cmd *cmd = buf; struct scsi_cmnd *sc = cmd->sc; @@ -168,7 +168,8 @@ static void virtscsi_complete_cmd(void *buf) sc->scsi_done(sc); } -static void virtscsi_vq_done(struct virtqueue *vq, void (*fn)(void *buf)) +static void virtscsi_vq_done(struct virtio_scsi *vscsi, struct virtqueue *vq, + void (*fn)(struct virtio_scsi *vscsi, void *buf)) { void *buf; unsigned int len; @@ -176,7 +177,7 @@ static void virtscsi_vq_done(struct virtqueue *vq, void (*fn)(void *buf)) do { virtqueue_disable_cb(vq); while ((buf = virtqueue_get_buf(vq, &len)) != NULL) - fn(buf); + fn(vscsi, buf); } while (!virtqueue_enable_cb(vq)); } @@ -187,11 +188,11 @@ static void virtscsi_req_done(struct virtqueue *vq) unsigned long flags; spin_lock_irqsave(&vscsi->req_vq.vq_lock, flags); - virtscsi_vq_done(vq, virtscsi_complete_cmd); + virtscsi_vq_done(vscsi, vq, virtscsi_complete_cmd); spin_unlock_irqrestore(&vscsi->req_vq.vq_lock, flags); }; -static void virtscsi_complete_free(void *buf) +static void virtscsi_complete_free(struct virtio_scsi *vscsi, void *buf) { struct virtio_scsi_cmd *cmd = buf; @@ -208,7 +209,7 @@ static void virtscsi_ctrl_done(struct virtqueue *vq) unsigned long flags; spin_lock_irqsave(&vscsi->ctrl_vq.vq_lock, flags); - virtscsi_vq_done(vq, virtscsi_complete_free); + virtscsi_vq_done(vscsi, vq, virtscsi_complete_free); spin_unlock_irqrestore(&vscsi->ctrl_vq.vq_lock, flags); }; @@ -331,7 +332,7 @@ static void virtscsi_handle_event(struct work_struct *work) virtscsi_kick_event(vscsi, event_node); } -static void virtscsi_complete_event(void *buf) +static void virtscsi_complete_event(struct virtio_scsi *vscsi, void *buf) { struct virtio_scsi_event_node *event_node = buf; @@ -346,7 +347,7 @@ static void virtscsi_event_done(struct virtqueue *vq) unsigned long flags; spin_lock_irqsave(&vscsi->event_vq.vq_lock, flags); - virtscsi_vq_done(vq, virtscsi_complete_event); + virtscsi_vq_done(vscsi, vq, virtscsi_complete_event); spin_unlock_irqrestore(&vscsi->event_vq.vq_lock, flags); }; -- 1.7.1
next prev parent reply other threads:[~2012-08-28 11:55 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-28 11:54 [PATCH 0/5] Multiqueue virtio-scsi Paolo Bonzini 2012-08-28 11:54 ` Paolo Bonzini 2012-08-28 11:54 ` [PATCH 1/5] virtio-ring: move queue_index to vring_virtqueue Paolo Bonzini 2012-08-28 11:54 ` Paolo Bonzini 2012-08-29 7:54 ` Jason Wang 2012-08-29 7:54 ` Jason Wang 2012-09-05 23:32 ` Rusty Russell 2012-09-05 23:32 ` Rusty Russell 2012-08-28 11:54 ` [PATCH 2/5] virtio: introduce an API to set affinity for a virtqueue Paolo Bonzini 2012-08-28 11:54 ` Paolo Bonzini 2012-09-05 23:32 ` Rusty Russell 2012-09-05 23:32 ` Rusty Russell 2012-08-28 11:54 ` [PATCH 3/5] virtio-scsi: allocate target pointers in a separate memory block Paolo Bonzini 2012-08-28 11:54 ` Paolo Bonzini 2012-08-28 14:07 ` Sasha Levin 2012-08-28 14:07 ` Sasha Levin 2012-08-28 14:25 ` Paolo Bonzini 2012-08-28 14:25 ` Paolo Bonzini 2012-08-28 11:54 ` Paolo Bonzini [this message] 2012-08-28 11:54 ` [PATCH 4/5] virtio-scsi: pass struct virtio_scsi to virtqueue completion function Paolo Bonzini 2012-08-28 11:54 ` [PATCH 5/5] virtio-scsi: introduce multiqueue support Paolo Bonzini 2012-08-28 11:54 ` Paolo Bonzini 2012-09-04 2:21 ` Nicholas A. Bellinger 2012-09-04 2:21 ` Nicholas A. Bellinger 2012-09-04 6:46 ` Paolo Bonzini 2012-09-04 6:46 ` Paolo Bonzini 2012-09-04 8:46 ` Michael S. Tsirkin 2012-09-04 8:46 ` Michael S. Tsirkin 2012-09-04 10:25 ` Paolo Bonzini 2012-09-04 10:25 ` Paolo Bonzini 2012-09-04 11:09 ` Michael S. Tsirkin 2012-09-04 11:09 ` Michael S. Tsirkin 2012-09-04 11:18 ` Paolo Bonzini 2012-09-04 11:18 ` Paolo Bonzini 2012-09-04 13:35 ` Michael S. Tsirkin 2012-09-04 13:35 ` Michael S. Tsirkin 2012-09-04 13:45 ` Paolo Bonzini 2012-09-04 13:45 ` Paolo Bonzini 2012-09-04 14:19 ` Michael S. Tsirkin 2012-09-04 14:19 ` Michael S. Tsirkin 2012-09-04 14:25 ` Paolo Bonzini 2012-09-04 14:25 ` Paolo Bonzini 2012-09-04 20:11 ` Nicholas A. Bellinger 2012-09-04 20:11 ` Nicholas A. Bellinger 2012-09-05 7:03 ` Paolo Bonzini 2012-09-05 7:03 ` Paolo Bonzini 2012-09-04 12:48 ` Michael S. Tsirkin 2012-09-04 12:48 ` Michael S. Tsirkin 2012-09-04 13:49 ` Paolo Bonzini 2012-09-04 13:49 ` Paolo Bonzini 2012-09-04 14:21 ` Michael S. Tsirkin 2012-09-04 14:21 ` Michael S. Tsirkin 2012-09-04 14:30 ` Paolo Bonzini 2012-09-04 14:30 ` Paolo Bonzini 2012-09-04 14:41 ` Michael S. Tsirkin 2012-09-04 14:41 ` Michael S. Tsirkin 2012-09-04 14:47 ` Michael S. Tsirkin 2012-09-04 14:47 ` Michael S. Tsirkin 2012-09-04 14:55 ` Paolo Bonzini 2012-09-04 14:55 ` Paolo Bonzini 2012-09-04 15:03 ` Michael S. Tsirkin 2012-09-04 15:03 ` Michael S. Tsirkin 2012-08-30 7:13 ` [PATCH 0/5] Multiqueue virtio-scsi Stefan Hajnoczi 2012-08-30 7:13 ` Stefan Hajnoczi 2012-08-30 14:53 ` Michael S. Tsirkin 2012-08-30 14:53 ` Michael S. Tsirkin 2012-08-30 15:45 ` Paolo Bonzini 2012-08-30 15:45 ` Paolo Bonzini
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=1346154857-12487-5-git-send-email-pbonzini@redhat.com \ --to=pbonzini@redhat.com \ --cc=jasowang@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ --cc=mst@redhat.com \ --cc=rusty@rustcorp.com.au \ --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.