Merge branch '3.3-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Pull target fixes from Nicholas Bellinger: "This series addresses two recently reported regression bugs related to legacy SCSI reservation usage in target core, and iscsi-target reservation conflict handling. The second patch in particular addresses possible data-corruption with SCSI reservations that is specific to iscsi-target fabric LUNs with multiple client writers. Both patches need to go into v3.2 stable ASAP, and the branch based on the last target-pending/3.3-rc-fixes HEAD. Again, thanks to Martin Svec for his help to identify and address this regression bug with iscsi-target." * '3.3-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: iscsi-target: Fix reservation conflict -EBUSY response handling bug target: Fix compatible reservation handling (CRH=1) with legacy RESERVE/RELEASE
This commit is contained in:
commit
fe83558a33
|
@ -1028,7 +1028,7 @@ done:
|
|||
return iscsit_add_reject_from_cmd(
|
||||
ISCSI_REASON_BOOKMARK_NO_RESOURCES,
|
||||
1, 1, buf, cmd);
|
||||
} else if (transport_ret == -EINVAL) {
|
||||
} else if (transport_ret < 0) {
|
||||
/*
|
||||
* Unsupported SAM Opcode. CHECK_CONDITION will be sent
|
||||
* in iscsit_execute_cmd() during the CmdSN OOO Execution
|
||||
|
|
|
@ -117,7 +117,7 @@ static struct t10_pr_registration *core_scsi3_locate_pr_reg(struct se_device *,
|
|||
struct se_node_acl *, struct se_session *);
|
||||
static void core_scsi3_put_pr_reg(struct t10_pr_registration *);
|
||||
|
||||
static int target_check_scsi2_reservation_conflict(struct se_cmd *cmd, int *ret)
|
||||
static int target_check_scsi2_reservation_conflict(struct se_cmd *cmd)
|
||||
{
|
||||
struct se_session *se_sess = cmd->se_sess;
|
||||
struct se_subsystem_dev *su_dev = cmd->se_dev->se_sub_dev;
|
||||
|
@ -127,7 +127,7 @@ static int target_check_scsi2_reservation_conflict(struct se_cmd *cmd, int *ret)
|
|||
int conflict = 0;
|
||||
|
||||
if (!crh)
|
||||
return false;
|
||||
return -EINVAL;
|
||||
|
||||
pr_reg = core_scsi3_locate_pr_reg(cmd->se_dev, se_sess->se_node_acl,
|
||||
se_sess);
|
||||
|
@ -155,16 +155,14 @@ static int target_check_scsi2_reservation_conflict(struct se_cmd *cmd, int *ret)
|
|||
*/
|
||||
if (pr_reg->pr_res_holder) {
|
||||
core_scsi3_put_pr_reg(pr_reg);
|
||||
*ret = 0;
|
||||
return false;
|
||||
return 1;
|
||||
}
|
||||
if ((pr_reg->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_REGONLY) ||
|
||||
(pr_reg->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_REGONLY) ||
|
||||
(pr_reg->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_ALLREG) ||
|
||||
(pr_reg->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_ALLREG)) {
|
||||
core_scsi3_put_pr_reg(pr_reg);
|
||||
*ret = 0;
|
||||
return true;
|
||||
return 1;
|
||||
}
|
||||
core_scsi3_put_pr_reg(pr_reg);
|
||||
conflict = 1;
|
||||
|
@ -189,10 +187,10 @@ static int target_check_scsi2_reservation_conflict(struct se_cmd *cmd, int *ret)
|
|||
" while active SPC-3 registrations exist,"
|
||||
" returning RESERVATION_CONFLICT\n");
|
||||
cmd->scsi_sense_reason = TCM_RESERVATION_CONFLICT;
|
||||
return true;
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
return false;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int target_scsi2_reservation_release(struct se_task *task)
|
||||
|
@ -201,12 +199,18 @@ int target_scsi2_reservation_release(struct se_task *task)
|
|||
struct se_device *dev = cmd->se_dev;
|
||||
struct se_session *sess = cmd->se_sess;
|
||||
struct se_portal_group *tpg = sess->se_tpg;
|
||||
int ret = 0;
|
||||
int ret = 0, rc;
|
||||
|
||||
if (!sess || !tpg)
|
||||
goto out;
|
||||
if (target_check_scsi2_reservation_conflict(cmd, &ret))
|
||||
rc = target_check_scsi2_reservation_conflict(cmd);
|
||||
if (rc == 1)
|
||||
goto out;
|
||||
else if (rc < 0) {
|
||||
cmd->scsi_sense_reason = TCM_RESERVATION_CONFLICT;
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = 0;
|
||||
spin_lock(&dev->dev_reservation_lock);
|
||||
|
@ -243,7 +247,7 @@ int target_scsi2_reservation_reserve(struct se_task *task)
|
|||
struct se_device *dev = cmd->se_dev;
|
||||
struct se_session *sess = cmd->se_sess;
|
||||
struct se_portal_group *tpg = sess->se_tpg;
|
||||
int ret = 0;
|
||||
int ret = 0, rc;
|
||||
|
||||
if ((cmd->t_task_cdb[1] & 0x01) &&
|
||||
(cmd->t_task_cdb[1] & 0x02)) {
|
||||
|
@ -259,8 +263,14 @@ int target_scsi2_reservation_reserve(struct se_task *task)
|
|||
*/
|
||||
if (!sess || !tpg)
|
||||
goto out;
|
||||
if (target_check_scsi2_reservation_conflict(cmd, &ret))
|
||||
rc = target_check_scsi2_reservation_conflict(cmd);
|
||||
if (rc == 1)
|
||||
goto out;
|
||||
else if (rc < 0) {
|
||||
cmd->scsi_sense_reason = TCM_RESERVATION_CONFLICT;
|
||||
ret = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = 0;
|
||||
spin_lock(&dev->dev_reservation_lock);
|
||||
|
|
|
@ -2539,6 +2539,7 @@ static int transport_generic_cmd_sequencer(
|
|||
cmd, cdb, pr_reg_type) != 0) {
|
||||
cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
|
||||
cmd->se_cmd_flags |= SCF_SCSI_RESERVATION_CONFLICT;
|
||||
cmd->scsi_status = SAM_STAT_RESERVATION_CONFLICT;
|
||||
cmd->scsi_sense_reason = TCM_RESERVATION_CONFLICT;
|
||||
return -EBUSY;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue