Commit a2b5d6f9 authored by Mike Christie's avatar Mike Christie Committed by Martin K. Petersen

scsi: target: Fix LUN ref count handling

Fix two bugs in the LUN refcounting:

 1. For the TCM_WRITE_PROTECTED case we were returning an error after
    taking a ref to the LUN, but never dropping it (caller just send status
    and drops cmd ref).

 2. We still need to do a percpu_ref_tryget_live for the virt LUN 0 like we
    do for other LUNs, because the TPG code does the refcount/wait process
    like it does with other LUNs.

Link: https://lore.kernel.org/r/1604257174-4524-2-git-send-email-michael.christie@oracle.comReviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 00c00807
...@@ -65,6 +65,16 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd) ...@@ -65,6 +65,16 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd)
atomic_long_add(se_cmd->data_length, atomic_long_add(se_cmd->data_length,
&deve->read_bytes); &deve->read_bytes);
if ((se_cmd->data_direction == DMA_TO_DEVICE) &&
deve->lun_access_ro) {
pr_err("TARGET_CORE[%s]: Detected WRITE_PROTECTED LUN"
" Access for 0x%08llx\n",
se_cmd->se_tfo->fabric_name,
se_cmd->orig_fe_lun);
rcu_read_unlock();
return TCM_WRITE_PROTECTED;
}
se_lun = rcu_dereference(deve->se_lun); se_lun = rcu_dereference(deve->se_lun);
if (!percpu_ref_tryget_live(&se_lun->lun_ref)) { if (!percpu_ref_tryget_live(&se_lun->lun_ref)) {
...@@ -76,17 +86,6 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd) ...@@ -76,17 +86,6 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd)
se_cmd->pr_res_key = deve->pr_res_key; se_cmd->pr_res_key = deve->pr_res_key;
se_cmd->se_cmd_flags |= SCF_SE_LUN_CMD; se_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
se_cmd->lun_ref_active = true; se_cmd->lun_ref_active = true;
if ((se_cmd->data_direction == DMA_TO_DEVICE) &&
deve->lun_access_ro) {
pr_err("TARGET_CORE[%s]: Detected WRITE_PROTECTED LUN"
" Access for 0x%08llx\n",
se_cmd->se_tfo->fabric_name,
se_cmd->orig_fe_lun);
rcu_read_unlock();
ret = TCM_WRITE_PROTECTED;
goto ref_dev;
}
} }
out_unlock: out_unlock:
rcu_read_unlock(); rcu_read_unlock();
...@@ -106,21 +105,20 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd) ...@@ -106,21 +105,20 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd)
return TCM_NON_EXISTENT_LUN; return TCM_NON_EXISTENT_LUN;
} }
se_lun = se_sess->se_tpg->tpg_virt_lun0;
se_cmd->se_lun = se_sess->se_tpg->tpg_virt_lun0;
se_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
percpu_ref_get(&se_lun->lun_ref);
se_cmd->lun_ref_active = true;
/* /*
* Force WRITE PROTECT for virtual LUN 0 * Force WRITE PROTECT for virtual LUN 0
*/ */
if ((se_cmd->data_direction != DMA_FROM_DEVICE) && if ((se_cmd->data_direction != DMA_FROM_DEVICE) &&
(se_cmd->data_direction != DMA_NONE)) { (se_cmd->data_direction != DMA_NONE))
ret = TCM_WRITE_PROTECTED; return TCM_WRITE_PROTECTED;
goto ref_dev;
} se_lun = se_sess->se_tpg->tpg_virt_lun0;
if (!percpu_ref_tryget_live(&se_lun->lun_ref))
return TCM_NON_EXISTENT_LUN;
se_cmd->se_lun = se_sess->se_tpg->tpg_virt_lun0;
se_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
se_cmd->lun_ref_active = true;
} }
/* /*
* RCU reference protected by percpu se_lun->lun_ref taken above that * RCU reference protected by percpu se_lun->lun_ref taken above that
...@@ -128,7 +126,6 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd) ...@@ -128,7 +126,6 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd)
* pointer can be kfree_rcu() by the final se_lun->lun_group put via * pointer can be kfree_rcu() by the final se_lun->lun_group put via
* target_core_fabric_configfs.c:target_fabric_port_release * target_core_fabric_configfs.c:target_fabric_port_release
*/ */
ref_dev:
se_cmd->se_dev = rcu_dereference_raw(se_lun->lun_se_dev); se_cmd->se_dev = rcu_dereference_raw(se_lun->lun_se_dev);
atomic_long_inc(&se_cmd->se_dev->num_cmds); atomic_long_inc(&se_cmd->se_dev->num_cmds);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment