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 3/5] virtio-scsi: allocate target pointers in a separate memory block
Date: Tue, 28 Aug 2012 13:54:15 +0200 [thread overview]
Message-ID: <1346154857-12487-4-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1346154857-12487-1-git-send-email-pbonzini@redhat.com>
We will place the request virtqueues in the flexible array member.
Refining the virtqueue API would let us drop the sglist copy, at
which point the pointer-to-array-of-pointers can become a simple
pointer-to-array. It would both simplify the allocation and remove a
dereference in several hot paths.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
drivers/scsi/virtio_scsi.c | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index 595af1a..62fec04 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -77,7 +77,7 @@ struct virtio_scsi {
/* Get some buffers ready for event vq */
struct virtio_scsi_event_node event_list[VIRTIO_SCSI_EVENT_LEN];
- struct virtio_scsi_target_state *tgt[];
+ struct virtio_scsi_target_state **tgt;
};
static struct kmem_cache *virtscsi_cmd_cache;
@@ -615,10 +615,13 @@ static void virtscsi_remove_vqs(struct virtio_device *vdev)
/* Stop all the virtqueues. */
vdev->config->reset(vdev);
- num_targets = sh->max_id;
- for (i = 0; i < num_targets; i++) {
- kfree(vscsi->tgt[i]);
- vscsi->tgt[i] = NULL;
+ if (vscsi->tgt) {
+ num_targets = sh->max_id;
+ for (i = 0; i < num_targets; i++) {
+ kfree(vscsi->tgt[i]);
+ vscsi->tgt[i] = NULL;
+ }
+ kfree(vscsi->tgt);
}
vdev->config->del_vqs(vdev);
@@ -660,6 +663,12 @@ static int virtscsi_init(struct virtio_device *vdev,
/* We need to know how many segments before we allocate. */
sg_elems = virtscsi_config_get(vdev, seg_max) ?: 1;
+ vscsi->tgt = kmalloc(num_targets *
+ sizeof(struct virtio_scsi_target_state *), GFP_KERNEL);
+ if (!vscsi->tgt) {
+ err = -ENOMEM;
+ goto out;
+ }
for (i = 0; i < num_targets; i++) {
vscsi->tgt[i] = virtscsi_alloc_tgt(vdev, sg_elems);
if (!vscsi->tgt[i]) {
@@ -685,9 +694,7 @@ static int __devinit virtscsi_probe(struct virtio_device *vdev)
/* Allocate memory and link the structs together. */
num_targets = virtscsi_config_get(vdev, max_target) + 1;
- shost = scsi_host_alloc(&virtscsi_host_template,
- sizeof(*vscsi)
- + num_targets * sizeof(struct virtio_scsi_target_state));
+ shost = scsi_host_alloc(&virtscsi_host_template, sizeof(*vscsi));
if (!shost)
return -ENOMEM;
--
1.7.1
next prev parent reply other threads:[~2012-08-28 11:55 UTC|newest]
Thread overview: 34+ 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 ` [PATCH 1/5] virtio-ring: move queue_index to vring_virtqueue Paolo Bonzini
2012-08-29 7:54 ` Jason Wang
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-09-05 23:32 ` Rusty Russell
2012-08-28 11:54 ` Paolo Bonzini [this message]
2012-08-28 14:07 ` [PATCH 3/5] virtio-scsi: allocate target pointers in a separate memory block Sasha Levin
2012-08-28 14:25 ` Paolo Bonzini
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-09-04 2:21 ` Nicholas A. Bellinger
2012-09-04 6:46 ` Paolo Bonzini
2012-09-04 8:46 ` Michael S. Tsirkin
2012-09-04 10:25 ` Paolo Bonzini
2012-09-04 11:09 ` Michael S. Tsirkin
2012-09-04 11:18 ` Paolo Bonzini
2012-09-04 13:35 ` Michael S. Tsirkin
2012-09-04 13:45 ` Paolo Bonzini
2012-09-04 14:19 ` Michael S. Tsirkin
2012-09-04 14:25 ` Paolo Bonzini
2012-09-04 20:11 ` Nicholas A. Bellinger
2012-09-05 7:03 ` Paolo Bonzini
2012-09-04 12:48 ` Michael S. Tsirkin
2012-09-04 13:49 ` Paolo Bonzini
2012-09-04 14:21 ` Michael S. Tsirkin
2012-09-04 14:30 ` Paolo Bonzini
2012-09-04 14:41 ` Michael S. Tsirkin
2012-09-04 14:47 ` Michael S. Tsirkin
2012-09-04 14:55 ` Paolo Bonzini
2012-09-04 15:03 ` Michael S. Tsirkin
2012-08-30 7:13 ` [PATCH 0/5] Multiqueue virtio-scsi Stefan Hajnoczi
2012-08-30 14:53 ` Michael S. Tsirkin
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-4-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: 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).