Skip to content

L
linux
Commit c6668726 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 

Pull SCSI target updates from Nicholas Bellinger:
 "Lots of activity in target land the last months.

  The highlights include:

   - Convert fabric drivers tree-wide to target_register_template() (hch
     + bart)

   - iser-target hardening fixes + v1.0 improvements (sagi)

   - Convert iscsi_thread_set usage to kthread.h + kill
     iscsi_target_tq.c (sagi + nab)

   - Add support for T10-PI WRITE_STRIP + READ_INSERT operation (mkp +
     sagi + nab)

   - DIF fixes for CONFIG_DEBUG_SG=y + UNMAP file emulation (akinobu +
     sagi + mkp)

   - Extended TCMU ABI v2 for future BIDI + DIF support (andy + ilias)

   - Fix COMPARE_AND_WRITE handling for NO_ALLLOC drivers (hch + nab)

  Thanks to everyone who contributed this round with new features,
  bug-reports, fixes, cleanups and improvements.

  Looking forward, it's currently shaping up to be a busy v4.2 as well"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (69 commits)
  target: Put TCMU under a new config option
  target: Version 2 of TCMU ABI
  target: fix tcm_mod_builder.py
  target/file: Fix UNMAP with DIF protection support
  target/file: Fix SG table for prot_buf initialization
  target/file: Fix BUG() when CONFIG_DEBUG_SG=y and DIF protection enabled
  target: Make core_tmr_abort_task() skip TMFs
  target/sbc: Update sbc_dif_generate pr_debug output
  target/sbc: Make internal DIF emulation honor ->prot_checks
  target/sbc: Return INVALID_CDB_FIELD if DIF + sess_prot_type disabled
  target: Ensure sess_prot_type is saved across session restart
  target/rd: Don't pass incomplete scatterlist entries to sbc_dif_verify_*
  target: Remove the unused flag SCF_ACK_KREF
  target: Fix two sparse warnings
  target: Fix COMPARE_AND_WRITE with SG_TO_MEM_NOALLOC handling
  target: simplify the target template registration API
  target: simplify target_xcopy_init_pt_lun
  target: remove the unused SCF_CMD_XCOPY_PASSTHROUGH flag
  target/rd: reduce code duplication in rd_execute_rw()
  tcm_loop: fixup tpgt string to integer conversion
  ...
parents 06b45f2a 68d4cef3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1687 additions and 2273 deletions
Documentation/target/tcm_mod_builder.py
View file @ c6668726
...@@ -237,8 +237,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): ...@@ -237,8 +237,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
buf += "#include \"" + fabric_mod_name + "_base.h\"\n" buf += "#include \"" + fabric_mod_name + "_base.h\"\n"
buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n" buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n"
buf += "/* Local pointer to allocated TCM configfs fabric module */\n" buf += "static const struct target_core_fabric_ops " + fabric_mod_name + "_ops;\n\n"
buf += "struct target_fabric_configfs *" + fabric_mod_name + "_fabric_configfs;\n\n"
buf += "static struct se_node_acl *" + fabric_mod_name + "_make_nodeacl(\n" buf += "static struct se_node_acl *" + fabric_mod_name + "_make_nodeacl(\n"
buf += " struct se_portal_group *se_tpg,\n" buf += " struct se_portal_group *se_tpg,\n"
...@@ -309,8 +308,8 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): ...@@ -309,8 +308,8 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
buf += " }\n" buf += " }\n"
buf += " tpg->" + fabric_mod_port + " = " + fabric_mod_port + ";\n" buf += " tpg->" + fabric_mod_port + " = " + fabric_mod_port + ";\n"
buf += " tpg->" + fabric_mod_port + "_tpgt = tpgt;\n\n" buf += " tpg->" + fabric_mod_port + "_tpgt = tpgt;\n\n"
buf += " ret = core_tpg_register(&" + fabric_mod_name + "_fabric_configfs->tf_ops, wwn,\n" buf += " ret = core_tpg_register(&" + fabric_mod_name + "_ops, wwn,\n"
buf += " &tpg->se_tpg, (void *)tpg,\n" buf += " &tpg->se_tpg, tpg,\n"
buf += " TRANSPORT_TPG_TYPE_NORMAL);\n" buf += " TRANSPORT_TPG_TYPE_NORMAL);\n"
buf += " if (ret < 0) {\n" buf += " if (ret < 0) {\n"
buf += " kfree(tpg);\n" buf += " kfree(tpg);\n"
...@@ -370,7 +369,10 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): ...@@ -370,7 +369,10 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
buf += " NULL,\n" buf += " NULL,\n"
buf += "};\n\n" buf += "};\n\n"
buf += "static struct target_core_fabric_ops " + fabric_mod_name + "_ops = {\n" buf += "static const struct target_core_fabric_ops " + fabric_mod_name + "_ops = {\n"
buf += " .module = THIS_MODULE,\n"
buf += " .name = " + fabric_mod_name + ",\n"
buf += " .get_fabric_proto_ident = " + fabric_mod_name + "_get_fabric_proto_ident,\n"
buf += " .get_fabric_name = " + fabric_mod_name + "_get_fabric_name,\n" buf += " .get_fabric_name = " + fabric_mod_name + "_get_fabric_name,\n"
buf += " .get_fabric_proto_ident = " + fabric_mod_name + "_get_fabric_proto_ident,\n" buf += " .get_fabric_proto_ident = " + fabric_mod_name + "_get_fabric_proto_ident,\n"
buf += " .tpg_get_wwn = " + fabric_mod_name + "_get_fabric_wwn,\n" buf += " .tpg_get_wwn = " + fabric_mod_name + "_get_fabric_wwn,\n"
...@@ -413,75 +415,18 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): ...@@ -413,75 +415,18 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
buf += " .fabric_drop_np = NULL,\n" buf += " .fabric_drop_np = NULL,\n"
buf += " .fabric_make_nodeacl = " + fabric_mod_name + "_make_nodeacl,\n" buf += " .fabric_make_nodeacl = " + fabric_mod_name + "_make_nodeacl,\n"
buf += " .fabric_drop_nodeacl = " + fabric_mod_name + "_drop_nodeacl,\n" buf += " .fabric_drop_nodeacl = " + fabric_mod_name + "_drop_nodeacl,\n"
buf += "};\n\n" buf += "\n"
buf += " .tfc_wwn_attrs = " + fabric_mod_name + "_wwn_attrs;\n"
buf += "static int " + fabric_mod_name + "_register_configfs(void)\n"
buf += "{\n"
buf += " struct target_fabric_configfs *fabric;\n"
buf += " int ret;\n\n"
buf += " printk(KERN_INFO \"" + fabric_mod_name.upper() + " fabric module %s on %s/%s\"\n"
buf += " \" on \"UTS_RELEASE\"\\n\"," + fabric_mod_name.upper() + "_VERSION, utsname()->sysname,\n"
buf += " utsname()->machine);\n"
buf += " /*\n"
buf += " * Register the top level struct config_item_type with TCM core\n"
buf += " */\n"
buf += " fabric = target_fabric_configfs_init(THIS_MODULE, \"" + fabric_mod_name + "\");\n"
buf += " if (IS_ERR(fabric)) {\n"
buf += " printk(KERN_ERR \"target_fabric_configfs_init() failed\\n\");\n"
buf += " return PTR_ERR(fabric);\n"
buf += " }\n"
buf += " /*\n"
buf += " * Setup fabric->tf_ops from our local " + fabric_mod_name + "_ops\n"
buf += " */\n"
buf += " fabric->tf_ops = " + fabric_mod_name + "_ops;\n"
buf += " /*\n"
buf += " * Setup default attribute lists for various fabric->tf_cit_tmpl\n"
buf += " */\n"
buf += " fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = " + fabric_mod_name + "_wwn_attrs;\n"
buf += " fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = NULL;\n"
buf += " fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL;\n"
buf += " fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;\n"
buf += " fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;\n"
buf += " fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;\n"
buf += " fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;\n"
buf += " fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;\n"
buf += " fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;\n"
buf += " /*\n"
buf += " * Register the fabric for use within TCM\n"
buf += " */\n"
buf += " ret = target_fabric_configfs_register(fabric);\n"
buf += " if (ret < 0) {\n"
buf += " printk(KERN_ERR \"target_fabric_configfs_register() failed\"\n"
buf += " \" for " + fabric_mod_name.upper() + "\\n\");\n"
buf += " return ret;\n"
buf += " }\n"
buf += " /*\n"
buf += " * Setup our local pointer to *fabric\n"
buf += " */\n"
buf += " " + fabric_mod_name + "_fabric_configfs = fabric;\n"
buf += " printk(KERN_INFO \"" + fabric_mod_name.upper() + "[0] - Set fabric -> " + fabric_mod_name + "_fabric_configfs\\n\");\n"
buf += " return 0;\n"
buf += "};\n\n"
buf += "static void __exit " + fabric_mod_name + "_deregister_configfs(void)\n"
buf += "{\n"
buf += " if (!" + fabric_mod_name + "_fabric_configfs)\n"
buf += " return;\n\n"
buf += " target_fabric_configfs_deregister(" + fabric_mod_name + "_fabric_configfs);\n"
buf += " " + fabric_mod_name + "_fabric_configfs = NULL;\n"
buf += " printk(KERN_INFO \"" + fabric_mod_name.upper() + "[0] - Cleared " + fabric_mod_name + "_fabric_configfs\\n\");\n"
buf += "};\n\n" buf += "};\n\n"
buf += "static int __init " + fabric_mod_name + "_init(void)\n" buf += "static int __init " + fabric_mod_name + "_init(void)\n"
buf += "{\n" buf += "{\n"
buf += " int ret;\n\n" buf += " return target_register_template(" + fabric_mod_name + "_ops);\n"
buf += " ret = " + fabric_mod_name + "_register_configfs();\n"
buf += " if (ret < 0)\n"
buf += " return ret;\n\n"
buf += " return 0;\n"
buf += "};\n\n" buf += "};\n\n"
buf += "static void __exit " + fabric_mod_name + "_exit(void)\n" buf += "static void __exit " + fabric_mod_name + "_exit(void)\n"
buf += "{\n" buf += "{\n"
buf += " " + fabric_mod_name + "_deregister_configfs();\n" buf += " target_unregister_template(" + fabric_mod_name + "_ops);\n"
buf += "};\n\n" buf += "};\n\n"
buf += "MODULE_DESCRIPTION(\"" + fabric_mod_name.upper() + " series fabric driver\");\n" buf += "MODULE_DESCRIPTION(\"" + fabric_mod_name.upper() + " series fabric driver\");\n"
......
Documentation/target/tcmu-design.txt
View file @ c6668726
...@@ -138,27 +138,40 @@ signals the kernel via a 4-byte write(). When cmd_head equals ...@@ -138,27 +138,40 @@ signals the kernel via a 4-byte write(). When cmd_head equals
cmd_tail, the ring is empty -- no commands are currently waiting to be cmd_tail, the ring is empty -- no commands are currently waiting to be
processed by userspace. processed by userspace.
TCMU commands start with a common header containing "len_op", a 32-bit TCMU commands are 8-byte aligned. They start with a common header
value that stores the length, as well as the opcode in the lowest containing "len_op", a 32-bit value that stores the length, as well as
unused bits. Currently only two opcodes are defined, TCMU_OP_PAD and the opcode in the lowest unused bits. It also contains cmd_id and
TCMU_OP_CMD. When userspace encounters a command with PAD opcode, it flags fields for setting by the kernel (kflags) and userspace
should skip ahead by the bytes in "length". (The kernel inserts PAD (uflags).
entries to ensure each CMD entry fits contigously into the circular
buffer.) Currently only two opcodes are defined, TCMU_OP_CMD and TCMU_OP_PAD.
When userspace handles a CMD, it finds the SCSI CDB (Command Data When the opcode is CMD, the entry in the command ring is a struct
Block) via tcmu_cmd_entry.req.cdb_off. This is an offset from the tcmu_cmd_entry. Userspace finds the SCSI CDB (Command Data Block) via
start of the overall shared memory region, not the entry. The data tcmu_cmd_entry.req.cdb_off. This is an offset from the start of the
in/out buffers are accessible via tht req.iov[] array. Note that overall shared memory region, not the entry. The data in/out buffers
each iov.iov_base is also an offset from the start of the region. are accessible via tht req.iov[] array. iov_cnt contains the number of
entries in iov[] needed to describe either the Data-In or Data-Out
TCMU currently does not support BIDI operations. buffers. For bidirectional commands, iov_cnt specifies how many iovec
entries cover the Data-Out area, and iov_bidi_count specifies how many
iovec entries immediately after that in iov[] cover the Data-In
area. Just like other fields, iov.iov_base is an offset from the start
of the region.
When completing a command, userspace sets rsp.scsi_status, and When completing a command, userspace sets rsp.scsi_status, and
rsp.sense_buffer if necessary. Userspace then increments rsp.sense_buffer if necessary. Userspace then increments
mailbox.cmd_tail by entry.hdr.length (mod cmdr_size) and signals the mailbox.cmd_tail by entry.hdr.length (mod cmdr_size) and signals the
kernel via the UIO method, a 4-byte write to the file descriptor. kernel via the UIO method, a 4-byte write to the file descriptor.
When the opcode is PAD, userspace only updates cmd_tail as above --
it's a no-op. (The kernel inserts PAD entries to ensure each CMD entry
is contiguous within the command ring.)
More opcodes may be added in the future. If userspace encounters an
opcode it does not handle, it must set UNKNOWN_OP bit (bit 0) in
hdr.uflags, update cmd_tail, and proceed with processing additional
commands, if any.
The Data Area: The Data Area:
This is shared-memory space after the command ring. The organization This is shared-memory space after the command ring. The organization
......
drivers/infiniband/ulp/isert/ib_isert.c
View file @ c6668726
This diff is collapsed.
drivers/infiniband/ulp/isert/ib_isert.h
View file @ c6668726
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#define isert_err(fmt, arg...) \ #define isert_err(fmt, arg...) \
pr_err(PFX "%s: " fmt, __func__ , ## arg) pr_err(PFX "%s: " fmt, __func__ , ## arg)
#define ISERT_RDMA_LISTEN_BACKLOG 10
#define ISCSI_ISER_SG_TABLESIZE 256 #define ISCSI_ISER_SG_TABLESIZE 256
#define ISER_FASTREG_LI_WRID 0xffffffffffffffffULL #define ISER_FASTREG_LI_WRID 0xffffffffffffffffULL
#define ISER_BEACON_WRID 0xfffffffffffffffeULL #define ISER_BEACON_WRID 0xfffffffffffffffeULL
...@@ -160,27 +159,25 @@ struct isert_conn { ...@@ -160,27 +159,25 @@ struct isert_conn {
u64 login_req_dma; u64 login_req_dma;
int login_req_len; int login_req_len;
u64 login_rsp_dma; u64 login_rsp_dma;
unsigned int conn_rx_desc_head; unsigned int rx_desc_head;
struct iser_rx_desc *conn_rx_descs; struct iser_rx_desc *rx_descs;
struct ib_recv_wr conn_rx_wr[ISERT_MIN_POSTED_RX]; struct ib_recv_wr rx_wr[ISERT_MIN_POSTED_RX];
struct iscsi_conn *conn; struct iscsi_conn *conn;
struct list_head conn_accept_node; struct list_head accept_node;
struct completion conn_login_comp; struct completion login_comp;
struct completion login_req_comp; struct completion login_req_comp;
struct iser_tx_desc conn_login_tx_desc; struct iser_tx_desc login_tx_desc;
struct rdma_cm_id *conn_cm_id; struct rdma_cm_id *cm_id;
struct ib_pd *conn_pd; struct ib_qp *qp;
struct ib_mr *conn_mr; struct isert_device *device;
struct ib_qp *conn_qp; struct mutex mutex;
struct isert_device *conn_device; struct completion wait;
struct mutex conn_mutex; struct completion wait_comp_err;
struct completion conn_wait; struct kref kref;
struct completion conn_wait_comp_err; struct list_head fr_pool;
struct kref conn_kref; int fr_pool_size;
struct list_head conn_fr_pool;
int conn_fr_pool_size;
/* lock to protect fastreg pool */ /* lock to protect fastreg pool */
spinlock_t conn_lock; spinlock_t pool_lock;
struct work_struct release_work; struct work_struct release_work;
struct ib_recv_wr beacon; struct ib_recv_wr beacon;
bool logout_posted; bool logout_posted;
...@@ -211,6 +208,8 @@ struct isert_device { ...@@ -211,6 +208,8 @@ struct isert_device {
bool pi_capable; bool pi_capable;
int refcount; int refcount;
struct ib_device *ib_device; struct ib_device *ib_device;
struct ib_pd *pd;
struct ib_mr *mr;
struct isert_comp *comps; struct isert_comp *comps;
int comps_used; int comps_used;
struct list_head dev_node; struct list_head dev_node;
......
drivers/infiniband/ulp/srpt/ib_srpt.c
View file @ c6668726
...@@ -93,7 +93,7 @@ MODULE_PARM_DESC(srpt_service_guid, ...@@ -93,7 +93,7 @@ MODULE_PARM_DESC(srpt_service_guid,
" instead of using the node_guid of the first HCA."); " instead of using the node_guid of the first HCA.");
static struct ib_client srpt_client; static struct ib_client srpt_client;
static struct target_fabric_configfs *srpt_target; static const struct target_core_fabric_ops srpt_template;
static void srpt_release_channel(struct srpt_rdma_ch *ch); static void srpt_release_channel(struct srpt_rdma_ch *ch);
static int srpt_queue_status(struct se_cmd *cmd); static int srpt_queue_status(struct se_cmd *cmd);
...@@ -3845,7 +3845,7 @@ static struct se_portal_group *srpt_make_tpg(struct se_wwn *wwn, ...@@ -3845,7 +3845,7 @@ static struct se_portal_group *srpt_make_tpg(struct se_wwn *wwn,
int res; int res;
/* Initialize sport->port_wwn and sport->port_tpg_1 */ /* Initialize sport->port_wwn and sport->port_tpg_1 */
res = core_tpg_register(&srpt_target->tf_ops, &sport->port_wwn, res = core_tpg_register(&srpt_template, &sport->port_wwn,
&sport->port_tpg_1, sport, TRANSPORT_TPG_TYPE_NORMAL); &sport->port_tpg_1, sport, TRANSPORT_TPG_TYPE_NORMAL);
if (res) if (res)
return ERR_PTR(res); return ERR_PTR(res);
...@@ -3913,7 +3913,9 @@ static struct configfs_attribute *srpt_wwn_attrs[] = { ...@@ -3913,7 +3913,9 @@ static struct configfs_attribute *srpt_wwn_attrs[] = {
NULL, NULL,
}; };
static struct target_core_fabric_ops srpt_template = { static const struct target_core_fabric_ops srpt_template = {
.module = THIS_MODULE,
.name = "srpt",
.get_fabric_name = srpt_get_fabric_name, .get_fabric_name = srpt_get_fabric_name,
.get_fabric_proto_ident = srpt_get_fabric_proto_ident, .get_fabric_proto_ident = srpt_get_fabric_proto_ident,
.tpg_get_wwn = srpt_get_fabric_wwn, .tpg_get_wwn = srpt_get_fabric_wwn,
...@@ -3958,6 +3960,10 @@ static struct target_core_fabric_ops srpt_template = { ...@@ -3958,6 +3960,10 @@ static struct target_core_fabric_ops srpt_template = {
.fabric_drop_np = NULL, .fabric_drop_np = NULL,
.fabric_make_nodeacl = srpt_make_nodeacl, .fabric_make_nodeacl = srpt_make_nodeacl,
.fabric_drop_nodeacl = srpt_drop_nodeacl, .fabric_drop_nodeacl = srpt_drop_nodeacl,
.tfc_wwn_attrs = srpt_wwn_attrs,
.tfc_tpg_base_attrs = srpt_tpg_attrs,
.tfc_tpg_attrib_attrs = srpt_tpg_attrib_attrs,
}; };
/** /**
...@@ -3988,33 +3994,9 @@ static int __init srpt_init_module(void) ...@@ -3988,33 +3994,9 @@ static int __init srpt_init_module(void)
goto out; goto out;
} }
srpt_target = target_fabric_configfs_init(THIS_MODULE, "srpt"); ret = target_register_template(&srpt_template);
if (IS_ERR(srpt_target)) { if (ret)
pr_err("couldn't register\n");
ret = PTR_ERR(srpt_target);
goto out; goto out;
}
srpt_target->tf_ops = srpt_template;
/*
* Set up default attribute lists.
*/
srpt_target->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = srpt_wwn_attrs;
srpt_target->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = srpt_tpg_attrs;
srpt_target->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = srpt_tpg_attrib_attrs;
srpt_target->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
srpt_target->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
srpt_target->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;
srpt_target->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
srpt_target->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
srpt_target->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;
ret = target_fabric_configfs_register(srpt_target);
if (ret < 0) {
pr_err("couldn't register\n");
goto out_free_target;
}
ret = ib_register_client(&srpt_client); ret = ib_register_client(&srpt_client);
if (ret) { if (ret) {
...@@ -4025,11 +4007,7 @@ static int __init srpt_init_module(void) ...@@ -4025,11 +4007,7 @@ static int __init srpt_init_module(void)
return 0; return 0;
out_unregister_target: out_unregister_target:
target_fabric_configfs_deregister(srpt_target); target_unregister_template(&srpt_template);
srpt_target = NULL;
out_free_target:
if (srpt_target)
target_fabric_configfs_free(srpt_target);
out: out:
return ret; return ret;
} }
...@@ -4037,8 +4015,7 @@ static int __init srpt_init_module(void) ...@@ -4037,8 +4015,7 @@ static int __init srpt_init_module(void)
static void __exit srpt_cleanup_module(void) static void __exit srpt_cleanup_module(void)
{ {
ib_unregister_client(&srpt_client); ib_unregister_client(&srpt_client);
target_fabric_configfs_deregister(srpt_target); target_unregister_template(&srpt_template);
srpt_target = NULL;
} }
module_init(srpt_init_module); module_init(srpt_init_module);
......
drivers/scsi/qla2xxx/qla_target.c
View file @ c6668726
...@@ -3065,7 +3065,7 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha, uint32_t handle, ...@@ -3065,7 +3065,7 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha, uint32_t handle,
{ {
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
struct se_cmd *se_cmd; struct se_cmd *se_cmd;
struct target_core_fabric_ops *tfo; const struct target_core_fabric_ops *tfo;
struct qla_tgt_cmd *cmd; struct qla_tgt_cmd *cmd;
if (handle & CTIO_INTERMEDIATE_HANDLE_MARK) { if (handle & CTIO_INTERMEDIATE_HANDLE_MARK) {
......
drivers/scsi/qla2xxx/tcm_qla2xxx.c
View file @ c6668726
...@@ -53,9 +53,8 @@ ...@@ -53,9 +53,8 @@
static struct workqueue_struct *tcm_qla2xxx_free_wq; static struct workqueue_struct *tcm_qla2xxx_free_wq;
static struct workqueue_struct *tcm_qla2xxx_cmd_wq; static struct workqueue_struct *tcm_qla2xxx_cmd_wq;
/* Local pointer to allocated TCM configfs fabric module */ static const struct target_core_fabric_ops tcm_qla2xxx_ops;
static struct target_fabric_configfs *tcm_qla2xxx_fabric_configfs; static const struct target_core_fabric_ops tcm_qla2xxx_npiv_ops;
static struct target_fabric_configfs *tcm_qla2xxx_npiv_fabric_configfs;
/* /*
* Parse WWN. * Parse WWN.
...@@ -336,6 +335,14 @@ static int tcm_qla2xxx_check_demo_mode_login_only(struct se_portal_group *se_tpg ...@@ -336,6 +335,14 @@ static int tcm_qla2xxx_check_demo_mode_login_only(struct se_portal_group *se_tpg
return tpg->tpg_attrib.demo_mode_login_only; return tpg->tpg_attrib.demo_mode_login_only;
} }
static int tcm_qla2xxx_check_prot_fabric_only(struct se_portal_group *se_tpg)
{
struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
struct tcm_qla2xxx_tpg, se_tpg);
return tpg->tpg_attrib.fabric_prot_type;
}
static struct se_node_acl *tcm_qla2xxx_alloc_fabric_acl( static struct se_node_acl *tcm_qla2xxx_alloc_fabric_acl(
struct se_portal_group *se_tpg) struct se_portal_group *se_tpg)
{ {
...@@ -1082,8 +1089,53 @@ static ssize_t tcm_qla2xxx_tpg_store_enable( ...@@ -1082,8 +1089,53 @@ static ssize_t tcm_qla2xxx_tpg_store_enable(
TF_TPG_BASE_ATTR(tcm_qla2xxx, enable, S_IRUGO | S_IWUSR); TF_TPG_BASE_ATTR(tcm_qla2xxx, enable, S_IRUGO | S_IWUSR);
static ssize_t tcm_qla2xxx_tpg_show_dynamic_sessions(
struct se_portal_group *se_tpg,
char *page)
{
return target_show_dynamic_sessions(se_tpg, page);
}
TF_TPG_BASE_ATTR_RO(tcm_qla2xxx, dynamic_sessions);
static ssize_t tcm_qla2xxx_tpg_store_fabric_prot_type(
struct se_portal_group *se_tpg,
const char *page,
size_t count)
{
struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
struct tcm_qla2xxx_tpg, se_tpg);
unsigned long val;
int ret = kstrtoul(page, 0, &val);
if (ret) {
pr_err("kstrtoul() returned %d for fabric_prot_type\n", ret);
return ret;
}
if (val != 0 && val != 1 && val != 3) {
pr_err("Invalid qla2xxx fabric_prot_type: %lu\n", val);
return -EINVAL;
}
tpg->tpg_attrib.fabric_prot_type = val;
return count;
}
static ssize_t tcm_qla2xxx_tpg_show_fabric_prot_type(
struct se_portal_group *se_tpg,
char *page)
{
struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
struct tcm_qla2xxx_tpg, se_tpg);
return sprintf(page, "%d\n", tpg->tpg_attrib.fabric_prot_type);
}
TF_TPG_BASE_ATTR(tcm_qla2xxx, fabric_prot_type, S_IRUGO | S_IWUSR);
static struct configfs_attribute *tcm_qla2xxx_tpg_attrs[] = { static struct configfs_attribute *tcm_qla2xxx_tpg_attrs[] = {
&tcm_qla2xxx_tpg_enable.attr, &tcm_qla2xxx_tpg_enable.attr,
&tcm_qla2xxx_tpg_dynamic_sessions.attr,
&tcm_qla2xxx_tpg_fabric_prot_type.attr,
NULL, NULL,
}; };
...@@ -1124,7 +1176,7 @@ static struct se_portal_group *tcm_qla2xxx_make_tpg( ...@@ -1124,7 +1176,7 @@ static struct se_portal_group *tcm_qla2xxx_make_tpg(
tpg->tpg_attrib.cache_dynamic_acls = 1; tpg->tpg_attrib.cache_dynamic_acls = 1;
tpg->tpg_attrib.demo_mode_login_only = 1; tpg->tpg_attrib.demo_mode_login_only = 1;
ret = core_tpg_register(&tcm_qla2xxx_fabric_configfs->tf_ops, wwn, ret = core_tpg_register(&tcm_qla2xxx_ops, wwn,
&tpg->se_tpg, tpg, TRANSPORT_TPG_TYPE_NORMAL); &tpg->se_tpg, tpg, TRANSPORT_TPG_TYPE_NORMAL);
if (ret < 0) { if (ret < 0) {
kfree(tpg); kfree(tpg);
...@@ -1244,7 +1296,7 @@ static struct se_portal_group *tcm_qla2xxx_npiv_make_tpg( ...@@ -1244,7 +1296,7 @@ static struct se_portal_group *tcm_qla2xxx_npiv_make_tpg(
tpg->tpg_attrib.cache_dynamic_acls = 1; tpg->tpg_attrib.cache_dynamic_acls = 1;
tpg->tpg_attrib.demo_mode_login_only = 1; tpg->tpg_attrib.demo_mode_login_only = 1;
ret = core_tpg_register(&tcm_qla2xxx_npiv_fabric_configfs->tf_ops, wwn, ret = core_tpg_register(&tcm_qla2xxx_npiv_ops, wwn,
&tpg->se_tpg, tpg, TRANSPORT_TPG_TYPE_NORMAL); &tpg->se_tpg, tpg, TRANSPORT_TPG_TYPE_NORMAL);
if (ret < 0) { if (ret < 0) {
kfree(tpg); kfree(tpg);
...@@ -1560,7 +1612,7 @@ static int tcm_qla2xxx_check_initiator_node_acl( ...@@ -1560,7 +1612,7 @@ static int tcm_qla2xxx_check_initiator_node_acl(
se_sess = transport_init_session_tags(num_tags, se_sess = transport_init_session_tags(num_tags,
sizeof(struct qla_tgt_cmd), sizeof(struct qla_tgt_cmd),
TARGET_PROT_NORMAL); TARGET_PROT_ALL);
if (IS_ERR(se_sess)) { if (IS_ERR(se_sess)) {
pr_err("Unable to initialize struct se_session\n"); pr_err("Unable to initialize struct se_session\n");
return PTR_ERR(se_sess); return PTR_ERR(se_sess);
...@@ -1934,7 +1986,9 @@ static struct configfs_attribute *tcm_qla2xxx_wwn_attrs[] = { ...@@ -1934,7 +1986,9 @@ static struct configfs_attribute *tcm_qla2xxx_wwn_attrs[] = {
NULL, NULL,
}; };
static struct target_core_fabric_ops tcm_qla2xxx_ops = { static const struct target_core_fabric_ops tcm_qla2xxx_ops = {
.module = THIS_MODULE,
.name = "qla2xxx",
.get_fabric_name = tcm_qla2xxx_get_fabric_name, .get_fabric_name = tcm_qla2xxx_get_fabric_name,
.get_fabric_proto_ident = tcm_qla2xxx_get_fabric_proto_ident, .get_fabric_proto_ident = tcm_qla2xxx_get_fabric_proto_ident,
.tpg_get_wwn = tcm_qla2xxx_get_fabric_wwn, .tpg_get_wwn = tcm_qla2xxx_get_fabric_wwn,
...@@ -1949,6 +2003,7 @@ static struct target_core_fabric_ops tcm_qla2xxx_ops = { ...@@ -1949,6 +2003,7 @@ static struct target_core_fabric_ops tcm_qla2xxx_ops = {
tcm_qla2xxx_check_demo_write_protect, tcm_qla2xxx_check_demo_write_protect,
.tpg_check_prod_mode_write_protect = .tpg_check_prod_mode_write_protect =
tcm_qla2xxx_check_prod_write_protect, tcm_qla2xxx_check_prod_write_protect,
.tpg_check_prot_fabric_only = tcm_qla2xxx_check_prot_fabric_only,
.tpg_check_demo_mode_login_only = tcm_qla2xxx_check_demo_mode_login_only, .tpg_check_demo_mode_login_only = tcm_qla2xxx_check_demo_mode_login_only,
.tpg_alloc_fabric_acl = tcm_qla2xxx_alloc_fabric_acl, .tpg_alloc_fabric_acl = tcm_qla2xxx_alloc_fabric_acl,
.tpg_release_fabric_acl = tcm_qla2xxx_release_fabric_acl, .tpg_release_fabric_acl = tcm_qla2xxx_release_fabric_acl,
...@@ -1983,9 +2038,15 @@ static struct target_core_fabric_ops tcm_qla2xxx_ops = { ...@@ -1983,9 +2038,15 @@ static struct target_core_fabric_ops tcm_qla2xxx_ops = {
.fabric_drop_np = NULL, .fabric_drop_np = NULL,
.fabric_make_nodeacl = tcm_qla2xxx_make_nodeacl, .fabric_make_nodeacl = tcm_qla2xxx_make_nodeacl,
.fabric_drop_nodeacl = tcm_qla2xxx_drop_nodeacl, .fabric_drop_nodeacl = tcm_qla2xxx_drop_nodeacl,
.tfc_wwn_attrs = tcm_qla2xxx_wwn_attrs,
.tfc_tpg_base_attrs = tcm_qla2xxx_tpg_attrs,
.tfc_tpg_attrib_attrs = tcm_qla2xxx_tpg_attrib_attrs,
}; };
static struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = { static const struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
.module = THIS_MODULE,
.name = "qla2xxx_npiv",
.get_fabric_name = tcm_qla2xxx_npiv_get_fabric_name, .get_fabric_name = tcm_qla2xxx_npiv_get_fabric_name,
.get_fabric_proto_ident = tcm_qla2xxx_get_fabric_proto_ident, .get_fabric_proto_ident = tcm_qla2xxx_get_fabric_proto_ident,
.tpg_get_wwn = tcm_qla2xxx_get_fabric_wwn, .tpg_get_wwn = tcm_qla2xxx_get_fabric_wwn,
...@@ -2033,94 +2094,26 @@ static struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = { ...@@ -2033,94 +2094,26 @@ static struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {
.fabric_drop_np = NULL, .fabric_drop_np = NULL,
.fabric_make_nodeacl = tcm_qla2xxx_make_nodeacl, .fabric_make_nodeacl = tcm_qla2xxx_make_nodeacl,
.fabric_drop_nodeacl = tcm_qla2xxx_drop_nodeacl, .fabric_drop_nodeacl = tcm_qla2xxx_drop_nodeacl,
.tfc_wwn_attrs = tcm_qla2xxx_wwn_attrs,
.tfc_tpg_base_attrs = tcm_qla2xxx_npiv_tpg_attrs,
}; };
static int tcm_qla2xxx_register_configfs(void) static int tcm_qla2xxx_register_configfs(void)
{ {
struct target_fabric_configfs *fabric, *npiv_fabric;
int ret; int ret;
pr_debug("TCM QLOGIC QLA2XXX fabric module %s on %s/%s on " pr_debug("TCM QLOGIC QLA2XXX fabric module %s on %s/%s on "
UTS_RELEASE"\n", TCM_QLA2XXX_VERSION, utsname()->sysname, UTS_RELEASE"\n", TCM_QLA2XXX_VERSION, utsname()->sysname,
utsname()->machine); utsname()->machine);
/*
* Register the top level struct config_item_type with TCM core ret = target_register_template(&tcm_qla2xxx_ops);
*/ if (ret)
fabric = target_fabric_configfs_init(THIS_MODULE, "qla2xxx");
if (IS_ERR(fabric)) {
pr_err("target_fabric_configfs_init() failed\n");
return PTR_ERR(fabric);
}
/*
* Setup fabric->tf_ops from our local tcm_qla2xxx_ops
*/
fabric->tf_ops = tcm_qla2xxx_ops;
/*
* Setup default attribute lists for various fabric->tf_cit_tmpl
*/
fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;
fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = tcm_qla2xxx_tpg_attrs;
fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs =
tcm_qla2xxx_tpg_attrib_attrs;
fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;
fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;
/*
* Register the fabric for use within TCM
*/
ret = target_fabric_configfs_register(fabric);
if (ret < 0) {
pr_err("target_fabric_configfs_register() failed for TCM_QLA2XXX\n");
return ret; return ret;
}
/*
* Setup our local pointer to *fabric
*/
tcm_qla2xxx_fabric_configfs = fabric;
pr_debug("TCM_QLA2XXX[0] - Set fabric -> tcm_qla2xxx_fabric_configfs\n");
/* ret = target_register_template(&tcm_qla2xxx_npiv_ops);
* Register the top level struct config_item_type for NPIV with TCM core if (ret)
*/
npiv_fabric = target_fabric_configfs_init(THIS_MODULE, "qla2xxx_npiv");
if (IS_ERR(npiv_fabric)) {
pr_err("target_fabric_configfs_init() failed\n");
ret = PTR_ERR(npiv_fabric);
goto out_fabric;
}
/*
* Setup fabric->tf_ops from our local tcm_qla2xxx_npiv_ops
*/
npiv_fabric->tf_ops = tcm_qla2xxx_npiv_ops;
/*
* Setup default attribute lists for various npiv_fabric->tf_cit_tmpl
*/
npiv_fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;
npiv_fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs =
tcm_qla2xxx_npiv_tpg_attrs;
npiv_fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL;
npiv_fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
npiv_fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;
npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;
/*
* Register the npiv_fabric for use within TCM
*/
ret = target_fabric_configfs_register(npiv_fabric);
if (ret < 0) {
pr_err("target_fabric_configfs_register() failed for TCM_QLA2XXX\n");
goto out_fabric; goto out_fabric;
}
/*
* Setup our local pointer to *npiv_fabric
*/
tcm_qla2xxx_npiv_fabric_configfs = npiv_fabric;
pr_debug("TCM_QLA2XXX[0] - Set fabric -> tcm_qla2xxx_npiv_fabric_configfs\n");
tcm_qla2xxx_free_wq = alloc_workqueue("tcm_qla2xxx_free", tcm_qla2xxx_free_wq = alloc_workqueue("tcm_qla2xxx_free",
WQ_MEM_RECLAIM, 0); WQ_MEM_RECLAIM, 0);
...@@ -2140,9 +2133,9 @@ static int tcm_qla2xxx_register_configfs(void) ...@@ -2140,9 +2133,9 @@ static int tcm_qla2xxx_register_configfs(void)
out_free_wq: out_free_wq:
destroy_workqueue(tcm_qla2xxx_free_wq); destroy_workqueue(tcm_qla2xxx_free_wq);
out_fabric_npiv: out_fabric_npiv:
target_fabric_configfs_deregister(tcm_qla2xxx_npiv_fabric_configfs); target_unregister_template(&tcm_qla2xxx_npiv_ops);
out_fabric: out_fabric:
target_fabric_configfs_deregister(tcm_qla2xxx_fabric_configfs); target_unregister_template(&tcm_qla2xxx_ops);
return ret; return ret;
} }
...@@ -2151,13 +2144,8 @@ static void tcm_qla2xxx_deregister_configfs(void) ...@@ -2151,13 +2144,8 @@ static void tcm_qla2xxx_deregister_configfs(void)
destroy_workqueue(tcm_qla2xxx_cmd_wq); destroy_workqueue(tcm_qla2xxx_cmd_wq);
destroy_workqueue(tcm_qla2xxx_free_wq); destroy_workqueue(tcm_qla2xxx_free_wq);
target_fabric_configfs_deregister(tcm_qla2xxx_fabric_configfs); target_unregister_template(&tcm_qla2xxx_ops);
tcm_qla2xxx_fabric_configfs = NULL; target_unregister_template(&tcm_qla2xxx_npiv_ops);
pr_debug("TCM_QLA2XXX[0] - Cleared tcm_qla2xxx_fabric_configfs\n");
target_fabric_configfs_deregister(tcm_qla2xxx_npiv_fabric_configfs);
tcm_qla2xxx_npiv_fabric_configfs = NULL;
pr_debug("TCM_QLA2XXX[0] - Cleared tcm_qla2xxx_npiv_fabric_configfs\n");
} }
static int __init tcm_qla2xxx_init(void) static int __init tcm_qla2xxx_init(void)
......
drivers/scsi/qla2xxx/tcm_qla2xxx.h
View file @ c6668726
...@@ -33,6 +33,7 @@ struct tcm_qla2xxx_tpg_attrib { ...@@ -33,6 +33,7 @@ struct tcm_qla2xxx_tpg_attrib {
int demo_mode_write_protect; int demo_mode_write_protect;
int prod_mode_write_protect; int prod_mode_write_protect;
int demo_mode_login_only; int demo_mode_login_only;
int fabric_prot_type;
}; };
struct tcm_qla2xxx_tpg { struct tcm_qla2xxx_tpg {
......
drivers/target/Kconfig
View file @ c6668726
...@@ -31,12 +31,13 @@ config TCM_PSCSI ...@@ -31,12 +31,13 @@ config TCM_PSCSI
Say Y here to enable the TCM/pSCSI subsystem plugin for non-buffered Say Y here to enable the TCM/pSCSI subsystem plugin for non-buffered
passthrough access to Linux/SCSI device passthrough access to Linux/SCSI device
config TCM_USER config TCM_USER2
tristate "TCM/USER Subsystem Plugin for Linux" tristate "TCM/USER Subsystem Plugin for Linux"
depends on UIO && NET depends on UIO && NET
help help
Say Y here to enable the TCM/USER subsystem plugin for a userspace Say Y here to enable the TCM/USER subsystem plugin for a userspace
process to handle requests process to handle requests. This is version 2 of the ABI; version 1
is obsolete.
source "drivers/target/loopback/Kconfig" source "drivers/target/loopback/Kconfig"
source "drivers/target/tcm_fc/Kconfig" source "drivers/target/tcm_fc/Kconfig"
......
drivers/target/Makefile
View file @ c6668726
...@@ -22,7 +22,7 @@ obj-$(CONFIG_TARGET_CORE) += target_core_mod.o ...@@ -22,7 +22,7 @@ obj-$(CONFIG_TARGET_CORE) += target_core_mod.o
obj-$(CONFIG_TCM_IBLOCK) += target_core_iblock.o obj-$(CONFIG_TCM_IBLOCK) += target_core_iblock.o
obj-$(CONFIG_TCM_FILEIO) += target_core_file.o obj-$(CONFIG_TCM_FILEIO) += target_core_file.o
obj-$(CONFIG_TCM_PSCSI) += target_core_pscsi.o obj-$(CONFIG_TCM_PSCSI) += target_core_pscsi.o
obj-$(CONFIG_TCM_USER) += target_core_user.o obj-$(CONFIG_TCM_USER2) += target_core_user.o
# Fabric modules # Fabric modules
obj-$(CONFIG_LOOPBACK_TARGET) += loopback/ obj-$(CONFIG_LOOPBACK_TARGET) += loopback/
......
drivers/target/iscsi/Makefile
View file @ c6668726
iscsi_target_mod-y += iscsi_target_parameters.o \ iscsi_target_mod-y += iscsi_target_parameters.o \
iscsi_target_seq_pdu_list.o \ iscsi_target_seq_pdu_list.o \
iscsi_target_tq.o \
iscsi_target_auth.o \ iscsi_target_auth.o \
iscsi_target_datain_values.o \ iscsi_target_datain_values.o \
iscsi_target_device.o \ iscsi_target_device.o \
......
drivers/target/iscsi/iscsi_target.c
View file @ c6668726
This diff is collapsed.
drivers/target/iscsi/iscsi_target.h
View file @ c6668726
...@@ -35,7 +35,7 @@ extern void iscsit_stop_session(struct iscsi_session *, int, int); ...@@ -35,7 +35,7 @@ extern void iscsit_stop_session(struct iscsi_session *, int, int);
extern int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *, int); extern int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *, int);
extern struct iscsit_global *iscsit_global; extern struct iscsit_global *iscsit_global;
extern struct target_fabric_configfs *lio_target_fabric_configfs; extern const struct target_core_fabric_ops iscsi_ops;
extern struct kmem_cache *lio_dr_cache; extern struct kmem_cache *lio_dr_cache;
extern struct kmem_cache *lio_ooo_cache; extern struct kmem_cache *lio_ooo_cache;
......
drivers/target/iscsi/iscsi_target_configfs.c
View file @ c6668726
...@@ -37,9 +37,6 @@ ...@@ -37,9 +37,6 @@
#include "iscsi_target_util.h" #include "iscsi_target_util.h"
#include "iscsi_target.h" #include "iscsi_target.h"
#include <target/iscsi/iscsi_target_stat.h> #include <target/iscsi/iscsi_target_stat.h>
#include "iscsi_target_configfs.h"
struct target_fabric_configfs *lio_target_fabric_configfs;
struct lio_target_configfs_attribute { struct lio_target_configfs_attribute {
struct configfs_attribute attr; struct configfs_attribute attr;
...@@ -1052,6 +1049,11 @@ TPG_ATTR(default_erl, S_IRUGO | S_IWUSR); ...@@ -1052,6 +1049,11 @@ TPG_ATTR(default_erl, S_IRUGO | S_IWUSR);
*/ */
DEF_TPG_ATTRIB(t10_pi); DEF_TPG_ATTRIB(t10_pi);
TPG_ATTR(t10_pi, S_IRUGO | S_IWUSR); TPG_ATTR(t10_pi, S_IRUGO | S_IWUSR);
/*
* Define iscsi_tpg_attrib_s_fabric_prot_type
*/
DEF_TPG_ATTRIB(fabric_prot_type);
TPG_ATTR(fabric_prot_type, S_IRUGO | S_IWUSR);
static struct configfs_attribute *lio_target_tpg_attrib_attrs[] = { static struct configfs_attribute *lio_target_tpg_attrib_attrs[] = {
&iscsi_tpg_attrib_authentication.attr, &iscsi_tpg_attrib_authentication.attr,
...@@ -1065,6 +1067,7 @@ static struct configfs_attribute *lio_target_tpg_attrib_attrs[] = { ...@@ -1065,6 +1067,7 @@ static struct configfs_attribute *lio_target_tpg_attrib_attrs[] = {
&iscsi_tpg_attrib_demo_mode_discovery.attr, &iscsi_tpg_attrib_demo_mode_discovery.attr,
&iscsi_tpg_attrib_default_erl.attr, &iscsi_tpg_attrib_default_erl.attr,
&iscsi_tpg_attrib_t10_pi.attr, &iscsi_tpg_attrib_t10_pi.attr,
&iscsi_tpg_attrib_fabric_prot_type.attr,
NULL, NULL,
}; };
...@@ -1410,8 +1413,18 @@ static ssize_t lio_target_tpg_store_enable( ...@@ -1410,8 +1413,18 @@ static ssize_t lio_target_tpg_store_enable(
TF_TPG_BASE_ATTR(lio_target, enable, S_IRUGO | S_IWUSR); TF_TPG_BASE_ATTR(lio_target, enable, S_IRUGO | S_IWUSR);
static ssize_t lio_target_tpg_show_dynamic_sessions(
struct se_portal_group *se_tpg,
char *page)
{
return target_show_dynamic_sessions(se_tpg, page);
}
TF_TPG_BASE_ATTR_RO(lio_target, dynamic_sessions);
static struct configfs_attribute *lio_target_tpg_attrs[] = { static struct configfs_attribute *lio_target_tpg_attrs[] = {
&lio_target_tpg_enable.attr, &lio_target_tpg_enable.attr,
&lio_target_tpg_dynamic_sessions.attr,
NULL, NULL,
}; };
...@@ -1450,10 +1463,8 @@ static struct se_portal_group *lio_target_tiqn_addtpg( ...@@ -1450,10 +1463,8 @@ static struct se_portal_group *lio_target_tiqn_addtpg(
if (!tpg) if (!tpg)
return NULL; return NULL;
ret = core_tpg_register( ret = core_tpg_register(&iscsi_ops, wwn, &tpg->tpg_se_tpg,
&lio_target_fabric_configfs->tf_ops, tpg, TRANSPORT_TPG_TYPE_NORMAL);
wwn, &tpg->tpg_se_tpg, tpg,
TRANSPORT_TPG_TYPE_NORMAL);
if (ret < 0) if (ret < 0)
return NULL; return NULL;
...@@ -1872,6 +1883,20 @@ static int lio_tpg_check_prod_mode_write_protect( ...@@ -1872,6 +1883,20 @@ static int lio_tpg_check_prod_mode_write_protect(
return tpg->tpg_attrib.prod_mode_write_protect; return tpg->tpg_attrib.prod_mode_write_protect;
} }
static int lio_tpg_check_prot_fabric_only(
struct se_portal_group *se_tpg)
{
struct iscsi_portal_group *tpg = se_tpg->se_tpg_fabric_ptr;
/*
* Only report fabric_prot_type if t10_pi has also been enabled
* for incoming ib_isert sessions.
*/
if (!tpg->tpg_attrib.t10_pi)
return 0;
return tpg->tpg_attrib.fabric_prot_type;
}
static void lio_tpg_release_fabric_acl( static void lio_tpg_release_fabric_acl(
struct se_portal_group *se_tpg, struct se_portal_group *se_tpg,
struct se_node_acl *se_acl) struct se_node_acl *se_acl)
...@@ -1953,115 +1978,60 @@ static void lio_release_cmd(struct se_cmd *se_cmd) ...@@ -1953,115 +1978,60 @@ static void lio_release_cmd(struct se_cmd *se_cmd)
iscsit_release_cmd(cmd); iscsit_release_cmd(cmd);
} }
/* End functions for target_core_fabric_ops */ const struct target_core_fabric_ops iscsi_ops = {
.module = THIS_MODULE,
int iscsi_target_register_configfs(void) .name = "iscsi",
{ .get_fabric_name = iscsi_get_fabric_name,
struct target_fabric_configfs *fabric; .get_fabric_proto_ident = iscsi_get_fabric_proto_ident,
int ret; .tpg_get_wwn = lio_tpg_get_endpoint_wwn,
.tpg_get_tag = lio_tpg_get_tag,
lio_target_fabric_configfs = NULL; .tpg_get_default_depth = lio_tpg_get_default_depth,
fabric = target_fabric_configfs_init(THIS_MODULE, "iscsi"); .tpg_get_pr_transport_id = iscsi_get_pr_transport_id,
if (IS_ERR(fabric)) { .tpg_get_pr_transport_id_len = iscsi_get_pr_transport_id_len,
pr_err("target_fabric_configfs_init() for" .tpg_parse_pr_out_transport_id = iscsi_parse_pr_out_transport_id,
" LIO-Target failed!\n"); .tpg_check_demo_mode = lio_tpg_check_demo_mode,
return PTR_ERR(fabric); .tpg_check_demo_mode_cache = lio_tpg_check_demo_mode_cache,
} .tpg_check_demo_mode_write_protect =
/* lio_tpg_check_demo_mode_write_protect,
* Setup the fabric API of function pointers used by target_core_mod.. .tpg_check_prod_mode_write_protect =
*/ lio_tpg_check_prod_mode_write_protect,
fabric->tf_ops.get_fabric_name = &iscsi_get_fabric_name; .tpg_check_prot_fabric_only = &lio_tpg_check_prot_fabric_only,
fabric->tf_ops.get_fabric_proto_ident = &iscsi_get_fabric_proto_ident; .tpg_alloc_fabric_acl = lio_tpg_alloc_fabric_acl,
fabric->tf_ops.tpg_get_wwn = &lio_tpg_get_endpoint_wwn; .tpg_release_fabric_acl = lio_tpg_release_fabric_acl,
fabric->tf_ops.tpg_get_tag = &lio_tpg_get_tag; .tpg_get_inst_index = lio_tpg_get_inst_index,
fabric->tf_ops.tpg_get_default_depth = &lio_tpg_get_default_depth; .check_stop_free = lio_check_stop_free,
fabric->tf_ops.tpg_get_pr_transport_id = &iscsi_get_pr_transport_id; .release_cmd = lio_release_cmd,
fabric->tf_ops.tpg_get_pr_transport_id_len = .shutdown_session = lio_tpg_shutdown_session,
&iscsi_get_pr_transport_id_len; .close_session = lio_tpg_close_session,
fabric->tf_ops.tpg_parse_pr_out_transport_id = .sess_get_index = lio_sess_get_index,
&iscsi_parse_pr_out_transport_id; .sess_get_initiator_sid = lio_sess_get_initiator_sid,
fabric->tf_ops.tpg_check_demo_mode = &lio_tpg_check_demo_mode; .write_pending = lio_write_pending,
fabric->tf_ops.tpg_check_demo_mode_cache = .write_pending_status = lio_write_pending_status,
&lio_tpg_check_demo_mode_cache; .set_default_node_attributes = lio_set_default_node_attributes,
fabric->tf_ops.tpg_check_demo_mode_write_protect = .get_task_tag = iscsi_get_task_tag,
&lio_tpg_check_demo_mode_write_protect; .get_cmd_state = iscsi_get_cmd_state,
fabric->tf_ops.tpg_check_prod_mode_write_protect = .queue_data_in = lio_queue_data_in,
&lio_tpg_check_prod_mode_write_protect; .queue_status = lio_queue_status,
fabric->tf_ops.tpg_alloc_fabric_acl = &lio_tpg_alloc_fabric_acl; .queue_tm_rsp = lio_queue_tm_rsp,
fabric->tf_ops.tpg_release_fabric_acl = &lio_tpg_release_fabric_acl; .aborted_task = lio_aborted_task,
fabric->tf_ops.tpg_get_inst_index = &lio_tpg_get_inst_index; .fabric_make_wwn = lio_target_call_coreaddtiqn,
fabric->tf_ops.check_stop_free = &lio_check_stop_free, .fabric_drop_wwn = lio_target_call_coredeltiqn,
fabric->tf_ops.release_cmd = &lio_release_cmd; .fabric_make_tpg = lio_target_tiqn_addtpg,
fabric->tf_ops.shutdown_session = &lio_tpg_shutdown_session; .fabric_drop_tpg = lio_target_tiqn_deltpg,
fabric->tf_ops.close_session = &lio_tpg_close_session; .fabric_make_np = lio_target_call_addnptotpg,
fabric->tf_ops.sess_get_index = &lio_sess_get_index; .fabric_drop_np = lio_target_call_delnpfromtpg,
fabric->tf_ops.sess_get_initiator_sid = &lio_sess_get_initiator_sid; .fabric_make_nodeacl = lio_target_make_nodeacl,
fabric->tf_ops.write_pending = &lio_write_pending; .fabric_drop_nodeacl = lio_target_drop_nodeacl,
fabric->tf_ops.write_pending_status = &lio_write_pending_status;
fabric->tf_ops.set_default_node_attributes = .tfc_discovery_attrs = lio_target_discovery_auth_attrs,
&lio_set_default_node_attributes; .tfc_wwn_attrs = lio_target_wwn_attrs,
fabric->tf_ops.get_task_tag = &iscsi_get_task_tag; .tfc_tpg_base_attrs = lio_target_tpg_attrs,
fabric->tf_ops.get_cmd_state = &iscsi_get_cmd_state; .tfc_tpg_attrib_attrs = lio_target_tpg_attrib_attrs,
fabric->tf_ops.queue_data_in = &lio_queue_data_in; .tfc_tpg_auth_attrs = lio_target_tpg_auth_attrs,
fabric->tf_ops.queue_status = &lio_queue_status; .tfc_tpg_param_attrs = lio_target_tpg_param_attrs,
fabric->tf_ops.queue_tm_rsp = &lio_queue_tm_rsp; .tfc_tpg_np_base_attrs = lio_target_portal_attrs,
fabric->tf_ops.aborted_task = &lio_aborted_task; .tfc_tpg_nacl_base_attrs = lio_target_initiator_attrs,
/* .tfc_tpg_nacl_attrib_attrs = lio_target_nacl_attrib_attrs,
* Setup function pointers for generic logic in target_core_fabric_configfs.c .tfc_tpg_nacl_auth_attrs = lio_target_nacl_auth_attrs,
*/ .tfc_tpg_nacl_param_attrs = lio_target_nacl_param_attrs,
fabric->tf_ops.fabric_make_wwn = &lio_target_call_coreaddtiqn; };
fabric->tf_ops.fabric_drop_wwn = &lio_target_call_coredeltiqn;
fabric->tf_ops.fabric_make_tpg = &lio_target_tiqn_addtpg;
fabric->tf_ops.fabric_drop_tpg = &lio_target_tiqn_deltpg;
fabric->tf_ops.fabric_post_link = NULL;
fabric->tf_ops.fabric_pre_unlink = NULL;
fabric->tf_ops.fabric_make_np = &lio_target_call_addnptotpg;
fabric->tf_ops.fabric_drop_np = &lio_target_call_delnpfromtpg;
fabric->tf_ops.fabric_make_nodeacl = &lio_target_make_nodeacl;
fabric->tf_ops.fabric_drop_nodeacl = &lio_target_drop_nodeacl;
/*
* Setup default attribute lists for various fabric->tf_cit_tmpl
* sturct config_item_type's
*/
fabric->tf_cit_tmpl.tfc_discovery_cit.ct_attrs = lio_target_discovery_auth_attrs;
fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = lio_target_wwn_attrs;
fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = lio_target_tpg_attrs;
fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = lio_target_tpg_attrib_attrs;
fabric->tf_cit_tmpl.tfc_tpg_auth_cit.ct_attrs = lio_target_tpg_auth_attrs;
fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = lio_target_tpg_param_attrs;
fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = lio_target_portal_attrs;
fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = lio_target_initiator_attrs;
fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = lio_target_nacl_attrib_attrs;
fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = lio_target_nacl_auth_attrs;
fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = lio_target_nacl_param_attrs;
ret = target_fabric_configfs_register(fabric);
if (ret < 0) {
pr_err("target_fabric_configfs_register() for"
" LIO-Target failed!\n");
target_fabric_configfs_free(fabric);
return ret;
}
lio_target_fabric_configfs = fabric;
pr_debug("LIO_TARGET[0] - Set fabric ->"
" lio_target_fabric_configfs\n");
return 0;
}
void iscsi_target_deregister_configfs(void)
{
if (!lio_target_fabric_configfs)
return;
/*
* Shutdown discovery sessions and disable discovery TPG
*/
if (iscsit_global->discovery_tpg)
iscsit_tpg_disable_portal_group(iscsit_global->discovery_tpg, 1);
target_fabric_configfs_deregister(lio_target_fabric_configfs);
lio_target_fabric_configfs = NULL;
pr_debug("LIO_TARGET[0] - Cleared"
" lio_target_fabric_configfs\n");
}
drivers/target/iscsi/iscsi_target_configfs.h deleted 100644 → 0
View file @ 06b45f2a
#ifndef ISCSI_TARGET_CONFIGFS_H
#define ISCSI_TARGET_CONFIGFS_H
extern int iscsi_target_register_configfs(void);
extern void iscsi_target_deregister_configfs(void);
#endif /* ISCSI_TARGET_CONFIGFS_H */
drivers/target/iscsi/iscsi_target_erl0.c
View file @ c6668726
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <target/iscsi/iscsi_target_core.h> #include <target/iscsi/iscsi_target_core.h>
#include "iscsi_target_seq_pdu_list.h" #include "iscsi_target_seq_pdu_list.h"
#include "iscsi_target_tq.h"
#include "iscsi_target_erl0.h" #include "iscsi_target_erl0.h"
#include "iscsi_target_erl1.h" #include "iscsi_target_erl1.h"
#include "iscsi_target_erl2.h" #include "iscsi_target_erl2.h"
...@@ -860,7 +859,10 @@ void iscsit_connection_reinstatement_rcfr(struct iscsi_conn *conn) ...@@ -860,7 +859,10 @@ void iscsit_connection_reinstatement_rcfr(struct iscsi_conn *conn)
} }
spin_unlock_bh(&conn->state_lock); spin_unlock_bh(&conn->state_lock);
iscsi_thread_set_force_reinstatement(conn); if (conn->tx_thread && conn->tx_thread_active)
send_sig(SIGINT, conn->tx_thread, 1);
if (conn->rx_thread && conn->rx_thread_active)
send_sig(SIGINT, conn->rx_thread, 1);
sleep: sleep:
wait_for_completion(&conn->conn_wait_rcfr_comp); wait_for_completion(&conn->conn_wait_rcfr_comp);
...@@ -885,10 +887,10 @@ void iscsit_cause_connection_reinstatement(struct iscsi_conn *conn, int sleep) ...@@ -885,10 +887,10 @@ void iscsit_cause_connection_reinstatement(struct iscsi_conn *conn, int sleep)
return; return;
} }
if (iscsi_thread_set_force_reinstatement(conn) < 0) { if (conn->tx_thread && conn->tx_thread_active)
spin_unlock_bh(&conn->state_lock); send_sig(SIGINT, conn->tx_thread, 1);
return; if (conn->rx_thread && conn->rx_thread_active)
} send_sig(SIGINT, conn->rx_thread, 1);
atomic_set(&conn->connection_reinstatement, 1); atomic_set(&conn->connection_reinstatement, 1);
if (!sleep) { if (!sleep) {
......
drivers/target/iscsi/iscsi_target_login.c
View file @ c6668726
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <target/iscsi/iscsi_target_core.h> #include <target/iscsi/iscsi_target_core.h>
#include <target/iscsi/iscsi_target_stat.h> #include <target/iscsi/iscsi_target_stat.h>
#include "iscsi_target_tq.h"
#include "iscsi_target_device.h" #include "iscsi_target_device.h"
#include "iscsi_target_nego.h" #include "iscsi_target_nego.h"
#include "iscsi_target_erl0.h" #include "iscsi_target_erl0.h"
...@@ -699,6 +698,51 @@ static void iscsi_post_login_start_timers(struct iscsi_conn *conn) ...@@ -699,6 +698,51 @@ static void iscsi_post_login_start_timers(struct iscsi_conn *conn)
iscsit_start_nopin_timer(conn); iscsit_start_nopin_timer(conn);
} }
static int iscsit_start_kthreads(struct iscsi_conn *conn)
{
int ret = 0;
spin_lock(&iscsit_global->ts_bitmap_lock);
conn->bitmap_id = bitmap_find_free_region(iscsit_global->ts_bitmap,
ISCSIT_BITMAP_BITS, get_order(1));
spin_unlock(&iscsit_global->ts_bitmap_lock);
if (conn->bitmap_id < 0) {
pr_err("bitmap_find_free_region() failed for"
" iscsit_start_kthreads()\n");
return -ENOMEM;
}
conn->tx_thread = kthread_run(iscsi_target_tx_thread, conn,
"%s", ISCSI_TX_THREAD_NAME);
if (IS_ERR(conn->tx_thread)) {
pr_err("Unable to start iscsi_target_tx_thread\n");
ret = PTR_ERR(conn->tx_thread);
goto out_bitmap;
}
conn->tx_thread_active = true;
conn->rx_thread = kthread_run(iscsi_target_rx_thread, conn,
"%s", ISCSI_RX_THREAD_NAME);
if (IS_ERR(conn->rx_thread)) {
pr_err("Unable to start iscsi_target_rx_thread\n");
ret = PTR_ERR(conn->rx_thread);
goto out_tx;
}
conn->rx_thread_active = true;
return 0;
out_tx:
kthread_stop(conn->tx_thread);
conn->tx_thread_active = false;
out_bitmap:
spin_lock(&iscsit_global->ts_bitmap_lock);
bitmap_release_region(iscsit_global->ts_bitmap, conn->bitmap_id,
get_order(1));
spin_unlock(&iscsit_global->ts_bitmap_lock);
return ret;
}
int iscsi_post_login_handler( int iscsi_post_login_handler(
struct iscsi_np *np, struct iscsi_np *np,
struct iscsi_conn *conn, struct iscsi_conn *conn,
...@@ -709,7 +753,7 @@ int iscsi_post_login_handler( ...@@ -709,7 +753,7 @@ int iscsi_post_login_handler(
struct se_session *se_sess = sess->se_sess; struct se_session *se_sess = sess->se_sess;
struct iscsi_portal_group *tpg = sess->tpg; struct iscsi_portal_group *tpg = sess->tpg;
struct se_portal_group *se_tpg = &tpg->tpg_se_tpg; struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;
struct iscsi_thread_set *ts; int rc;
iscsit_inc_conn_usage_count(conn); iscsit_inc_conn_usage_count(conn);
...@@ -724,7 +768,6 @@ int iscsi_post_login_handler( ...@@ -724,7 +768,6 @@ int iscsi_post_login_handler(
/* /*
* SCSI Initiator -> SCSI Target Port Mapping * SCSI Initiator -> SCSI Target Port Mapping
*/ */
ts = iscsi_get_thread_set();
if (!zero_tsih) { if (!zero_tsih) {
iscsi_set_session_parameters(sess->sess_ops, iscsi_set_session_parameters(sess->sess_ops,
conn->param_list, 0); conn->param_list, 0);
...@@ -751,9 +794,11 @@ int iscsi_post_login_handler( ...@@ -751,9 +794,11 @@ int iscsi_post_login_handler(
sess->sess_ops->InitiatorName); sess->sess_ops->InitiatorName);
spin_unlock_bh(&sess->conn_lock); spin_unlock_bh(&sess->conn_lock);
iscsi_post_login_start_timers(conn); rc = iscsit_start_kthreads(conn);
if (rc)
return rc;
iscsi_activate_thread_set(conn, ts); iscsi_post_login_start_timers(conn);
/* /*
* Determine CPU mask to ensure connection's RX and TX kthreads * Determine CPU mask to ensure connection's RX and TX kthreads
* are scheduled on the same CPU. * are scheduled on the same CPU.
...@@ -810,8 +855,11 @@ int iscsi_post_login_handler( ...@@ -810,8 +855,11 @@ int iscsi_post_login_handler(
" iSCSI Target Portal Group: %hu\n", tpg->nsessions, tpg->tpgt); " iSCSI Target Portal Group: %hu\n", tpg->nsessions, tpg->tpgt);
spin_unlock_bh(&se_tpg->session_lock); spin_unlock_bh(&se_tpg->session_lock);
rc = iscsit_start_kthreads(conn);
if (rc)
return rc;
iscsi_post_login_start_timers(conn); iscsi_post_login_start_timers(conn);
iscsi_activate_thread_set(conn, ts);
/* /*
* Determine CPU mask to ensure connection's RX and TX kthreads * Determine CPU mask to ensure connection's RX and TX kthreads
* are scheduled on the same CPU. * are scheduled on the same CPU.
......
drivers/target/iscsi/iscsi_target_tpg.c
View file @ c6668726
...@@ -68,10 +68,8 @@ int iscsit_load_discovery_tpg(void) ...@@ -68,10 +68,8 @@ int iscsit_load_discovery_tpg(void)
return -1; return -1;
} }
ret = core_tpg_register( ret = core_tpg_register(&iscsi_ops, NULL, &tpg->tpg_se_tpg,
&lio_target_fabric_configfs->tf_ops, tpg, TRANSPORT_TPG_TYPE_DISCOVERY);
NULL, &tpg->tpg_se_tpg, tpg,
TRANSPORT_TPG_TYPE_DISCOVERY);
if (ret < 0) { if (ret < 0) {
kfree(tpg); kfree(tpg);
return -1; return -1;
...@@ -228,6 +226,7 @@ static void iscsit_set_default_tpg_attribs(struct iscsi_portal_group *tpg) ...@@ -228,6 +226,7 @@ static void iscsit_set_default_tpg_attribs(struct iscsi_portal_group *tpg)
a->demo_mode_discovery = TA_DEMO_MODE_DISCOVERY; a->demo_mode_discovery = TA_DEMO_MODE_DISCOVERY;
a->default_erl = TA_DEFAULT_ERL; a->default_erl = TA_DEFAULT_ERL;
a->t10_pi = TA_DEFAULT_T10_PI; a->t10_pi = TA_DEFAULT_T10_PI;
a->fabric_prot_type = TA_DEFAULT_FABRIC_PROT_TYPE;
} }
int iscsit_tpg_add_portal_group(struct iscsi_tiqn *tiqn, struct iscsi_portal_group *tpg) int iscsit_tpg_add_portal_group(struct iscsi_tiqn *tiqn, struct iscsi_portal_group *tpg)
...@@ -878,3 +877,21 @@ int iscsit_ta_t10_pi( ...@@ -878,3 +877,21 @@ int iscsit_ta_t10_pi(
return 0; return 0;
} }
int iscsit_ta_fabric_prot_type(
struct iscsi_portal_group *tpg,
u32 prot_type)
{
struct iscsi_tpg_attrib *a = &tpg->tpg_attrib;
if ((prot_type != 0) && (prot_type != 1) && (prot_type != 3)) {
pr_err("Illegal value for fabric_prot_type: %u\n", prot_type);
return -EINVAL;
}
a->fabric_prot_type = prot_type;
pr_debug("iSCSI_TPG[%hu] - T10 Fabric Protection Type: %u\n",
tpg->tpgt, prot_type);
return 0;
}
drivers/target/iscsi/iscsi_target_tpg.h
View file @ c6668726
...@@ -39,5 +39,6 @@ extern int iscsit_ta_prod_mode_write_protect(struct iscsi_portal_group *, u32); ...@@ -39,5 +39,6 @@ extern int iscsit_ta_prod_mode_write_protect(struct iscsi_portal_group *, u32);
extern int iscsit_ta_demo_mode_discovery(struct iscsi_portal_group *, u32); extern int iscsit_ta_demo_mode_discovery(struct iscsi_portal_group *, u32);
extern int iscsit_ta_default_erl(struct iscsi_portal_group *, u32); extern int iscsit_ta_default_erl(struct iscsi_portal_group *, u32);
extern int iscsit_ta_t10_pi(struct iscsi_portal_group *, u32); extern int iscsit_ta_t10_pi(struct iscsi_portal_group *, u32);
extern int iscsit_ta_fabric_prot_type(struct iscsi_portal_group *, u32);
#endif /* ISCSI_TARGET_TPG_H */ #endif /* ISCSI_TARGET_TPG_H */
drivers/target/iscsi/iscsi_target_tq.c deleted 100644 → 0
View file @ 06b45f2a
This diff is collapsed.
drivers/target/iscsi/iscsi_target_tq.h deleted 100644 → 0
View file @ 06b45f2a
#ifndef ISCSI_THREAD_QUEUE_H
#define ISCSI_THREAD_QUEUE_H
/*
* Defines for thread sets.
*/
extern int iscsi_thread_set_force_reinstatement(struct iscsi_conn *);
extern int iscsi_allocate_thread_sets(u32);
extern void iscsi_deallocate_thread_sets(void);
extern void iscsi_activate_thread_set(struct iscsi_conn *, struct iscsi_thread_set *);
extern struct iscsi_thread_set *iscsi_get_thread_set(void);
extern void iscsi_set_thread_clear(struct iscsi_conn *, u8);
extern void iscsi_set_thread_set_signal(struct iscsi_conn *, u8);
extern int iscsi_release_thread_set(struct iscsi_conn *);
extern struct iscsi_conn *iscsi_rx_thread_pre_handler(struct iscsi_thread_set *);
extern struct iscsi_conn *iscsi_tx_thread_pre_handler(struct iscsi_thread_set *);
extern int iscsi_thread_set_init(void);
extern void iscsi_thread_set_free(void);
extern int iscsi_target_tx_thread(void *);
extern int iscsi_target_rx_thread(void *);
#define TARGET_THREAD_SET_COUNT 4
#define ISCSI_RX_THREAD 1
#define ISCSI_TX_THREAD 2
#define ISCSI_RX_THREAD_NAME "iscsi_trx"
#define ISCSI_TX_THREAD_NAME "iscsi_ttx"
#define ISCSI_BLOCK_RX_THREAD 0x1
#define ISCSI_BLOCK_TX_THREAD 0x2
#define ISCSI_CLEAR_RX_THREAD 0x1
#define ISCSI_CLEAR_TX_THREAD 0x2
#define ISCSI_SIGNAL_RX_THREAD 0x1
#define ISCSI_SIGNAL_TX_THREAD 0x2
/* struct iscsi_thread_set->status */
#define ISCSI_THREAD_SET_FREE 1
#define ISCSI_THREAD_SET_ACTIVE 2
#define ISCSI_THREAD_SET_DIE 3
#define ISCSI_THREAD_SET_RESET 4
#define ISCSI_THREAD_SET_DEALLOCATE_THREADS 5
/* By default allow a maximum of 32K iSCSI connections */
#define ISCSI_TS_BITMAP_BITS 32768
struct iscsi_thread_set {
/* flags used for blocking and restarting sets */
int blocked_threads;
/* flag for creating threads */
int create_threads;
/* flag for delaying readding to inactive list */
int delay_inactive;
/* status for thread set */
int status;
/* which threads have had signals sent */
int signal_sent;
/* flag for which threads exited first */
int thread_clear;
/* Active threads in the thread set */
int thread_count;
/* Unique thread ID */
u32 thread_id;
/* pointer to connection if set is active */
struct iscsi_conn *conn;
/* used for controlling ts state accesses */
spinlock_t ts_state_lock;
/* used for restarting thread queue */
struct completion rx_restart_comp;
/* used for restarting thread queue */
struct completion tx_restart_comp;
/* used for normal unused blocking */
struct completion rx_start_comp;
/* used for normal unused blocking */
struct completion tx_start_comp;
/* OS descriptor for rx thread */
struct task_struct *rx_thread;
/* OS descriptor for tx thread */
struct task_struct *tx_thread;
/* struct iscsi_thread_set in list list head*/
struct list_head ts_list;
struct semaphore ts_activate_sem;
};
#endif /*** ISCSI_THREAD_QUEUE_H ***/
drivers/target/iscsi/iscsi_target_util.c
View file @ c6668726
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include "iscsi_target_erl1.h" #include "iscsi_target_erl1.h"
#include "iscsi_target_erl2.h" #include "iscsi_target_erl2.h"
#include "iscsi_target_tpg.h" #include "iscsi_target_tpg.h"
#include "iscsi_target_tq.h"
#include "iscsi_target_util.h" #include "iscsi_target_util.h"
#include "iscsi_target.h" #include "iscsi_target.h"
......
drivers/target/loopback/tcm_loop.c
View file @ c6668726
This diff is collapsed.
drivers/target/loopback/tcm_loop.h
View file @ c6668726
...@@ -43,6 +43,7 @@ struct tcm_loop_nacl { ...@@ -43,6 +43,7 @@ struct tcm_loop_nacl {
struct tcm_loop_tpg { struct tcm_loop_tpg {
unsigned short tl_tpgt; unsigned short tl_tpgt;
unsigned short tl_transport_status; unsigned short tl_transport_status;
enum target_prot_type tl_fabric_prot_type;
atomic_t tl_tpg_port_count; atomic_t tl_tpg_port_count;
struct se_portal_group tl_se_tpg; struct se_portal_group tl_se_tpg;
struct tcm_loop_hba *tl_hba; struct tcm_loop_hba *tl_hba;
......
drivers/target/sbp/sbp_target.c
View file @ c6668726
...@@ -42,8 +42,7 @@ ...@@ -42,8 +42,7 @@
#include "sbp_target.h" #include "sbp_target.h"
/* Local pointer to allocated TCM configfs fabric module */ static const struct target_core_fabric_ops sbp_ops;
static struct target_fabric_configfs *sbp_fabric_configfs;
/* FireWire address region for management and command block address handlers */ /* FireWire address region for management and command block address handlers */
static const struct fw_address_region sbp_register_region = { static const struct fw_address_region sbp_register_region = {
...@@ -2215,8 +2214,7 @@ static struct se_portal_group *sbp_make_tpg( ...@@ -2215,8 +2214,7 @@ static struct se_portal_group *sbp_make_tpg(
goto out_free_tpg; goto out_free_tpg;
} }
ret = core_tpg_register(&sbp_fabric_configfs->tf_ops, wwn, ret = core_tpg_register(&sbp_ops, wwn, &tpg->se_tpg, tpg,
&tpg->se_tpg, (void *)tpg,
TRANSPORT_TPG_TYPE_NORMAL); TRANSPORT_TPG_TYPE_NORMAL);
if (ret < 0) if (ret < 0)
goto out_unreg_mgt_agt; goto out_unreg_mgt_agt;
...@@ -2503,7 +2501,9 @@ static struct configfs_attribute *sbp_tpg_attrib_attrs[] = { ...@@ -2503,7 +2501,9 @@ static struct configfs_attribute *sbp_tpg_attrib_attrs[] = {
NULL, NULL,
}; };
static struct target_core_fabric_ops sbp_ops = { static const struct target_core_fabric_ops sbp_ops = {
.module = THIS_MODULE,
.name = "sbp",
.get_fabric_name = sbp_get_fabric_name, .get_fabric_name = sbp_get_fabric_name,
.get_fabric_proto_ident = sbp_get_fabric_proto_ident, .get_fabric_proto_ident = sbp_get_fabric_proto_ident,
.tpg_get_wwn = sbp_get_fabric_wwn, .tpg_get_wwn = sbp_get_fabric_wwn,
...@@ -2544,68 +2544,20 @@ static struct target_core_fabric_ops sbp_ops = { ...@@ -2544,68 +2544,20 @@ static struct target_core_fabric_ops sbp_ops = {
.fabric_drop_np = NULL, .fabric_drop_np = NULL,
.fabric_make_nodeacl = sbp_make_nodeacl, .fabric_make_nodeacl = sbp_make_nodeacl,
.fabric_drop_nodeacl = sbp_drop_nodeacl, .fabric_drop_nodeacl = sbp_drop_nodeacl,
};
static int sbp_register_configfs(void)
{
struct target_fabric_configfs *fabric;
int ret;
fabric = target_fabric_configfs_init(THIS_MODULE, "sbp");
if (IS_ERR(fabric)) {
pr_err("target_fabric_configfs_init() failed\n");
return PTR_ERR(fabric);
}
fabric->tf_ops = sbp_ops;
/*
* Setup default attribute lists for various fabric->tf_cit_tmpl
*/
fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = sbp_wwn_attrs;
fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = sbp_tpg_base_attrs;
fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = sbp_tpg_attrib_attrs;
fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;
fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;
ret = target_fabric_configfs_register(fabric);
if (ret < 0) {
pr_err("target_fabric_configfs_register() failed for SBP\n");
return ret;
}
sbp_fabric_configfs = fabric; .tfc_wwn_attrs = sbp_wwn_attrs,
.tfc_tpg_base_attrs = sbp_tpg_base_attrs,
return 0; .tfc_tpg_attrib_attrs = sbp_tpg_attrib_attrs,
};
static void sbp_deregister_configfs(void)
{
if (!sbp_fabric_configfs)
return;
target_fabric_configfs_deregister(sbp_fabric_configfs);
sbp_fabric_configfs = NULL;
}; };
static int __init sbp_init(void) static int __init sbp_init(void)
{ {
int ret; return target_register_template(&sbp_ops);
ret = sbp_register_configfs();
if (ret < 0)
return ret;
return 0;
}; };
static void __exit sbp_exit(void) static void __exit sbp_exit(void)
{ {
sbp_deregister_configfs(); target_unregister_template(&sbp_ops);
}; };
MODULE_DESCRIPTION("FireWire SBP fabric driver"); MODULE_DESCRIPTION("FireWire SBP fabric driver");
......
drivers/target/target_core_configfs.c
View file @ c6668726
...@@ -142,8 +142,8 @@ static struct config_group *target_core_register_fabric( ...@@ -142,8 +142,8 @@ static struct config_group *target_core_register_fabric(
tf = target_core_get_fabric(name); tf = target_core_get_fabric(name);
if (!tf) { if (!tf) {
pr_err("target_core_register_fabric() trying autoload for %s\n", pr_debug("target_core_register_fabric() trying autoload for %s\n",
name); name);
/* /*
* Below are some hardcoded request_module() calls to automatically * Below are some hardcoded request_module() calls to automatically
...@@ -165,8 +165,8 @@ static struct config_group *target_core_register_fabric( ...@@ -165,8 +165,8 @@ static struct config_group *target_core_register_fabric(
*/ */
ret = request_module("iscsi_target_mod"); ret = request_module("iscsi_target_mod");
if (ret < 0) { if (ret < 0) {
pr_err("request_module() failed for" pr_debug("request_module() failed for"
" iscsi_target_mod.ko: %d\n", ret); " iscsi_target_mod.ko: %d\n", ret);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
} else if (!strncmp(name, "loopback", 8)) { } else if (!strncmp(name, "loopback", 8)) {
...@@ -178,8 +178,8 @@ static struct config_group *target_core_register_fabric( ...@@ -178,8 +178,8 @@ static struct config_group *target_core_register_fabric(
*/ */
ret = request_module("tcm_loop"); ret = request_module("tcm_loop");
if (ret < 0) { if (ret < 0) {
pr_err("request_module() failed for" pr_debug("request_module() failed for"
" tcm_loop.ko: %d\n", ret); " tcm_loop.ko: %d\n", ret);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
} }
...@@ -188,8 +188,8 @@ static struct config_group *target_core_register_fabric( ...@@ -188,8 +188,8 @@ static struct config_group *target_core_register_fabric(
} }
if (!tf) { if (!tf) {
pr_err("target_core_get_fabric() failed for %s\n", pr_debug("target_core_get_fabric() failed for %s\n",
name); name);
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
pr_debug("Target_Core_ConfigFS: REGISTER -> Located fabric:" pr_debug("Target_Core_ConfigFS: REGISTER -> Located fabric:"
...@@ -300,81 +300,17 @@ struct configfs_subsystem *target_core_subsystem[] = { ...@@ -300,81 +300,17 @@ struct configfs_subsystem *target_core_subsystem[] = {
// Start functions called by external Target Fabrics Modules // Start functions called by external Target Fabrics Modules
//############################################################################*/ //############################################################################*/
/* static int target_fabric_tf_ops_check(const struct target_core_fabric_ops *tfo)
* First function called by fabric modules to:
*
* 1) Allocate a struct target_fabric_configfs and save the *fabric_cit pointer.
* 2) Add struct target_fabric_configfs to g_tf_list
* 3) Return struct target_fabric_configfs to fabric module to be passed
* into target_fabric_configfs_register().
*/
struct target_fabric_configfs *target_fabric_configfs_init(
struct module *fabric_mod,
const char *name)
{ {
struct target_fabric_configfs *tf; if (!tfo->name) {
pr_err("Missing tfo->name\n");
if (!(name)) { return -EINVAL;
pr_err("Unable to locate passed fabric name\n");
return ERR_PTR(-EINVAL);
} }
if (strlen(name) >= TARGET_FABRIC_NAME_SIZE) { if (strlen(tfo->name) >= TARGET_FABRIC_NAME_SIZE) {
pr_err("Passed name: %s exceeds TARGET_FABRIC" pr_err("Passed name: %s exceeds TARGET_FABRIC"
"_NAME_SIZE\n", name); "_NAME_SIZE\n", tfo->name);
return ERR_PTR(-EINVAL); return -EINVAL;
} }
tf = kzalloc(sizeof(struct target_fabric_configfs), GFP_KERNEL);
if (!tf)
return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&tf->tf_list);
atomic_set(&tf->tf_access_cnt, 0);
/*
* Setup the default generic struct config_item_type's (cits) in
* struct target_fabric_configfs->tf_cit_tmpl
*/
tf->tf_module = fabric_mod;
target_fabric_setup_cits(tf);
tf->tf_subsys = target_core_subsystem[0];
snprintf(tf->tf_name, TARGET_FABRIC_NAME_SIZE, "%s", name);
mutex_lock(&g_tf_lock);
list_add_tail(&tf->tf_list, &g_tf_list);
mutex_unlock(&g_tf_lock);
pr_debug("<<<<<<<<<<<<<<<<<<<<<< BEGIN FABRIC API >>>>>>>>"
">>>>>>>>>>>>>>\n");
pr_debug("Initialized struct target_fabric_configfs: %p for"
" %s\n", tf, tf->tf_name);
return tf;
}
EXPORT_SYMBOL(target_fabric_configfs_init);
/*
* Called by fabric plugins after FAILED target_fabric_configfs_register() call.
*/
void target_fabric_configfs_free(
struct target_fabric_configfs *tf)
{
mutex_lock(&g_tf_lock);
list_del(&tf->tf_list);
mutex_unlock(&g_tf_lock);
kfree(tf);
}
EXPORT_SYMBOL(target_fabric_configfs_free);
/*
* Perform a sanity check of the passed tf->tf_ops before completing
* TCM fabric module registration.
*/
static int target_fabric_tf_ops_check(
struct target_fabric_configfs *tf)
{
struct target_core_fabric_ops *tfo = &tf->tf_ops;
if (!tfo->get_fabric_name) { if (!tfo->get_fabric_name) {
pr_err("Missing tfo->get_fabric_name()\n"); pr_err("Missing tfo->get_fabric_name()\n");
return -EINVAL; return -EINVAL;
...@@ -508,77 +444,59 @@ static int target_fabric_tf_ops_check( ...@@ -508,77 +444,59 @@ static int target_fabric_tf_ops_check(
return 0; return 0;
} }
/* int target_register_template(const struct target_core_fabric_ops *fo)
* Called 2nd from fabric module with returned parameter of
* struct target_fabric_configfs * from target_fabric_configfs_init().
*
* Upon a successful registration, the new fabric's struct config_item is
* return. Also, a pointer to this struct is set in the passed
* struct target_fabric_configfs.
*/
int target_fabric_configfs_register(
struct target_fabric_configfs *tf)
{ {
struct target_fabric_configfs *tf;
int ret; int ret;
ret = target_fabric_tf_ops_check(fo);
if (ret)
return ret;
tf = kzalloc(sizeof(struct target_fabric_configfs), GFP_KERNEL);
if (!tf) { if (!tf) {
pr_err("Unable to locate target_fabric_configfs" pr_err("%s: could not allocate memory!\n", __func__);
" pointer\n"); return -ENOMEM;
return -EINVAL;
}
if (!tf->tf_subsys) {
pr_err("Unable to target struct config_subsystem"
" pointer\n");
return -EINVAL;
} }
ret = target_fabric_tf_ops_check(tf);
if (ret < 0)
return ret;
pr_debug("<<<<<<<<<<<<<<<<<<<<<< END FABRIC API >>>>>>>>>>>>" INIT_LIST_HEAD(&tf->tf_list);
">>>>>>>>>>\n"); atomic_set(&tf->tf_access_cnt, 0);
/*
* Setup the default generic struct config_item_type's (cits) in
* struct target_fabric_configfs->tf_cit_tmpl
*/
tf->tf_module = fo->module;
tf->tf_subsys = target_core_subsystem[0];
snprintf(tf->tf_name, TARGET_FABRIC_NAME_SIZE, "%s", fo->name);
tf->tf_ops = *fo;
target_fabric_setup_cits(tf);
mutex_lock(&g_tf_lock);
list_add_tail(&tf->tf_list, &g_tf_list);
mutex_unlock(&g_tf_lock);
return 0; return 0;
} }
EXPORT_SYMBOL(target_fabric_configfs_register); EXPORT_SYMBOL(target_register_template);
void target_fabric_configfs_deregister( void target_unregister_template(const struct target_core_fabric_ops *fo)
struct target_fabric_configfs *tf)
{ {
struct configfs_subsystem *su; struct target_fabric_configfs *t;
if (!tf) {
pr_err("Unable to locate passed target_fabric_"
"configfs\n");
return;
}
su = tf->tf_subsys;
if (!su) {
pr_err("Unable to locate passed tf->tf_subsys"
" pointer\n");
return;
}
pr_debug("<<<<<<<<<<<<<<<<<<<<<< BEGIN FABRIC API >>>>>>>>>>"
">>>>>>>>>>>>\n");
mutex_lock(&g_tf_lock); mutex_lock(&g_tf_lock);
if (atomic_read(&tf->tf_access_cnt)) { list_for_each_entry(t, &g_tf_list, tf_list) {
mutex_unlock(&g_tf_lock); if (!strcmp(t->tf_name, fo->name)) {
pr_err("Non zero tf->tf_access_cnt for fabric %s\n", BUG_ON(atomic_read(&t->tf_access_cnt));
tf->tf_name); list_del(&t->tf_list);
BUG(); kfree(t);
break;
}
} }
list_del(&tf->tf_list);
mutex_unlock(&g_tf_lock); mutex_unlock(&g_tf_lock);
pr_debug("Target_Core_ConfigFS: DEREGISTER -> Releasing tf:"
" %s\n", tf->tf_name);
tf->tf_module = NULL;
tf->tf_subsys = NULL;
kfree(tf);
pr_debug("<<<<<<<<<<<<<<<<<<<<<< END FABRIC API >>>>>>>>>>>>>>>>>"
">>>>>\n");
} }
EXPORT_SYMBOL(target_fabric_configfs_deregister); EXPORT_SYMBOL(target_unregister_template);
/*############################################################################## /*##############################################################################
// Stop functions called by external Target Fabrics Modules // Stop functions called by external Target Fabrics Modules
...@@ -945,7 +863,7 @@ static ssize_t target_core_dev_pr_show_attr_res_pr_holder_tg_port( ...@@ -945,7 +863,7 @@ static ssize_t target_core_dev_pr_show_attr_res_pr_holder_tg_port(
struct se_lun *lun; struct se_lun *lun;
struct se_portal_group *se_tpg; struct se_portal_group *se_tpg;
struct t10_pr_registration *pr_reg; struct t10_pr_registration *pr_reg;
struct target_core_fabric_ops *tfo; const struct target_core_fabric_ops *tfo;
ssize_t len = 0; ssize_t len = 0;
spin_lock(&dev->dev_reservation_lock); spin_lock(&dev->dev_reservation_lock);
...@@ -979,7 +897,7 @@ SE_DEV_PR_ATTR_RO(res_pr_holder_tg_port); ...@@ -979,7 +897,7 @@ SE_DEV_PR_ATTR_RO(res_pr_holder_tg_port);
static ssize_t target_core_dev_pr_show_attr_res_pr_registered_i_pts( static ssize_t target_core_dev_pr_show_attr_res_pr_registered_i_pts(
struct se_device *dev, char *page) struct se_device *dev, char *page)
{ {
struct target_core_fabric_ops *tfo; const struct target_core_fabric_ops *tfo;
struct t10_pr_registration *pr_reg; struct t10_pr_registration *pr_reg;
unsigned char buf[384]; unsigned char buf[384];
char i_buf[PR_REG_ISID_ID_LEN]; char i_buf[PR_REG_ISID_ID_LEN];
......
drivers/target/target_core_fabric_configfs.c
View file @ c6668726
...@@ -56,6 +56,20 @@ static void target_fabric_setup_##_name##_cit(struct target_fabric_configfs *tf) ...@@ -56,6 +56,20 @@ static void target_fabric_setup_##_name##_cit(struct target_fabric_configfs *tf)
pr_debug("Setup generic %s\n", __stringify(_name)); \ pr_debug("Setup generic %s\n", __stringify(_name)); \
} }
#define TF_CIT_SETUP_DRV(_name, _item_ops, _group_ops) \
static void target_fabric_setup_##_name##_cit(struct target_fabric_configfs *tf) \
{ \
struct target_fabric_configfs_template *tfc = &tf->tf_cit_tmpl; \
struct config_item_type *cit = &tfc->tfc_##_name##_cit; \
struct configfs_attribute **attrs = tf->tf_ops.tfc_##_name##_attrs; \
\
cit->ct_item_ops = _item_ops; \
cit->ct_group_ops = _group_ops; \
cit->ct_attrs = attrs; \
cit->ct_owner = tf->tf_module; \
pr_debug("Setup generic %s\n", __stringify(_name)); \
}
/* Start of tfc_tpg_mappedlun_cit */ /* Start of tfc_tpg_mappedlun_cit */
static int target_fabric_mappedlun_link( static int target_fabric_mappedlun_link(
...@@ -278,7 +292,7 @@ static struct configfs_item_operations target_fabric_nacl_attrib_item_ops = { ...@@ -278,7 +292,7 @@ static struct configfs_item_operations target_fabric_nacl_attrib_item_ops = {
.store_attribute = target_fabric_nacl_attrib_attr_store, .store_attribute = target_fabric_nacl_attrib_attr_store,
}; };
TF_CIT_SETUP(tpg_nacl_attrib, &target_fabric_nacl_attrib_item_ops, NULL, NULL); TF_CIT_SETUP_DRV(tpg_nacl_attrib, &target_fabric_nacl_attrib_item_ops, NULL);
/* End of tfc_tpg_nacl_attrib_cit */ /* End of tfc_tpg_nacl_attrib_cit */
...@@ -291,7 +305,7 @@ static struct configfs_item_operations target_fabric_nacl_auth_item_ops = { ...@@ -291,7 +305,7 @@ static struct configfs_item_operations target_fabric_nacl_auth_item_ops = {
.store_attribute = target_fabric_nacl_auth_attr_store, .store_attribute = target_fabric_nacl_auth_attr_store,
}; };
TF_CIT_SETUP(tpg_nacl_auth, &target_fabric_nacl_auth_item_ops, NULL, NULL); TF_CIT_SETUP_DRV(tpg_nacl_auth, &target_fabric_nacl_auth_item_ops, NULL);
/* End of tfc_tpg_nacl_auth_cit */ /* End of tfc_tpg_nacl_auth_cit */
...@@ -304,7 +318,7 @@ static struct configfs_item_operations target_fabric_nacl_param_item_ops = { ...@@ -304,7 +318,7 @@ static struct configfs_item_operations target_fabric_nacl_param_item_ops = {
.store_attribute = target_fabric_nacl_param_attr_store, .store_attribute = target_fabric_nacl_param_attr_store,
}; };
TF_CIT_SETUP(tpg_nacl_param, &target_fabric_nacl_param_item_ops, NULL, NULL); TF_CIT_SETUP_DRV(tpg_nacl_param, &target_fabric_nacl_param_item_ops, NULL);
/* End of tfc_tpg_nacl_param_cit */ /* End of tfc_tpg_nacl_param_cit */
...@@ -461,8 +475,8 @@ static struct configfs_group_operations target_fabric_nacl_base_group_ops = { ...@@ -461,8 +475,8 @@ static struct configfs_group_operations target_fabric_nacl_base_group_ops = {
.drop_item = target_fabric_drop_mappedlun, .drop_item = target_fabric_drop_mappedlun,
}; };
TF_CIT_SETUP(tpg_nacl_base, &target_fabric_nacl_base_item_ops, TF_CIT_SETUP_DRV(tpg_nacl_base, &target_fabric_nacl_base_item_ops,
&target_fabric_nacl_base_group_ops, NULL); &target_fabric_nacl_base_group_ops);
/* End of tfc_tpg_nacl_base_cit */ /* End of tfc_tpg_nacl_base_cit */
...@@ -570,7 +584,7 @@ static struct configfs_item_operations target_fabric_np_base_item_ops = { ...@@ -570,7 +584,7 @@ static struct configfs_item_operations target_fabric_np_base_item_ops = {
.store_attribute = target_fabric_np_base_attr_store, .store_attribute = target_fabric_np_base_attr_store,
}; };
TF_CIT_SETUP(tpg_np_base, &target_fabric_np_base_item_ops, NULL, NULL); TF_CIT_SETUP_DRV(tpg_np_base, &target_fabric_np_base_item_ops, NULL);
/* End of tfc_tpg_np_base_cit */ /* End of tfc_tpg_np_base_cit */
...@@ -966,7 +980,7 @@ static struct configfs_item_operations target_fabric_tpg_attrib_item_ops = { ...@@ -966,7 +980,7 @@ static struct configfs_item_operations target_fabric_tpg_attrib_item_ops = {
.store_attribute = target_fabric_tpg_attrib_attr_store, .store_attribute = target_fabric_tpg_attrib_attr_store,
}; };
TF_CIT_SETUP(tpg_attrib, &target_fabric_tpg_attrib_item_ops, NULL, NULL); TF_CIT_SETUP_DRV(tpg_attrib, &target_fabric_tpg_attrib_item_ops, NULL);
/* End of tfc_tpg_attrib_cit */ /* End of tfc_tpg_attrib_cit */
...@@ -979,7 +993,7 @@ static struct configfs_item_operations target_fabric_tpg_auth_item_ops = { ...@@ -979,7 +993,7 @@ static struct configfs_item_operations target_fabric_tpg_auth_item_ops = {
.store_attribute = target_fabric_tpg_auth_attr_store, .store_attribute = target_fabric_tpg_auth_attr_store,
}; };
TF_CIT_SETUP(tpg_auth, &target_fabric_tpg_auth_item_ops, NULL, NULL); TF_CIT_SETUP_DRV(tpg_auth, &target_fabric_tpg_auth_item_ops, NULL);
/* End of tfc_tpg_attrib_cit */ /* End of tfc_tpg_attrib_cit */
...@@ -992,7 +1006,7 @@ static struct configfs_item_operations target_fabric_tpg_param_item_ops = { ...@@ -992,7 +1006,7 @@ static struct configfs_item_operations target_fabric_tpg_param_item_ops = {
.store_attribute = target_fabric_tpg_param_attr_store, .store_attribute = target_fabric_tpg_param_attr_store,
}; };
TF_CIT_SETUP(tpg_param, &target_fabric_tpg_param_item_ops, NULL, NULL); TF_CIT_SETUP_DRV(tpg_param, &target_fabric_tpg_param_item_ops, NULL);
/* End of tfc_tpg_param_cit */ /* End of tfc_tpg_param_cit */
...@@ -1018,7 +1032,7 @@ static struct configfs_item_operations target_fabric_tpg_base_item_ops = { ...@@ -1018,7 +1032,7 @@ static struct configfs_item_operations target_fabric_tpg_base_item_ops = {
.store_attribute = target_fabric_tpg_attr_store, .store_attribute = target_fabric_tpg_attr_store,
}; };
TF_CIT_SETUP(tpg_base, &target_fabric_tpg_base_item_ops, NULL, NULL); TF_CIT_SETUP_DRV(tpg_base, &target_fabric_tpg_base_item_ops, NULL);
/* End of tfc_tpg_base_cit */ /* End of tfc_tpg_base_cit */
...@@ -1192,7 +1206,7 @@ static struct configfs_item_operations target_fabric_wwn_item_ops = { ...@@ -1192,7 +1206,7 @@ static struct configfs_item_operations target_fabric_wwn_item_ops = {
.store_attribute = target_fabric_wwn_attr_store, .store_attribute = target_fabric_wwn_attr_store,
}; };
TF_CIT_SETUP(wwn, &target_fabric_wwn_item_ops, &target_fabric_wwn_group_ops, NULL); TF_CIT_SETUP_DRV(wwn, &target_fabric_wwn_item_ops, &target_fabric_wwn_group_ops);
/* End of tfc_wwn_cit */ /* End of tfc_wwn_cit */
...@@ -1206,7 +1220,7 @@ static struct configfs_item_operations target_fabric_discovery_item_ops = { ...@@ -1206,7 +1220,7 @@ static struct configfs_item_operations target_fabric_discovery_item_ops = {
.store_attribute = target_fabric_discovery_attr_store, .store_attribute = target_fabric_discovery_attr_store,
}; };
TF_CIT_SETUP(discovery, &target_fabric_discovery_item_ops, NULL, NULL); TF_CIT_SETUP_DRV(discovery, &target_fabric_discovery_item_ops, NULL);
/* End of tfc_discovery_cit */ /* End of tfc_discovery_cit */
......
drivers/target/target_core_file.c
View file @ c6668726
This diff is collapsed.
drivers/target/target_core_iblock.c
View file @ c6668726
...@@ -444,7 +444,7 @@ iblock_execute_write_same_unmap(struct se_cmd *cmd) ...@@ -444,7 +444,7 @@ iblock_execute_write_same_unmap(struct se_cmd *cmd)
struct block_device *bdev = IBLOCK_DEV(cmd->se_dev)->ibd_bd; struct block_device *bdev = IBLOCK_DEV(cmd->se_dev)->ibd_bd;
sector_t lba = cmd->t_task_lba; sector_t lba = cmd->t_task_lba;
sector_t nolb = sbc_get_write_same_sectors(cmd); sector_t nolb = sbc_get_write_same_sectors(cmd);
int ret; sense_reason_t ret;
ret = iblock_do_unmap(cmd, bdev, lba, nolb); ret = iblock_do_unmap(cmd, bdev, lba, nolb);
if (ret) if (ret)
...@@ -774,7 +774,7 @@ iblock_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, ...@@ -774,7 +774,7 @@ iblock_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,
sg_num--; sg_num--;
} }
if (cmd->prot_type) { if (cmd->prot_type && dev->dev_attrib.pi_prot_type) {
int rc = iblock_alloc_bip(cmd, bio_start); int rc = iblock_alloc_bip(cmd, bio_start);
if (rc) if (rc)
goto fail_put_bios; goto fail_put_bios;
......
drivers/target/target_core_internal.h
View file @ c6668726
...@@ -4,7 +4,13 @@ ...@@ -4,7 +4,13 @@
/* target_core_alua.c */ /* target_core_alua.c */
extern struct t10_alua_lu_gp *default_lu_gp; extern struct t10_alua_lu_gp *default_lu_gp;
/* target_core_configfs.c */
extern struct configfs_subsystem *target_core_subsystem[];
/* target_core_device.c */ /* target_core_device.c */
extern struct mutex g_device_mutex;
extern struct list_head g_device_list;
struct se_dev_entry *core_get_se_deve_from_rtpi(struct se_node_acl *, u16); struct se_dev_entry *core_get_se_deve_from_rtpi(struct se_node_acl *, u16);
int core_free_device_list_for_node(struct se_node_acl *, int core_free_device_list_for_node(struct se_node_acl *,
struct se_portal_group *); struct se_portal_group *);
......
drivers/target/target_core_pr.c
View file @ c6668726
...@@ -78,6 +78,22 @@ enum preempt_type { ...@@ -78,6 +78,22 @@ enum preempt_type {
static void __core_scsi3_complete_pro_release(struct se_device *, struct se_node_acl *, static void __core_scsi3_complete_pro_release(struct se_device *, struct se_node_acl *,
struct t10_pr_registration *, int, int); struct t10_pr_registration *, int, int);
static int is_reservation_holder(
struct t10_pr_registration *pr_res_holder,
struct t10_pr_registration *pr_reg)
{
int pr_res_type;
if (pr_res_holder) {
pr_res_type = pr_res_holder->pr_res_type;
return pr_res_holder == pr_reg ||
pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_ALLREG ||
pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_ALLREG;
}
return 0;
}
static sense_reason_t static sense_reason_t
target_scsi2_reservation_check(struct se_cmd *cmd) target_scsi2_reservation_check(struct se_cmd *cmd)
{ {
...@@ -664,7 +680,7 @@ static struct t10_pr_registration *__core_scsi3_alloc_registration( ...@@ -664,7 +680,7 @@ static struct t10_pr_registration *__core_scsi3_alloc_registration(
struct se_dev_entry *deve_tmp; struct se_dev_entry *deve_tmp;
struct se_node_acl *nacl_tmp; struct se_node_acl *nacl_tmp;
struct se_port *port, *port_tmp; struct se_port *port, *port_tmp;
struct target_core_fabric_ops *tfo = nacl->se_tpg->se_tpg_tfo; const struct target_core_fabric_ops *tfo = nacl->se_tpg->se_tpg_tfo;
struct t10_pr_registration *pr_reg, *pr_reg_atp, *pr_reg_tmp, *pr_reg_tmp_safe; struct t10_pr_registration *pr_reg, *pr_reg_atp, *pr_reg_tmp, *pr_reg_tmp_safe;
int ret; int ret;
/* /*
...@@ -963,7 +979,7 @@ int core_scsi3_check_aptpl_registration( ...@@ -963,7 +979,7 @@ int core_scsi3_check_aptpl_registration(
} }
static void __core_scsi3_dump_registration( static void __core_scsi3_dump_registration(
struct target_core_fabric_ops *tfo, const struct target_core_fabric_ops *tfo,
struct se_device *dev, struct se_device *dev,
struct se_node_acl *nacl, struct se_node_acl *nacl,
struct t10_pr_registration *pr_reg, struct t10_pr_registration *pr_reg,
...@@ -1004,7 +1020,7 @@ static void __core_scsi3_add_registration( ...@@ -1004,7 +1020,7 @@ static void __core_scsi3_add_registration(
enum register_type register_type, enum register_type register_type,
int register_move) int register_move)
{ {
struct target_core_fabric_ops *tfo = nacl->se_tpg->se_tpg_tfo; const struct target_core_fabric_ops *tfo = nacl->se_tpg->se_tpg_tfo;
struct t10_pr_registration *pr_reg_tmp, *pr_reg_tmp_safe; struct t10_pr_registration *pr_reg_tmp, *pr_reg_tmp_safe;
struct t10_reservation *pr_tmpl = &dev->t10_pr; struct t10_reservation *pr_tmpl = &dev->t10_pr;
...@@ -1220,8 +1236,10 @@ static void __core_scsi3_free_registration( ...@@ -1220,8 +1236,10 @@ static void __core_scsi3_free_registration(
struct t10_pr_registration *pr_reg, struct t10_pr_registration *pr_reg,
struct list_head *preempt_and_abort_list, struct list_head *preempt_and_abort_list,
int dec_holders) int dec_holders)
__releases(&pr_tmpl->registration_lock)
__acquires(&pr_tmpl->registration_lock)
{ {
struct target_core_fabric_ops *tfo = const struct target_core_fabric_ops *tfo =
pr_reg->pr_reg_nacl->se_tpg->se_tpg_tfo; pr_reg->pr_reg_nacl->se_tpg->se_tpg_tfo;
struct t10_reservation *pr_tmpl = &dev->t10_pr; struct t10_reservation *pr_tmpl = &dev->t10_pr;
char i_buf[PR_REG_ISID_ID_LEN]; char i_buf[PR_REG_ISID_ID_LEN];
...@@ -1445,7 +1463,7 @@ core_scsi3_decode_spec_i_port( ...@@ -1445,7 +1463,7 @@ core_scsi3_decode_spec_i_port(
struct t10_pr_registration *pr_reg_tmp, *pr_reg_tmp_safe; struct t10_pr_registration *pr_reg_tmp, *pr_reg_tmp_safe;
LIST_HEAD(tid_dest_list); LIST_HEAD(tid_dest_list);
struct pr_transport_id_holder *tidh_new, *tidh, *tidh_tmp; struct pr_transport_id_holder *tidh_new, *tidh, *tidh_tmp;
struct target_core_fabric_ops *tmp_tf_ops; const struct target_core_fabric_ops *tmp_tf_ops;
unsigned char *buf; unsigned char *buf;
unsigned char *ptr, *i_str = NULL, proto_ident, tmp_proto_ident; unsigned char *ptr, *i_str = NULL, proto_ident, tmp_proto_ident;
char *iport_ptr = NULL, i_buf[PR_REG_ISID_ID_LEN]; char *iport_ptr = NULL, i_buf[PR_REG_ISID_ID_LEN];
...@@ -2287,7 +2305,6 @@ core_scsi3_pro_reserve(struct se_cmd *cmd, int type, int scope, u64 res_key) ...@@ -2287,7 +2305,6 @@ core_scsi3_pro_reserve(struct se_cmd *cmd, int type, int scope, u64 res_key)
spin_lock(&dev->dev_reservation_lock); spin_lock(&dev->dev_reservation_lock);
pr_res_holder = dev->dev_pr_res_holder; pr_res_holder = dev->dev_pr_res_holder;
if (pr_res_holder) { if (pr_res_holder) {
int pr_res_type = pr_res_holder->pr_res_type;
/* /*
* From spc4r17 Section 5.7.9: Reserving: * From spc4r17 Section 5.7.9: Reserving:
* *
...@@ -2298,9 +2315,7 @@ core_scsi3_pro_reserve(struct se_cmd *cmd, int type, int scope, u64 res_key) ...@@ -2298,9 +2315,7 @@ core_scsi3_pro_reserve(struct se_cmd *cmd, int type, int scope, u64 res_key)
* the logical unit, then the command shall be completed with * the logical unit, then the command shall be completed with
* RESERVATION CONFLICT status. * RESERVATION CONFLICT status.
*/ */
if ((pr_res_holder != pr_reg) && if (!is_reservation_holder(pr_res_holder, pr_reg)) {
(pr_res_type != PR_TYPE_WRITE_EXCLUSIVE_ALLREG) &&
(pr_res_type != PR_TYPE_EXCLUSIVE_ACCESS_ALLREG)) {
struct se_node_acl *pr_res_nacl = pr_res_holder->pr_reg_nacl; struct se_node_acl *pr_res_nacl = pr_res_holder->pr_reg_nacl;
pr_err("SPC-3 PR: Attempted RESERVE from" pr_err("SPC-3 PR: Attempted RESERVE from"
" [%s]: %s while reservation already held by" " [%s]: %s while reservation already held by"
...@@ -2409,7 +2424,7 @@ static void __core_scsi3_complete_pro_release( ...@@ -2409,7 +2424,7 @@ static void __core_scsi3_complete_pro_release(
int explicit, int explicit,
int unreg) int unreg)
{ {
struct target_core_fabric_ops *tfo = se_nacl->se_tpg->se_tpg_tfo; const struct target_core_fabric_ops *tfo = se_nacl->se_tpg->se_tpg_tfo;
char i_buf[PR_REG_ISID_ID_LEN]; char i_buf[PR_REG_ISID_ID_LEN];
int pr_res_type = 0, pr_res_scope = 0; int pr_res_type = 0, pr_res_scope = 0;
...@@ -2477,7 +2492,6 @@ core_scsi3_emulate_pro_release(struct se_cmd *cmd, int type, int scope, ...@@ -2477,7 +2492,6 @@ core_scsi3_emulate_pro_release(struct se_cmd *cmd, int type, int scope,
struct se_lun *se_lun = cmd->se_lun; struct se_lun *se_lun = cmd->se_lun;
struct t10_pr_registration *pr_reg, *pr_reg_p, *pr_res_holder; struct t10_pr_registration *pr_reg, *pr_reg_p, *pr_res_holder;
struct t10_reservation *pr_tmpl = &dev->t10_pr; struct t10_reservation *pr_tmpl = &dev->t10_pr;
int all_reg = 0;
sense_reason_t ret = 0; sense_reason_t ret = 0;
if (!se_sess || !se_lun) { if (!se_sess || !se_lun) {
...@@ -2514,13 +2528,9 @@ core_scsi3_emulate_pro_release(struct se_cmd *cmd, int type, int scope, ...@@ -2514,13 +2528,9 @@ core_scsi3_emulate_pro_release(struct se_cmd *cmd, int type, int scope,
spin_unlock(&dev->dev_reservation_lock); spin_unlock(&dev->dev_reservation_lock);
goto out_put_pr_reg; goto out_put_pr_reg;
} }
if ((pr_res_holder->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_ALLREG) ||
(pr_res_holder->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_ALLREG))
all_reg = 1;
if ((all_reg == 0) && (pr_res_holder != pr_reg)) { if (!is_reservation_holder(pr_res_holder, pr_reg)) {
/* /*
* Non 'All Registrants' PR Type cases..
* Release request from a registered I_T nexus that is not a * Release request from a registered I_T nexus that is not a
* persistent reservation holder. return GOOD status. * persistent reservation holder. return GOOD status.
*/ */
...@@ -2726,7 +2736,7 @@ static void __core_scsi3_complete_pro_preempt( ...@@ -2726,7 +2736,7 @@ static void __core_scsi3_complete_pro_preempt(
enum preempt_type preempt_type) enum preempt_type preempt_type)
{ {
struct se_node_acl *nacl = pr_reg->pr_reg_nacl; struct se_node_acl *nacl = pr_reg->pr_reg_nacl;
struct target_core_fabric_ops *tfo = nacl->se_tpg->se_tpg_tfo; const struct target_core_fabric_ops *tfo = nacl->se_tpg->se_tpg_tfo;
char i_buf[PR_REG_ISID_ID_LEN]; char i_buf[PR_REG_ISID_ID_LEN];
memset(i_buf, 0, PR_REG_ISID_ID_LEN); memset(i_buf, 0, PR_REG_ISID_ID_LEN);
...@@ -3111,7 +3121,7 @@ core_scsi3_emulate_pro_register_and_move(struct se_cmd *cmd, u64 res_key, ...@@ -3111,7 +3121,7 @@ core_scsi3_emulate_pro_register_and_move(struct se_cmd *cmd, u64 res_key,
struct se_node_acl *pr_res_nacl, *pr_reg_nacl, *dest_node_acl = NULL; struct se_node_acl *pr_res_nacl, *pr_reg_nacl, *dest_node_acl = NULL;
struct se_port *se_port; struct se_port *se_port;
struct se_portal_group *se_tpg, *dest_se_tpg = NULL; struct se_portal_group *se_tpg, *dest_se_tpg = NULL;
struct target_core_fabric_ops *dest_tf_ops = NULL, *tf_ops; const 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_pr_registration *pr_reg, *pr_res_holder, *dest_pr_reg;
struct t10_reservation *pr_tmpl = &dev->t10_pr; struct t10_reservation *pr_tmpl = &dev->t10_pr;
unsigned char *buf; unsigned char *buf;
...@@ -3375,7 +3385,7 @@ core_scsi3_emulate_pro_register_and_move(struct se_cmd *cmd, u64 res_key, ...@@ -3375,7 +3385,7 @@ core_scsi3_emulate_pro_register_and_move(struct se_cmd *cmd, u64 res_key,
* From spc4r17 section 5.7.8 Table 50 -- * From spc4r17 section 5.7.8 Table 50 --
* Register behaviors for a REGISTER AND MOVE service action * Register behaviors for a REGISTER AND MOVE service action
*/ */
if (pr_res_holder != pr_reg) { if (!is_reservation_holder(pr_res_holder, pr_reg)) {
pr_warn("SPC-3 PR REGISTER_AND_MOVE: Calling I_T" pr_warn("SPC-3 PR REGISTER_AND_MOVE: Calling I_T"
" Nexus is not reservation holder\n"); " Nexus is not reservation holder\n");
spin_unlock(&dev->dev_reservation_lock); spin_unlock(&dev->dev_reservation_lock);
......
drivers/target/target_core_rd.c
View file @ c6668726
This diff is collapsed.
drivers/target/target_core_sbc.c
View file @ c6668726
This diff is collapsed.
drivers/target/target_core_spc.c
View file @ c6668726
...@@ -103,10 +103,12 @@ spc_emulate_inquiry_std(struct se_cmd *cmd, unsigned char *buf) ...@@ -103,10 +103,12 @@ spc_emulate_inquiry_std(struct se_cmd *cmd, unsigned char *buf)
buf[5] |= 0x8; buf[5] |= 0x8;
/* /*
* Set Protection (PROTECT) bit when DIF has been enabled on the * Set Protection (PROTECT) bit when DIF has been enabled on the
* device, and the transport supports VERIFY + PASS. * device, and the fabric supports VERIFY + PASS. Also report
* PROTECT=1 if sess_prot_type has been configured to allow T10-PI
* to unprotected devices.
*/ */
if (sess->sup_prot_ops & (TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS)) { if (sess->sup_prot_ops & (TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS)) {
if (dev->dev_attrib.pi_prot_type) if (dev->dev_attrib.pi_prot_type || cmd->se_sess->sess_prot_type)
buf[5] |= 0x1; buf[5] |= 0x1;
} }
...@@ -467,9 +469,11 @@ spc_emulate_evpd_86(struct se_cmd *cmd, unsigned char *buf) ...@@ -467,9 +469,11 @@ spc_emulate_evpd_86(struct se_cmd *cmd, unsigned char *buf)
* only for TYPE3 protection. * only for TYPE3 protection.
*/ */
if (sess->sup_prot_ops & (TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS)) { if (sess->sup_prot_ops & (TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS)) {
if (dev->dev_attrib.pi_prot_type == TARGET_DIF_TYPE1_PROT) if (dev->dev_attrib.pi_prot_type == TARGET_DIF_TYPE1_PROT ||
cmd->se_sess->sess_prot_type == TARGET_DIF_TYPE1_PROT)
buf[4] = 0x5; buf[4] = 0x5;
else if (dev->dev_attrib.pi_prot_type == TARGET_DIF_TYPE3_PROT) else if (dev->dev_attrib.pi_prot_type == TARGET_DIF_TYPE3_PROT ||
cmd->se_sess->sess_prot_type == TARGET_DIF_TYPE3_PROT)
buf[4] = 0x4; buf[4] = 0x4;
} }
...@@ -861,7 +865,7 @@ static int spc_modesense_control(struct se_cmd *cmd, u8 pc, u8 *p) ...@@ -861,7 +865,7 @@ static int spc_modesense_control(struct se_cmd *cmd, u8 pc, u8 *p)
* TAG field. * TAG field.
*/ */
if (sess->sup_prot_ops & (TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS)) { if (sess->sup_prot_ops & (TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS)) {
if (dev->dev_attrib.pi_prot_type) if (dev->dev_attrib.pi_prot_type || sess->sess_prot_type)
p[5] |= 0x80; p[5] |= 0x80;
} }
...@@ -1099,7 +1103,7 @@ static sense_reason_t spc_emulate_modeselect(struct se_cmd *cmd) ...@@ -1099,7 +1103,7 @@ static sense_reason_t spc_emulate_modeselect(struct se_cmd *cmd)
unsigned char *buf; unsigned char *buf;
unsigned char tbuf[SE_MODE_PAGE_BUF]; unsigned char tbuf[SE_MODE_PAGE_BUF];
int length; int length;
int ret = 0; sense_reason_t ret = 0;
int i; int i;
if (!cmd->data_length) { if (!cmd->data_length) {
......
drivers/target/target_core_tmr.c
View file @ c6668726
...@@ -125,8 +125,8 @@ void core_tmr_abort_task( ...@@ -125,8 +125,8 @@ void core_tmr_abort_task(
if (dev != se_cmd->se_dev) if (dev != se_cmd->se_dev)
continue; continue;
/* skip se_cmd associated with tmr */ /* skip task management functions, including tmr->task_cmd */
if (tmr->task_cmd == se_cmd) if (se_cmd->se_cmd_flags & SCF_SCSI_TMR_CDB)
continue; continue;
ref_tag = se_cmd->se_tfo->get_task_tag(se_cmd); ref_tag = se_cmd->se_tfo->get_task_tag(se_cmd);
......
drivers/target/target_core_tpg.c
View file @ c6668726
...@@ -672,7 +672,7 @@ static int core_tpg_setup_virtual_lun0(struct se_portal_group *se_tpg) ...@@ -672,7 +672,7 @@ static int core_tpg_setup_virtual_lun0(struct se_portal_group *se_tpg)
} }
int core_tpg_register( int core_tpg_register(
struct target_core_fabric_ops *tfo, const struct target_core_fabric_ops *tfo,
struct se_wwn *se_wwn, struct se_wwn *se_wwn,
struct se_portal_group *se_tpg, struct se_portal_group *se_tpg,
void *tpg_fabric_ptr, void *tpg_fabric_ptr,
......
drivers/target/target_core_transport.c
View file @ c6668726
This diff is collapsed.
drivers/target/target_core_user.c
View file @ c6668726
This diff is collapsed.
drivers/target/target_core_xcopy.c
View file @ c6668726
...@@ -34,20 +34,12 @@ ...@@ -34,20 +34,12 @@
#include <target/target_core_fabric.h> #include <target/target_core_fabric.h>
#include <target/target_core_configfs.h> #include <target/target_core_configfs.h>
#include "target_core_internal.h"
#include "target_core_pr.h" #include "target_core_pr.h"
#include "target_core_ua.h" #include "target_core_ua.h"
#include "target_core_xcopy.h" #include "target_core_xcopy.h"
static struct workqueue_struct *xcopy_wq = NULL; static struct workqueue_struct *xcopy_wq = NULL;
/*
* From target_core_device.c
*/
extern struct mutex g_device_mutex;
extern struct list_head g_device_list;
/*
* From target_core_configfs.c
*/
extern struct configfs_subsystem *target_core_subsystem[];
static int target_xcopy_gen_naa_ieee(struct se_device *dev, unsigned char *buf) static int target_xcopy_gen_naa_ieee(struct se_device *dev, unsigned char *buf)
{ {
...@@ -433,7 +425,7 @@ static int xcopy_pt_queue_status(struct se_cmd *se_cmd) ...@@ -433,7 +425,7 @@ static int xcopy_pt_queue_status(struct se_cmd *se_cmd)
return 0; return 0;
} }
static struct target_core_fabric_ops xcopy_pt_tfo = { static const struct target_core_fabric_ops xcopy_pt_tfo = {
.get_fabric_name = xcopy_pt_get_fabric_name, .get_fabric_name = xcopy_pt_get_fabric_name,
.get_task_tag = xcopy_pt_get_tag, .get_task_tag = xcopy_pt_get_tag,
.get_cmd_state = xcopy_pt_get_cmd_state, .get_cmd_state = xcopy_pt_get_cmd_state,
...@@ -548,33 +540,22 @@ static void target_xcopy_setup_pt_port( ...@@ -548,33 +540,22 @@ static void target_xcopy_setup_pt_port(
} }
} }
static int target_xcopy_init_pt_lun( static void target_xcopy_init_pt_lun(struct se_device *se_dev,
struct xcopy_pt_cmd *xpt_cmd, struct se_cmd *pt_cmd, bool remote_port)
struct xcopy_op *xop,
struct se_device *se_dev,
struct se_cmd *pt_cmd,
bool remote_port)
{ {
/* /*
* Don't allocate + init an pt_cmd->se_lun if honoring local port for * Don't allocate + init an pt_cmd->se_lun if honoring local port for
* reservations. The pt_cmd->se_lun pointer will be setup from within * reservations. The pt_cmd->se_lun pointer will be setup from within
* target_xcopy_setup_pt_port() * target_xcopy_setup_pt_port()
*/ */
if (!remote_port) { if (remote_port) {
pt_cmd->se_cmd_flags |= SCF_SE_LUN_CMD | SCF_CMD_XCOPY_PASSTHROUGH; pr_debug("Setup emulated se_dev: %p from se_dev\n",
return 0; pt_cmd->se_dev);
pt_cmd->se_lun = &se_dev->xcopy_lun;
pt_cmd->se_dev = se_dev;
} }
pt_cmd->se_lun = &se_dev->xcopy_lun; pt_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
pt_cmd->se_dev = se_dev;
pr_debug("Setup emulated se_dev: %p from se_dev\n", pt_cmd->se_dev);
pt_cmd->se_cmd_flags |= SCF_SE_LUN_CMD | SCF_CMD_XCOPY_PASSTHROUGH;
pr_debug("Setup emulated se_dev: %p to pt_cmd->se_lun->lun_se_dev\n",
pt_cmd->se_lun->lun_se_dev);
return 0;
} }
static int target_xcopy_setup_pt_cmd( static int target_xcopy_setup_pt_cmd(
...@@ -592,11 +573,8 @@ static int target_xcopy_setup_pt_cmd( ...@@ -592,11 +573,8 @@ static int target_xcopy_setup_pt_cmd(
* Setup LUN+port to honor reservations based upon xop->op_origin for * Setup LUN+port to honor reservations based upon xop->op_origin for
* X-COPY PUSH or X-COPY PULL based upon where the CDB was received. * X-COPY PUSH or X-COPY PULL based upon where the CDB was received.
*/ */
rc = target_xcopy_init_pt_lun(xpt_cmd, xop, se_dev, cmd, remote_port); target_xcopy_init_pt_lun(se_dev, cmd, remote_port);
if (rc < 0) {
ret = rc;
goto out;
}
xpt_cmd->xcopy_op = xop; xpt_cmd->xcopy_op = xop;
target_xcopy_setup_pt_port(xpt_cmd, xop, remote_port); target_xcopy_setup_pt_port(xpt_cmd, xop, remote_port);
......
drivers/target/tcm_fc/tcm_fc.h
View file @ c6668726
This diff is collapsed.
drivers/target/tcm_fc/tfc_conf.c
View file @ c6668726
This diff is collapsed.
drivers/usb/gadget/legacy/tcm_usb_gadget.c
View file @ c6668726
This diff is collapsed.
drivers/vhost/scsi.c
View file @ c6668726
This diff is collapsed.
drivers/xen/xen-scsiback.c
View file @ c6668726
This diff is collapsed.
include/target/iscsi/iscsi_target_core.h
View file @ c6668726
This diff is collapsed.
include/target/target_core_base.h
View file @ c6668726
This diff is collapsed.
include/target/target_core_configfs.h
View file @ c6668726
This diff is collapsed.
include/target/target_core_fabric.h
View file @ c6668726
This diff is collapsed.
include/uapi/linux/target_core_user.h
View file @ c6668726
This diff is collapsed.
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