Skip to content

L
linux
Commit a1d8b49a authored by Andy Grover's avatar Andy Grover Committed by Nicholas Bellinger
Browse files
Options

target: Updates from AGrover and HCH (round 3) 

This patch contains a squashed version of third round series cleanups,
improvements ,and simplfications from Andy and Christoph ahead of the
heavy lifting between round 3 -> 4 for the target core SGL conversion.

This include cleanups to the main target I/O path and other miscellaneous
updates.

target: Replace custom sg<->buf functions with lib funcs
target: Simplify sector limiting code
target: get_cdb should never return NULL
target: Simplify transport_memcpy_se_mem_read_contig
target: Use assignment rather than increment for t_task_cdbs
target: Don't pass dma_size to generic_get_mem
target: Pass sg with type scatterlist in transport_map_sg_to_mem
target: Move task_sg_num next to task_sg in struct se_task
target: inline struct se_transport_task into struct se_cmd
target: Change name & semantics of transport_get_sectors()
target: Remove unused members of se_cmd
target: Rename se_cmd.t_task_cdbs to t_task_list_num
target: Fix some spelling
target: Remove unused var from transport_generic_do_tmr
target: map_sg_to_mem: return sg_count in return value
target/pscsi: Use min_t for sector limits
target/pscsi: Unused param for pscsi_get_bio()
target: Rename get_cdb_count to allocate_tasks
target: Make transport_generic_new_cmd() available for iscsi-target
target: Remove fabric callback to allocate iovecs
target: Fix transport_generic_new_cmd WRITE comment

(hch: Use __GFP_ZERO usage for alloc_pages() usage)
Signed-off-by: default avatarAndy Grover <agrover@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent dd3a5ad8
Hide whitespace changes
Inline Side-by-side
Showing with 583 additions and 753 deletions
drivers/target/loopback/tcm_loop.c
View file @ a1d8b49a
......@@ -118,7 +118,7 @@ static struct se_cmd *tcm_loop_allocate_core_cmd(
* Signal BIDI usage with T_TASK(cmd)->t_tasks_bidi
*/
if (scsi_bidi_cmnd(sc))
se_cmd->t_task.t_tasks_bidi = 1;
se_cmd->t_tasks_bidi = 1;
/*
* Locate the struct se_lun pointer and attach it to struct se_cmd
*/
......@@ -169,7 +169,7 @@ static int tcm_loop_new_cmd_map(struct se_cmd *se_cmd)
* For BIDI commands, pass in the extra READ buffer
* to transport_generic_map_mem_to_cmd() below..
*/
if (se_cmd->t_task.t_tasks_bidi) {
if (se_cmd->t_tasks_bidi) {
struct scsi_data_buffer *sdb = scsi_in(sc);
sgl_bidi = sdb->table.sgl;
......@@ -1423,13 +1423,6 @@ static int tcm_loop_register_configfs(void)
fabric->tf_ops.tpg_release_fabric_acl =
&tcm_loop_tpg_release_fabric_acl;
fabric->tf_ops.tpg_get_inst_index = &tcm_loop_get_inst_index;
/*
* Since tcm_loop is mapping physical memory from Linux/SCSI
* struct scatterlist arrays for each struct scsi_cmnd I/O,
* we do not need TCM to allocate a iovec array for
* virtual memory address mappings
*/
fabric->tf_ops.alloc_cmd_iovecs = NULL;
/*
* Used for setting up remaining TCM resources in process context
*/
......
drivers/target/target_core_alua.c
View file @ a1d8b49a
......@@ -65,7 +65,7 @@ int core_emulate_report_target_port_groups(struct se_cmd *cmd)
struct se_port *port;
struct t10_alua_tg_pt_gp *tg_pt_gp;
struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem;
unsigned char *buf = (unsigned char *)cmd->t_task.t_task_buf;
unsigned char *buf = (unsigned char *)cmd->t_task_buf;
u32 rd_len = 0, off = 4; /* Skip over RESERVED area to first
Target port group descriptor */
......@@ -157,7 +157,7 @@ int core_emulate_set_target_port_groups(struct se_cmd *cmd)
struct se_node_acl *nacl = cmd->se_sess->se_node_acl;
struct t10_alua_tg_pt_gp *tg_pt_gp = NULL, *l_tg_pt_gp;
struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem, *l_tg_pt_gp_mem;
unsigned char *buf = (unsigned char *)cmd->t_task.t_task_buf;
unsigned char *buf = (unsigned char *)cmd->t_task_buf;
unsigned char *ptr = &buf[4]; /* Skip over RESERVED area in header */
u32 len = 4; /* Skip over RESERVED area in header */
int alua_access_state, primary = 0, rc;
......
drivers/target/target_core_cdb.c
View file @ a1d8b49a
......@@ -66,7 +66,7 @@ target_emulate_inquiry_std(struct se_cmd *cmd)
{
struct se_lun *lun = cmd->se_lun;
struct se_device *dev = cmd->se_dev;
unsigned char *buf = cmd->t_task.t_task_buf;
unsigned char *buf = cmd->t_task_buf;
/*
* Make sure we at least have 6 bytes of INQUIRY response
......@@ -621,8 +621,8 @@ static int
target_emulate_inquiry(struct se_cmd *cmd)
{
struct se_device *dev = cmd->se_dev;
unsigned char *buf = cmd->t_task.t_task_buf;
unsigned char *cdb = cmd->t_task.t_task_cdb;
unsigned char *buf = cmd->t_task_buf;
unsigned char *cdb = cmd->t_task_cdb;
if (!(cdb[1] & 0x1))
return target_emulate_inquiry_std(cmd);
......@@ -666,7 +666,7 @@ static int
target_emulate_readcapacity(struct se_cmd *cmd)
{
struct se_device *dev = cmd->se_dev;
unsigned char *buf = cmd->t_task.t_task_buf;
unsigned char *buf = cmd->t_task_buf;
unsigned long long blocks_long = dev->transport->get_blocks(dev);
u32 blocks;
......@@ -696,7 +696,7 @@ static int
target_emulate_readcapacity_16(struct se_cmd *cmd)
{
struct se_device *dev = cmd->se_dev;
unsigned char *buf = cmd->t_task.t_task_buf;
unsigned char *buf = cmd->t_task_buf;
unsigned long long blocks = dev->transport->get_blocks(dev);
buf[0] = (blocks >> 56) & 0xff;
......@@ -831,8 +831,8 @@ static int
target_emulate_modesense(struct se_cmd *cmd, int ten)
{
struct se_device *dev = cmd->se_dev;
char *cdb = cmd->t_task.t_task_cdb;
unsigned char *rbuf = cmd->t_task.t_task_buf;
char *cdb = cmd->t_task_cdb;
unsigned char *rbuf = cmd->t_task_buf;
int type = dev->transport->get_device_type(dev);
int offset = (ten) ? 8 : 4;
int length = 0;
......@@ -903,8 +903,8 @@ target_emulate_modesense(struct se_cmd *cmd, int ten)
static int
target_emulate_request_sense(struct se_cmd *cmd)
{
unsigned char *cdb = cmd->t_task.t_task_cdb;
unsigned char *buf = cmd->t_task.t_task_buf;
unsigned char *cdb = cmd->t_task_cdb;
unsigned char *buf = cmd->t_task_buf;
u8 ua_asc = 0, ua_ascq = 0;
if (cdb[1] & 0x01) {
......@@ -965,8 +965,8 @@ target_emulate_unmap(struct se_task *task)
{
struct se_cmd *cmd = task->task_se_cmd;
struct se_device *dev = cmd->se_dev;
unsigned char *buf = cmd->t_task.t_task_buf, *ptr = NULL;
unsigned char *cdb = &cmd->t_task.t_task_cdb[0];
unsigned char *buf = cmd->t_task_buf, *ptr = NULL;
unsigned char *cdb = &cmd->t_task_cdb[0];
sector_t lba;
unsigned int size = cmd->data_length, range;
int ret, offset;
......@@ -1012,7 +1012,8 @@ target_emulate_write_same(struct se_task *task, int write_same32)
{
struct se_cmd *cmd = task->task_se_cmd;
struct se_device *dev = cmd->se_dev;
sector_t range, lba = cmd->t_task.t_task_lba;
sector_t range;
sector_t lba = cmd->t_task_lba;
unsigned int num_blocks;
int ret;
/*
......@@ -1021,9 +1022,9 @@ target_emulate_write_same(struct se_task *task, int write_same32)
* range based on ->get_blocks() - starting LBA.
*/
if (write_same32)
num_blocks = get_unaligned_be32(&cmd->t_task.t_task_cdb[28]);
num_blocks = get_unaligned_be32(&cmd->t_task_cdb[28]);
else
num_blocks = get_unaligned_be32(&cmd->t_task.t_task_cdb[10]);
num_blocks = get_unaligned_be32(&cmd->t_task_cdb[10]);
if (num_blocks != 0)
range = num_blocks;
......@@ -1052,7 +1053,7 @@ transport_emulate_control_cdb(struct se_task *task)
unsigned short service_action;
int ret = 0;
switch (cmd->t_task.t_task_cdb[0]) {
switch (cmd->t_task_cdb[0]) {
case INQUIRY:
ret = target_emulate_inquiry(cmd);
break;
......@@ -1066,13 +1067,13 @@ transport_emulate_control_cdb(struct se_task *task)
ret = target_emulate_modesense(cmd, 1);
break;
case SERVICE_ACTION_IN:
switch (cmd->t_task.t_task_cdb[1] & 0x1f) {
switch (cmd->t_task_cdb[1] & 0x1f) {
case SAI_READ_CAPACITY_16:
ret = target_emulate_readcapacity_16(cmd);
break;
default:
printk(KERN_ERR "Unsupported SA: 0x%02x\n",
cmd->t_task.t_task_cdb[1] & 0x1f);
cmd->t_task_cdb[1] & 0x1f);
return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
}
break;
......@@ -1097,7 +1098,7 @@ transport_emulate_control_cdb(struct se_task *task)
break;
case VARIABLE_LENGTH_CMD:
service_action =
get_unaligned_be16(&cmd->t_task.t_task_cdb[8]);
get_unaligned_be16(&cmd->t_task_cdb[8]);
switch (service_action) {
case WRITE_SAME_32:
if (!dev->transport->do_discard) {
......@@ -1136,7 +1137,7 @@ transport_emulate_control_cdb(struct se_task *task)
break;
default:
printk(KERN_ERR "Unsupported SCSI Opcode: 0x%02x for %s\n",
cmd->t_task.t_task_cdb[0], dev->transport->name);
cmd->t_task_cdb[0], dev->transport->name);
return PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
}
......
drivers/target/target_core_device.c
View file @ a1d8b49a
......@@ -168,7 +168,7 @@ int transport_lookup_cmd_lun(struct se_cmd *se_cmd, u32 unpacked_lun)
*/
spin_lock_irqsave(&se_lun->lun_cmd_lock, flags);
list_add_tail(&se_cmd->se_lun_node, &se_lun->lun_cmd_list);
atomic_set(&se_cmd->t_task.transport_lun_active, 1);
atomic_set(&se_cmd->transport_lun_active, 1);
spin_unlock_irqrestore(&se_lun->lun_cmd_lock, flags);
return 0;
......@@ -656,10 +656,10 @@ int transport_core_report_lun_response(struct se_cmd *se_cmd)
struct se_lun *se_lun;
struct se_session *se_sess = se_cmd->se_sess;
struct se_task *se_task;
unsigned char *buf = se_cmd->t_task.t_task_buf;
unsigned char *buf = se_cmd->t_task_buf;
u32 cdb_offset = 0, lun_count = 0, offset = 8, i;
list_for_each_entry(se_task, &se_cmd->t_task.t_task_list, t_list)
list_for_each_entry(se_task, &se_cmd->t_task_list, t_list)
break;
if (!(se_task)) {
......
drivers/target/target_core_file.c
View file @ a1d8b49a
......@@ -377,7 +377,7 @@ static void fd_emulate_sync_cache(struct se_task *task)
struct se_cmd *cmd = task->task_se_cmd;
struct se_device *dev = cmd->se_dev;
struct fd_dev *fd_dev = dev->dev_ptr;
int immed = (cmd->t_task.t_task_cdb[1] & 0x2);
int immed = (cmd->t_task_cdb[1] & 0x2);
loff_t start, end;
int ret;
......@@ -391,11 +391,11 @@ static void fd_emulate_sync_cache(struct se_task *task)
/*
* Determine if we will be flushing the entire device.
*/
if (cmd->t_task.t_task_lba == 0 && cmd->data_length == 0) {
if (cmd->t_task_lba == 0 && cmd->data_length == 0) {
start = 0;
end = LLONG_MAX;
} else {
start = cmd->t_task.t_task_lba * dev->se_sub_dev->se_dev_attrib.block_size;
start = cmd->t_task_lba * dev->se_sub_dev->se_dev_attrib.block_size;
if (cmd->data_length)
end = start + cmd->data_length;
else
......@@ -475,7 +475,7 @@ static int fd_do_task(struct se_task *task)
if (ret > 0 &&
dev->se_sub_dev->se_dev_attrib.emulate_write_cache > 0 &&
dev->se_sub_dev->se_dev_attrib.emulate_fua_write > 0 &&
cmd->t_task.t_tasks_fua) {
cmd->t_tasks_fua) {
/*
* We might need to be a bit smarter here
* and return some sense data to let the initiator
......
drivers/target/target_core_iblock.c
View file @ a1d8b49a
......@@ -331,7 +331,7 @@ static void iblock_emulate_sync_cache(struct se_task *task)
{
struct se_cmd *cmd = task->task_se_cmd;
struct iblock_dev *ib_dev = cmd->se_dev->dev_ptr;
int immed = (cmd->t_task.t_task_cdb[1] & 0x2);
int immed = (cmd->t_task_cdb[1] & 0x2);
sector_t error_sector;
int ret;
......@@ -400,7 +400,7 @@ static int iblock_do_task(struct se_task *task)
*/
if (dev->se_sub_dev->se_dev_attrib.emulate_write_cache == 0 ||
(dev->se_sub_dev->se_dev_attrib.emulate_fua_write > 0 &&
task->task_se_cmd->t_task.t_tasks_fua))
task->task_se_cmd->t_tasks_fua))
rw = WRITE_FUA;
else
rw = WRITE;
......
drivers/target/target_core_pr.c
View file @ a1d8b49a
......@@ -157,8 +157,8 @@ static int core_scsi2_reservation_reserve(struct se_cmd *cmd)
struct se_session *sess = cmd->se_sess;
struct se_portal_group *tpg = sess->se_tpg;
if ((cmd->t_task.t_task_cdb[1] & 0x01) &&
(cmd->t_task.t_task_cdb[1] & 0x02)) {
if ((cmd->t_task_cdb[1] & 0x01) &&
(cmd->t_task_cdb[1] & 0x02)) {
printk(KERN_ERR "LongIO and Obselete Bits set, returning"
" ILLEGAL_REQUEST\n");
return PYX_TRANSPORT_ILLEGAL_REQUEST;
......@@ -216,7 +216,7 @@ int core_scsi2_emulate_crh(struct se_cmd *cmd)
struct se_subsystem_dev *su_dev = cmd->se_dev->se_sub_dev;
struct t10_pr_registration *pr_reg;
struct t10_reservation *pr_tmpl = &su_dev->t10_pr;
unsigned char *cdb = &cmd->t_task.t_task_cdb[0];
unsigned char *cdb = &cmd->t_task_cdb[0];
int crh = (su_dev->t10_pr.res_type == SPC3_PERSISTENT_RESERVATIONS);
int conflict = 0;
......@@ -1482,7 +1482,7 @@ static int core_scsi3_decode_spec_i_port(
struct list_head tid_dest_list;
struct pr_transport_id_holder *tidh_new, *tidh, *tidh_tmp;
struct target_core_fabric_ops *tmp_tf_ops;
unsigned char *buf = (unsigned char *)cmd->t_task.t_task_buf;
unsigned char *buf = (unsigned char *)cmd->t_task_buf;
unsigned char *ptr, *i_str = NULL, proto_ident, tmp_proto_ident;
char *iport_ptr = NULL, dest_iport[64], i_buf[PR_REG_ISID_ID_LEN];
u32 tpdl, tid_len = 0;
......@@ -3307,7 +3307,7 @@ static int core_scsi3_emulate_pro_register_and_move(
struct target_core_fabric_ops *dest_tf_ops = NULL, *tf_ops;
struct t10_pr_registration *pr_reg, *pr_res_holder, *dest_pr_reg;
struct t10_reservation *pr_tmpl = &dev->se_sub_dev->t10_pr;
unsigned char *buf = (unsigned char *)cmd->t_task.t_task_buf;
unsigned char *buf = (unsigned char *)cmd->t_task_buf;
unsigned char *initiator_str;
char *iport_ptr = NULL, dest_iport[64], i_buf[PR_REG_ISID_ID_LEN];
u32 tid_len, tmp_tid_len;
......@@ -3723,7 +3723,7 @@ static unsigned long long core_scsi3_extract_reservation_key(unsigned char *cdb)
*/
static int core_scsi3_emulate_pr_out(struct se_cmd *cmd, unsigned char *cdb)
{
unsigned char *buf = (unsigned char *)cmd->t_task.t_task_buf;
unsigned char *buf = (unsigned char *)cmd->t_task_buf;
u64 res_key, sa_res_key;
int sa, scope, type, aptpl;
int spec_i_pt = 0, all_tg_pt = 0, unreg = 0;
......@@ -3830,7 +3830,7 @@ static int core_scsi3_pri_read_keys(struct se_cmd *cmd)
struct se_device *se_dev = cmd->se_dev;
struct se_subsystem_dev *su_dev = se_dev->se_sub_dev;
struct t10_pr_registration *pr_reg;
unsigned char *buf = (unsigned char *)cmd->t_task.t_task_buf;
unsigned char *buf = (unsigned char *)cmd->t_task_buf;
u32 add_len = 0, off = 8;
if (cmd->data_length < 8) {
......@@ -3885,7 +3885,7 @@ static int core_scsi3_pri_read_reservation(struct se_cmd *cmd)
struct se_device *se_dev = cmd->se_dev;
struct se_subsystem_dev *su_dev = se_dev->se_sub_dev;
struct t10_pr_registration *pr_reg;
unsigned char *buf = (unsigned char *)cmd->t_task.t_task_buf;
unsigned char *buf = (unsigned char *)cmd->t_task_buf;
u64 pr_res_key;
u32 add_len = 16; /* Hardcoded to 16 when a reservation is held. */
......@@ -3965,7 +3965,7 @@ static int core_scsi3_pri_report_capabilities(struct se_cmd *cmd)
{
struct se_device *dev = cmd->se_dev;
struct t10_reservation *pr_tmpl = &dev->se_sub_dev->t10_pr;
unsigned char *buf = (unsigned char *)cmd->t_task.t_task_buf;
unsigned char *buf = (unsigned char *)cmd->t_task_buf;
u16 add_len = 8; /* Hardcoded to 8. */
if (cmd->data_length < 6) {
......@@ -4020,7 +4020,7 @@ static int core_scsi3_pri_read_full_status(struct se_cmd *cmd)
struct se_portal_group *se_tpg;
struct t10_pr_registration *pr_reg, *pr_reg_tmp;
struct t10_reservation *pr_tmpl = &se_dev->se_sub_dev->t10_pr;
unsigned char *buf = (unsigned char *)cmd->t_task.t_task_buf;
unsigned char *buf = (unsigned char *)cmd->t_task_buf;
u32 add_desc_len = 0, add_len = 0, desc_len, exp_desc_len;
u32 off = 8; /* off into first Full Status descriptor */
int format_code = 0;
......@@ -4174,7 +4174,7 @@ static int core_scsi3_emulate_pr_in(struct se_cmd *cmd, unsigned char *cdb)
int core_scsi3_emulate_pr(struct se_cmd *cmd)
{
unsigned char *cdb = &cmd->t_task.t_task_cdb[0];
unsigned char *cdb = &cmd->t_task_cdb[0];
struct se_device *dev = cmd->se_dev;
/*
* Following spc2r20 5.5.1 Reservations overview:
......
drivers/target/target_core_pscsi.c
View file @ a1d8b49a
......@@ -328,10 +328,8 @@ static struct se_device *pscsi_add_device_to_list(
q = sd->request_queue;
limits = &dev_limits.limits;
limits->logical_block_size = sd->sector_size;
limits->max_hw_sectors = (sd->host->max_sectors > queue_max_hw_sectors(q)) ?
queue_max_hw_sectors(q) : sd->host->max_sectors;
limits->max_sectors = (sd->host->max_sectors > queue_max_sectors(q)) ?
queue_max_sectors(q) : sd->host->max_sectors;
limits->max_hw_sectors = min_t(int, sd->host->max_sectors, queue_max_hw_sectors(q));
limits->max_sectors = min_t(int, sd->host->max_sectors, queue_max_sectors(q));
dev_limits.hw_queue_depth = sd->queue_depth;
dev_limits.queue_depth = sd->queue_depth;
/*
......@@ -697,7 +695,7 @@ static int pscsi_transport_complete(struct se_task *task)
if (task->task_se_cmd->se_deve->lun_flags &
TRANSPORT_LUNFLAGS_READ_ONLY) {
unsigned char *buf = task->task_se_cmd->t_task.t_task_buf;
unsigned char *buf = task->task_se_cmd->t_task_buf;
if (cdb[0] == MODE_SENSE_10) {
if (!(buf[3] & 0x80))
......@@ -763,7 +761,7 @@ static struct se_task *
pscsi_alloc_task(struct se_cmd *cmd)
{
struct pscsi_plugin_task *pt;
unsigned char *cdb = cmd->t_task.t_task_cdb;
unsigned char *cdb = cmd->t_task_cdb;
pt = kzalloc(sizeof(struct pscsi_plugin_task), GFP_KERNEL);
if (!pt) {
......@@ -776,7 +774,7 @@ pscsi_alloc_task(struct se_cmd *cmd)
* allocate the extended CDB buffer for per struct se_task context
* pt->pscsi_cdb now.
*/
if (cmd->t_task.t_task_cdb != cmd->t_task.__t_task_cdb) {
if (cmd->t_task_cdb != cmd->__t_task_cdb) {
pt->pscsi_cdb = kzalloc(scsi_command_size(cdb), GFP_KERNEL);
if (!(pt->pscsi_cdb)) {
......@@ -889,7 +887,7 @@ static void pscsi_free_task(struct se_task *task)
* Release the extended CDB allocation from pscsi_alloc_task()
* if one exists.
*/
if (cmd->t_task.t_task_cdb != cmd->t_task.__t_task_cdb)
if (cmd->t_task_cdb != cmd->__t_task_cdb)
kfree(pt->pscsi_cdb);
/*
* We do not release the bio(s) here associated with this task, as
......@@ -1053,7 +1051,7 @@ static void pscsi_bi_endio(struct bio *bio, int error)
bio_put(bio);
}
static inline struct bio *pscsi_get_bio(struct pscsi_dev_virt *pdv, int sg_num)
static inline struct bio *pscsi_get_bio(int sg_num)
{
struct bio *bio;
/*
......@@ -1126,7 +1124,7 @@ static int __pscsi_map_task_SG(
/*
* Calls bio_kmalloc() and sets bio->bi_end_io()
*/
bio = pscsi_get_bio(pdv, nr_vecs);
bio = pscsi_get_bio(nr_vecs);
if (!(bio))
goto fail;
......@@ -1266,7 +1264,7 @@ static int pscsi_map_task_non_SG(struct se_task *task)
return 0;
ret = blk_rq_map_kern(pdv->pdv_sd->request_queue,
pt->pscsi_req, cmd->t_task.t_task_buf,
pt->pscsi_req, cmd->t_task_buf,
task->task_size, GFP_KERNEL);
if (ret < 0) {
printk(KERN_ERR "PSCSI: blk_rq_map_kern() failed: %d\n", ret);
......
drivers/target/target_core_rd.c
View file @ a1d8b49a
......@@ -737,7 +737,7 @@ static int rd_DIRECT_with_offset(
}
out:
task->task_se_cmd->t_task.t_tasks_se_num += *se_mem_cnt;
task->task_se_cmd->t_tasks_se_num += *se_mem_cnt;
#ifdef DEBUG_RAMDISK_DR
printk(KERN_INFO "RD_DR - Allocated %u struct se_mem segments for task\n",
*se_mem_cnt);
......@@ -819,7 +819,7 @@ static int rd_DIRECT_without_offset(
}
out:
task->task_se_cmd->t_task.t_tasks_se_num += *se_mem_cnt;
task->task_se_cmd->t_tasks_se_num += *se_mem_cnt;
#ifdef DEBUG_RAMDISK_DR
printk(KERN_INFO "RD_DR - Allocated %u struct se_mem segments for task\n",
*se_mem_cnt);
......@@ -880,14 +880,14 @@ static int rd_DIRECT_do_se_mem_map(
* across multiple struct se_task->task_sg[].
*/
ret = transport_init_task_sg(task,
list_first_entry(&cmd->t_task.t_mem_list,
list_first_entry(&cmd->t_mem_list,
struct se_mem, se_list),
task_offset);
if (ret <= 0)
return ret;
return transport_map_mem_to_sg(task, se_mem_list, task->task_sg,
list_first_entry(&cmd->t_task.t_mem_list,
list_first_entry(&cmd->t_mem_list,
struct se_mem, se_list),
out_se_mem, se_mem_cnt, task_offset_in);
}
......
drivers/target/target_core_tmr.c
View file @ a1d8b49a
......@@ -178,14 +178,14 @@ int core_tmr_lun_reset(
continue;
spin_unlock(&dev->se_tmr_lock);
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
if (!(atomic_read(&cmd->t_task.t_transport_active))) {
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
if (!(atomic_read(&cmd->t_transport_active))) {
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
spin_lock(&dev->se_tmr_lock);
continue;
}
if (cmd->t_state == TRANSPORT_ISTATE_PROCESSING) {
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
spin_lock(&dev->se_tmr_lock);
continue;
}
......@@ -193,7 +193,7 @@ int core_tmr_lun_reset(
" Response: 0x%02x, t_state: %d\n",
(preempt_and_abort_list) ? "Preempt" : "", tmr_p,
tmr_p->function, tmr_p->response, cmd->t_state);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
transport_cmd_finish_abort_tmr(cmd);
spin_lock(&dev->se_tmr_lock);
......@@ -247,38 +247,38 @@ int core_tmr_lun_reset(
atomic_set(&task->task_state_active, 0);
spin_unlock_irqrestore(&dev->execute_task_lock, flags);
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
DEBUG_LR("LUN_RESET: %s cmd: %p task: %p"
" ITT/CmdSN: 0x%08x/0x%08x, i_state: %d, t_state/"
"def_t_state: %d/%d cdb: 0x%02x\n",
(preempt_and_abort_list) ? "Preempt" : "", cmd, task,
cmd->se_tfo->get_task_tag(cmd), 0,
cmd->se_tfo->get_cmd_state(cmd), cmd->t_state,
cmd->deferred_t_state, cmd->t_task.t_task_cdb[0]);
cmd->deferred_t_state, cmd->t_task_cdb[0]);
DEBUG_LR("LUN_RESET: ITT[0x%08x] - pr_res_key: 0x%016Lx"
" t_task_cdbs: %d t_task_cdbs_left: %d"
" t_task_cdbs_sent: %d -- t_transport_active: %d"
" t_transport_stop: %d t_transport_sent: %d\n",
cmd->se_tfo->get_task_tag(cmd), cmd->pr_res_key,
cmd->t_task.t_task_cdbs,
atomic_read(&cmd->t_task.t_task_cdbs_left),
atomic_read(&cmd->t_task.t_task_cdbs_sent),
atomic_read(&cmd->t_task.t_transport_active),
atomic_read(&cmd->t_task.t_transport_stop),
atomic_read(&cmd->t_task.t_transport_sent));
cmd->t_task_list_num,
atomic_read(&cmd->t_task_cdbs_left),
atomic_read(&cmd->t_task_cdbs_sent),
atomic_read(&cmd->t_transport_active),
atomic_read(&cmd->t_transport_stop),
atomic_read(&cmd->t_transport_sent));
if (atomic_read(&task->task_active)) {
atomic_set(&task->task_stop, 1);
spin_unlock_irqrestore(
&cmd->t_task.t_state_lock, flags);
&cmd->t_state_lock, flags);
DEBUG_LR("LUN_RESET: Waiting for task: %p to shutdown"
" for dev: %p\n", task, dev);
wait_for_completion(&task->task_stop_comp);
DEBUG_LR("LUN_RESET Completed task: %p shutdown for"
" dev: %p\n", task, dev);
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
atomic_dec(&cmd->t_task.t_task_cdbs_left);
spin_lock_irqsave(&cmd->t_state_lock, flags);
atomic_dec(&cmd->t_task_cdbs_left);
atomic_set(&task->task_active, 0);
atomic_set(&task->task_stop, 0);
......@@ -288,24 +288,24 @@ int core_tmr_lun_reset(
}
__transport_stop_task_timer(task, &flags);
if (!(atomic_dec_and_test(&cmd->t_task.t_task_cdbs_ex_left))) {
if (!(atomic_dec_and_test(&cmd->t_task_cdbs_ex_left))) {
spin_unlock_irqrestore(
&cmd->t_task.t_state_lock, flags);
&cmd->t_state_lock, flags);
DEBUG_LR("LUN_RESET: Skipping task: %p, dev: %p for"
" t_task_cdbs_ex_left: %d\n", task, dev,
atomic_read(&cmd->t_task.t_task_cdbs_ex_left));
atomic_read(&cmd->t_task_cdbs_ex_left));
spin_lock_irqsave(&dev->execute_task_lock, flags);
continue;
}
fe_count = atomic_read(&cmd->t_task.t_fe_count);
fe_count = atomic_read(&cmd->t_fe_count);
if (atomic_read(&cmd->t_task.t_transport_active)) {
if (atomic_read(&cmd->t_transport_active)) {
DEBUG_LR("LUN_RESET: got t_transport_active = 1 for"
" task: %p, t_fe_count: %d dev: %p\n", task,
fe_count, dev);
atomic_set(&cmd->t_task.t_transport_aborted, 1);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock,
atomic_set(&cmd->t_transport_aborted, 1);
spin_unlock_irqrestore(&cmd->t_state_lock,
flags);
core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
......@@ -314,8 +314,8 @@ int core_tmr_lun_reset(
}
DEBUG_LR("LUN_RESET: Got t_transport_active = 0 for task: %p,"
" t_fe_count: %d dev: %p\n", task, fe_count, dev);
atomic_set(&cmd->t_task.t_transport_aborted, 1);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
atomic_set(&cmd->t_transport_aborted, 1);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
spin_lock_irqsave(&dev->execute_task_lock, flags);
......@@ -345,7 +345,7 @@ int core_tmr_lun_reset(
if (prout_cmd == cmd)
continue;
atomic_dec(&cmd->t_task.t_transport_queue_active);
atomic_dec(&cmd->t_transport_queue_active);
atomic_dec(&qobj->queue_cnt);
list_del(&cmd->se_queue_node);
spin_unlock_irqrestore(&qobj->cmd_queue_lock, flags);
......@@ -353,7 +353,7 @@ int core_tmr_lun_reset(
DEBUG_LR("LUN_RESET: %s from Device Queue: cmd: %p t_state:"
" %d t_fe_count: %d\n", (preempt_and_abort_list) ?
"Preempt" : "", cmd, cmd->t_state,
atomic_read(&cmd->t_task.t_fe_count));
atomic_read(&cmd->t_fe_count));
/*
* Signal that the command has failed via cmd->se_cmd_flags,
* and call TFO->new_cmd_failure() to wakeup any fabric
......@@ -365,7 +365,7 @@ int core_tmr_lun_reset(
transport_new_cmd_failure(cmd);
core_tmr_handle_tas_abort(tmr_nacl, cmd, tas,
atomic_read(&cmd->t_task.t_fe_count));
atomic_read(&cmd->t_fe_count));
spin_lock_irqsave(&qobj->cmd_queue_lock, flags);
}
spin_unlock_irqrestore(&qobj->cmd_queue_lock, flags);
......
drivers/target/target_core_transport.c
View file @ a1d8b49a
......@@ -206,20 +206,18 @@ static int __transport_execute_tasks(struct se_device *dev);
static void transport_complete_task_attr(struct se_cmd *cmd);
static void transport_direct_request_timeout(struct se_cmd *cmd);
static void transport_free_dev_tasks(struct se_cmd *cmd);
static u32 transport_generic_get_cdb_count(struct se_cmd *cmd,
static u32 transport_allocate_tasks(struct se_cmd *cmd,
unsigned long long starting_lba, u32 sectors,
enum dma_data_direction data_direction,
struct list_head *mem_list, int set_counts);
static int transport_generic_get_mem(struct se_cmd *cmd, u32 length,
u32 dma_size);
static int transport_generic_get_mem(struct se_cmd *cmd, u32 length);
static int transport_generic_remove(struct se_cmd *cmd,
int release_to_pool, int session_reinstatement);
static int transport_get_sectors(struct se_cmd *cmd);
static int transport_cmd_get_valid_sectors(struct se_cmd *cmd);
static int transport_map_sg_to_mem(struct se_cmd *cmd,
struct list_head *se_mem_list, struct scatterlist *sgl,
u32 *se_mem_cnt);
static void transport_memcpy_se_mem_read_contig(struct se_cmd *cmd,
unsigned char *dst, struct list_head *se_mem_list);
struct list_head *se_mem_list, struct scatterlist *sgl);
static void transport_memcpy_se_mem_read_contig(unsigned char *dst,
struct list_head *se_mem_list, u32 len);
static void transport_release_fe_cmd(struct se_cmd *cmd);
static void transport_remove_cmd_from_queue(struct se_cmd *cmd,
struct se_queue_obj *qobj);
......@@ -573,7 +571,7 @@ void transport_deregister_session(struct se_session *se_sess)
EXPORT_SYMBOL(transport_deregister_session);
/*
* Called with cmd->t_task.t_state_lock held.
* Called with cmd->t_state_lock held.
*/
static void transport_all_task_dev_remove_state(struct se_cmd *cmd)
{
......@@ -581,7 +579,7 @@ static void transport_all_task_dev_remove_state(struct se_cmd *cmd)
struct se_task *task;
unsigned long flags;
list_for_each_entry(task, &cmd->t_task.t_task_list, t_list) {
list_for_each_entry(task, &cmd->t_task_list, t_list) {
dev = task->se_dev;
if (!(dev))
continue;
......@@ -599,7 +597,7 @@ static void transport_all_task_dev_remove_state(struct se_cmd *cmd)
spin_unlock_irqrestore(&dev->execute_task_lock, flags);
atomic_set(&task->task_state_active, 0);
atomic_dec(&cmd->t_task.t_task_cdbs_ex_left);
atomic_dec(&cmd->t_task_cdbs_ex_left);
}
}
......@@ -618,32 +616,32 @@ static int transport_cmd_check_stop(
{
unsigned long flags;
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
/*
* Determine if IOCTL context caller in requesting the stopping of this
* command for LUN shutdown purposes.
*/
if (atomic_read(&cmd->t_task.transport_lun_stop)) {
DEBUG_CS("%s:%d atomic_read(&cmd->t_task.transport_lun_stop)"
if (atomic_read(&cmd->transport_lun_stop)) {
DEBUG_CS("%s:%d atomic_read(&cmd->transport_lun_stop)"
" == TRUE for ITT: 0x%08x\n", __func__, __LINE__,
cmd->se_tfo->get_task_tag(cmd));
cmd->deferred_t_state = cmd->t_state;
cmd->t_state = TRANSPORT_DEFERRED_CMD;
atomic_set(&cmd->t_task.t_transport_active, 0);
atomic_set(&cmd->t_transport_active, 0);
if (transport_off == 2)
transport_all_task_dev_remove_state(cmd);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
complete(&cmd->t_task.transport_lun_stop_comp);
complete(&cmd->transport_lun_stop_comp);
return 1;
}
/*
* Determine if frontend context caller is requesting the stopping of
* this command for frontend exceptions.
*/
if (atomic_read(&cmd->t_task.t_transport_stop)) {
DEBUG_CS("%s:%d atomic_read(&cmd->t_task.t_transport_stop) =="
if (atomic_read(&cmd->t_transport_stop)) {
DEBUG_CS("%s:%d atomic_read(&cmd->t_transport_stop) =="
" TRUE for ITT: 0x%08x\n", __func__, __LINE__,
cmd->se_tfo->get_task_tag(cmd));
......@@ -658,13 +656,13 @@ static int transport_cmd_check_stop(
*/
if (transport_off == 2)
cmd->se_lun = NULL;
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
complete(&cmd->t_task.t_transport_stop_comp);
complete(&cmd->t_transport_stop_comp);
return 1;
}
if (transport_off) {
atomic_set(&cmd->t_task.t_transport_active, 0);
atomic_set(&cmd->t_transport_active, 0);
if (transport_off == 2) {
transport_all_task_dev_remove_state(cmd);
/*
......@@ -679,18 +677,18 @@ static int transport_cmd_check_stop(
*/
if (cmd->se_tfo->check_stop_free != NULL) {
spin_unlock_irqrestore(
&cmd->t_task.t_state_lock, flags);
&cmd->t_state_lock, flags);
cmd->se_tfo->check_stop_free(cmd);
return 1;
}
}
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return 0;
} else if (t_state)
cmd->t_state = t_state;
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return 0;
}
......@@ -708,21 +706,21 @@ static void transport_lun_remove_cmd(struct se_cmd *cmd)
if (!lun)
return;
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
if (!(atomic_read(&cmd->t_task.transport_dev_active))) {
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
if (!(atomic_read(&cmd->transport_dev_active))) {
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
goto check_lun;
}
atomic_set(&cmd->t_task.transport_dev_active, 0);
atomic_set(&cmd->transport_dev_active, 0);
transport_all_task_dev_remove_state(cmd);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
check_lun:
spin_lock_irqsave(&lun->lun_cmd_lock, flags);
if (atomic_read(&cmd->t_task.transport_lun_active)) {
if (atomic_read(&cmd->transport_lun_active)) {
list_del(&cmd->se_lun_node);
atomic_set(&cmd->t_task.transport_lun_active, 0);
atomic_set(&cmd->transport_lun_active, 0);
#if 0
printk(KERN_INFO "Removed ITT: 0x%08x from LUN LIST[%d]\n"
cmd->se_tfo->get_task_tag(cmd), lun->unpacked_lun);
......@@ -763,15 +761,15 @@ static void transport_add_cmd_to_queue(
INIT_LIST_HEAD(&cmd->se_queue_node);
if (t_state) {
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
cmd->t_state = t_state;
atomic_set(&cmd->t_task.t_transport_active, 1);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
atomic_set(&cmd->t_transport_active, 1);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
}
spin_lock_irqsave(&qobj->cmd_queue_lock, flags);
list_add_tail(&cmd->se_queue_node, &qobj->qobj_list);
atomic_inc(&cmd->t_task.t_transport_queue_active);
atomic_inc(&cmd->t_transport_queue_active);
spin_unlock_irqrestore(&qobj->cmd_queue_lock, flags);
atomic_inc(&qobj->queue_cnt);
......@@ -791,7 +789,7 @@ transport_get_cmd_from_queue(struct se_queue_obj *qobj)
}
cmd = list_first_entry(&qobj->qobj_list, struct se_cmd, se_queue_node);
atomic_dec(&cmd->t_task.t_transport_queue_active);
atomic_dec(&cmd->t_transport_queue_active);
list_del(&cmd->se_queue_node);
atomic_dec(&qobj->queue_cnt);
......@@ -807,24 +805,24 @@ static void transport_remove_cmd_from_queue(struct se_cmd *cmd,
unsigned long flags;
spin_lock_irqsave(&qobj->cmd_queue_lock, flags);
if (!(atomic_read(&cmd->t_task.t_transport_queue_active))) {
if (!(atomic_read(&cmd->t_transport_queue_active))) {
spin_unlock_irqrestore(&qobj->cmd_queue_lock, flags);
return;
}
list_for_each_entry(t, &qobj->qobj_list, se_queue_node)
if (t == cmd) {
atomic_dec(&cmd->t_task.t_transport_queue_active);
atomic_dec(&cmd->t_transport_queue_active);
atomic_dec(&qobj->queue_cnt);
list_del(&cmd->se_queue_node);
break;
}
spin_unlock_irqrestore(&qobj->cmd_queue_lock, flags);
if (atomic_read(&cmd->t_task.t_transport_queue_active)) {
if (atomic_read(&cmd->t_transport_queue_active)) {
printk(KERN_ERR "ITT: 0x%08x t_transport_queue_active: %d\n",
cmd->se_tfo->get_task_tag(cmd),
atomic_read(&cmd->t_task.t_transport_queue_active));
atomic_read(&cmd->t_transport_queue_active));
}
}
......@@ -834,7 +832,7 @@ static void transport_remove_cmd_from_queue(struct se_cmd *cmd,
*/
void transport_complete_sync_cache(struct se_cmd *cmd, int good)
{
struct se_task *task = list_entry(cmd->t_task.t_task_list.next,
struct se_task *task = list_entry(cmd->t_task_list.next,
struct se_task, t_list);
if (good) {
......@@ -864,12 +862,12 @@ void transport_complete_task(struct se_task *task, int success)
unsigned long flags;
#if 0
printk(KERN_INFO "task: %p CDB: 0x%02x obj_ptr: %p\n", task,
cmd->t_task.t_task_cdb[0], dev);
cmd->t_task_cdb[0], dev);
#endif
if (dev)
atomic_inc(&dev->depth_left);
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
atomic_set(&task->task_active, 0);
/*
......@@ -891,14 +889,14 @@ void transport_complete_task(struct se_task *task, int success)
*/
if (atomic_read(&task->task_stop)) {
/*
* Decrement cmd->t_task.t_se_count if this task had
* Decrement cmd->t_se_count if this task had
* previously thrown its timeout exception handler.
*/
if (atomic_read(&task->task_timeout)) {
atomic_dec(&cmd->t_task.t_se_count);
atomic_dec(&cmd->t_se_count);
atomic_set(&task->task_timeout, 0);
}
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
complete(&task->task_stop_comp);
return;
......@@ -910,33 +908,33 @@ void transport_complete_task(struct se_task *task, int success)
*/
if (atomic_read(&task->task_timeout)) {
if (!(atomic_dec_and_test(
&cmd->t_task.t_task_cdbs_timeout_left))) {
spin_unlock_irqrestore(&cmd->t_task.t_state_lock,
&cmd->t_task_cdbs_timeout_left))) {
spin_unlock_irqrestore(&cmd->t_state_lock,
flags);
return;
}
t_state = TRANSPORT_COMPLETE_TIMEOUT;
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
transport_add_cmd_to_queue(cmd, t_state);
return;
}
atomic_dec(&cmd->t_task.t_task_cdbs_timeout_left);
atomic_dec(&cmd->t_task_cdbs_timeout_left);
/*
* Decrement the outstanding t_task_cdbs_left count. The last
* struct se_task from struct se_cmd will complete itself into the
* device queue depending upon int success.
*/
if (!(atomic_dec_and_test(&cmd->t_task.t_task_cdbs_left))) {
if (!(atomic_dec_and_test(&cmd->t_task_cdbs_left))) {
if (!success)
cmd->t_task.t_tasks_failed = 1;
cmd->t_tasks_failed = 1;
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return;
}
if (!success || cmd->t_task.t_tasks_failed) {
if (!success || cmd->t_tasks_failed) {
t_state = TRANSPORT_COMPLETE_FAILURE;
if (!task->task_error_status) {
task->task_error_status =
......@@ -945,10 +943,10 @@ void transport_complete_task(struct se_task *task, int success)
PYX_TRANSPORT_UNKNOWN_SAM_OPCODE;
}
} else {
atomic_set(&cmd->t_task.t_transport_complete, 1);
atomic_set(&cmd->t_transport_complete, 1);
t_state = TRANSPORT_COMPLETE_OK;
}
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
transport_add_cmd_to_queue(cmd, t_state);
}
......@@ -1041,8 +1039,8 @@ static void transport_add_tasks_to_state_queue(struct se_cmd *cmd)
struct se_task *task;
unsigned long flags;
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
list_for_each_entry(task, &cmd->t_task.t_task_list, t_list) {
spin_lock_irqsave(&cmd->t_state_lock, flags);
list_for_each_entry(task, &cmd->t_task_list, t_list) {
dev = task->se_dev;
if (atomic_read(&task->task_state_active))
......@@ -1058,7 +1056,7 @@ static void transport_add_tasks_to_state_queue(struct se_cmd *cmd)
spin_unlock(&dev->execute_task_lock);
}
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
}
static void transport_add_tasks_from_cmd(struct se_cmd *cmd)
......@@ -1068,7 +1066,7 @@ static void transport_add_tasks_from_cmd(struct se_cmd *cmd)
unsigned long flags;
spin_lock_irqsave(&dev->execute_task_lock, flags);
list_for_each_entry(task, &cmd->t_task.t_task_list, t_list) {
list_for_each_entry(task, &cmd->t_task_list, t_list) {
if (atomic_read(&task->task_execute_queue))
continue;
/*
......@@ -1670,14 +1668,13 @@ transport_generic_get_task(struct se_cmd *cmd,
INIT_LIST_HEAD(&task->t_execute_list);
INIT_LIST_HEAD(&task->t_state_list);
init_completion(&task->task_stop_comp);
task->task_no = cmd->t_task.t_tasks_no++;
task->task_se_cmd = cmd;
task->se_dev = dev;
task->task_data_direction = data_direction;
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
list_add_tail(&task->t_list, &cmd->t_task.t_task_list);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
list_add_tail(&task->t_list, &cmd->t_task_list);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return task;
}
......@@ -1701,14 +1698,14 @@ void transport_init_se_cmd(
INIT_LIST_HEAD(&cmd->se_delayed_node);
INIT_LIST_HEAD(&cmd->se_ordered_node);
INIT_LIST_HEAD(&cmd->t_task.t_mem_list);
INIT_LIST_HEAD(&cmd->t_task.t_mem_bidi_list);
INIT_LIST_HEAD(&cmd->t_task.t_task_list);
init_completion(&cmd->t_task.transport_lun_fe_stop_comp);
init_completion(&cmd->t_task.transport_lun_stop_comp);
init_completion(&cmd->t_task.t_transport_stop_comp);
spin_lock_init(&cmd->t_task.t_state_lock);
atomic_set(&cmd->t_task.transport_dev_active, 1);
INIT_LIST_HEAD(&cmd->t_mem_list);
INIT_LIST_HEAD(&cmd->t_mem_bidi_list);
INIT_LIST_HEAD(&cmd->t_task_list);
init_completion(&cmd->transport_lun_fe_stop_comp);
init_completion(&cmd->transport_lun_stop_comp);
init_completion(&cmd->t_transport_stop_comp);
spin_lock_init(&cmd->t_state_lock);
atomic_set(&cmd->transport_dev_active, 1);
cmd->se_tfo = tfo;
cmd->se_sess = se_sess;
......@@ -1753,8 +1750,8 @@ void transport_free_se_cmd(
/*
* Check and free any extended CDB buffer that was allocated
*/
if (se_cmd->t_task.t_task_cdb != se_cmd->t_task.__t_task_cdb)
kfree(se_cmd->t_task.t_task_cdb);
if (se_cmd->t_task_cdb != se_cmd->__t_task_cdb)
kfree(se_cmd->t_task_cdb);
}
EXPORT_SYMBOL(transport_free_se_cmd);
......@@ -1792,26 +1789,26 @@ int transport_generic_allocate_tasks(
* allocate the additional extended CDB buffer now.. Otherwise
* setup the pointer from __t_task_cdb to t_task_cdb.
*/
if (scsi_command_size(cdb) > sizeof(cmd->t_task.__t_task_cdb)) {
cmd->t_task.t_task_cdb = kzalloc(scsi_command_size(cdb),
if (scsi_command_size(cdb) > sizeof(cmd->__t_task_cdb)) {
cmd->t_task_cdb = kzalloc(scsi_command_size(cdb),
GFP_KERNEL);
if (!(cmd->t_task.t_task_cdb)) {
printk(KERN_ERR "Unable to allocate cmd->t_task.t_task_cdb"
" %u > sizeof(cmd->t_task.__t_task_cdb): %lu ops\n",
if (!(cmd->t_task_cdb)) {
printk(KERN_ERR "Unable to allocate cmd->t_task_cdb"
" %u > sizeof(cmd->__t_task_cdb): %lu ops\n",
scsi_command_size(cdb),
(unsigned long)sizeof(cmd->t_task.__t_task_cdb));
(unsigned long)sizeof(cmd->__t_task_cdb));
return -ENOMEM;
}
} else
cmd->t_task.t_task_cdb = &cmd->t_task.__t_task_cdb[0];
cmd->t_task_cdb = &cmd->__t_task_cdb[0];
/*
* Copy the original CDB into cmd->t_task.
* Copy the original CDB into cmd->
*/
memcpy(cmd->t_task.t_task_cdb, cdb, scsi_command_size(cdb));
memcpy(cmd->t_task_cdb, cdb, scsi_command_size(cdb));
/*
* Setup the received CDB based on SCSI defined opcodes and
* perform unit attention, persistent reservations and ALUA
* checks for virtual device backends. The cmd->t_task.t_task_cdb
* checks for virtual device backends. The cmd->t_task_cdb
* pointer is expected to be setup before we reach this point.
*/
ret = transport_generic_cmd_sequencer(cmd, cdb);
......@@ -1845,7 +1842,6 @@ int transport_generic_handle_cdb(
printk(KERN_ERR "cmd->se_lun is NULL\n");
return -EINVAL;
}
transport_add_cmd_to_queue(cmd, TRANSPORT_NEW_CMD);
return 0;
}
......@@ -1936,9 +1932,9 @@ static int transport_stop_tasks_for_cmd(struct se_cmd *cmd)
/*
* No tasks remain in the execution queue
*/
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
list_for_each_entry_safe(task, task_tmp,
&cmd->t_task.t_task_list, t_list) {
&cmd->t_task_list, t_list) {
DEBUG_TS("task_no[%d] - Processing task %p\n",
task->task_no, task);
/*
......@@ -1947,14 +1943,14 @@ static int transport_stop_tasks_for_cmd(struct se_cmd *cmd)
*/
if (!atomic_read(&task->task_sent) &&
!atomic_read(&task->task_active)) {
spin_unlock_irqrestore(&cmd->t_task.t_state_lock,
spin_unlock_irqrestore(&cmd->t_state_lock,
flags);
transport_remove_task_from_execute_queue(task,
task->se_dev);
DEBUG_TS("task_no[%d] - Removed from execute queue\n",
task->task_no);
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
continue;
}
......@@ -1964,7 +1960,7 @@ static int transport_stop_tasks_for_cmd(struct se_cmd *cmd)
*/
if (atomic_read(&task->task_active)) {
atomic_set(&task->task_stop, 1);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock,
spin_unlock_irqrestore(&cmd->t_state_lock,
flags);
DEBUG_TS("task_no[%d] - Waiting to complete\n",
......@@ -1973,8 +1969,8 @@ static int transport_stop_tasks_for_cmd(struct se_cmd *cmd)
DEBUG_TS("task_no[%d] - Stopped successfully\n",
task->task_no);
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
atomic_dec(&cmd->t_task.t_task_cdbs_left);
spin_lock_irqsave(&cmd->t_state_lock, flags);
atomic_dec(&cmd->t_task_cdbs_left);
atomic_set(&task->task_active, 0);
atomic_set(&task->task_stop, 0);
......@@ -1985,7 +1981,7 @@ static int transport_stop_tasks_for_cmd(struct se_cmd *cmd)
__transport_stop_task_timer(task, &flags);
}
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return ret;
}
......@@ -2001,7 +1997,7 @@ static void transport_generic_request_failure(
{
DEBUG_GRF("-----[ Storage Engine Exception for cmd: %p ITT: 0x%08x"
" CDB: 0x%02x\n", cmd, cmd->se_tfo->get_task_tag(cmd),
cmd->t_task.t_task_cdb[0]);
cmd->t_task_cdb[0]);
DEBUG_GRF("-----[ i_state: %d t_state/def_t_state:"
" %d/%d transport_error_status: %d\n",
cmd->se_tfo->get_cmd_state(cmd),
......@@ -2010,13 +2006,13 @@ static void transport_generic_request_failure(
DEBUG_GRF("-----[ t_task_cdbs: %d t_task_cdbs_left: %d"
" t_task_cdbs_sent: %d t_task_cdbs_ex_left: %d --"
" t_transport_active: %d t_transport_stop: %d"
" t_transport_sent: %d\n", cmd->t_task.t_task_cdbs,
atomic_read(&cmd->t_task.t_task_cdbs_left),
atomic_read(&cmd->t_task.t_task_cdbs_sent),
atomic_read(&cmd->t_task.t_task_cdbs_ex_left),
atomic_read(&cmd->t_task.t_transport_active),
atomic_read(&cmd->t_task.t_transport_stop),
atomic_read(&cmd->t_task.t_transport_sent));
" t_transport_sent: %d\n", cmd->t_task_cdbs,
atomic_read(&cmd->t_task_cdbs_left),
atomic_read(&cmd->t_task_cdbs_sent),
atomic_read(&cmd->t_task_cdbs_ex_left),
atomic_read(&cmd->t_transport_active),
atomic_read(&cmd->t_transport_stop),
atomic_read(&cmd->t_transport_sent));
transport_stop_all_task_timers(cmd);
......@@ -2098,7 +2094,7 @@ static void transport_generic_request_failure(
break;
default:
printk(KERN_ERR "Unknown transport error for CDB 0x%02x: %d\n",
cmd->t_task.t_task_cdb[0],
cmd->t_task_cdb[0],
cmd->transport_error_status);
cmd->scsi_sense_reason = TCM_UNSUPPORTED_SCSI_OPCODE;
break;
......@@ -2119,19 +2115,19 @@ static void transport_direct_request_timeout(struct se_cmd *cmd)
{
unsigned long flags;
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
if (!(atomic_read(&cmd->t_task.t_transport_timeout))) {
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
if (!(atomic_read(&cmd->t_transport_timeout))) {
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return;
}
if (atomic_read(&cmd->t_task.t_task_cdbs_timeout_left)) {
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
if (atomic_read(&cmd->t_task_cdbs_timeout_left)) {
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return;
}
atomic_sub(atomic_read(&cmd->t_task.t_transport_timeout),
&cmd->t_task.t_se_count);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
atomic_sub(atomic_read(&cmd->t_transport_timeout),
&cmd->t_se_count);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
}
static void transport_generic_request_timeout(struct se_cmd *cmd)
......@@ -2139,16 +2135,16 @@ static void transport_generic_request_timeout(struct se_cmd *cmd)
unsigned long flags;
/*
* Reset cmd->t_task.t_se_count to allow transport_generic_remove()
* Reset cmd->t_se_count to allow transport_generic_remove()
* to allow last call to free memory resources.
*/
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
if (atomic_read(&cmd->t_task.t_transport_timeout) > 1) {
int tmp = (atomic_read(&cmd->t_task.t_transport_timeout) - 1);
spin_lock_irqsave(&cmd->t_state_lock, flags);
if (atomic_read(&cmd->t_transport_timeout) > 1) {
int tmp = (atomic_read(&cmd->t_transport_timeout) - 1);
atomic_sub(tmp, &cmd->t_task.t_se_count);
atomic_sub(tmp, &cmd->t_se_count);
}
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
transport_generic_remove(cmd, 0, 0);
}
......@@ -2164,8 +2160,8 @@ transport_generic_allocate_buf(struct se_cmd *cmd, u32 data_length)
return -ENOMEM;
}
cmd->t_task.t_tasks_se_num = 0;
cmd->t_task.t_task_buf = buf;
cmd->t_tasks_se_num = 0;
cmd->t_task_buf = buf;
return 0;
}
......@@ -2207,9 +2203,9 @@ static void transport_set_supported_SAM_opcode(struct se_cmd *se_cmd)
{
unsigned long flags;
spin_lock_irqsave(&se_cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&se_cmd->t_state_lock, flags);
se_cmd->se_cmd_flags |= SCF_SUPPORTED_SAM_OPCODE;
spin_unlock_irqrestore(&se_cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
}
/*
......@@ -2223,9 +2219,9 @@ static void transport_task_timeout_handler(unsigned long data)
DEBUG_TT("transport task timeout fired! task: %p cmd: %p\n", task, cmd);
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
if (task->task_flags & TF_STOP) {
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return;
}
task->task_flags &= ~TF_RUNNING;
......@@ -2236,13 +2232,13 @@ static void transport_task_timeout_handler(unsigned long data)
if (!(atomic_read(&task->task_active))) {
DEBUG_TT("transport task: %p cmd: %p timeout task_active"
" == 0\n", task, cmd);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return;
}
atomic_inc(&cmd->t_task.t_se_count);
atomic_inc(&cmd->t_task.t_transport_timeout);
cmd->t_task.t_tasks_failed = 1;
atomic_inc(&cmd->t_se_count);
atomic_inc(&cmd->t_transport_timeout);
cmd->t_tasks_failed = 1;
atomic_set(&task->task_timeout, 1);
task->task_error_status = PYX_TRANSPORT_TASK_TIMEOUT;
......@@ -2251,28 +2247,28 @@ static void transport_task_timeout_handler(unsigned long data)
if (atomic_read(&task->task_stop)) {
DEBUG_TT("transport task: %p cmd: %p timeout task_stop"
" == 1\n", task, cmd);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
complete(&task->task_stop_comp);
return;
}
if (!(atomic_dec_and_test(&cmd->t_task.t_task_cdbs_left))) {
if (!(atomic_dec_and_test(&cmd->t_task_cdbs_left))) {
DEBUG_TT("transport task: %p cmd: %p timeout non zero"
" t_task_cdbs_left\n", task, cmd);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return;
}
DEBUG_TT("transport task: %p cmd: %p timeout ZERO t_task_cdbs_left\n",
task, cmd);
cmd->t_state = TRANSPORT_COMPLETE_FAILURE;
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
transport_add_cmd_to_queue(cmd, TRANSPORT_COMPLETE_FAILURE);
}
/*
* Called with cmd->t_task.t_state_lock held.
* Called with cmd->t_state_lock held.
*/
static void transport_start_task_timer(struct se_task *task)
{
......@@ -2302,7 +2298,7 @@ static void transport_start_task_timer(struct se_task *task)
}
/*
* Called with spin_lock_irq(&cmd->t_task.t_state_lock) held.
* Called with spin_lock_irq(&cmd->t_state_lock) held.
*/
void __transport_stop_task_timer(struct se_task *task, unsigned long *flags)
{
......@@ -2312,11 +2308,11 @@ void __transport_stop_task_timer(struct se_task *task, unsigned long *flags)
return;
task->task_flags |= TF_STOP;
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, *flags);
spin_unlock_irqrestore(&cmd->t_state_lock, *flags);
del_timer_sync(&task->task_timer);
spin_lock_irqsave(&cmd->t_task.t_state_lock, *flags);
spin_lock_irqsave(&cmd->t_state_lock, *flags);
task->task_flags &= ~TF_RUNNING;
task->task_flags &= ~TF_STOP;
}
......@@ -2326,11 +2322,11 @@ static void transport_stop_all_task_timers(struct se_cmd *cmd)
struct se_task *task = NULL, *task_tmp;
unsigned long flags;
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
list_for_each_entry_safe(task, task_tmp,
&cmd->t_task.t_task_list, t_list)
&cmd->t_task_list, t_list)
__transport_stop_task_timer(task, &flags);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
}
static inline int transport_tcq_window_closed(struct se_device *dev)
......@@ -2365,7 +2361,7 @@ static inline int transport_execute_task_attr(struct se_cmd *cmd)
smp_mb__after_atomic_inc();
DEBUG_STA("Added HEAD_OF_QUEUE for CDB:"
" 0x%02x, se_ordered_id: %u\n",
cmd->t_task->t_task_cdb[0],
cmd->_task_cdb[0],
cmd->se_ordered_id);
return 1;
} else if (cmd->sam_task_attr == MSG_ORDERED_TAG) {
......@@ -2379,7 +2375,7 @@ static inline int transport_execute_task_attr(struct se_cmd *cmd)
DEBUG_STA("Added ORDERED for CDB: 0x%02x to ordered"
" list, se_ordered_id: %u\n",
cmd->t_task.t_task_cdb[0],
cmd->t_task_cdb[0],
cmd->se_ordered_id);
/*
* Add ORDERED command to tail of execution queue if
......@@ -2413,7 +2409,7 @@ static inline int transport_execute_task_attr(struct se_cmd *cmd)
DEBUG_STA("Added CDB: 0x%02x Task Attr: 0x%02x to"
" delayed CMD list, se_ordered_id: %u\n",
cmd->t_task.t_task_cdb[0], cmd->sam_task_attr,
cmd->t_task_cdb[0], cmd->sam_task_attr,
cmd->se_ordered_id);
/*
* Return zero to let transport_execute_tasks() know
......@@ -2487,7 +2483,7 @@ static int __transport_execute_tasks(struct se_device *dev)
/*
* Check if there is enough room in the device and HBA queue to send
* struct se_transport_task's to the selected transport.
* struct se_tasks to the selected transport.
*/
check_depth:
if (!atomic_read(&dev->depth_left))
......@@ -2511,17 +2507,17 @@ static int __transport_execute_tasks(struct se_device *dev)
cmd = task->task_se_cmd;
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
atomic_set(&task->task_active, 1);
atomic_set(&task->task_sent, 1);
atomic_inc(&cmd->t_task.t_task_cdbs_sent);
atomic_inc(&cmd->t_task_cdbs_sent);
if (atomic_read(&cmd->t_task.t_task_cdbs_sent) ==
cmd->t_task.t_task_cdbs)
if (atomic_read(&cmd->t_task_cdbs_sent) ==
cmd->t_task_list_num)
atomic_set(&cmd->transport_sent, 1);
transport_start_task_timer(task);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
/*
* The struct se_cmd->transport_emulate_cdb() function pointer is used
* to grab REPORT_LUNS and other CDBs we want to handle before they hit the
......@@ -2586,10 +2582,10 @@ void transport_new_cmd_failure(struct se_cmd *se_cmd)
* Any unsolicited data will get dumped for failed command inside of
* the fabric plugin
*/
spin_lock_irqsave(&se_cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&se_cmd->t_state_lock, flags);
se_cmd->se_cmd_flags |= SCF_SE_CMD_FAILED;
se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
spin_unlock_irqrestore(&se_cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
se_cmd->se_tfo->new_cmd_failure(se_cmd);
}
......@@ -2799,17 +2795,18 @@ static void transport_xor_callback(struct se_cmd *cmd)
return;
}
/*
* Copy the scatterlist WRITE buffer located at cmd->t_task.t_mem_list
* Copy the scatterlist WRITE buffer located at cmd->t_mem_list
* into the locally allocated *buf
*/
transport_memcpy_se_mem_read_contig(cmd, buf, &cmd->t_task.t_mem_list);
transport_memcpy_se_mem_read_contig(buf, &cmd->t_mem_list,
cmd->data_length);
/*
* Now perform the XOR against the BIDI read memory located at
* cmd->t_task.t_mem_bidi_list
* cmd->t_mem_bidi_list
*/
offset = 0;
list_for_each_entry(se_mem, &cmd->t_task.t_mem_bidi_list, se_list) {
list_for_each_entry(se_mem, &cmd->t_mem_bidi_list, se_list) {
addr = (unsigned char *)kmap_atomic(se_mem->se_page, KM_USER0);
if (!(addr))
goto out;
......@@ -2837,14 +2834,14 @@ static int transport_get_sense_data(struct se_cmd *cmd)
WARN_ON(!cmd->se_lun);
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
if (cmd->se_cmd_flags & SCF_SENT_CHECK_CONDITION) {
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return 0;
}
list_for_each_entry_safe(task, task_tmp,
&cmd->t_task.t_task_list, t_list) {
&cmd->t_task_list, t_list) {
if (!task->task_sense)
continue;
......@@ -2866,7 +2863,7 @@ static int transport_get_sense_data(struct se_cmd *cmd)
cmd->se_tfo->get_task_tag(cmd), task->task_no);
continue;
}
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
offset = cmd->se_tfo->set_fabric_sense_len(cmd,
TRANSPORT_SENSE_BUFFER);
......@@ -2884,7 +2881,7 @@ static int transport_get_sense_data(struct se_cmd *cmd)
cmd->scsi_status);
return 0;
}
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return -1;
}
......@@ -2895,7 +2892,7 @@ static int transport_allocate_resources(struct se_cmd *cmd)
if ((cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB) ||
(cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB))
return transport_generic_get_mem(cmd, length, PAGE_SIZE);
return transport_generic_get_mem(cmd, length);
else if (cmd->se_cmd_flags & SCF_SCSI_CONTROL_NONSG_IO_CDB)
return transport_generic_allocate_buf(cmd, length);
else
......@@ -2999,7 +2996,7 @@ static int transport_generic_cmd_sequencer(
goto out_unsupported_cdb;
size = transport_get_size(sectors, cdb, cmd);
cmd->transport_split_cdb = &split_cdb_XX_6;
cmd->t_task.t_task_lba = transport_lba_21(cdb);
cmd->t_task_lba = transport_lba_21(cdb);
cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
break;
case READ_10:
......@@ -3008,7 +3005,7 @@ static int transport_generic_cmd_sequencer(
goto out_unsupported_cdb;
size = transport_get_size(sectors, cdb, cmd);
cmd->transport_split_cdb = &split_cdb_XX_10;
cmd->t_task.t_task_lba = transport_lba_32(cdb);
cmd->t_task_lba = transport_lba_32(cdb);
cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
break;
case READ_12:
......@@ -3017,7 +3014,7 @@ static int transport_generic_cmd_sequencer(
goto out_unsupported_cdb;
size = transport_get_size(sectors, cdb, cmd);
cmd->transport_split_cdb = &split_cdb_XX_12;
cmd->t_task.t_task_lba = transport_lba_32(cdb);
cmd->t_task_lba = transport_lba_32(cdb);
cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
break;
case READ_16:
......@@ -3026,7 +3023,7 @@ static int transport_generic_cmd_sequencer(
goto out_unsupported_cdb;
size = transport_get_size(sectors, cdb, cmd);
cmd->transport_split_cdb = &split_cdb_XX_16;
cmd->t_task.t_task_lba = transport_lba_64(cdb);
cmd->t_task_lba = transport_lba_64(cdb);
cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
break;
case WRITE_6:
......@@ -3035,7 +3032,7 @@ static int transport_generic_cmd_sequencer(
goto out_unsupported_cdb;
size = transport_get_size(sectors, cdb, cmd);
cmd->transport_split_cdb = &split_cdb_XX_6;
cmd->t_task.t_task_lba = transport_lba_21(cdb);
cmd->t_task_lba = transport_lba_21(cdb);
cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
break;
case WRITE_10:
......@@ -3044,8 +3041,8 @@ static int transport_generic_cmd_sequencer(
goto out_unsupported_cdb;
size = transport_get_size(sectors, cdb, cmd);
cmd->transport_split_cdb = &split_cdb_XX_10;
cmd->t_task.t_task_lba = transport_lba_32(cdb);
cmd->t_task.t_tasks_fua = (cdb[1] & 0x8);
cmd->t_task_lba = transport_lba_32(cdb);
cmd->t_tasks_fua = (cdb[1] & 0x8);
cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
break;
case WRITE_12:
......@@ -3054,8 +3051,8 @@ static int transport_generic_cmd_sequencer(
goto out_unsupported_cdb;
size = transport_get_size(sectors, cdb, cmd);
cmd->transport_split_cdb = &split_cdb_XX_12;
cmd->t_task.t_task_lba = transport_lba_32(cdb);
cmd->t_task.t_tasks_fua = (cdb[1] & 0x8);
cmd->t_task_lba = transport_lba_32(cdb);
cmd->t_tasks_fua = (cdb[1] & 0x8);
cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
break;
case WRITE_16:
......@@ -3064,20 +3061,20 @@ static int transport_generic_cmd_sequencer(
goto out_unsupported_cdb;
size = transport_get_size(sectors, cdb, cmd);
cmd->transport_split_cdb = &split_cdb_XX_16;
cmd->t_task.t_task_lba = transport_lba_64(cdb);
cmd->t_task.t_tasks_fua = (cdb[1] & 0x8);
cmd->t_task_lba = transport_lba_64(cdb);
cmd->t_tasks_fua = (cdb[1] & 0x8);
cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
break;
case XDWRITEREAD_10:
if ((cmd->data_direction != DMA_TO_DEVICE) ||
!(cmd->t_task.t_tasks_bidi))
!(cmd->t_tasks_bidi))
goto out_invalid_cdb_field;
sectors = transport_get_sectors_10(cdb, cmd, &sector_ret);
if (sector_ret)
goto out_unsupported_cdb;
size = transport_get_size(sectors, cdb, cmd);
cmd->transport_split_cdb = &split_cdb_XX_10;
cmd->t_task.t_task_lba = transport_lba_32(cdb);
cmd->t_task_lba = transport_lba_32(cdb);
cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
passthrough = (dev->transport->transport_type ==
TRANSPORT_PLUGIN_PHBA_PDEV);
......@@ -3090,7 +3087,7 @@ static int transport_generic_cmd_sequencer(
* Setup BIDI XOR callback to be run during transport_generic_complete_ok()
*/
cmd->transport_complete_callback = &transport_xor_callback;
cmd->t_task.t_tasks_fua = (cdb[1] & 0x8);
cmd->t_tasks_fua = (cdb[1] & 0x8);
break;
case VARIABLE_LENGTH_CMD:
service_action = get_unaligned_be16(&cdb[8]);
......@@ -3112,7 +3109,7 @@ static int transport_generic_cmd_sequencer(
* XDWRITE_READ_32 logic.
*/
cmd->transport_split_cdb = &split_cdb_XX_32;
cmd->t_task.t_task_lba = transport_lba_64_ext(cdb);
cmd->t_task_lba = transport_lba_64_ext(cdb);
cmd->se_cmd_flags |= SCF_SCSI_DATA_SG_IO_CDB;
/*
......@@ -3126,7 +3123,7 @@ static int transport_generic_cmd_sequencer(
* transport_generic_complete_ok()
*/
cmd->transport_complete_callback = &transport_xor_callback;
cmd->t_task.t_tasks_fua = (cdb[10] & 0x8);
cmd->t_tasks_fua = (cdb[10] & 0x8);
break;
case WRITE_SAME_32:
sectors = transport_get_sectors_32(cdb, cmd, &sector_ret);
......@@ -3138,7 +3135,7 @@ static int transport_generic_cmd_sequencer(
else
size = dev->se_sub_dev->se_dev_attrib.block_size;
cmd->t_task.t_task_lba = get_unaligned_be64(&cdb[12]);
cmd->t_task_lba = get_unaligned_be64(&cdb[12]);
cmd->se_cmd_flags |= SCF_SCSI_CONTROL_SG_IO_CDB;
/*
......@@ -3373,10 +3370,10 @@ static int transport_generic_cmd_sequencer(
*/
if (cdb[0] == SYNCHRONIZE_CACHE) {
sectors = transport_get_sectors_10(cdb, cmd, &sector_ret);
cmd->t_task.t_task_lba = transport_lba_32(cdb);
cmd->t_task_lba = transport_lba_32(cdb);
} else {
sectors = transport_get_sectors_16(cdb, cmd, &sector_ret);
cmd->t_task.t_task_lba = transport_lba_64(cdb);
cmd->t_task_lba = transport_lba_64(cdb);
}
if (sector_ret)
goto out_unsupported_cdb;
......@@ -3398,7 +3395,7 @@ static int transport_generic_cmd_sequencer(
* Check to ensure that LBA + Range does not exceed past end of
* device.
*/
if (transport_get_sectors(cmd) < 0)
if (!transport_cmd_get_valid_sectors(cmd))
goto out_invalid_cdb_field;
break;
case UNMAP:
......@@ -3427,7 +3424,7 @@ static int transport_generic_cmd_sequencer(
else
size = dev->se_sub_dev->se_dev_attrib.block_size;
cmd->t_task.t_task_lba = get_unaligned_be64(&cdb[2]);
cmd->t_task_lba = get_unaligned_be16(&cdb[2]);
passthrough = (dev->transport->transport_type ==
TRANSPORT_PLUGIN_PHBA_PDEV);
/*
......@@ -3542,88 +3539,22 @@ static int transport_generic_cmd_sequencer(
static inline void transport_release_tasks(struct se_cmd *);
/*
* This function will copy a contiguous *src buffer into a destination
* struct scatterlist array.
*/
static void transport_memcpy_write_contig(
struct se_cmd *cmd,
struct scatterlist *sg_d,
unsigned char *src)
{
u32 i = 0, length = 0, total_length = cmd->data_length;
void *dst;
while (total_length) {
length = sg_d[i].length;
if (length > total_length)
length = total_length;
dst = sg_virt(&sg_d[i]);
memcpy(dst, src, length);
if (!(total_length -= length))
return;
src += length;
i++;
}
}
/*
* This function will copy a struct scatterlist array *sg_s into a destination
* contiguous *dst buffer.
*/
static void transport_memcpy_read_contig(
struct se_cmd *cmd,
unsigned char *dst,
struct scatterlist *sg_s)
{
u32 i = 0, length = 0, total_length = cmd->data_length;
void *src;
while (total_length) {
length = sg_s[i].length;
if (length > total_length)
length = total_length;
src = sg_virt(&sg_s[i]);
memcpy(dst, src, length);
if (!(total_length -= length))
return;
dst += length;
i++;
}
}
static void transport_memcpy_se_mem_read_contig(
struct se_cmd *cmd,
unsigned char *dst,
struct list_head *se_mem_list)
struct list_head *se_mem_list,
u32 tot_len)
{
struct se_mem *se_mem;
void *src;
u32 length = 0, total_length = cmd->data_length;
u32 length;
list_for_each_entry(se_mem, se_mem_list, se_list) {
length = se_mem->se_len;
if (length > total_length)
length = total_length;
length = min_t(u32, se_mem->se_len, tot_len);
src = page_address(se_mem->se_page) + se_mem->se_off;
memcpy(dst, src, length);
if (!(total_length -= length))
return;
tot_len -= length;
if (!tot_len)
break;
dst += length;
}
}
......@@ -3744,14 +3675,15 @@ static void transport_generic_complete_ok(struct se_cmd *cmd)
}
spin_unlock(&cmd->se_lun->lun_sep_lock);
/*
* If enabled by TCM fabirc module pre-registered SGL
* If enabled by TCM fabric module pre-registered SGL
* memory, perform the memcpy() from the TCM internal
* contigious buffer back to the original SGL.
* contiguous buffer back to the original SGL.
*/
if (cmd->se_cmd_flags & SCF_PASSTHROUGH_CONTIG_TO_SG)
transport_memcpy_write_contig(cmd,
cmd->t_task.t_task_pt_sgl,
cmd->t_task.t_task_buf);
sg_copy_from_buffer(cmd->t_task_pt_sgl,
cmd->t_task_pt_sgl_num,
cmd->t_task_buf,
cmd->data_length);
cmd->se_tfo->queue_data_in(cmd);
break;
......@@ -3765,7 +3697,7 @@ static void transport_generic_complete_ok(struct se_cmd *cmd)
/*
* Check if we need to send READ payload for BIDI-COMMAND
*/
if (!list_empty(&cmd->t_task.t_mem_bidi_list)) {
if (!list_empty(&cmd->t_mem_bidi_list)) {
spin_lock(&cmd->se_lun->lun_sep_lock);
if (cmd->se_lun->lun_sep) {
cmd->se_lun->lun_sep->sep_stats.tx_data_octets +=
......@@ -3792,9 +3724,9 @@ static void transport_free_dev_tasks(struct se_cmd *cmd)
struct se_task *task, *task_tmp;
unsigned long flags;
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
list_for_each_entry_safe(task, task_tmp,
&cmd->t_task.t_task_list, t_list) {
&cmd->t_task_list, t_list) {
if (atomic_read(&task->task_active))
continue;
......@@ -3803,15 +3735,15 @@ static void transport_free_dev_tasks(struct se_cmd *cmd)
list_del(&task->t_list);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
if (task->se_dev)
task->se_dev->transport->free_task(task);
else
printk(KERN_ERR "task[%u] - task->se_dev is NULL\n",
task->task_no);
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
}
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
}
static inline void transport_free_pages(struct se_cmd *cmd)
......@@ -3824,9 +3756,9 @@ static inline void transport_free_pages(struct se_cmd *cmd)
if (cmd->se_dev->transport->do_se_mem_map)
free_page = 0;
if (cmd->t_task.t_task_buf) {
kfree(cmd->t_task.t_task_buf);
cmd->t_task.t_task_buf = NULL;
if (cmd->t_task_buf) {
kfree(cmd->t_task_buf);
cmd->t_task_buf = NULL;
return;
}
......@@ -3837,7 +3769,7 @@ static inline void transport_free_pages(struct se_cmd *cmd)
return;
list_for_each_entry_safe(se_mem, se_mem_tmp,
&cmd->t_task.t_mem_list, se_list) {
&cmd->t_mem_list, se_list) {
/*
* We only release call __free_page(struct se_mem->se_page) when
* SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC is NOT in use,
......@@ -3848,10 +3780,10 @@ static inline void transport_free_pages(struct se_cmd *cmd)
list_del(&se_mem->se_list);
kmem_cache_free(se_mem_cache, se_mem);
}
cmd->t_task.t_tasks_se_num = 0;
cmd->t_tasks_se_num = 0;
list_for_each_entry_safe(se_mem, se_mem_tmp,
&cmd->t_task.t_mem_bidi_list, se_list) {
&cmd->t_mem_bidi_list, se_list) {
/*
* We only release call __free_page(struct se_mem->se_page) when
* SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC is NOT in use,
......@@ -3862,7 +3794,7 @@ static inline void transport_free_pages(struct se_cmd *cmd)
list_del(&se_mem->se_list);
kmem_cache_free(se_mem_cache, se_mem);
}
cmd->t_task.t_tasks_se_bidi_num = 0;
cmd->t_tasks_se_bidi_num = 0;
}
static inline void transport_release_tasks(struct se_cmd *cmd)
......@@ -3874,23 +3806,23 @@ static inline int transport_dec_and_check(struct se_cmd *cmd)
{
unsigned long flags;
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
if (atomic_read(&cmd->t_task.t_fe_count)) {
if (!(atomic_dec_and_test(&cmd->t_task.t_fe_count))) {
spin_unlock_irqrestore(&cmd->t_task.t_state_lock,
spin_lock_irqsave(&cmd->t_state_lock, flags);
if (atomic_read(&cmd->t_fe_count)) {
if (!(atomic_dec_and_test(&cmd->t_fe_count))) {
spin_unlock_irqrestore(&cmd->t_state_lock,
flags);
return 1;
}
}
if (atomic_read(&cmd->t_task.t_se_count)) {
if (!(atomic_dec_and_test(&cmd->t_task.t_se_count))) {
spin_unlock_irqrestore(&cmd->t_task.t_state_lock,
if (atomic_read(&cmd->t_se_count)) {
if (!(atomic_dec_and_test(&cmd->t_se_count))) {
spin_unlock_irqrestore(&cmd->t_state_lock,
flags);
return 1;
}
}
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return 0;
}
......@@ -3902,14 +3834,14 @@ static void transport_release_fe_cmd(struct se_cmd *cmd)
if (transport_dec_and_check(cmd))
return;
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
if (!(atomic_read(&cmd->t_task.transport_dev_active))) {
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
if (!(atomic_read(&cmd->transport_dev_active))) {
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
goto free_pages;
}
atomic_set(&cmd->t_task.transport_dev_active, 0);
atomic_set(&cmd->transport_dev_active, 0);
transport_all_task_dev_remove_state(cmd);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
transport_release_tasks(cmd);
free_pages:
......@@ -3927,22 +3859,22 @@ static int transport_generic_remove(
if (transport_dec_and_check(cmd)) {
if (session_reinstatement) {
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
transport_all_task_dev_remove_state(cmd);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock,
spin_unlock_irqrestore(&cmd->t_state_lock,
flags);
}
return 1;
}
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
if (!(atomic_read(&cmd->t_task.transport_dev_active))) {
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
if (!(atomic_read(&cmd->transport_dev_active))) {
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
goto free_pages;
}
atomic_set(&cmd->t_task.transport_dev_active, 0);
atomic_set(&cmd->transport_dev_active, 0);
transport_all_task_dev_remove_state(cmd);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
transport_release_tasks(cmd);
......@@ -3977,7 +3909,6 @@ int transport_generic_map_mem_to_cmd(
struct scatterlist *sgl_bidi,
u32 sgl_bidi_count)
{
u32 mapped_sg_count = 0;
int ret;
if (!sgl || !sgl_count)
......@@ -3993,24 +3924,20 @@ int transport_generic_map_mem_to_cmd(
* processed into a TCM struct se_subsystem_dev, we do the mapping
* from the passed physical memory to struct se_mem->se_page here.
*/
ret = transport_map_sg_to_mem(cmd,
&cmd->t_task.t_mem_list, sgl, &mapped_sg_count);
ret = transport_map_sg_to_mem(cmd, &cmd->t_mem_list, sgl);
if (ret < 0)
return -ENOMEM;
cmd->t_task.t_tasks_se_num = mapped_sg_count;
cmd->t_tasks_se_num = ret;
/*
* Setup BIDI READ list of struct se_mem elements
*/
if (sgl_bidi && sgl_bidi_count) {
mapped_sg_count = 0;
ret = transport_map_sg_to_mem(cmd,
&cmd->t_task.t_mem_bidi_list, sgl_bidi,
&mapped_sg_count);
ret = transport_map_sg_to_mem(cmd, &cmd->t_mem_bidi_list, sgl_bidi);
if (ret < 0)
return -ENOMEM;
cmd->t_task.t_tasks_se_bidi_num = mapped_sg_count;
cmd->t_tasks_se_bidi_num = ret;
}
cmd->se_cmd_flags |= SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC;
......@@ -4021,7 +3948,7 @@ int transport_generic_map_mem_to_cmd(
return -ENOSYS;
}
/*
* For incoming CDBs using a contiguous buffer internall with TCM,
* For incoming CDBs using a contiguous buffer internal with TCM,
* save the passed struct scatterlist memory. After TCM storage object
* processing has completed for this struct se_cmd, TCM core will call
* transport_memcpy_[write,read]_contig() as necessary from
......@@ -4030,8 +3957,8 @@ int transport_generic_map_mem_to_cmd(
* struct scatterlist format.
*/
cmd->se_cmd_flags |= SCF_PASSTHROUGH_CONTIG_TO_SG;
cmd->t_task.t_task_pt_sgl = sgl;
/* don't need sgl count? We assume it contains cmd->data_length data */
cmd->t_task_pt_sgl = sgl;
cmd->t_task_pt_sgl_num = sgl_count;
}
return 0;
......@@ -4044,54 +3971,51 @@ static inline long long transport_dev_end_lba(struct se_device *dev)
return dev->transport->get_blocks(dev) + 1;
}
static int transport_get_sectors(struct se_cmd *cmd)
static int transport_cmd_get_valid_sectors(struct se_cmd *cmd)
{
struct se_device *dev = cmd->se_dev;
cmd->t_task.t_tasks_sectors =
(cmd->data_length / dev->se_sub_dev->se_dev_attrib.block_size);
if (!(cmd->t_task.t_tasks_sectors))
cmd->t_task.t_tasks_sectors = 1;
u32 sectors;
if (dev->transport->get_device_type(dev) != TYPE_DISK)
return 0;
if ((cmd->t_task.t_task_lba + cmd->t_task.t_tasks_sectors) >
sectors = (cmd->data_length / dev->se_sub_dev->se_dev_attrib.block_size);
if ((cmd->t_task_lba + sectors) >
transport_dev_end_lba(dev)) {
printk(KERN_ERR "LBA: %llu Sectors: %u exceeds"
" transport_dev_end_lba(): %llu\n",
cmd->t_task.t_task_lba, cmd->t_task.t_tasks_sectors,
cmd->t_task_lba, sectors,
transport_dev_end_lba(dev));
cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
cmd->scsi_sense_reason = TCM_SECTOR_COUNT_TOO_MANY;
return PYX_TRANSPORT_REQ_TOO_MANY_SECTORS;
return 0;
}
return 0;
return sectors;
}
static int transport_new_cmd_obj(struct se_cmd *cmd)
{
struct se_device *dev = cmd->se_dev;
u32 task_cdbs = 0, rc;
u32 task_cdbs;
u32 rc;
if (!(cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB)) {
task_cdbs++;
cmd->t_task.t_task_cdbs++;
task_cdbs = 1;
cmd->t_task_list_num = 1;
} else {
int set_counts = 1;
/*
* Setup any BIDI READ tasks and memory from
* cmd->t_task.t_mem_bidi_list so the READ struct se_tasks
* cmd->t_mem_bidi_list so the READ struct se_tasks
* are queued first for the non pSCSI passthrough case.
*/
if (!list_empty(&cmd->t_task.t_mem_bidi_list) &&
if (!list_empty(&cmd->t_mem_bidi_list) &&
(dev->transport->transport_type != TRANSPORT_PLUGIN_PHBA_PDEV)) {
rc = transport_generic_get_cdb_count(cmd,
cmd->t_task.t_task_lba,
cmd->t_task.t_tasks_sectors,
DMA_FROM_DEVICE, &cmd->t_task.t_mem_bidi_list,
rc = transport_allocate_tasks(cmd,
cmd->t_task_lba,
transport_cmd_get_valid_sectors(cmd),
DMA_FROM_DEVICE, &cmd->t_mem_bidi_list,
set_counts);
if (!(rc)) {
cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
......@@ -4102,13 +4026,13 @@ static int transport_new_cmd_obj(struct se_cmd *cmd)
set_counts = 0;
}
/*
* Setup the tasks and memory from cmd->t_task.t_mem_list
* Setup the tasks and memory from cmd->t_mem_list
* Note for BIDI transfers this will contain the WRITE payload
*/
task_cdbs = transport_generic_get_cdb_count(cmd,
cmd->t_task.t_task_lba,
cmd->t_task.t_tasks_sectors,
cmd->data_direction, &cmd->t_task.t_mem_list,
task_cdbs = transport_allocate_tasks(cmd,
cmd->t_task_lba,
transport_cmd_get_valid_sectors(cmd),
cmd->data_direction, &cmd->t_mem_list,
set_counts);
if (!(task_cdbs)) {
cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
......@@ -4116,26 +4040,25 @@ static int transport_new_cmd_obj(struct se_cmd *cmd)
TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
return PYX_TRANSPORT_LU_COMM_FAILURE;
}
cmd->t_task.t_task_cdbs += task_cdbs;
cmd->t_task_list_num = task_cdbs;
#if 0
printk(KERN_INFO "data_length: %u, LBA: %llu t_tasks_sectors:"
" %u, t_task_cdbs: %u\n", obj_ptr, cmd->data_length,
cmd->t_task.t_task_lba, cmd->t_task.t_tasks_sectors,
cmd->t_task.t_task_cdbs);
cmd->t_task_lba, cmd->t_tasks_sectors,
cmd->t_task_cdbs);
#endif
}
atomic_set(&cmd->t_task.t_task_cdbs_left, task_cdbs);
atomic_set(&cmd->t_task.t_task_cdbs_ex_left, task_cdbs);
atomic_set(&cmd->t_task.t_task_cdbs_timeout_left, task_cdbs);
atomic_set(&cmd->t_task_cdbs_left, task_cdbs);
atomic_set(&cmd->t_task_cdbs_ex_left, task_cdbs);
atomic_set(&cmd->t_task_cdbs_timeout_left, task_cdbs);
return 0;
}
static int
transport_generic_get_mem(struct se_cmd *cmd, u32 length, u32 dma_size)
transport_generic_get_mem(struct se_cmd *cmd, u32 length)
{
unsigned char *buf;
struct se_mem *se_mem;
/*
......@@ -4152,24 +4075,16 @@ transport_generic_get_mem(struct se_cmd *cmd, u32 length, u32 dma_size)
}
/* #warning FIXME Allocate contigous pages for struct se_mem elements */
se_mem->se_page = alloc_pages(GFP_KERNEL, 0);
se_mem->se_page = alloc_pages(GFP_KERNEL | __GFP_ZERO, 0);
if (!(se_mem->se_page)) {
printk(KERN_ERR "alloc_pages() failed\n");
goto out;
}
buf = kmap_atomic(se_mem->se_page, KM_IRQ0);
if (!(buf)) {
printk(KERN_ERR "kmap_atomic() failed\n");
goto out;
}
INIT_LIST_HEAD(&se_mem->se_list);
se_mem->se_len = (length > dma_size) ? dma_size : length;
memset(buf, 0, se_mem->se_len);
kunmap_atomic(buf, KM_IRQ0);
list_add_tail(&se_mem->se_list, &cmd->t_task.t_mem_list);
cmd->t_task.t_tasks_se_num++;
se_mem->se_len = min_t(u32, length, PAGE_SIZE);
list_add_tail(&se_mem->se_list, &cmd->t_mem_list);
cmd->t_tasks_se_num++;
DEBUG_MEM("Allocated struct se_mem page(%p) Length(%u)"
" Offset(%u)\n", se_mem->se_page, se_mem->se_len,
......@@ -4179,7 +4094,7 @@ transport_generic_get_mem(struct se_cmd *cmd, u32 length, u32 dma_size)
}
DEBUG_MEM("Allocated total struct se_mem elements(%u)\n",
cmd->t_task.t_tasks_se_num);
cmd->t_tasks_se_num);
return 0;
out:
......@@ -4211,7 +4126,7 @@ int transport_init_task_sg(
sg_length = se_mem->se_len;
if (!(list_is_last(&se_mem->se_list,
&se_cmd->t_task.t_mem_list)))
&se_cmd->t_mem_list)))
se_mem = list_entry(se_mem->se_list.next,
struct se_mem, se_list);
} else {
......@@ -4231,7 +4146,7 @@ int transport_init_task_sg(
sg_length = (se_mem->se_len - task_offset);
if (!(list_is_last(&se_mem->se_list,
&se_cmd->t_task.t_mem_list)))
&se_cmd->t_mem_list)))
se_mem = list_entry(se_mem->se_list.next,
struct se_mem, se_list);
}
......@@ -4272,7 +4187,7 @@ int transport_init_task_sg(
* Setup task->task_sg_bidi for SCSI READ payload for
* TCM/pSCSI passthrough if present for BIDI-COMMAND
*/
if (!list_empty(&se_cmd->t_task.t_mem_bidi_list) &&
if (!list_empty(&se_cmd->t_mem_bidi_list) &&
(se_dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)) {
task->task_sg_bidi = kzalloc(task_sg_num_padded *
sizeof(struct scatterlist), GFP_KERNEL);
......@@ -4308,59 +4223,19 @@ int transport_init_task_sg(
return task->task_sg_num;
}
static inline int transport_set_tasks_sectors_disk(
struct se_task *task,
/* Reduce sectors if they are too long for the device */
static inline sector_t transport_limit_task_sectors(
struct se_device *dev,
unsigned long long lba,
u32 sectors,
int *max_sectors_set)
sector_t sectors)
{
if ((lba + sectors) > transport_dev_end_lba(dev)) {
task->task_sectors = ((transport_dev_end_lba(dev) - lba) + 1);
sectors = min_t(sector_t, sectors, dev->se_sub_dev->se_dev_attrib.max_sectors);
if (task->task_sectors > dev->se_sub_dev->se_dev_attrib.max_sectors) {
task->task_sectors = dev->se_sub_dev->se_dev_attrib.max_sectors;
*max_sectors_set = 1;
}
} else {
if (sectors > dev->se_sub_dev->se_dev_attrib.max_sectors) {
task->task_sectors = dev->se_sub_dev->se_dev_attrib.max_sectors;
*max_sectors_set = 1;
} else
task->task_sectors = sectors;
}
if (dev->transport->get_device_type(dev) == TYPE_DISK)
if ((lba + sectors) > transport_dev_end_lba(dev))
sectors = ((transport_dev_end_lba(dev) - lba) + 1);
return 0;
}
static inline int transport_set_tasks_sectors_non_disk(
struct se_task *task,
struct se_device *dev,
unsigned long long lba,
u32 sectors,
int *max_sectors_set)
{
if (sectors > dev->se_sub_dev->se_dev_attrib.max_sectors) {
task->task_sectors = dev->se_sub_dev->se_dev_attrib.max_sectors;
*max_sectors_set = 1;
} else
task->task_sectors = sectors;
return 0;
}
static inline int transport_set_tasks_sectors(
struct se_task *task,
struct se_device *dev,
unsigned long long lba,
u32 sectors,
int *max_sectors_set)
{
return (dev->transport->get_device_type(dev) == TYPE_DISK) ?
transport_set_tasks_sectors_disk(task, dev, lba, sectors,
max_sectors_set) :
transport_set_tasks_sectors_non_disk(task, dev, lba, sectors,
max_sectors_set);
return sectors;
}
/*
......@@ -4369,11 +4244,11 @@ static inline int transport_set_tasks_sectors(
static int transport_map_sg_to_mem(
struct se_cmd *cmd,
struct list_head *se_mem_list,
struct scatterlist *sg,
u32 *sg_count)
struct scatterlist *sg)
{
struct se_mem *se_mem;
u32 cmd_size = cmd->data_length;
int sg_count = 0;
WARN_ON(!sg);
......@@ -4403,7 +4278,7 @@ static int transport_map_sg_to_mem(
se_mem->se_len = cmd_size;
cmd_size -= se_mem->se_len;
(*sg_count)++;
sg_count++;
DEBUG_MEM("sg_to_mem: sg_count: %u cmd_size: %u\n",
sg_count, cmd_size);
......@@ -4415,7 +4290,7 @@ static int transport_map_sg_to_mem(
DEBUG_MEM("task[0] - Mapped(%u) struct scatterlist segments\n", sg_count);
return 0;
return sg_count;
}
/* transport_map_mem_to_sg():
......@@ -4425,7 +4300,7 @@ static int transport_map_sg_to_mem(
int transport_map_mem_to_sg(
struct se_task *task,
struct list_head *se_mem_list,
void *in_mem,
struct scatterlist *sg,
struct se_mem *in_se_mem,
struct se_mem **out_se_mem,
u32 *se_mem_cnt,
......@@ -4433,7 +4308,6 @@ int transport_map_mem_to_sg(
{
struct se_cmd *se_cmd = task->task_se_cmd;
struct se_mem *se_mem = in_se_mem;
struct scatterlist *sg = (struct scatterlist *)in_mem;
u32 task_size = task->task_size, sg_no = 0;
if (!sg) {
......@@ -4444,7 +4318,7 @@ int transport_map_mem_to_sg(
while (task_size != 0) {
/*
* Setup the contigious array of scatterlists for
* Setup the contiguous array of scatterlists for
* this struct se_task.
*/
sg_assign_page(sg, se_mem->se_page);
......@@ -4456,7 +4330,7 @@ int transport_map_mem_to_sg(
sg->length = se_mem->se_len;
if (!(list_is_last(&se_mem->se_list,
&se_cmd->t_task.t_mem_list))) {
&se_cmd->t_mem_list))) {
se_mem = list_entry(se_mem->se_list.next,
struct se_mem, se_list);
(*se_mem_cnt)++;
......@@ -4492,7 +4366,7 @@ int transport_map_mem_to_sg(
sg->length = (se_mem->se_len - *task_offset);
if (!(list_is_last(&se_mem->se_list,
&se_cmd->t_task.t_mem_list))) {
&se_cmd->t_mem_list))) {
se_mem = list_entry(se_mem->se_list.next,
struct se_mem, se_list);
(*se_mem_cnt)++;
......@@ -4548,9 +4422,9 @@ void transport_do_task_sg_chain(struct se_cmd *cmd)
}
/*
* Walk the struct se_task list and setup scatterlist chains
* for each contiguosly allocated struct se_task->task_sg[].
* for each contiguously allocated struct se_task->task_sg[].
*/
list_for_each_entry(task, &cmd->t_task.t_task_list, t_list) {
list_for_each_entry(task, &cmd->t_task_list, t_list) {
if (!(task->task_sg) || !(task->task_padded_sg))
continue;
......@@ -4561,7 +4435,7 @@ void transport_do_task_sg_chain(struct se_cmd *cmd)
* Either add chain or mark end of scatterlist
*/
if (!(list_is_last(&task->t_list,
&cmd->t_task.t_task_list))) {
&cmd->t_task_list))) {
/*
* Clear existing SGL termination bit set in
* transport_init_task_sg(), see sg_mark_end()
......@@ -4587,7 +4461,7 @@ void transport_do_task_sg_chain(struct se_cmd *cmd)
/*
* Check for single task..
*/
if (!(list_is_last(&task->t_list, &cmd->t_task.t_task_list))) {
if (!(list_is_last(&task->t_list, &cmd->t_task_list))) {
/*
* Clear existing SGL termination bit set in
* transport_init_task_sg(), see sg_mark_end()
......@@ -4605,15 +4479,15 @@ void transport_do_task_sg_chain(struct se_cmd *cmd)
* Setup the starting pointer and total t_tasks_sg_linked_no including
* padding SGs for linking and to mark the end.
*/
cmd->t_task.t_tasks_sg_chained = sg_first;
cmd->t_task.t_tasks_sg_chained_no = sg_count;
cmd->t_tasks_sg_chained = sg_first;
cmd->t_tasks_sg_chained_no = sg_count;
DEBUG_CMD_M("Setup cmd: %p cmd->t_task.t_tasks_sg_chained: %p and"
" t_tasks_sg_chained_no: %u\n", cmd, cmd->t_task.t_tasks_sg_chained,
cmd->t_task.t_tasks_sg_chained_no);
DEBUG_CMD_M("Setup cmd: %p cmd->t_tasks_sg_chained: %p and"
" t_tasks_sg_chained_no: %u\n", cmd, cmd->t_tasks_sg_chained,
cmd->t_tasks_sg_chained_no);
for_each_sg(cmd->t_task.t_tasks_sg_chained, sg,
cmd->t_task.t_tasks_sg_chained_no, i) {
for_each_sg(cmd->t_tasks_sg_chained, sg,
cmd->t_tasks_sg_chained_no, i) {
DEBUG_CMD_M("SG[%d]: %p page: %p length: %d offset: %d\n",
i, sg, sg_page(sg), sg->length, sg->offset);
......@@ -4646,7 +4520,7 @@ static int transport_do_se_mem_map(
in_mem, in_se_mem, out_se_mem, se_mem_cnt,
task_offset_in);
if (ret == 0)
task->task_se_cmd->t_task.t_tasks_se_num += *se_mem_cnt;
task->task_se_cmd->t_tasks_se_num += *se_mem_cnt;
return ret;
}
......@@ -4684,7 +4558,10 @@ static int transport_do_se_mem_map(
task_offset_in);
}
static u32 transport_generic_get_cdb_count(
/*
* Break up cmd into chunks transport can handle
*/
static u32 transport_allocate_tasks(
struct se_cmd *cmd,
unsigned long long lba,
u32 sectors,
......@@ -4694,17 +4571,18 @@ static u32 transport_generic_get_cdb_count(
{
unsigned char *cdb = NULL;
struct se_task *task;
struct se_mem *se_mem = NULL, *se_mem_lout = NULL;
struct se_mem *se_mem_bidi = NULL, *se_mem_bidi_lout = NULL;
struct se_mem *se_mem = NULL;
struct se_mem *se_mem_lout = NULL;
struct se_mem *se_mem_bidi = NULL;
struct se_mem *se_mem_bidi_lout = NULL;
struct se_device *dev = cmd->se_dev;
int max_sectors_set = 0, ret;
u32 task_offset_in = 0, se_mem_cnt = 0, se_mem_bidi_cnt = 0, task_cdbs = 0;
int ret;
u32 task_offset_in = 0;
u32 se_mem_cnt = 0;
u32 se_mem_bidi_cnt = 0;
u32 task_cdbs = 0;
if (!mem_list) {
printk(KERN_ERR "mem_list is NULL in transport_generic_get"
"_cdb_count()\n");
return 0;
}
BUG_ON(!mem_list);
/*
* While using RAMDISK_DR backstores is the only case where
* mem_list will ever be empty at this point.
......@@ -4715,40 +4593,47 @@ static u32 transport_generic_get_cdb_count(
* Check for extra se_mem_bidi mapping for BIDI-COMMANDs to
* struct se_task->task_sg_bidi for TCM/pSCSI passthrough operation
*/
if (!list_empty(&cmd->t_task.t_mem_bidi_list) &&
if (!list_empty(&cmd->t_mem_bidi_list) &&
(dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV))
se_mem_bidi = list_first_entry(&cmd->t_task.t_mem_bidi_list,
se_mem_bidi = list_first_entry(&cmd->t_mem_bidi_list,
struct se_mem, se_list);
while (sectors) {
sector_t limited_sectors;
DEBUG_VOL("ITT[0x%08x] LBA(%llu) SectorsLeft(%u) EOBJ(%llu)\n",
cmd->se_tfo->get_task_tag(cmd), lba, sectors,
transport_dev_end_lba(dev));
limited_sectors = transport_limit_task_sectors(dev, lba, sectors);
if (!limited_sectors)
break;
task = transport_generic_get_task(cmd, data_direction);
if (!(task))
if (!task)
goto out;
transport_set_tasks_sectors(task, dev, lba, sectors,
&max_sectors_set);
task->task_lba = lba;
task->task_sectors = limited_sectors;
lba += task->task_sectors;
sectors -= task->task_sectors;
task->task_size = (task->task_sectors *
dev->se_sub_dev->se_dev_attrib.block_size);
cdb = dev->transport->get_cdb(task);
if ((cdb)) {
memcpy(cdb, cmd->t_task.t_task_cdb,
scsi_command_size(cmd->t_task.t_task_cdb));
cmd->transport_split_cdb(task->task_lba,
&task->task_sectors, cdb);
}
/* Should be part of task, can't fail */
BUG_ON(!cdb);
memcpy(cdb, cmd->t_task_cdb,
scsi_command_size(cmd->t_task_cdb));
/* Update new cdb with updated lba/sectors */
cmd->transport_split_cdb(task->task_lba,
&task->task_sectors, cdb);
/*
* Perform the SE OBJ plugin and/or Transport plugin specific
* mapping for cmd->t_task.t_mem_list. And setup the
* mapping for cmd->t_mem_list. And setup the
* task->task_sg and if necessary task->task_sg_bidi
*/
ret = transport_do_se_mem_map(dev, task, mem_list,
......@@ -4759,7 +4644,7 @@ static u32 transport_generic_get_cdb_count(
se_mem = se_mem_lout;
/*
* Setup the cmd->t_task.t_mem_bidi_list -> task->task_sg_bidi
* Setup the cmd->t_mem_bidi_list -> task->task_sg_bidi
* mapping for SCSI READ for BIDI-COMMAND passthrough with TCM/pSCSI
*
* Note that the first call to transport_do_se_mem_map() above will
......@@ -4769,7 +4654,7 @@ static u32 transport_generic_get_cdb_count(
*/
if (task->task_sg_bidi != NULL) {
ret = transport_do_se_mem_map(dev, task,
&cmd->t_task.t_mem_bidi_list, NULL,
&cmd->t_mem_bidi_list, NULL,
se_mem_bidi, &se_mem_bidi_lout, &se_mem_bidi_cnt,
&task_offset_in);
if (ret < 0)
......@@ -4781,19 +4666,11 @@ static u32 transport_generic_get_cdb_count(
DEBUG_VOL("Incremented task_cdbs(%u) task->task_sg_num(%u)\n",
task_cdbs, task->task_sg_num);
if (max_sectors_set) {
max_sectors_set = 0;
continue;
}
if (!sectors)
break;
}
if (set_counts) {
atomic_inc(&cmd->t_task.t_fe_count);
atomic_inc(&cmd->t_task.t_se_count);
atomic_inc(&cmd->t_fe_count);
atomic_inc(&cmd->t_se_count);
}
DEBUG_VOL("ITT[0x%08x] total %s cdbs(%u)\n",
......@@ -4818,27 +4695,27 @@ transport_map_control_cmd_to_task(struct se_cmd *cmd)
return PYX_TRANSPORT_OUT_OF_MEMORY_RESOURCES;
cdb = dev->transport->get_cdb(task);
if (cdb)
memcpy(cdb, cmd->t_task.t_task_cdb,
scsi_command_size(cmd->t_task.t_task_cdb));
BUG_ON(!cdb);
memcpy(cdb, cmd->t_task_cdb,
scsi_command_size(cmd->t_task_cdb));
task->task_size = cmd->data_length;
task->task_sg_num =
(cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB) ? 1 : 0;
atomic_inc(&cmd->t_task.t_fe_count);
atomic_inc(&cmd->t_task.t_se_count);
atomic_inc(&cmd->t_fe_count);
atomic_inc(&cmd->t_se_count);
if (cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB) {
struct se_mem *se_mem = NULL, *se_mem_lout = NULL;
u32 se_mem_cnt = 0, task_offset = 0;
if (!list_empty(&cmd->t_task.t_mem_list))
se_mem = list_first_entry(&cmd->t_task.t_mem_list,
if (!list_empty(&cmd->t_mem_list))
se_mem = list_first_entry(&cmd->t_mem_list,
struct se_mem, se_list);
ret = transport_do_se_mem_map(dev, task,
&cmd->t_task.t_mem_list, NULL, se_mem,
&cmd->t_mem_list, NULL, se_mem,
&se_mem_lout, &se_mem_cnt, &task_offset);
if (ret < 0)
return PYX_TRANSPORT_OUT_OF_MEMORY_RESOURCES;
......@@ -4869,9 +4746,8 @@ transport_map_control_cmd_to_task(struct se_cmd *cmd)
/*
* Generate struct se_task(s) and/or their payloads for this CDB.
*/
static int transport_generic_new_cmd(struct se_cmd *cmd)
int transport_generic_new_cmd(struct se_cmd *cmd)
{
struct se_portal_group *se_tpg;
struct se_task *task;
struct se_device *dev = cmd->se_dev;
int ret = 0;
......@@ -4880,7 +4756,7 @@ static int transport_generic_new_cmd(struct se_cmd *cmd)
* Determine is the TCM fabric module has already allocated physical
* memory, and is directly calling transport_generic_map_mem_to_cmd()
* to setup beforehand the linked list of physical memory at
* cmd->t_task.t_mem_list of struct se_mem->se_page
* cmd->t_mem_list of struct se_mem->se_page
*/
if (!(cmd->se_cmd_flags & SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC)) {
ret = transport_allocate_resources(cmd);
......@@ -4888,28 +4764,12 @@ static int transport_generic_new_cmd(struct se_cmd *cmd)
return ret;
}
ret = transport_get_sectors(cmd);
if (ret < 0)
return ret;
ret = transport_new_cmd_obj(cmd);
if (ret < 0)
return ret;
/*
* Determine if the calling TCM fabric module is talking to
* Linux/NET via kernel sockets and needs to allocate a
* struct iovec array to complete the struct se_cmd
*/
se_tpg = cmd->se_lun->lun_sep->sep_tpg;
if (se_tpg->se_tpg_tfo->alloc_cmd_iovecs != NULL) {
ret = se_tpg->se_tpg_tfo->alloc_cmd_iovecs(cmd);
if (ret < 0)
return PYX_TRANSPORT_OUT_OF_MEMORY_RESOURCES;
}
if (cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB) {
list_for_each_entry(task, &cmd->t_task.t_task_list, t_list) {
list_for_each_entry(task, &cmd->t_task_list, t_list) {
if (atomic_read(&task->task_sent))
continue;
if (!dev->transport->map_task_SG)
......@@ -4926,7 +4786,7 @@ static int transport_generic_new_cmd(struct se_cmd *cmd)
}
/*
* For WRITEs, let the iSCSI Target RX Thread know its buffer is ready..
* For WRITEs, let the fabric know its buffer is ready..
* This WRITE struct se_cmd (and all of its associated struct se_task's)
* will be added to the struct se_device execution queue after its WRITE
* data has arrived. (ie: It gets handled by the transport processing
......@@ -4943,6 +4803,7 @@ static int transport_generic_new_cmd(struct se_cmd *cmd)
transport_execute_tasks(cmd);
return 0;
}
EXPORT_SYMBOL(transport_generic_new_cmd);
/* transport_generic_process_write():
*
......@@ -4956,9 +4817,9 @@ void transport_generic_process_write(struct se_cmd *cmd)
* original EDTL
*/
if (cmd->se_cmd_flags & SCF_UNDERFLOW_BIT) {
if (!cmd->t_task.t_tasks_se_num) {
if (!cmd->t_tasks_se_num) {
unsigned char *dst, *buf =
(unsigned char *)cmd->t_task.t_task_buf;
(unsigned char *)cmd->t_task_buf;
dst = kzalloc(cmd->cmd_spdtl), GFP_KERNEL);
if (!(dst)) {
......@@ -4970,15 +4831,15 @@ void transport_generic_process_write(struct se_cmd *cmd)
}
memcpy(dst, buf, cmd->cmd_spdtl);
kfree(cmd->t_task.t_task_buf);
cmd->t_task.t_task_buf = dst;
kfree(cmd->t_task_buf);
cmd->t_task_buf = dst;
} else {
struct scatterlist *sg =
(struct scatterlist *sg)cmd->t_task.t_task_buf;
(struct scatterlist *sg)cmd->t_task_buf;
struct scatterlist *orig_sg;
orig_sg = kzalloc(sizeof(struct scatterlist) *
cmd->t_task.t_tasks_se_num,
cmd->t_tasks_se_num,
GFP_KERNEL))) {
if (!(orig_sg)) {
printk(KERN_ERR "Unable to allocate memory"
......@@ -4988,9 +4849,9 @@ void transport_generic_process_write(struct se_cmd *cmd)
return;
}
memcpy(orig_sg, cmd->t_task.t_task_buf,
memcpy(orig_sg, cmd->t_task_buf,
sizeof(struct scatterlist) *
cmd->t_task.t_tasks_se_num);
cmd->t_tasks_se_num);
cmd->data_length = cmd->cmd_spdtl;
/*
......@@ -5021,22 +4882,23 @@ static int transport_generic_write_pending(struct se_cmd *cmd)
unsigned long flags;
int ret;
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
cmd->t_state = TRANSPORT_WRITE_PENDING;
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
/*
* For the TCM control CDBs using a contiguous buffer, do the memcpy
* from the passed Linux/SCSI struct scatterlist located at
* se_cmd->t_task.t_task_pt_buf to the contiguous buffer at
* se_cmd->t_task.t_task_buf.
* se_cmd->t_task_pt_sgl to the contiguous buffer at
* se_cmd->t_task_buf.
*/
if (cmd->se_cmd_flags & SCF_PASSTHROUGH_CONTIG_TO_SG)
transport_memcpy_read_contig(cmd,
cmd->t_task.t_task_buf,
cmd->t_task.t_task_pt_sgl);
sg_copy_to_buffer(cmd->t_task_pt_sgl,
cmd->t_task_pt_sgl_num,
cmd->t_task_buf,
cmd->data_length);
/*
* Clear the se_cmd for WRITE_PENDING status in order to set
* cmd->t_task.t_transport_active=0 so that transport_generic_handle_data
* cmd->t_transport_active=0 so that transport_generic_handle_data
* can be called from HW target mode interrupt code. This is safe
* to be called with transport_off=1 before the cmd->se_tfo->write_pending
* because the se_cmd->se_lun pointer is not being cleared.
......@@ -5123,28 +4985,28 @@ static int transport_lun_wait_for_tasks(struct se_cmd *cmd, struct se_lun *lun)
* If the frontend has already requested this struct se_cmd to
* be stopped, we can safely ignore this struct se_cmd.
*/
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
if (atomic_read(&cmd->t_task.t_transport_stop)) {
atomic_set(&cmd->t_task.transport_lun_stop, 0);
spin_lock_irqsave(&cmd->t_state_lock, flags);
if (atomic_read(&cmd->t_transport_stop)) {
atomic_set(&cmd->transport_lun_stop, 0);
DEBUG_TRANSPORT_S("ConfigFS ITT[0x%08x] - t_transport_stop =="
" TRUE, skipping\n", cmd->se_tfo->get_task_tag(cmd));
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
transport_cmd_check_stop(cmd, 1, 0);
return -EPERM;
}
atomic_set(&cmd->t_task.transport_lun_fe_stop, 1);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
atomic_set(&cmd->transport_lun_fe_stop, 1);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
wake_up_interruptible(&cmd->se_dev->dev_queue_obj.thread_wq);
ret = transport_stop_tasks_for_cmd(cmd);
DEBUG_TRANSPORT_S("ConfigFS: cmd: %p t_task_cdbs: %d stop tasks ret:"
" %d\n", cmd, cmd->t_task.t_task_cdbs, ret);
" %d\n", cmd, cmd->t_task_cdbs, ret);
if (!ret) {
DEBUG_TRANSPORT_S("ConfigFS: ITT[0x%08x] - stopping cmd....\n",
cmd->se_tfo->get_task_tag(cmd));
wait_for_completion(&cmd->t_task.transport_lun_stop_comp);
wait_for_completion(&cmd->transport_lun_stop_comp);
DEBUG_TRANSPORT_S("ConfigFS: ITT[0x%08x] - stopped cmd....\n",
cmd->se_tfo->get_task_tag(cmd));
}
......@@ -5174,19 +5036,19 @@ static void __transport_clear_lun_from_sessions(struct se_lun *lun)
struct se_cmd, se_lun_node);
list_del(&cmd->se_lun_node);
atomic_set(&cmd->t_task.transport_lun_active, 0);
atomic_set(&cmd->transport_lun_active, 0);
/*
* This will notify iscsi_target_transport.c:
* transport_cmd_check_stop() that a LUN shutdown is in
* progress for the iscsi_cmd_t.
*/
spin_lock(&cmd->t_task.t_state_lock);
DEBUG_CLEAR_L("SE_LUN[%d] - Setting cmd->t_task.transport"
spin_lock(&cmd->t_state_lock);
DEBUG_CLEAR_L("SE_LUN[%d] - Setting cmd->transport"
"_lun_stop for ITT: 0x%08x\n",
cmd->se_lun->unpacked_lun,
cmd->se_tfo->get_task_tag(cmd));
atomic_set(&cmd->t_task.transport_lun_stop, 1);
spin_unlock(&cmd->t_task.t_state_lock);
atomic_set(&cmd->transport_lun_stop, 1);
spin_unlock(&cmd->t_state_lock);
spin_unlock_irqrestore(&lun->lun_cmd_lock, lun_flags);
......@@ -5214,14 +5076,14 @@ static void __transport_clear_lun_from_sessions(struct se_lun *lun)
cmd->se_lun->unpacked_lun,
cmd->se_tfo->get_task_tag(cmd));
spin_lock_irqsave(&cmd->t_task.t_state_lock, cmd_flags);
if (!(atomic_read(&cmd->t_task.transport_dev_active))) {
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, cmd_flags);
spin_lock_irqsave(&cmd->t_state_lock, cmd_flags);
if (!(atomic_read(&cmd->transport_dev_active))) {
spin_unlock_irqrestore(&cmd->t_state_lock, cmd_flags);
goto check_cond;
}
atomic_set(&cmd->t_task.transport_dev_active, 0);
atomic_set(&cmd->transport_dev_active, 0);
transport_all_task_dev_remove_state(cmd);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, cmd_flags);
spin_unlock_irqrestore(&cmd->t_state_lock, cmd_flags);
transport_free_dev_tasks(cmd);
/*
......@@ -5238,24 +5100,24 @@ static void __transport_clear_lun_from_sessions(struct se_lun *lun)
* be released, notify the waiting thread now that LU has
* finished accessing it.
*/
spin_lock_irqsave(&cmd->t_task.t_state_lock, cmd_flags);
if (atomic_read(&cmd->t_task.transport_lun_fe_stop)) {
spin_lock_irqsave(&cmd->t_state_lock, cmd_flags);
if (atomic_read(&cmd->transport_lun_fe_stop)) {
DEBUG_CLEAR_L("SE_LUN[%d] - Detected FE stop for"
" struct se_cmd: %p ITT: 0x%08x\n",
lun->unpacked_lun,
cmd, cmd->se_tfo->get_task_tag(cmd));
spin_unlock_irqrestore(&cmd->t_task.t_state_lock,
spin_unlock_irqrestore(&cmd->t_state_lock,
cmd_flags);
transport_cmd_check_stop(cmd, 1, 0);
complete(&cmd->t_task.transport_lun_fe_stop_comp);
complete(&cmd->transport_lun_fe_stop_comp);
spin_lock_irqsave(&lun->lun_cmd_lock, lun_flags);
continue;
}
DEBUG_CLEAR_L("SE_LUN[%d] - ITT: 0x%08x finished processing\n",
lun->unpacked_lun, cmd->se_tfo->get_task_tag(cmd));
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, cmd_flags);
spin_unlock_irqrestore(&cmd->t_state_lock, cmd_flags);
spin_lock_irqsave(&lun->lun_cmd_lock, lun_flags);
}
spin_unlock_irqrestore(&lun->lun_cmd_lock, lun_flags);
......@@ -5301,15 +5163,15 @@ static void transport_generic_wait_for_tasks(
if (!(cmd->se_cmd_flags & SCF_SE_LUN_CMD) && !(cmd->se_tmr_req))
return;
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
/*
* If we are already stopped due to an external event (ie: LUN shutdown)
* sleep until the connection can have the passed struct se_cmd back.
* The cmd->t_task.transport_lun_stopped_sem will be upped by
* The cmd->transport_lun_stopped_sem will be upped by
* transport_clear_lun_from_sessions() once the ConfigFS context caller
* has completed its operation on the struct se_cmd.
*/
if (atomic_read(&cmd->t_task.transport_lun_stop)) {
if (atomic_read(&cmd->transport_lun_stop)) {
DEBUG_TRANSPORT_S("wait_for_tasks: Stopping"
" wait_for_completion(&cmd->t_tasktransport_lun_fe"
......@@ -5322,10 +5184,10 @@ static void transport_generic_wait_for_tasks(
* We go ahead and up transport_lun_stop_comp just to be sure
* here.
*/
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
complete(&cmd->t_task.transport_lun_stop_comp);
wait_for_completion(&cmd->t_task.transport_lun_fe_stop_comp);
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
complete(&cmd->transport_lun_stop_comp);
wait_for_completion(&cmd->transport_lun_fe_stop_comp);
spin_lock_irqsave(&cmd->t_state_lock, flags);
transport_all_task_dev_remove_state(cmd);
/*
......@@ -5338,13 +5200,13 @@ static void transport_generic_wait_for_tasks(
"stop_comp); for ITT: 0x%08x\n",
cmd->se_tfo->get_task_tag(cmd));
atomic_set(&cmd->t_task.transport_lun_stop, 0);
atomic_set(&cmd->transport_lun_stop, 0);
}
if (!atomic_read(&cmd->t_task.t_transport_active) ||
atomic_read(&cmd->t_task.t_transport_aborted))
if (!atomic_read(&cmd->t_transport_active) ||
atomic_read(&cmd->t_transport_aborted))
goto remove;
atomic_set(&cmd->t_task.t_transport_stop, 1);
atomic_set(&cmd->t_transport_stop, 1);
DEBUG_TRANSPORT_S("wait_for_tasks: Stopping %p ITT: 0x%08x"
" i_state: %d, t_state/def_t_state: %d/%d, t_transport_stop"
......@@ -5352,21 +5214,21 @@ static void transport_generic_wait_for_tasks(
cmd->se_tfo->get_cmd_state(cmd), cmd->t_state,
cmd->deferred_t_state);
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
wake_up_interruptible(&cmd->se_dev->dev_queue_obj.thread_wq);
wait_for_completion(&cmd->t_task.t_transport_stop_comp);
wait_for_completion(&cmd->t_transport_stop_comp);
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
atomic_set(&cmd->t_task.t_transport_active, 0);
atomic_set(&cmd->t_task.t_transport_stop, 0);
spin_lock_irqsave(&cmd->t_state_lock, flags);
atomic_set(&cmd->t_transport_active, 0);
atomic_set(&cmd->t_transport_stop, 0);
DEBUG_TRANSPORT_S("wait_for_tasks: Stopped wait_for_compltion("
"&cmd->t_task.t_transport_stop_comp) for ITT: 0x%08x\n",
"&cmd->t_transport_stop_comp) for ITT: 0x%08x\n",
cmd->se_tfo->get_task_tag(cmd));
remove:
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
if (!remove_cmd)
return;
......@@ -5405,13 +5267,13 @@ int transport_send_check_condition_and_sense(
int offset;
u8 asc = 0, ascq = 0;
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
if (cmd->se_cmd_flags & SCF_SENT_CHECK_CONDITION) {
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return 0;
}
cmd->se_cmd_flags |= SCF_SENT_CHECK_CONDITION;
spin_unlock_irqrestore(&cmd->t_task.t_state_lock, flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
if (!reason && from_transport)
goto after_reason;
......@@ -5570,14 +5432,14 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status)
{
int ret = 0;
if (atomic_read(&cmd->t_task.t_transport_aborted) != 0) {
if (atomic_read(&cmd->t_transport_aborted) != 0) {
if (!(send_status) ||
(cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
return 1;
#if 0
printk(KERN_INFO "Sending delayed SAM_STAT_TASK_ABORTED"
" status for CDB: 0x%02x ITT: 0x%08x\n",
cmd->t_task.t_task_cdb[0],
cmd->t_task_cdb[0],
cmd->se_tfo->get_task_tag(cmd));
#endif
cmd->se_cmd_flags |= SCF_SENT_DELAYED_TAS;
......@@ -5598,7 +5460,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
*/
if (cmd->data_direction == DMA_TO_DEVICE) {
if (cmd->se_tfo->write_pending_status(cmd) != 0) {
atomic_inc(&cmd->t_task.t_transport_aborted);
atomic_inc(&cmd->t_transport_aborted);
smp_mb__after_atomic_inc();
cmd->scsi_status = SAM_STAT_TASK_ABORTED;
transport_new_cmd_failure(cmd);
......@@ -5608,7 +5470,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
cmd->scsi_status = SAM_STAT_TASK_ABORTED;
#if 0
printk(KERN_INFO "Setting SAM_STAT_TASK_ABORTED status for CDB: 0x%02x,"
" ITT: 0x%08x\n", cmd->t_task.t_task_cdb[0],
" ITT: 0x%08x\n", cmd->t_task_cdb[0],
cmd->se_tfo->get_task_tag(cmd));
#endif
cmd->se_tfo->queue_status(cmd);
......@@ -5620,14 +5482,12 @@ void transport_send_task_abort(struct se_cmd *cmd)
*/
int transport_generic_do_tmr(struct se_cmd *cmd)
{
struct se_cmd *ref_cmd;
struct se_device *dev = cmd->se_dev;
struct se_tmr_req *tmr = cmd->se_tmr_req;
int ret;
switch (tmr->function) {
case TMR_ABORT_TASK:
ref_cmd = tmr->ref_cmd;
tmr->response = TMR_FUNCTION_REJECTED;
break;
case TMR_ABORT_TASK_SET:
......@@ -5699,7 +5559,7 @@ static void transport_processing_shutdown(struct se_device *dev)
spin_unlock_irqrestore(&dev->execute_task_lock, flags);
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
spin_lock_irqsave(&cmd->t_state_lock, flags);
DEBUG_DO("PT: cmd: %p task: %p ITT/CmdSN: 0x%08x/0x%08x,"
" i_state/def_i_state: %d/%d, t_state/def_t_state:"
......@@ -5707,22 +5567,22 @@ static void transport_processing_shutdown(struct se_device *dev)
cmd->se_tfo->get_task_tag(cmd), cmd->cmd_sn,
cmd->se_tfo->get_cmd_state(cmd), cmd->deferred_i_state,
cmd->t_state, cmd->deferred_t_state,
cmd->t_task.t_task_cdb[0]);
cmd->t_task_cdb[0]);
DEBUG_DO("PT: ITT[0x%08x] - t_task_cdbs: %d t_task_cdbs_left:"
" %d t_task_cdbs_sent: %d -- t_transport_active: %d"
" t_transport_stop: %d t_transport_sent: %d\n",
cmd->se_tfo->get_task_tag(cmd),
cmd->t_task.t_task_cdbs,
atomic_read(&cmd->t_task.t_task_cdbs_left),
atomic_read(&cmd->t_task.t_task_cdbs_sent),
atomic_read(&cmd->t_task.t_transport_active),
atomic_read(&cmd->t_task.t_transport_stop),
atomic_read(&cmd->t_task.t_transport_sent));
cmd->t_task_cdbs,
atomic_read(&cmd->t_task_cdbs_left),
atomic_read(&cmd->t_task_cdbs_sent),
atomic_read(&cmd->t_transport_active),
atomic_read(&cmd->t_transport_stop),
atomic_read(&cmd->t_transport_sent));
if (atomic_read(&task->task_active)) {
atomic_set(&task->task_stop, 1);
spin_unlock_irqrestore(
&cmd->t_task.t_state_lock, flags);
&cmd->t_state_lock, flags);
DEBUG_DO("Waiting for task: %p to shutdown for dev:"
" %p\n", task, dev);
......@@ -5730,8 +5590,8 @@ static void transport_processing_shutdown(struct se_device *dev)
DEBUG_DO("Completed task: %p shutdown for dev: %p\n",
task, dev);
spin_lock_irqsave(&cmd->t_task.t_state_lock, flags);
atomic_dec(&cmd->t_task.t_task_cdbs_left);
spin_lock_irqsave(&cmd->t_state_lock, flags);
atomic_dec(&cmd->t_task_cdbs_left);
atomic_set(&task->task_active, 0);
atomic_set(&task->task_stop, 0);
......@@ -5741,25 +5601,25 @@ static void transport_processing_shutdown(struct se_device *dev)
}
__transport_stop_task_timer(task, &flags);
if (!(atomic_dec_and_test(&cmd->t_task.t_task_cdbs_ex_left))) {
if (!(atomic_dec_and_test(&cmd->t_task_cdbs_ex_left))) {
spin_unlock_irqrestore(
&cmd->t_task.t_state_lock, flags);
&cmd->t_state_lock, flags);
DEBUG_DO("Skipping task: %p, dev: %p for"
" t_task_cdbs_ex_left: %d\n", task, dev,
atomic_read(&cmd->t_task.t_task_cdbs_ex_left));
atomic_read(&cmd->t_task_cdbs_ex_left));
spin_lock_irqsave(&dev->execute_task_lock, flags);
continue;
}
if (atomic_read(&cmd->t_task.t_transport_active)) {
if (atomic_read(&cmd->t_transport_active)) {
DEBUG_DO("got t_transport_active = 1 for task: %p, dev:"
" %p\n", task, dev);
if (atomic_read(&cmd->t_task.t_fe_count)) {
if (atomic_read(&cmd->t_fe_count)) {
spin_unlock_irqrestore(
&cmd->t_task.t_state_lock, flags);
&cmd->t_state_lock, flags);
transport_send_check_condition_and_sense(
cmd, TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE,
0);
......@@ -5770,7 +5630,7 @@ static void transport_processing_shutdown(struct se_device *dev)
transport_cmd_check_stop(cmd, 1, 0);
} else {
spin_unlock_irqrestore(
&cmd->t_task.t_state_lock, flags);
&cmd->t_state_lock, flags);
transport_remove_cmd_from_queue(cmd,
&cmd->se_dev->dev_queue_obj);
......@@ -5787,9 +5647,9 @@ static void transport_processing_shutdown(struct se_device *dev)
DEBUG_DO("Got t_transport_active = 0 for task: %p, dev: %p\n",
task, dev);
if (atomic_read(&cmd->t_task.t_fe_count)) {
if (atomic_read(&cmd->t_fe_count)) {
spin_unlock_irqrestore(
&cmd->t_task.t_state_lock, flags);
&cmd->t_state_lock, flags);
transport_send_check_condition_and_sense(cmd,
TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE, 0);
transport_remove_cmd_from_queue(cmd,
......@@ -5799,7 +5659,7 @@ static void transport_processing_shutdown(struct se_device *dev)
transport_cmd_check_stop(cmd, 1, 0);
} else {
spin_unlock_irqrestore(
&cmd->t_task.t_state_lock, flags);
&cmd->t_state_lock, flags);
transport_remove_cmd_from_queue(cmd,
&cmd->se_dev->dev_queue_obj);
......@@ -5820,7 +5680,7 @@ static void transport_processing_shutdown(struct se_device *dev)
DEBUG_DO("From Device Queue: cmd: %p t_state: %d\n",
cmd, cmd->t_state);
if (atomic_read(&cmd->t_task.t_fe_count)) {
if (atomic_read(&cmd->t_fe_count)) {
transport_send_check_condition_and_sense(cmd,
TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE, 0);
......
drivers/target/target_core_ua.c
View file @ a1d8b49a
......@@ -270,7 +270,7 @@ void core_scsi3_ua_for_check_condition(
nacl->se_tpg->se_tpg_tfo->get_fabric_name(),
(dev->se_sub_dev->se_dev_attrib.emulate_ua_intlck_ctrl != 0) ? "Reporting" :
"Releasing", dev->se_sub_dev->se_dev_attrib.emulate_ua_intlck_ctrl,
cmd->orig_fe_lun, cmd->t_task.t_task_cdb[0], *asc, *ascq);
cmd->orig_fe_lun, cmd->t_task_cdb[0], *asc, *ascq);
}
int core_scsi3_ua_clear_for_request_sense(
......
drivers/target/tcm_fc/tfc_cmd.c
View file @ a1d8b49a
......@@ -60,7 +60,6 @@ void ft_dump_cmd(struct ft_cmd *cmd, const char *caller)
struct fc_seq *sp;
struct se_cmd *se_cmd;
struct se_mem *mem;
struct se_transport_task *task;
if (!(ft_debug_logging & FT_DEBUG_IO))
return;
......@@ -72,12 +71,11 @@ void ft_dump_cmd(struct ft_cmd *cmd, const char *caller)
caller, cmd, cmd->cdb);
printk(KERN_INFO "%s: cmd %p lun %d\n", caller, cmd, cmd->lun);
task = &se_cmd->t_task;
printk(KERN_INFO "%s: cmd %p task %p se_num %u buf %p len %u se_cmd_flags <0x%x>\n",
caller, cmd, task, task->t_tasks_se_num,
task->t_task_buf, se_cmd->data_length, se_cmd->se_cmd_flags);
printk(KERN_INFO "%s: cmd %p se_num %u buf %p len %u se_cmd_flags <0x%x>\n",
caller, cmd, se_cmd->t_tasks_se_num,
se_cmd->t_task_buf, se_cmd->data_length, se_cmd->se_cmd_flags);
list_for_each_entry(mem, &task->t_mem_list, se_list)
list_for_each_entry(mem, &se_cmd->t_mem_list, se_list)
printk(KERN_INFO "%s: cmd %p mem %p page %p "
"len 0x%x off 0x%x\n",
caller, cmd, mem,
......@@ -262,9 +260,9 @@ int ft_write_pending(struct se_cmd *se_cmd)
* TCM/LIO target
*/
transport_do_task_sg_chain(se_cmd);
cmd->sg = se_cmd->t_task.t_tasks_sg_chained;
cmd->sg = se_cmd->t_tasks_sg_chained;
cmd->sg_cnt =
se_cmd->t_task.t_tasks_sg_chained_no;
se_cmd->t_tasks_sg_chained_no;
}
if (cmd->sg && lport->tt.ddp_setup(lport, ep->xid,
cmd->sg, cmd->sg_cnt))
......
drivers/target/tcm_fc/tfc_io.c
View file @ a1d8b49a
......@@ -65,7 +65,6 @@
int ft_queue_data_in(struct se_cmd *se_cmd)
{
struct ft_cmd *cmd = container_of(se_cmd, struct ft_cmd, se_cmd);
struct se_transport_task *task;
struct fc_frame *fp = NULL;
struct fc_exch *ep;
struct fc_lport *lport;
......@@ -90,14 +89,13 @@ int ft_queue_data_in(struct se_cmd *se_cmd)
lport = ep->lp;
cmd->seq = lport->tt.seq_start_next(cmd->seq);
task = &se_cmd->t_task;
remaining = se_cmd->data_length;
/*
* Setup to use first mem list entry if any.
*/
if (task->t_tasks_se_num) {
mem = list_first_entry(&task->t_mem_list,
if (se_cmd->t_tasks_se_num) {
mem = list_first_entry(&se_cmd->t_mem_list,
struct se_mem, se_list);
mem_len = mem->se_len;
mem_off = mem->se_off;
......@@ -148,8 +146,8 @@ int ft_queue_data_in(struct se_cmd *se_cmd)
if (use_sg) {
if (!mem) {
BUG_ON(!task->t_task_buf);
page_addr = task->t_task_buf + mem_off;
BUG_ON(!se_cmd->t_task_buf);
page_addr = se_cmd->t_task_buf + mem_off;
/*
* In this case, offset is 'offset_in_page' of
* (t_task_buf + mem_off) instead of 'mem_off'.
......@@ -180,7 +178,7 @@ int ft_queue_data_in(struct se_cmd *se_cmd)
kunmap_atomic(page_addr, KM_SOFTIRQ0);
to += tlen;
} else {
from = task->t_task_buf + mem_off;
from = se_cmd->t_task_buf + mem_off;
memcpy(to, from, tlen);
to += tlen;
}
......@@ -220,7 +218,6 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct fc_frame *fp)
struct fc_seq *seq = cmd->seq;
struct fc_exch *ep;
struct fc_lport *lport;
struct se_transport_task *task;
struct fc_frame_header *fh;
struct se_mem *mem;
u32 mem_off;
......@@ -235,8 +232,6 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct fc_frame *fp)
u32 f_ctl;
void *buf;
task = &se_cmd->t_task;
fh = fc_frame_header_get(fp);
if (!(ntoh24(fh->fh_f_ctl) & FC_FC_REL_OFF))
goto drop;
......@@ -312,8 +307,8 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct fc_frame *fp)
/*
* Setup to use first mem list entry if any.
*/
if (task->t_tasks_se_num) {
mem = list_first_entry(&task->t_mem_list,
if (se_cmd->t_tasks_se_num) {
mem = list_first_entry(&se_cmd->t_mem_list,
struct se_mem, se_list);
mem_len = mem->se_len;
mem_off = mem->se_off;
......@@ -355,7 +350,7 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct fc_frame *fp)
memcpy(to, from, tlen);
kunmap_atomic(page_addr, KM_SOFTIRQ0);
} else {
to = task->t_task_buf + mem_off;
to = se_cmd->t_task_buf + mem_off;
memcpy(to, from, tlen);
}
from += tlen;
......
include/target/target_core_base.h
View file @ a1d8b49a
......@@ -403,64 +403,10 @@ struct se_queue_obj {
wait_queue_head_t thread_wq;
} ____cacheline_aligned;
/*
* Used one per struct se_cmd to hold all extra struct se_task
* metadata. This structure is setup and allocated in
* drivers/target/target_core_transport.c:__transport_alloc_se_cmd()
*/
struct se_transport_task {
unsigned char *t_task_cdb;
unsigned char __t_task_cdb[TCM_MAX_COMMAND_SIZE];
unsigned long long t_task_lba;
int t_tasks_failed;
int t_tasks_fua;
bool t_tasks_bidi;
u32 t_task_cdbs;
u32 t_tasks_check;
u32 t_tasks_no;
u32 t_tasks_sectors;
u32 t_tasks_se_num;
u32 t_tasks_se_bidi_num;
u32 t_tasks_sg_chained_no;
atomic_t t_fe_count;
atomic_t t_se_count;
atomic_t t_task_cdbs_left;
atomic_t t_task_cdbs_ex_left;
atomic_t t_task_cdbs_timeout_left;
atomic_t t_task_cdbs_sent;
atomic_t t_transport_aborted;
atomic_t t_transport_active;
atomic_t t_transport_complete;
atomic_t t_transport_queue_active;
atomic_t t_transport_sent;
atomic_t t_transport_stop;
atomic_t t_transport_timeout;
atomic_t transport_dev_active;
atomic_t transport_lun_active;
atomic_t transport_lun_fe_stop;
atomic_t transport_lun_stop;
spinlock_t t_state_lock;
struct completion t_transport_stop_comp;
struct completion transport_lun_fe_stop_comp;
struct completion transport_lun_stop_comp;
struct scatterlist *t_tasks_sg_chained;
struct scatterlist t_tasks_sg_bounce;
void *t_task_buf;
/*
* Used for pre-registered fabric SGL passthrough WRITE and READ
* with the special SCF_PASSTHROUGH_CONTIG_TO_SG case for TCM_Loop
* and other HW target mode fabric modules.
*/
struct scatterlist *t_task_pt_sgl;
struct list_head t_mem_list;
/* Used for BIDI READ */
struct list_head t_mem_bidi_list;
struct list_head t_task_list;
} ____cacheline_aligned;
struct se_task {
unsigned char task_sense;
struct scatterlist *task_sg;
u32 task_sg_num;
struct scatterlist *task_sg_bidi;
u8 task_scsi_status;
u8 task_flags;
......@@ -471,8 +417,6 @@ struct se_task {
u32 task_no;
u32 task_sectors;
u32 task_size;
u32 task_sg_num;
u32 task_sg_offset;
enum dma_data_direction task_data_direction;
struct se_cmd *task_se_cmd;
struct se_device *se_dev;
......@@ -534,13 +478,58 @@ struct se_cmd {
/* Only used for internal passthrough and legacy TCM fabric modules */
struct se_session *se_sess;
struct se_tmr_req *se_tmr_req;
struct se_transport_task t_task;
struct list_head se_queue_node;
struct target_core_fabric_ops *se_tfo;
int (*transport_emulate_cdb)(struct se_cmd *);
void (*transport_split_cdb)(unsigned long long, u32 *, unsigned char *);
void (*transport_wait_for_tasks)(struct se_cmd *, int, int);
void (*transport_complete_callback)(struct se_cmd *);
unsigned char *t_task_cdb;
unsigned char __t_task_cdb[TCM_MAX_COMMAND_SIZE];
unsigned long long t_task_lba;
int t_tasks_failed;
int t_tasks_fua;
bool t_tasks_bidi;
u32 t_tasks_se_num;
u32 t_tasks_se_bidi_num;
u32 t_tasks_sg_chained_no;
atomic_t t_fe_count;
atomic_t t_se_count;
atomic_t t_task_cdbs_left;
atomic_t t_task_cdbs_ex_left;
atomic_t t_task_cdbs_timeout_left;
atomic_t t_task_cdbs_sent;
atomic_t t_transport_aborted;
atomic_t t_transport_active;
atomic_t t_transport_complete;
atomic_t t_transport_queue_active;
atomic_t t_transport_sent;
atomic_t t_transport_stop;
atomic_t t_transport_timeout;
atomic_t transport_dev_active;
atomic_t transport_lun_active;
atomic_t transport_lun_fe_stop;
atomic_t transport_lun_stop;
spinlock_t t_state_lock;
struct completion t_transport_stop_comp;
struct completion transport_lun_fe_stop_comp;
struct completion transport_lun_stop_comp;
struct scatterlist *t_tasks_sg_chained;
struct scatterlist t_tasks_sg_bounce;
void *t_task_buf;
/*
* Used for pre-registered fabric SGL passthrough WRITE and READ
* with the special SCF_PASSTHROUGH_CONTIG_TO_SG case for TCM_Loop
* and other HW target mode fabric modules.
*/
struct scatterlist *t_task_pt_sgl;
u32 t_task_pt_sgl_num;
struct list_head t_mem_list;
/* Used for BIDI READ */
struct list_head t_mem_bidi_list;
struct list_head t_task_list;
u32 t_task_list_num;
} ____cacheline_aligned;
struct se_tmr_req {
......
include/target/target_core_fabric_ops.h
View file @ a1d8b49a
......@@ -38,11 +38,6 @@ struct target_core_fabric_ops {
* initially allocated in interrupt context.
*/
int (*new_cmd_map)(struct se_cmd *);
/*
* Optional function pointer for TCM fabric modules that use
* Linux/NET sockets to allocate struct iovec array to struct se_cmd
*/
int (*alloc_cmd_iovecs)(struct se_cmd *);
/*
* Optional to release struct se_cmd and fabric dependent allocated
* I/O descriptor in transport_cmd_check_stop()
......
include/target/target_core_transport.h
View file @ a1d8b49a
......@@ -184,10 +184,11 @@ extern void transport_generic_free_cmd(struct se_cmd *, int, int, int);
extern void transport_generic_wait_for_cmds(struct se_cmd *, int);
extern int transport_init_task_sg(struct se_task *, struct se_mem *, u32);
extern int transport_map_mem_to_sg(struct se_task *, struct list_head *,
void *, struct se_mem *,
struct scatterlist *, struct se_mem *,
struct se_mem **, u32 *, u32 *);
extern void transport_do_task_sg_chain(struct se_cmd *);
extern void transport_generic_process_write(struct se_cmd *);
extern int transport_generic_new_cmd(struct se_cmd *);
extern int transport_generic_do_tmr(struct se_cmd *);
/* From target_core_alua.c */
extern int core_alua_check_nonop_delay(struct se_cmd *);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7