Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec98f782 authored by Andy Grover's avatar Andy Grover Committed by Nicholas Bellinger
Browse files

target: Eliminate usage of struct se_mem 



Both backstores and fabrics use arrays of struct scatterlist to describe
data buffers. However TCM used struct se_mems, basically a linked list
of scatterlist entries. We are able to simplify the code by eliminating
this intermediate data structure and just using struct scatterlist[]
throughout.

Also, moved attachment of task to cmd out of transport_generic_get_task
and into allocate_control_task and allocate_data_tasks. The reasoning
is that it's nonintuitive that get_task should automatically add it to
the cmd's task list -- it should just return an allocated, initialized
task. That's all it should do, based on the function's name, so either the
function shouldn't do it, or the name should change to encapsulate the
entire essence of what it does.

(nab: Fix compile warnings in tcm_fc, and make transport_kmap_first_data_page
 honor sg->offset for SGLs from contigious memory with TCM_Loop, and
 fix control se_cmd descriptor memory leak)

Signed-off-by: default avatarAndy Grover <agrover@redhat.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 3a867205

drivers/target/loopback/tcm_loop.c

+1 −4
Original line number Diff line number Diff line
@@ -175,10 +175,7 @@ static int tcm_loop_new_cmd_map(struct se_cmd *se_cmd) 
		sgl_bidi_count = sdb->table.nents;

	}



	/*

	 * Map the SG memory into struct se_mem->page linked list using the same

	 * physical memory at sg->page_link.

	 */

	/* Tell the core about our preallocated memory */

	ret = transport_generic_map_mem_to_cmd(se_cmd, scsi_sglist(sc),

			scsi_sg_count(sc), sgl_bidi, sgl_bidi_count);

	if (ret < 0)

drivers/target/target_core_iblock.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ static int iblock_map_task_SG(struct se_task *task) 
	hbio = tbio = bio;

	/*

	 * Use fs/bio.c:bio_add_pages() to setup the bio_vec maplist

	 * from TCM struct se_mem -> task->task_sg -> struct scatterlist memory.

	 * from task->task_sg -> struct scatterlist memory.

	 */

	for_each_sg(task->task_sg, sg, task->task_sg_num, i) {

		DEBUG_IBLOCK("task: %p bio: %p Calling bio_add_page(): page:"

drivers/target/target_core_pscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ static int __pscsi_map_task_SG( 
		return 0;

	/*

	 * For SCF_SCSI_DATA_SG_IO_CDB, Use fs/bio.c:bio_add_page() to setup

	 * the bio_vec maplist from TC< struct se_mem -> task->task_sg ->

	 * the bio_vec maplist from task->task_sg ->

	 * struct scatterlist memory.  The struct se_task->task_sg[] currently needs

	 * to be attached to struct bios for submission to Linux/SCSI using

	 * struct request to struct scsi_device->request_queue.

drivers/target/target_core_transport.c

+265 −730

File changed.

Preview size limit exceeded, changes collapsed.

drivers/target/tcm_fc/tfc_cmd.c

+13 −12
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ void ft_dump_cmd(struct ft_cmd *cmd, const char *caller) 
	struct fc_exch *ep;

	struct fc_seq *sp;

	struct se_cmd *se_cmd;

	struct se_mem *mem;

	struct scatterlist *sg;

	int count;



	if (!(ft_debug_logging & FT_DEBUG_IO))

		return;
@@ -71,15 +72,16 @@ void ft_dump_cmd(struct ft_cmd *cmd, const char *caller) 
		caller, cmd, cmd->cdb);

	printk(KERN_INFO "%s: cmd %p lun %d\n", caller, cmd, cmd->lun);



	printk(KERN_INFO "%s: cmd %p se_num %u len %u se_cmd_flags <0x%x>\n",

	       caller, cmd, se_cmd->t_tasks_se_num,

	printk(KERN_INFO "%s: cmd %p data_nents %u len %u se_cmd_flags <0x%x>\n",

		caller, cmd, se_cmd->t_data_nents,

	       se_cmd->data_length, se_cmd->se_cmd_flags);



	list_for_each_entry(mem, &se_cmd->t_mem_list, se_list)

		printk(KERN_INFO "%s: cmd %p mem %p page %p "

	for_each_sg(se_cmd->t_data_sg, sg, se_cmd->t_data_nents, count)

		printk(KERN_INFO "%s: cmd %p sg %p page %p "

			"len 0x%x off 0x%x\n",

		       caller, cmd, mem,

		       mem->se_page, mem->se_len, mem->se_off);

			caller, cmd, sg,

			sg_page(sg), sg->length, sg->offset);



	sp = cmd->seq;

	if (sp) {

		ep = fc_seq_exch(sp);
@@ -256,10 +258,9 @@ int ft_write_pending(struct se_cmd *se_cmd) 
		    (fh->fh_r_ctl == FC_RCTL_DD_DATA_DESC)) {

			if (se_cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB) {

				/*

				 * Map se_mem list to scatterlist, so that

				 * DDP can be setup. DDP setup function require

				 * scatterlist. se_mem_list is internal to

				 * TCM/LIO target

				 * cmd may have been broken up into multiple

				 * tasks. Link their sgs together so we can

				 * operate on them all at once.

				 */

				transport_do_task_sg_chain(se_cmd);

				cmd->sg = se_cmd->t_tasks_sg_chained;