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

target: Allow control CDBs with data > 1 page 



We need to handle >1 page control cdbs, so extend the code to do a vmap
if bigger than 1 page. It seems like kmap() is still preferable if just
a page, fewer TLB shootdowns(?), so keep using that when possible.

Rename function pair for their new scope.

Signed-off-by: default avatarAndy Grover <agrover@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent e8904dc5

drivers/target/target_core_alua.c

+4 −4
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ int target_emulate_report_target_port_groups(struct se_task *task) 
		return -EINVAL;

	}



	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);



	spin_lock(&su_dev->t10_alua.tg_pt_gps_lock);

	list_for_each_entry(tg_pt_gp, &su_dev->t10_alua.tg_pt_gps_list,
@@ -163,7 +163,7 @@ int target_emulate_report_target_port_groups(struct se_task *task) 
	buf[2] = ((rd_len >> 8) & 0xff);

	buf[3] = (rd_len & 0xff);



	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);



	task->task_scsi_status = GOOD;

	transport_complete_task(task, 1);
@@ -194,7 +194,7 @@ int target_emulate_set_target_port_groups(struct se_task *task) 
		cmd->scsi_sense_reason = TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;

		return -EINVAL;

	}

	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);



	/*

	 * Determine if explict ALUA via SET_TARGET_PORT_GROUPS is allowed
@@ -351,7 +351,7 @@ int target_emulate_set_target_port_groups(struct se_task *task) 
	}



out:

	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);

	task->task_scsi_status = GOOD;

	transport_complete_task(task, 1);

	return 0;

drivers/target/target_core_cdb.c

+14 −14
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ target_emulate_inquiry_std(struct se_cmd *cmd) 
		return -EINVAL;

	}



	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);



	if (dev == tpg->tpg_virt_lun0.lun_se_dev) {

		buf[0] = 0x3f; /* Not connected */
@@ -134,7 +134,7 @@ target_emulate_inquiry_std(struct se_cmd *cmd) 
	buf[4] = 31; /* Set additional length to 31 */



out:

	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);

	return 0;

}
@@ -716,7 +716,7 @@ int target_emulate_inquiry(struct se_task *task) 
		return -EINVAL;

	}



	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);



	buf[0] = dev->transport->get_device_type(dev);
@@ -733,7 +733,7 @@ int target_emulate_inquiry(struct se_task *task) 
	ret = -EINVAL;



out_unmap:

	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);

out:

	if (!ret) {

		task->task_scsi_status = GOOD;
@@ -755,7 +755,7 @@ int target_emulate_readcapacity(struct se_task *task) 
	else

		blocks = (u32)blocks_long;



	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);



	buf[0] = (blocks >> 24) & 0xff;

	buf[1] = (blocks >> 16) & 0xff;
@@ -771,7 +771,7 @@ int target_emulate_readcapacity(struct se_task *task) 
	if (dev->se_sub_dev->se_dev_attrib.emulate_tpu || dev->se_sub_dev->se_dev_attrib.emulate_tpws)

		put_unaligned_be32(0xFFFFFFFF, &buf[0]);



	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);



	task->task_scsi_status = GOOD;

	transport_complete_task(task, 1);
@@ -785,7 +785,7 @@ int target_emulate_readcapacity_16(struct se_task *task) 
	unsigned char *buf;

	unsigned long long blocks = dev->transport->get_blocks(dev);



	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);



	buf[0] = (blocks >> 56) & 0xff;

	buf[1] = (blocks >> 48) & 0xff;
@@ -806,7 +806,7 @@ int target_emulate_readcapacity_16(struct se_task *task) 
	if (dev->se_sub_dev->se_dev_attrib.emulate_tpu || dev->se_sub_dev->se_dev_attrib.emulate_tpws)

		buf[14] = 0x80;



	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);



	task->task_scsi_status = GOOD;

	transport_complete_task(task, 1);
@@ -1019,9 +1019,9 @@ int target_emulate_modesense(struct se_task *task) 
			offset = cmd->data_length;

	}



	rbuf = transport_kmap_first_data_page(cmd);

	rbuf = transport_kmap_data_sg(cmd);

	memcpy(rbuf, buf, offset);

	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);



	task->task_scsi_status = GOOD;

	transport_complete_task(task, 1);
@@ -1043,7 +1043,7 @@ int target_emulate_request_sense(struct se_task *task) 
		return -ENOSYS;

	}



	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);



	if (!core_scsi3_ua_clear_for_request_sense(cmd, &ua_asc, &ua_ascq)) {

		/*
@@ -1089,7 +1089,7 @@ int target_emulate_request_sense(struct se_task *task) 
	}



end:

	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);

	task->task_scsi_status = GOOD;

	transport_complete_task(task, 1);

	return 0;
@@ -1123,7 +1123,7 @@ int target_emulate_unmap(struct se_task *task) 
	dl = get_unaligned_be16(&cdb[0]);

	bd_dl = get_unaligned_be16(&cdb[2]);



	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);



	ptr = &buf[offset];

	pr_debug("UNMAP: Sub: %s Using dl: %hu bd_dl: %hu size: %hu"
@@ -1147,7 +1147,7 @@ int target_emulate_unmap(struct se_task *task) 
	}



err:

	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);

	if (!ret) {

		task->task_scsi_status = GOOD;

		transport_complete_task(task, 1);

drivers/target/target_core_device.c

+2 −2
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ int target_report_luns(struct se_task *se_task) 
	unsigned char *buf;

	u32 cdb_offset = 0, lun_count = 0, offset = 8, i;



	buf = transport_kmap_first_data_page(se_cmd);

	buf = (unsigned char *) transport_kmap_data_sg(se_cmd);



	/*

	 * If no struct se_session pointer is present, this struct se_cmd is
@@ -695,7 +695,7 @@ int target_report_luns(struct se_task *se_task) 
	 * See SPC3 r07, page 159.

	 */

done:

	transport_kunmap_first_data_page(se_cmd);

	transport_kunmap_data_sg(se_cmd);

	lun_count *= 8;

	buf[0] = ((lun_count >> 24) & 0xff);

	buf[1] = ((lun_count >> 16) & 0xff);

drivers/target/target_core_pr.c

+19 −19
Original line number Diff line number Diff line
@@ -1535,7 +1535,7 @@ static int core_scsi3_decode_spec_i_port( 
	tidh_new->dest_local_nexus = 1;

	list_add_tail(&tidh_new->dest_list, &tid_dest_list);



	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);

	/*

	 * For a PERSISTENT RESERVE OUT specify initiator ports payload,

	 * first extract TransportID Parameter Data Length, and make sure
@@ -1786,7 +1786,7 @@ static int core_scsi3_decode_spec_i_port( 


	}



	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);



	/*

	 * Go ahead and create a registrations from tid_dest_list for the
@@ -1834,7 +1834,7 @@ static int core_scsi3_decode_spec_i_port( 


	return 0;

out:

	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);

	/*

	 * For the failure case, release everything from tid_dest_list

	 * including *dest_pr_reg and the configfs dependances..
@@ -3411,14 +3411,14 @@ static int core_scsi3_emulate_pro_register_and_move( 
	 * will be moved to for the TransportID containing SCSI initiator WWN

	 * information.

	 */

	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);

	rtpi = (buf[18] & 0xff) << 8;

	rtpi |= buf[19] & 0xff;

	tid_len = (buf[20] & 0xff) << 24;

	tid_len |= (buf[21] & 0xff) << 16;

	tid_len |= (buf[22] & 0xff) << 8;

	tid_len |= buf[23] & 0xff;

	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);

	buf = NULL;



	if ((tid_len + 24) != cmd->data_length) {
@@ -3470,7 +3470,7 @@ static int core_scsi3_emulate_pro_register_and_move( 
		return -EINVAL;

	}



	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);

	proto_ident = (buf[24] & 0x0f);

#if 0

	pr_debug("SPC-3 PR REGISTER_AND_MOVE: Extracted Protocol Identifier:"
@@ -3504,7 +3504,7 @@ static int core_scsi3_emulate_pro_register_and_move( 
		goto out;

	}



	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);

	buf = NULL;



	pr_debug("SPC-3 PR [%s] Extracted initiator %s identifier: %s"
@@ -3769,13 +3769,13 @@ after_iport_check: 
					" REGISTER_AND_MOVE\n");

	}



	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);



	core_scsi3_put_pr_reg(dest_pr_reg);

	return 0;

out:

	if (buf)

		transport_kunmap_first_data_page(cmd);

		transport_kunmap_data_sg(cmd);

	if (dest_se_deve)

		core_scsi3_lunacl_undepend_item(dest_se_deve);

	if (dest_node_acl)
@@ -3849,7 +3849,7 @@ int target_scsi3_emulate_pr_out(struct se_task *task) 
	scope = (cdb[2] & 0xf0);

	type = (cdb[2] & 0x0f);



	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);

	/*

	 * From PERSISTENT_RESERVE_OUT parameter list (payload)

	 */
@@ -3867,7 +3867,7 @@ int target_scsi3_emulate_pr_out(struct se_task *task) 
		aptpl = (buf[17] & 0x01);

		unreg = (buf[17] & 0x02);

	}

	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);

	buf = NULL;



	/*
@@ -3967,7 +3967,7 @@ static int core_scsi3_pri_read_keys(struct se_cmd *cmd) 
		return -EINVAL;

	}



	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);

	buf[0] = ((su_dev->t10_pr.pr_generation >> 24) & 0xff);

	buf[1] = ((su_dev->t10_pr.pr_generation >> 16) & 0xff);

	buf[2] = ((su_dev->t10_pr.pr_generation >> 8) & 0xff);
@@ -4001,7 +4001,7 @@ static int core_scsi3_pri_read_keys(struct se_cmd *cmd) 
	buf[6] = ((add_len >> 8) & 0xff);

	buf[7] = (add_len & 0xff);



	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);



	return 0;

}
@@ -4027,7 +4027,7 @@ static int core_scsi3_pri_read_reservation(struct se_cmd *cmd) 
		return -EINVAL;

	}



	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);

	buf[0] = ((su_dev->t10_pr.pr_generation >> 24) & 0xff);

	buf[1] = ((su_dev->t10_pr.pr_generation >> 16) & 0xff);

	buf[2] = ((su_dev->t10_pr.pr_generation >> 8) & 0xff);
@@ -4086,7 +4086,7 @@ static int core_scsi3_pri_read_reservation(struct se_cmd *cmd) 


err:

	spin_unlock(&se_dev->dev_reservation_lock);

	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);



	return 0;

}
@@ -4110,7 +4110,7 @@ static int core_scsi3_pri_report_capabilities(struct se_cmd *cmd) 
		return -EINVAL;

	}



	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);



	buf[0] = ((add_len << 8) & 0xff);

	buf[1] = (add_len & 0xff);
@@ -4142,7 +4142,7 @@ static int core_scsi3_pri_report_capabilities(struct se_cmd *cmd) 
	buf[4] |= 0x02; /* PR_TYPE_WRITE_EXCLUSIVE */

	buf[5] |= 0x01; /* PR_TYPE_EXCLUSIVE_ACCESS_ALLREG */



	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);



	return 0;

}
@@ -4172,7 +4172,7 @@ static int core_scsi3_pri_read_full_status(struct se_cmd *cmd) 
		return -EINVAL;

	}



	buf = transport_kmap_first_data_page(cmd);

	buf = transport_kmap_data_sg(cmd);



	buf[0] = ((su_dev->t10_pr.pr_generation >> 24) & 0xff);

	buf[1] = ((su_dev->t10_pr.pr_generation >> 16) & 0xff);
@@ -4293,7 +4293,7 @@ static int core_scsi3_pri_read_full_status(struct se_cmd *cmd) 
	buf[6] = ((add_len >> 8) & 0xff);

	buf[7] = (add_len & 0xff);



	transport_kunmap_first_data_page(cmd);

	transport_kunmap_data_sg(cmd);



	return 0;

}

drivers/target/target_core_pscsi.c

+2 −2
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ static int pscsi_transport_complete(struct se_task *task) 


		if (task->task_se_cmd->se_deve->lun_flags &

				TRANSPORT_LUNFLAGS_READ_ONLY) {

			unsigned char *buf = transport_kmap_first_data_page(task->task_se_cmd);

			unsigned char *buf = transport_kmap_data_sg(task->task_se_cmd);



			if (cdb[0] == MODE_SENSE_10) {

				if (!(buf[3] & 0x80))
@@ -703,7 +703,7 @@ static int pscsi_transport_complete(struct se_task *task) 
					buf[2] |= 0x80;

			}



			transport_kunmap_first_data_page(task->task_se_cmd);

			transport_kunmap_data_sg(task->task_se_cmd);

		}

	}

after_mode_sense:

CRA Git | Maintained and supported by SUSTech CRA and CCSE