target/core: Rework the SPC-2 reservation handling code
PATCH 2/11 target/core: Rework the SPC-2 reservation handling code
Instead of tracking the initiator that established an SPC-2 reservation, track the session through which the SPC-2 reservation has been established. This patch does not change any functionality.
Cc Mike Christie <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Hannes Reinecke <[email protected]>
Cc Nicholas Bellinger <[email protected]>
Signed-off-by Bart Van Assche <[email protected]>
--- drivers/target/target_core_configfs.c | 5 ++-- drivers/target/target_core_pr.c | 33 +++++++++++++++------------ drivers/target/target_core_pr.h | 1 + drivers/target/target_core_tmr.c | 2 +- include/target/target_core_base.h | 4 ++-- include/target/target_core_fabric.h | 1 + 6 files changed, 27 insertions(+), 19 deletions(-)
drivers/target/target_core_configfs.c +3 -2
@@ -1624,11 +1624,12 @@ static ssize_t target_core_dev_pr_show_spc3_res(struct se_device *dev,static ssize_t target_core_dev_pr_show_spc2_res (struct se_device *dev,char *page) { +struct se_session *sess = dev->reservation_holder;struct se_node_acl *se_nacl;ssize_t len; - se_nacl = dev->dev_reserved_node_acl; -if (se_nacl) { +if (sess) { + se_nacl = sess->se_node_acl; len = sprintf(page, "SPC-2 Reservation: %s Initiator: %s\n", se_nacl->se_tpg->se_tpg_tfo->fabric_name,
drivers/target/target_core_pr.c +19 -14
@@ -111,10 +111,10 @@ target_scsi2_reservation_check(struct se_cmd *cmd)break ; } -if (!dev->dev_reserved_node_acl || !sess) +if (!dev->reservation_holder || !sess)return 0 ; -if (dev->dev_reserved_node_acl != sess->se_node_acl) +if (dev->reservation_holder->se_node_acl != sess->se_node_acl)return TCM_RESERVATION_CONFLICT ;if (dev->dev_reservation_flags &DRF_SPC2_RESERVATIONS_WITH_ISID ) {
@@ -200,6 +200,16 @@ static int target_check_scsi2_reservation_conflict(struct se_cmd *cmd)return 0 ; } +void target_release_reservation (struct se_device *dev) +{ + dev->reservation_holder =NULL ; + dev->dev_reservation_flags &= ~DRF_SPC2_RESERVATIONS ; +if (dev->dev_reservation_flags &DRF_SPC2_RESERVATIONS_WITH_ISID ) { + dev->dev_res_bin_isid =0 ; + dev->dev_reservation_flags &= ~DRF_SPC2_RESERVATIONS_WITH_ISID ; + } +} +sense_reason_t target_scsi2_reservation_release (struct se_cmd *cmd) {
@@ -217,21 +227,16 @@ target_scsi2_reservation_release(struct se_cmd *cmd)return TCM_RESERVATION_CONFLICT ;spin_lock (&dev->dev_reservation_lock); -if (!dev->dev_reserved_node_acl || !sess) +if (!dev->reservation_holder || !sess) goto out_unlock; -if (dev->dev_reserved_node_acl != sess->se_node_acl) +if (dev->reservation_holder->se_node_acl != sess->se_node_acl) goto out_unlock;if (dev->dev_res_bin_isid != sess->sess_bin_isid) goto out_unlock; - dev->dev_reserved_node_acl =NULL ; - dev->dev_reservation_flags &= ~DRF_SPC2_RESERVATIONS ; -if (dev->dev_reservation_flags &DRF_SPC2_RESERVATIONS_WITH_ISID ) { - dev->dev_res_bin_isid =0 ; - dev->dev_reservation_flags &= ~DRF_SPC2_RESERVATIONS_WITH_ISID ; - } +target_release_reservation (dev); tpg = sess->se_tpg; pr_debug("SCSI-2 Released reservation for %s LUN: %llu ->" " MAPPED LUN: %llu for %s\n",
@@ -275,13 +280,13 @@ target_scsi2_reservation_reserve(struct se_cmd *cmd) tpg = sess->se_tpg;spin_lock (&dev->dev_reservation_lock); -if (dev->dev_reserved_node_acl && - (dev->dev_reserved_node_acl != sess->se_node_acl)) { +if (dev->reservation_holder && + dev->reservation_holder->se_node_acl != sess->se_node_acl) {pr_err ("SCSI-2 RESERVATION CONFLIFT for %s fabric\n" , tpg->se_tpg_tfo->fabric_name);pr_err ("Original reserver LUN: %llu %s\n" , cmd->se_lun->unpacked_lun, - dev->dev_reserved_node_acl->initiatorname); + dev->reservation_holder->se_node_acl->initiatorname); pr_err("Current attempt - LUN: %llu -> MAPPED LUN: %llu" " from %s \n", cmd->se_lun->unpacked_lun, cmd->orig_fe_lun,
@@ -290,7 +295,7 @@ target_scsi2_reservation_reserve(struct se_cmd *cmd) goto out_unlock; } - dev->dev_reserved_node_acl = sess->se_node_acl; + dev->reservation_holder = sess; dev->dev_reservation_flags |=DRF_SPC2_RESERVATIONS ;if (sess->sess_bin_isid !=0 ) { dev->dev_res_bin_isid = sess->sess_bin_isid;
drivers/target/target_core_pr.h +1 -0
@@ -58,6 +58,7 @@ extern struct kmem_cache *t10_pr_reg_cache;extern void core_pr_dump_initiator_port (struct t10_pr_registration *,char *,u32 ); +extern void target_release_reservation (struct se_device *dev);extern sense_reason_t target_scsi2_reservation_release (struct se_cmd *);extern sense_reason_t target_scsi2_reservation_reserve (struct se_cmd *); extern int core_scsi3_alloc_aptpl_registration(
drivers/target/target_core_tmr.c +1 -1
@@ -390,7 +390,7 @@ int core_tmr_lun_reset(if (!preempt_and_abort_list && (dev->dev_reservation_flags &DRF_SPC2_RESERVATIONS )) {spin_lock (&dev->dev_reservation_lock); - dev->dev_reserved_node_acl =NULL ; + dev->reservation_holder =NULL ; dev->dev_reservation_flags &= ~DRF_SPC2_RESERVATIONS ;spin_unlock (&dev->dev_reservation_lock);pr_debug ("LUN_RESET: SCSI-2 Released reservation\n" );
include/target/target_core_base.h +2 -2
@@ -795,8 +795,8 @@ struct se_device {spinlock_t se_tmr_lock;spinlock_t qf_cmd_lock;struct semaphore caw_sem; -/* Used for legacy SPC-2 reservationsa */ -struct se_node_acl *dev_reserved_node_acl; +/* Used for legacy SPC-2 reservations */ +struct se_session *reservation_holder;/* Used for ALUA Logical Unit Group membership */ struct t10_alua_lu_gp_member *dev_alua_lu_gp_mem;/* Used for SPC-3 Persistent Reservations */
include/target/target_core_fabric.h +1 -0
@@ -142,6 +142,7 @@ void transport_register_session(struct se_portal_group *, struct se_node_acl *, struct se_session *, void *);ssize_t target_show_dynamic_sessions (struct se_portal_group *,char *);void transport_free_session (struct se_session *); +void target_spc2_release (struct se_node_acl *nacl);void target_put_nacl (struct se_node_acl *);void transport_deregister_session_configfs (struct se_session *);void transport_deregister_session (struct se_session *);
Signature · 1 line
2.21.0.196.g041f5ea1cf98