scsi: target: Convert target drivers to use sbitmap
The sbitmap and the percpu_ida perform essentially the same task, allocating tags for commands. The sbitmap outperforms the percpu_ida as documented here: https://lkml.org/lkml/2014/4/22/553 The sbitmap interface is a little harder to use, but being able to remove the percpu_ida code and getting better performance justifies the additional complexity. Signed-off-by: Matthew Wilcox <willy@infradead.org> Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com> # f_tcm Reviewed-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
committed by
Martin K. Petersen
parent
83c2b54b92
commit
10e9cbb6b5
@@ -46,7 +46,6 @@
|
||||
#include <linux/virtio_scsi.h>
|
||||
#include <linux/llist.h>
|
||||
#include <linux/bitmap.h>
|
||||
#include <linux/percpu_ida.h>
|
||||
|
||||
#include "vhost.h"
|
||||
|
||||
@@ -567,7 +566,7 @@ vhost_scsi_get_tag(struct vhost_virtqueue *vq, struct vhost_scsi_tpg *tpg,
|
||||
struct se_session *se_sess;
|
||||
struct scatterlist *sg, *prot_sg;
|
||||
struct page **pages;
|
||||
int tag;
|
||||
int tag, cpu;
|
||||
|
||||
tv_nexus = tpg->tpg_nexus;
|
||||
if (!tv_nexus) {
|
||||
@@ -576,7 +575,7 @@ vhost_scsi_get_tag(struct vhost_virtqueue *vq, struct vhost_scsi_tpg *tpg,
|
||||
}
|
||||
se_sess = tv_nexus->tvn_se_sess;
|
||||
|
||||
tag = percpu_ida_alloc(&se_sess->sess_tag_pool, TASK_RUNNING);
|
||||
tag = sbitmap_queue_get(&se_sess->sess_tag_pool, &cpu);
|
||||
if (tag < 0) {
|
||||
pr_err("Unable to obtain tag for vhost_scsi_cmd\n");
|
||||
return ERR_PTR(-ENOMEM);
|
||||
@@ -591,6 +590,7 @@ vhost_scsi_get_tag(struct vhost_virtqueue *vq, struct vhost_scsi_tpg *tpg,
|
||||
cmd->tvc_prot_sgl = prot_sg;
|
||||
cmd->tvc_upages = pages;
|
||||
cmd->tvc_se_cmd.map_tag = tag;
|
||||
cmd->tvc_se_cmd.map_cpu = cpu;
|
||||
cmd->tvc_tag = scsi_tag;
|
||||
cmd->tvc_lun = lun;
|
||||
cmd->tvc_task_attr = task_attr;
|
||||
|
||||
Reference in New Issue
Block a user