github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-06 21:58:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

scsi: target: Use combined sense codes

Browse Source 
Refactor the target core code to use the 16-bit sense codes for building
sense and replace all hard-coded additional sense codes and additional
sense code qualifiers with the enum values defined in
include/scsi/scsi_sense.h. This helps with code clarity as the sense codes
being processed are easier to test and self-documented.

No functional change intended.

Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Hannes Reinecke <hare@kernel.org>
Link: https://patch.msgid.link/20260908090308.1085097-35-dlemoal@kernel.org
Signed-off-by: Martin K. Petersen (Oracle) <mkp@kernel.org>
This commit is contained in:
Damien Le Moal 2026-09-08 18:03:02 +09:00 committed by Martin K. Petersen (Oracle)
parent 3f7abb6b35
commit 9dd9bcb293
4 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/target/target_core_spc.c
View File

@ -1226,9 +1226,9 @@ static sense_reason_t spc_emulate_request_sense(struct se_cmd *cmd)
{
unsigned char *cdb = cmd->t_task_cdb;
unsigned char *rbuf;
u8 ua_asc = 0, ua_ascq = 0;
unsigned char buf[SE_SENSE_BUF];
bool desc_format = target_sense_desc_format(cmd->se_dev);
u16 sense_code = NO_ADDITIONAL_SENSE_INFORMATION;
memset(buf, 0, SE_SENSE_BUF);
@ -1242,11 +1242,12 @@ static sense_reason_t spc_emulate_request_sense(struct se_cmd *cmd)
if (!rbuf)
return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
if (!core_scsi3_ua_clear_for_request_sense(cmd, &ua_asc, &ua_ascq))
scsi_build_sense_buffer(desc_format, buf, UNIT_ATTENTION,
ua_asc, ua_ascq);
if (!core_scsi3_ua_clear_for_request_sense(cmd, &sense_code))
scsi_set_sense_buffer(desc_format, buf, UNIT_ATTENTION,
sense_code);
else
scsi_build_sense_buffer(desc_format, buf, NO_SENSE, 0x0, 0x0);
scsi_set_sense_buffer(desc_format, buf, NO_SENSE,
NO_ADDITIONAL_SENSE_INFORMATION);
memcpy(rbuf, buf, min_t(u32, sizeof(buf), cmd->data_length));
transport_kunmap_data_sg(cmd);

11
drivers/target/target_core_transport.c
View File

@ -3555,7 +3555,8 @@ static void translate_sense_reason(struct se_cmd *cmd, sense_reason_t reason)
const struct sense_detail *sd;
u8 *buffer = cmd->sense_buffer;
int r = (__force int)reason;
u8 key, asc, ascq;
u16 code;
u8 key;
bool desc_format = target_sense_desc_format(cmd->se_dev);
if (r < ARRAY_SIZE(sense_detail_table) && sense_detail_table[r].key)
@ -3566,21 +3567,19 @@ static void translate_sense_reason(struct se_cmd *cmd, sense_reason_t reason)
key = sd->key;
if (reason == TCM_CHECK_CONDITION_UNIT_ATTENTION) {
if (!core_scsi3_ua_for_check_condition(cmd, &key, &asc,
&ascq)) {
if (!core_scsi3_ua_for_check_condition(cmd, &key, &code)) {
cmd->scsi_status = SAM_STAT_BUSY;
return;
}
} else {
WARN_ON_ONCE(sd->asc == 0);
asc = sd->asc;
ascq = sd->ascq;
code = scsi_sense_code(sd->asc, sd->ascq);
}
cmd->se_cmd_flags |= SCF_EMULATED_TASK_SENSE;
cmd->scsi_status = SAM_STAT_CHECK_CONDITION;
cmd->scsi_sense_length = TRANSPORT_SENSE_BUFFER;
scsi_build_sense_buffer(desc_format, buffer, key, asc, ascq);
scsi_set_sense_buffer(desc_format, buffer, key, code);
if (sd->add_sense_info)
WARN_ON_ONCE(scsi_set_sense_information(buffer,
cmd->scsi_sense_length,

28
drivers/target/target_core_ua.c
View File

@ -187,11 +187,10 @@ void core_scsi3_ua_release_all(
/*
* Dequeue a unit attention from the unit attention list. This function
* returns true if the dequeuing succeeded and if *@key, *@asc and *@ascq have
* returns true if the dequeuing succeeded and if *@key and *@code have
* been set.
*/
bool core_scsi3_ua_for_check_condition(struct se_cmd *cmd, u8 *key, u8 *asc,
u8 *ascq)
bool core_scsi3_ua_for_check_condition(struct se_cmd *cmd, u8 *key, u16 *code)
{
struct se_device *dev = cmd->se_dev;
struct se_dev_entry *deve;
@ -214,8 +213,7 @@ bool core_scsi3_ua_for_check_condition(struct se_cmd *cmd, u8 *key, u8 *asc,
if (!deve) {
rcu_read_unlock();
*key = ILLEGAL_REQUEST;
*asc = 0x25; /* LOGICAL UNIT NOT SUPPORTED */
*ascq = 0;
*code = LU_NOT_SUPPORTED;
return true;
}
*key = UNIT_ATTENTION;
@ -232,8 +230,7 @@ bool core_scsi3_ua_for_check_condition(struct se_cmd *cmd, u8 *key, u8 *asc,
* clearing it.
*/
if (!dev_ua_intlck_clear) {
*asc = ua->ua_asc;
*ascq = ua->ua_ascq;
*code = scsi_sense_code(ua->ua_asc, ua->ua_ascq);
break;
}
/*
@ -242,8 +239,7 @@ bool core_scsi3_ua_for_check_condition(struct se_cmd *cmd, u8 *key, u8 *asc,
* (head of the list) in the outgoing CHECK_CONDITION + sense.
*/
if (head) {
*asc = ua->ua_asc;
*ascq = ua->ua_ascq;
*code = scsi_sense_code(ua->ua_asc, ua->ua_ascq);
head = 0;
}
list_del(&ua->ua_nacl_list);
@ -258,15 +254,13 @@ bool core_scsi3_ua_for_check_condition(struct se_cmd *cmd, u8 *key, u8 *asc,
nacl->se_tpg->se_tpg_tfo->fabric_name,
dev_ua_intlck_clear ? "Releasing" : "Reporting",
dev->dev_attrib.emulate_ua_intlck_ctrl,
cmd->orig_fe_lun, cmd->t_task_cdb[0], *asc, *ascq);
cmd->orig_fe_lun, cmd->t_task_cdb[0],
scsi_sense_code_asc(*code), scsi_sense_code_ascq(*code));
return head == 0;
}
int core_scsi3_ua_clear_for_request_sense(
struct se_cmd *cmd,
u8 *asc,
u8 *ascq)
int core_scsi3_ua_clear_for_request_sense(struct se_cmd *cmd, u16 *code)
{
struct se_dev_entry *deve;
struct se_session *sess = cmd->se_sess;
@ -304,8 +298,7 @@ int core_scsi3_ua_clear_for_request_sense(
spin_lock(&deve->ua_lock);
list_for_each_entry_safe(ua, ua_p, &deve->ua_list, ua_nacl_list) {
if (head) {
*asc = ua->ua_asc;
*ascq = ua->ua_ascq;
*code = scsi_sense_code(ua->ua_asc, ua->ua_ascq);
head = 0;
}
list_del(&ua->ua_nacl_list);
@ -317,7 +310,8 @@ int core_scsi3_ua_clear_for_request_sense(
pr_debug("[%s]: Released UNIT ATTENTION condition, mapped"
" LUN: %llu, got REQUEST_SENSE reported ASC: 0x%02x,"
" ASCQ: 0x%02x\n", nacl->se_tpg->se_tpg_tfo->fabric_name,
cmd->orig_fe_lun, *asc, *ascq);
cmd->orig_fe_lun, scsi_sense_code_asc(*code),
scsi_sense_code_ascq(*code));
return (head) ? -EPERM : 0;
}

7
drivers/target/target_core_ua.h
View File

@ -37,9 +37,8 @@ extern sense_reason_t target_scsi3_ua_check(struct se_cmd *);
extern int core_scsi3_ua_allocate(struct se_dev_entry *, u8, u8);
extern void target_ua_allocate_lun(struct se_node_acl *, u32, u8, u8);
extern void core_scsi3_ua_release_all(struct se_dev_entry *);
extern bool core_scsi3_ua_for_check_condition(struct se_cmd *, u8 *, u8 *,
u8 *);
extern int core_scsi3_ua_clear_for_request_sense(struct se_cmd *,
u8 *, u8 *);
extern bool core_scsi3_ua_for_check_condition(struct se_cmd *cmd, u8 *key,
u16 *code);
extern int core_scsi3_ua_clear_for_request_sense(struct se_cmd *cmd, u16 *code);
#endif /* TARGET_CORE_UA_H */