scsi: target: core: Abort all preempted regs if requested

According to SPC the preempted commands shall be always aborted.

SPC-4: 5.12.11.2.6 Preempting and aborting

  c) all commands from the I_T nexus(es) associated with the persistent
  reservations or registrations being preempted (i.e., preempted commands)
  except the PERSISTENT RESERVE OUT command itself shall be aborted as
  defined in SAM-5;

Link: https://lore.kernel.org/r/20220909090425.14479-4-d.bogdanov@yadro.com
Reviewed-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Dmitry Bogdanov <d.bogdanov@yadro.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index e3869576f254f016d9d99c658f469201071904ec..6a5f9504a4811a2893ea12c52681bc518ce21561 100644 (file)
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -2960,9 +2960,23 @@ core_scsi3_pro_preempt(struct se_cmd *cmd, int type, int scope, u64 res_key,
 
                spin_unlock(&dev->dev_reservation_lock);
 
-               if (preempt_type == PREEMPT_AND_ABORT)
+               /*
+                * SPC-4 5.12.11.2.6 Preempting and aborting
+                * The actions described in this subclause shall be performed
+                * for all I_T nexuses that are registered with the non-zero
+                * SERVICE ACTION RESERVATION KEY value, without regard for
+                * whether the preempted I_T nexuses hold the persistent
+                * reservation. If the SERVICE ACTION RESERVATION KEY field is
+                * set to zero and an all registrants persistent reservation is
+                * present, the device server shall abort all commands for all
+                * registered I_T nexuses.
+                */
+               if (preempt_type == PREEMPT_AND_ABORT) {
+                       core_tmr_lun_reset(dev, NULL, &preempt_and_abort_list,
+                                          cmd);
                        core_scsi3_release_preempt_and_abort(
                                &preempt_and_abort_list, pr_reg_n);
+               }
 
                if (pr_tmpl->pr_aptpl_active)
                        core_scsi3_update_and_write_aptpl(cmd->se_dev, true);