Skip to content

Commit 5c755fe

Browse files
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: "It's been a busy development cycle for target-core in a number of different areas. The fabric API usage for se_node_acl allocation is now within target-core code, dropping the external API callers for all fabric drivers tree-wide. There is a new conversion to RCU hlists for se_node_acl and se_portal_group LUN mappings, that turns fast-past LUN lookup into a completely lockless code-path. It also removes the original hard-coded limitation of 256 LUNs per fabric endpoint. The configfs attributes for backends can now be shared between core and driver code, allowing existing drivers to use common code while still allowing flexibility for new backend provided attributes. The highlights include: - Merge sbc_verify_dif_* into common code (sagi) - Remove iscsi-target support for obsolete IFMarker/OFMarker (Christophe Vu-Brugier) - Add bidi support in target/user backend (ilias + vangelis + agover) - Move se_node_acl allocation into target-core code (hch) - Add crc_t10dif_update common helper (akinobu + mkp) - Handle target-core odd SGL mapping for data transfer memory (akinobu) - Move transport ID handling into target-core (hch) - Move task tag into struct se_cmd + support 64-bit tags (bart) - Convert se_node_acl->device_list[] to RCU hlist (nab + hch + paulmck) - Convert se_portal_group->tpg_lun_list[] to RCU hlist (nab + hch + paulmck) - Simplify target backend driver registration (hch) - Consolidate + simplify target backend attribute implementations (hch + nab) - Subsume se_port + t10_alua_tg_pt_gp_member into se_lun (hch) - Drop lun_sep_lock for se_lun->lun_se_dev RCU usage (hch + nab) - Drop unnecessary core_tpg_register TFO parameter (nab) - Use 64-bit LUNs tree-wide (hannes) - Drop left-over TARGET_MAX_LUNS_PER_TRANSPORT limit (hannes)" * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (76 commits) target: Bump core version to v5.0 target: remove target_core_configfs.h target: remove unused TARGET_CORE_CONFIG_ROOT define target: consolidate version defines target: implement WRITE_SAME with UNMAP bit using ->execute_unmap target: simplify UNMAP handling target: replace se_cmd->execute_rw with a protocol_data field target/user: Fix inconsistent kmap_atomic/kunmap_atomic target: Send UA when changing LUN inventory target: Send UA upon LUN RESET tmr completion target: Send UA on ALUA target port group change target: Convert se_lun->lun_deve_lock to normal spinlock target: use 'se_dev_entry' when allocating UAs target: Remove 'ua_nacl' pointer from se_ua structure target_core_alua: Correct UA handling when switching states xen-scsiback: Fix compile warning for 64-bit LUN target: Remove TARGET_MAX_LUNS_PER_TRANSPORT target: use 64-bit LUNs target: Drop duplicate + unused se_dev_check_wce target: Drop unnecessary core_tpg_register TFO parameter ...
2 parents 6d7c8e1 + 2ec1e9e commit 5c755fe

Some content is hidden

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

68 files changed

+3163
-6312
lines changed

Documentation/target/tcm_mod_builder.py

Lines changed: 1 addition & 276 deletions
Large diffs are not rendered by default.

Documentation/target/tcm_mod_builder.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ fabric skeleton, by simply using:
1313
This script will create a new drivers/target/$TCM_NEW_MOD/, and will do the following
1414

1515
*) Generate new API callers for drivers/target/target_core_fabric_configs.c logic
16-
->make_nodeacl(), ->drop_nodeacl(), ->make_tpg(), ->drop_tpg()
17-
->make_wwn(), ->drop_wwn(). These are created into $TCM_NEW_MOD/$TCM_NEW_MOD_configfs.c
16+
->make_tpg(), ->drop_tpg(), ->make_wwn(), ->drop_wwn(). These are created
17+
into $TCM_NEW_MOD/$TCM_NEW_MOD_configfs.c
1818
*) Generate basic infrastructure for loading/unloading LKMs and TCM/ConfigFS fabric module
1919
using a skeleton struct target_core_fabric_ops API template.
2020
*) Based on user defined T10 Proto_Ident for the new fabric module being built,

Documentation/target/tcmu-design.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ overall shared memory region, not the entry. The data in/out buffers
152152
are accessible via tht req.iov[] array. iov_cnt contains the number of
153153
entries in iov[] needed to describe either the Data-In or Data-Out
154154
buffers. For bidirectional commands, iov_cnt specifies how many iovec
155-
entries cover the Data-Out area, and iov_bidi_count specifies how many
155+
entries cover the Data-Out area, and iov_bidi_cnt specifies how many
156156
iovec entries immediately after that in iov[] cover the Data-In
157157
area. Just like other fields, iov.iov_base is an offset from the start
158158
of the region.

drivers/infiniband/ulp/isert/ib_isert.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,7 +1356,7 @@ isert_handle_scsi_cmd(struct isert_conn *isert_conn,
13561356
if (!rc && dump_payload == false && unsol_data)
13571357
iscsit_set_unsoliticed_dataout(cmd);
13581358
else if (dump_payload && imm_data)
1359-
target_put_sess_cmd(conn->sess->se_sess, &cmd->se_cmd);
1359+
target_put_sess_cmd(&cmd->se_cmd);
13601360

13611361
return 0;
13621362
}
@@ -1781,7 +1781,7 @@ isert_put_cmd(struct isert_cmd *isert_cmd, bool comp_err)
17811781
cmd->se_cmd.t_state == TRANSPORT_WRITE_PENDING) {
17821782
struct se_cmd *se_cmd = &cmd->se_cmd;
17831783

1784-
target_put_sess_cmd(se_cmd->se_sess, se_cmd);
1784+
target_put_sess_cmd(se_cmd);
17851785
}
17861786
}
17871787

@@ -1954,7 +1954,7 @@ isert_completion_rdma_read(struct iser_tx_desc *tx_desc,
19541954
spin_unlock_bh(&cmd->istate_lock);
19551955

19561956
if (ret) {
1957-
target_put_sess_cmd(se_cmd->se_sess, se_cmd);
1957+
target_put_sess_cmd(se_cmd);
19581958
transport_send_check_condition_and_sense(se_cmd,
19591959
se_cmd->pi_err, 0);
19601960
} else {

0 commit comments

Comments
 (0)