mpt3sas: support target smid for [abort|query] task
Subsystems (3)
PATCH RESEND 1/1 mpt3sas: support target smid for [abort|query] task
From: Minwoo Im <[email protected]>
From: Minwoo Im <[email protected]>
We can request task management IOCTL command(MPI2_FUNCTION_SCSI_TASK_MGMT) to /dev/mpt3ctl. If the given task_type is either abort task or query task, it may need a field named "Initiator Port Transfer Tag to Manage" in the IU.
Current code does not support to check target IPTT tag from the tm_request. This patch introduces to check TaskMID given from the userspace as a target tag. We have a rule of relationship between (struct request *req->tag) and smid in mpt3sas_base.c:
3318 u16
3319 mpt3sas_base_get_smid_scsiio(struct MPT3SAS_ADAPTER *ioc, u8 cb_idx,
3320 struct scsi_cmnd *scmd)
3321 {
3322 struct scsiio_tracker *request = scsi_cmd_priv(scmd); 3323 unsigned int tag = scmd->request->tag; 3324 u16 smid;
3325
3326 smid = tag + 1;
So if we want to abort a request tagged #X, then we can pass (X + 1) to this IOCTL handler. Otherwise, user space just can pass 0 TaskMID to abort the first outstanding smid which is legacy behaviour.
--- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_ctl.c +10 -2
@@ -596,8 +596,16 @@ _ctl_set_task_mid(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command *karg,if (priv_data->sas_target->handle != handle)continue ; st =scsi_cmd_priv (scmd); - tm_request->TaskMID =cpu_to_le16 (st->smid); - found =1 ; + +/* +* If the given TaskMID from the user space is zero, then the +* first outstanding smid will be picked up. Otherwise, +* targeted smid will be the one. +*/ +if (!tm_request->TaskMID || tm_request->TaskMID == st->smid) { + tm_request->TaskMID =cpu_to_le16 (st->smid); + found =1 ; + } }if (!found) {
Signature · 1 line
2.17.1
Martin K. Petersen
AppliedMinwoo,
Quoted 4 lines
We can request task management IOCTL
command(MPI2_FUNCTION_SCSI_TASK_MGMT)to/dev/mpt3ctl. If the giventask_typeis either abort task or query task, it may need a field named "Initiator Port Transfer Tag to Manage" in the IU.
Applied to 5.4/scsi-queue, thank you!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering