From: Paolo Bonzini <pbonzini@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: kvm@vger.kernel.org, gaowanlong@cn.fujitsu.com,
hutao@cn.fujitsu.com, linux-scsi@vger.kernel.org,
virtualization@lists.linux-foundation.org, mst@redhat.com,
rusty@rustcorp.com.au, asias@redhat.com, stefanha@redhat.com,
nab@linux-iscsi.org
Subject: [PATCH v2 2/5] virtio-scsi: use functions for piecewise composition of buffers
Date: Tue, 18 Dec 2012 13:32:49 +0100 [thread overview]
Message-ID: <1355833972-20319-3-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1355833972-20319-1-git-send-email-pbonzini@redhat.com>
Using the new virtio_scsi_add_sg function lets us simplify the queueing
path. In particular, all data protected by the tgt_lock is just gone
(multiqueue will find a new use for the lock).
The speedup is relatively small (2-4%) but it is worthwhile because of
the code simplification---both in this patches and in the next ones.
Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
v1->v2: new
drivers/scsi/virtio_scsi.c | 94 +++++++++++++++++++------------------------
1 files changed, 42 insertions(+), 52 deletions(-)
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index 74ab67a..2b93b6e 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -59,11 +59,8 @@ struct virtio_scsi_vq {
/* Per-target queue state */
struct virtio_scsi_target_state {
- /* Protects sg. Lock hierarchy is tgt_lock -> vq_lock. */
+ /* Never held at the same time as vq_lock. */
spinlock_t tgt_lock;
-
- /* For sglist construction when adding commands to the virtqueue. */
- struct scatterlist sg[];
};
/* Driver instance state */
@@ -351,57 +348,58 @@ static void virtscsi_event_done(struct virtqueue *vq)
spin_unlock_irqrestore(&vscsi->event_vq.vq_lock, flags);
};
-static void virtscsi_map_sgl(struct scatterlist *sg, unsigned int *p_idx,
- struct scsi_data_buffer *sdb)
-{
- struct sg_table *table = &sdb->table;
- struct scatterlist *sg_elem;
- unsigned int idx = *p_idx;
- int i;
-
- for_each_sg(table->sgl, sg_elem, table->nents, i)
- sg[idx++] = *sg_elem;
-
- *p_idx = idx;
-}
-
/**
- * virtscsi_map_cmd - map a scsi_cmd to a virtqueue scatterlist
+ * virtscsi_add_cmd - add a virtio_scsi_cmd to a virtqueue
* @vscsi : virtio_scsi state
* @cmd : command structure
- * @out_num : number of read-only elements
- * @in_num : number of write-only elements
* @req_size : size of the request buffer
* @resp_size : size of the response buffer
- *
- * Called with tgt_lock held.
+ * @gfp : flags to use for memory allocations
*/
-static void virtscsi_map_cmd(struct virtio_scsi_target_state *tgt,
- struct virtio_scsi_cmd *cmd,
- unsigned *out_num, unsigned *in_num,
- size_t req_size, size_t resp_size)
+static int virtscsi_add_cmd(struct virtqueue *vq,
+ struct virtio_scsi_cmd *cmd,
+ size_t req_size, size_t resp_size, gfp_t gfp)
{
struct scsi_cmnd *sc = cmd->sc;
- struct scatterlist *sg = tgt->sg;
- unsigned int idx = 0;
+ struct scatterlist sg;
+ unsigned int count, count_sg;
+ struct sg_table *out, *in;
+ struct virtqueue_buf buf;
+ int ret;
+
+ out = in = NULL;
+
+ if (sc && sc->sc_data_direction != DMA_NONE) {
+ if (sc->sc_data_direction != DMA_FROM_DEVICE)
+ out = &scsi_out(sc)->table;
+ if (sc->sc_data_direction != DMA_TO_DEVICE)
+ in = &scsi_in(sc)->table;
+ }
+
+ count_sg = 2 + (out ? 1 : 0) + (in ? 1 : 0);
+ count = 2 + (out ? out->nents : 0) + (in ? in->nents : 0);
+ ret = virtqueue_start_buf(vq, &buf, cmd, count, count_sg, gfp);
+ if (ret < 0)
+ return ret;
/* Request header. */
- sg_set_buf(&sg[idx++], &cmd->req, req_size);
+ sg_init_one(&sg, &cmd->req, req_size);
+ virtqueue_add_sg(&buf, &sg, 1, DMA_TO_DEVICE);
/* Data-out buffer. */
- if (sc && sc->sc_data_direction != DMA_FROM_DEVICE)
- virtscsi_map_sgl(sg, &idx, scsi_out(sc));
-
- *out_num = idx;
+ if (out)
+ virtqueue_add_sg(&buf, out->sgl, out->nents, DMA_TO_DEVICE);
/* Response header. */
- sg_set_buf(&sg[idx++], &cmd->resp, resp_size);
+ sg_init_one(&sg, &cmd->resp, resp_size);
+ virtqueue_add_sg(&buf, &sg, 1, DMA_FROM_DEVICE);
/* Data-in buffer */
- if (sc && sc->sc_data_direction != DMA_TO_DEVICE)
- virtscsi_map_sgl(sg, &idx, scsi_in(sc));
+ if (in)
+ virtqueue_add_sg(&buf, in->sgl, in->nents, DMA_FROM_DEVICE);
- *in_num = idx - *out_num;
+ virtqueue_end_buf(&buf);
+ return 0;
}
static int virtscsi_kick_cmd(struct virtio_scsi_target_state *tgt,
@@ -409,25 +407,20 @@ static int virtscsi_kick_cmd(struct virtio_scsi_target_state *tgt,
struct virtio_scsi_cmd *cmd,
size_t req_size, size_t resp_size, gfp_t gfp)
{
- unsigned int out_num, in_num;
unsigned long flags;
- int err;
+ int ret;
bool needs_kick = false;
- spin_lock_irqsave(&tgt->tgt_lock, flags);
- virtscsi_map_cmd(tgt, cmd, &out_num, &in_num, req_size, resp_size);
-
- spin_lock(&vq->vq_lock);
- err = virtqueue_add_buf(vq->vq, tgt->sg, out_num, in_num, cmd, gfp);
- spin_unlock(&tgt->tgt_lock);
- if (!err)
+ spin_lock_irqsave(&vq->vq_lock, flags);
+ ret = virtscsi_add_cmd(vq->vq, cmd, req_size, resp_size, gfp);
+ if (!ret)
needs_kick = virtqueue_kick_prepare(vq->vq);
spin_unlock_irqrestore(&vq->vq_lock, flags);
if (needs_kick)
virtqueue_notify(vq->vq);
- return err;
+ return ret;
}
static int virtscsi_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *sc)
@@ -592,14 +585,11 @@ static struct virtio_scsi_target_state *virtscsi_alloc_tgt(
gfp_t gfp_mask = GFP_KERNEL;
/* We need extra sg elements at head and tail. */
- tgt = kmalloc(sizeof(*tgt) + sizeof(tgt->sg[0]) * (sg_elems + 2),
- gfp_mask);
-
+ tgt = kmalloc(sizeof(*tgt), gfp_mask);
if (!tgt)
return NULL;
spin_lock_init(&tgt->tgt_lock);
- sg_init_table(tgt->sg, sg_elems + 2);
return tgt;
}
--
1.7.1
next prev parent reply other threads:[~2012-12-18 12:33 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-18 12:32 [PATCH v2 0/5] Multiqueue virtio-scsi, and API for piecewise buffer submission Paolo Bonzini
2012-12-18 12:32 ` [PATCH v2 1/5] virtio: add functions for piecewise addition of buffers Paolo Bonzini
2012-12-18 13:36 ` Michael S. Tsirkin
2012-12-18 13:43 ` Paolo Bonzini
2012-12-18 13:59 ` Michael S. Tsirkin
2012-12-18 14:32 ` Paolo Bonzini
2012-12-18 15:06 ` Michael S. Tsirkin
2012-12-19 10:47 ` Stefan Hajnoczi
2012-12-19 12:04 ` Paolo Bonzini
2012-12-19 12:40 ` Stefan Hajnoczi
2012-12-19 16:51 ` Michael S. Tsirkin
2012-12-19 16:52 ` Michael S. Tsirkin
2013-01-02 5:03 ` Rusty Russell
2013-01-03 8:58 ` Wanlong Gao
2013-01-06 23:32 ` Rusty Russell
2013-01-03 9:22 ` Paolo Bonzini
2013-01-07 0:02 ` Rusty Russell
2013-01-07 14:27 ` Paolo Bonzini
2013-01-08 0:12 ` Rusty Russell
2013-01-10 8:44 ` Paolo Bonzini
2012-12-18 12:32 ` Paolo Bonzini [this message]
2012-12-18 13:37 ` [PATCH v2 2/5] virtio-scsi: use functions for piecewise composition " Michael S. Tsirkin
2012-12-18 13:35 ` Paolo Bonzini
2012-12-18 12:32 ` [PATCH v2 3/5] virtio-scsi: redo allocation of target data Paolo Bonzini
2012-12-18 12:32 ` [PATCH v2 4/5] virtio-scsi: pass struct virtio_scsi to virtqueue completion function Paolo Bonzini
2012-12-18 12:32 ` [PATCH v2 5/5] virtio-scsi: introduce multiqueue support Paolo Bonzini
2012-12-18 13:57 ` Michael S. Tsirkin
2012-12-18 14:08 ` Paolo Bonzini
2012-12-18 15:03 ` Michael S. Tsirkin
2012-12-18 15:51 ` Paolo Bonzini
2012-12-18 16:02 ` Michael S. Tsirkin
2012-12-25 12:41 ` Wanlong Gao
2012-12-19 11:27 ` Stefan Hajnoczi
2012-12-18 13:42 ` [PATCH v2 0/5] Multiqueue virtio-scsi, and API for piecewise buffer submission Michael S. Tsirkin
2012-12-24 6:44 ` Wanlong Gao
2012-12-18 22:18 ` Rolf Eike Beer
2012-12-19 8:52 ` Paolo Bonzini
2012-12-19 11:32 ` Michael S. Tsirkin
2013-01-15 9:48 ` [PATCH 1/2] virtio-scsi: split out request queue set affinity function Wanlong Gao
2013-01-15 9:50 ` [PATCH 2/2] virtio-scsi: reset virtqueue affinity when doing cpu hotplug Wanlong Gao
2013-01-16 3:31 ` Rusty Russell
2013-01-16 3:55 ` Wanlong Gao
2013-02-06 17:27 ` 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=1355833972-20319-3-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=asias@redhat.com \
--cc=gaowanlong@cn.fujitsu.com \
--cc=hutao@cn.fujitsu.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=mst@redhat.com \
--cc=nab@linux-iscsi.org \
--cc=rusty@rustcorp.com.au \
--cc=stefanha@redhat.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: link
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;
as well as URLs for NNTP newsgroup(s).