Skip to content

Commit a188e7e

Browse files
torvaldstorvalds
committed
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Pull scsi target updates from Nicholas Bellinger: "Things have been calm for the most part with no new fabric drivers in flight for v3.7 (we're up to eight now !), so this update is primarily focused on addressing a few long-standing items within target-core and iscsi-target fabric code. The highlights include: - target: Simplify fabric sense data length handling (roland) - qla2xxx: Fix endianness of task management response code (roland) - target: fix truncation of mode data, support zero allocation length (paolo) - target: Properly support zero-length commands in normal processing path (paolo) - iscsi-target: Correctly set 0xffffffff field within ISCSI_OP_REJECT PDU (ronnie + nab) - iscsi-target: Add explicit set of cache_dynamic_acls=1 for TPG demo-mode (ronnie + nab) - target/file: Re-enable optional fd_buffered_io=1 operation (nab + hch) - iscsi-target: Add MaxXmitDataSegmenthLength forr target -> initiator MDRSL declaration (nab) - target: Add target_submit_cmd_map_sgls for SGL fabric memory passthrough (nab + hch) - tcm_loop: Convert I/O path to use target_submit_cmd_map_sgls (hch + nab) - tcm_vhost: Convert I/O path to use target_submit_cmd_map_sgls (nab + hch) The last series for adding a new target_submit_cmd_map_sgls() fabric caller (as requested by hch) that accepts pre-allocated SGL memory (using existing logic), along with converting tcm_loop + tcm_vhost has only been in -next for the last days, but has gotten enough review +testing and is clear enough a mechanical change that I think it's reasonable to merge for -rc1 code. Thanks again to everyone who contributed this round! Extra special thanks to Roland (PureStorage) for tracking down the qla2xxx target TMR response code endian issue, and to Paolo (Redhat) for resolving the long standing zero-length CDB issues within target-core between virtual and pSCSI backends." * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (44 commits) iscsi-target: Bump defaults for nopin_timeout + nopin_response_timeout values iscsit: proper endianess conversions iscsit: use the itt_t abstract type iscsit: add missing endianess conversion in iscsit_check_inaddr_any iscsit: remove incorrect unlock in iscsit_build_sendtargets_resp iscsit: mark various functions static target/iscsi: precedence bug in iscsit_set_dataout_sequence_values() target/usb-gadget: strlen() doesn't count the terminator target/usb-gadget: remove duplicate initialization tcm_vhost: Convert I/O path to use target_submit_cmd_map_sgls target: Add control CDB READ payload zero work-around tcm_loop: Convert I/O path to use target_submit_cmd_map_sgls target: Add target_submit_cmd_map_sgls for SGL fabric memory passthrough iscsi-target: Add explicit set of cache_dynamic_acls=1 for TPG demo-mode iscsi-target: Change iscsi_target_seq_pdu_list.c to honor MaxXmitDataSegmentLength iscsi-target: Add MaxXmitDataSegmentLength connection recovery check iscsi-target: Convert incoming PDU payload checks to MaxXmitDataSegmentLength iscsi-target: Enable MaxXmitDataSegmentLength operation in login path iscsi-target: Add base MaxXmitDataSegmentLength code target/file: Re-enable optional fd_buffered_io=1 operation ...
2 parents e1b2814 + cf0eb28 commit a188e7e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+640
-735
lines changed

‎Documentation/target/tcm_mod_builder.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,6 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
402402
buf += " .queue_data_in = " + fabric_mod_name + "_queue_data_in,\n"
403403
buf += " .queue_status = " + fabric_mod_name + "_queue_status,\n"
404404
buf += " .queue_tm_rsp = " + fabric_mod_name + "_queue_tm_rsp,\n"
405-
buf += " .get_fabric_sense_len = " + fabric_mod_name + "_get_fabric_sense_len,\n"
406-
buf += " .set_fabric_sense_len = " + fabric_mod_name + "_set_fabric_sense_len,\n"
407405
buf += " .is_state_remove = " + fabric_mod_name + "_is_state_remove,\n"
408406
buf += " /*\n"
409407
buf += " * Setup function pointers for generic logic in target_core_fabric_configfs.c\n"
@@ -906,20 +904,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
906904
buf += "}\n\n"
907905
bufi += "int " + fabric_mod_name + "_queue_tm_rsp(struct se_cmd *);\n"
908906

909-
if re.search('get_fabric_sense_len\)\(', fo):
910-
buf += "u16 " + fabric_mod_name + "_get_fabric_sense_len(void)\n"
911-
buf += "{\n"
912-
buf += " return 0;\n"
913-
buf += "}\n\n"
914-
bufi += "u16 " + fabric_mod_name + "_get_fabric_sense_len(void);\n"
915-
916-
if re.search('set_fabric_sense_len\)\(', fo):
917-
buf += "u16 " + fabric_mod_name + "_set_fabric_sense_len(struct se_cmd *se_cmd, u32 sense_length)\n"
918-
buf += "{\n"
919-
buf += " return 0;\n"
920-
buf += "}\n\n"
921-
bufi += "u16 " + fabric_mod_name + "_set_fabric_sense_len(struct se_cmd *, u32);\n"
922-
923907
if re.search('is_state_remove\)\(', fo):
924908
buf += "int " + fabric_mod_name + "_is_state_remove(struct se_cmd *se_cmd)\n"
925909
buf += "{\n"

‎drivers/infiniband/ulp/srpt/ib_srpt.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3564,16 +3564,6 @@ static int srpt_get_tcm_cmd_state(struct se_cmd *se_cmd)
35643564
return srpt_get_cmd_state(ioctx);
35653565
}
35663566

3567-
static u16 srpt_set_fabric_sense_len(struct se_cmd *cmd, u32 sense_length)
3568-
{
3569-
return 0;
3570-
}
3571-
3572-
static u16 srpt_get_fabric_sense_len(void)
3573-
{
3574-
return 0;
3575-
}
3576-
35773567
/**
35783568
* srpt_parse_i_port_id() - Parse an initiator port ID.
35793569
* @name: ASCII representation of a 128-bit initiator port ID.
@@ -3953,8 +3943,6 @@ static struct target_core_fabric_ops srpt_template = {
39533943
.queue_data_in = srpt_queue_response,
39543944
.queue_status = srpt_queue_status,
39553945
.queue_tm_rsp = srpt_queue_response,
3956-
.get_fabric_sense_len = srpt_get_fabric_sense_len,
3957-
.set_fabric_sense_len = srpt_set_fabric_sense_len,
39583946
/*
39593947
* Setup function pointers for generic logic in
39603948
* target_core_fabric_configfs.c

‎drivers/scsi/qla2xxx/qla_target.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,7 @@ static void qlt_24xx_send_task_mgmt_ctio(struct scsi_qla_host *ha,
14031403
ctio->u.status1.scsi_status =
14041404
__constant_cpu_to_le16(SS_RESPONSE_INFO_LEN_VALID);
14051405
ctio->u.status1.response_len = __constant_cpu_to_le16(8);
1406-
((uint32_t *)ctio->u.status1.sense_data)[0] = cpu_to_be32(resp_code);
1406+
ctio->u.status1.sense_data[0] = resp_code;
14071407

14081408
qla2x00_start_iocbs(ha, ha->req);
14091409
}

‎drivers/scsi/qla2xxx/tcm_qla2xxx.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -735,17 +735,6 @@ static int tcm_qla2xxx_queue_tm_rsp(struct se_cmd *se_cmd)
735735
return 0;
736736
}
737737

738-
static u16 tcm_qla2xxx_get_fabric_sense_len(void)
739-
{
740-
return 0;
741-
}
742-
743-
static u16 tcm_qla2xxx_set_fabric_sense_len(struct se_cmd *se_cmd,
744-
u32 sense_length)
745-
{
746-
return 0;
747-
}
748-
749738
/* Local pointer to allocated TCM configfs fabric module */
750739
struct target_fabric_configfs *tcm_qla2xxx_fabric_configfs;
751740
struct target_fabric_configfs *tcm_qla2xxx_npiv_fabric_configfs;
@@ -1691,8 +1680,6 @@ static struct target_core_fabric_ops tcm_qla2xxx_ops = {
16911680
.queue_data_in = tcm_qla2xxx_queue_data_in,
16921681
.queue_status = tcm_qla2xxx_queue_status,
16931682
.queue_tm_rsp = tcm_qla2xxx_queue_tm_rsp,
1694-
.get_fabric_sense_len = tcm_qla2xxx_get_fabric_sense_len,
1695-
.set_fabric_sense_len = tcm_qla2xxx_set_fabric_sense_len,
16961683
/*
16971684
* Setup function pointers for generic logic in
16981685
* target_core_fabric_configfs.c
@@ -1740,8 +1727,6 @@ static struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
17401727
.queue_data_in = tcm_qla2xxx_queue_data_in,
17411728
.queue_status = tcm_qla2xxx_queue_status,
17421729
.queue_tm_rsp = tcm_qla2xxx_queue_tm_rsp,
1743-
.get_fabric_sense_len = tcm_qla2xxx_get_fabric_sense_len,
1744-
.set_fabric_sense_len = tcm_qla2xxx_set_fabric_sense_len,
17451730
/*
17461731
* Setup function pointers for generic logic in
17471732
* target_core_fabric_configfs.c

0 commit comments

Comments
 (0)