mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-19 05:36:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

qla2x00t-32gbit, target: Port to kernel-v5.1-rc2

Browse Source 
Switch from percpu_ida to sbitmap since percpu_ida has been removed.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8100 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-03-29 01:38:40 +00:00
parent 34bbbf47d8
commit 2b876f7093
2 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c
+31 -1
View File
@@ -439,7 +439,14 @@ static void sqa_qla2xxx_rel_cmd(struct qla_tgt_cmd *cmd)
struct fc_port *sess = cmd->sess;
struct sqa_scst_tgt *sqa_tgt = sess->vha->vha_tgt.target_lport_ptr;
#if QLT_USE_PERCPU_IDA
percpu_ida_free(&sqa_tgt->tgt_tag_pool, cmd->se_cmd.map_tag);
#elif QLT_USE_SBITMAP
sbitmap_queue_clear(&sqa_tgt->tgt_tag_pool, cmd->se_cmd.map_tag,
cmd->se_cmd.map_cpu);
#else
#error Neither percpu_ida nor sbitmap are available.
#endif
}
static struct qla_tgt_cmd *sqa_qla2xxx_get_cmd(struct fc_port *sess)
@@ -449,13 +456,24 @@ static struct qla_tgt_cmd *sqa_qla2xxx_get_cmd(struct fc_port *sess)
struct qla_tgt_cmd *cmd;
int tag;
#if QLT_USE_PERCPU_IDA
tag = percpu_ida_alloc(&sqa_tgt->tgt_tag_pool, TASK_RUNNING);
#elif QLT_USE_SBITMAP
int cpu;
tag = sbitmap_queue_get(&sqa_tgt->tgt_tag_pool, &cpu);
#else
#error Neither percpu_ida nor sbitmap are available.
#endif
if (tag < 0)
return NULL;
cmd = &((struct qla_tgt_cmd *)sqa_tgt->tgt_cmd_map)[tag];
memset(cmd, 0, sizeof(struct qla_tgt_cmd));
cmd->se_cmd.map_tag = tag;
#if QLT_USE_SBITMAP
cmd->se_cmd.map_cpu = cpu;
#endif
cmd->sess = sess;
cmd->vha = sess->vha;
cmd->rel_cmd = sqa_qla2xxx_rel_cmd;
@@ -906,7 +924,6 @@ static struct se_session *sqa_alloc_sesess(scsi_qla_host_t *vha)
INIT_LIST_HEAD(&se_sess->sess_list);
INIT_LIST_HEAD(&se_sess->sess_acl_list);
INIT_LIST_HEAD(&se_sess->sess_cmd_list);
INIT_LIST_HEAD(&se_sess->sess_wait_list);
spin_lock_init(&se_sess->sess_cmd_lock);
return se_sess;
@@ -914,7 +931,13 @@ static struct se_session *sqa_alloc_sesess(scsi_qla_host_t *vha)
static void sqa_free_sesess(struct se_session *se_sess)
{
#if QLT_USE_PERCPU_IDA
percpu_ida_destroy(&se_sess->sess_tag_pool);
#elif QLT_USE_SBITMAP
sbitmap_queue_free(&se_sess->sess_tag_pool);
#else
#error Neither percpu_ida nor sbitmap are available.
#endif
kfree(se_sess);
}
@@ -1440,7 +1463,14 @@ static int sqa_init_scst_tgt(struct scsi_qla_host *vha)
goto done;
}
#if QLT_USE_PERCPU_IDA
res = percpu_ida_init(&sqa_tgt->tgt_tag_pool, tag_num);
#elif QLT_USE_SBITMAP
res = sbitmap_queue_init_node(&sqa_tgt->tgt_tag_pool, tag_num, -1,
false, GFP_KERNEL, NUMA_NO_NODE);
#else
#error Neither percpu_ida nor sbitmap are available.
#endif
if (res < 0) {
pr_err("Unable to init se_sess->sess_tag_pool,"
" tag_num: %u\n", tag_num);
qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.h
+24 -1
View File
@@ -1,3 +1,20 @@
#include <linux/version.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && \
!(defined(RHEL_MAJOR) && RHEL_MAJOR -0 >= 7)
#define QLT_USE_PERCPU_IDA 0
#define QLT_USE_SBITMAP 0
#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
#define QLT_USE_PERCPU_IDA 1
#define QLT_USE_SBITMAP 0
/* See also commit 798ab48eecdf ("idr: Percpu ida") # v3.12 */
#include <linux/percpu_ida.h>
#else
#define QLT_USE_PERCPU_IDA 0
#define QLT_USE_SBITMAP 1
/* See also commit 693ba15c9202 ("scsi: Remove percpu_ida") # v4.19. */
#include <linux/sbitmap.h>
#endif
#define SQA_DEFAULT_TAGS 2048
extern size_t qlt_add_vtarget(u64, u64, u64);
@@ -8,5 +25,11 @@ struct sqa_scst_tgt{
struct scst_tgt *scst_tgt;
struct qla_tgt *qla_tgt;
void *tgt_cmd_map;
struct percpu_ida tgt_tag_pool;
#if QLT_USE_PERCPU_IDA
struct percpu_ida tgt_tag_pool;
#elif QLT_USE_SBITMAP
struct sbitmap_queue tgt_tag_pool;
#else
#error Neither percpu_ida nor sbitmap are available.
#endif
};