From: Mike Christie <mchristi@redhat.com> To: bvanassche@acm.org, bstroesser@ts.fujitsu.com, martin.petersen@oracle.com, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Cc: Mike Christie <mchristi@redhat.com> Subject: [PATCH 01/11] target: check enforce_pr_isids during registration Date: Tue, 28 Apr 2020 06:10:59 +0000 [thread overview] Message-ID: <20200428061109.3042-2-mchristi@redhat.com> (raw) In-Reply-To: <20200428061109.3042-1-mchristi@redhat.com> Move the check for enforce_pr_isids to the registration code where we can fail at the time an initiator tries to register a path without an isid. In its current place in __core_scsi3_locate_pr_reg, it is too late because it can be registered and be reported in PR in commands and it is stuck in this state because we cannot unregister it. Note. I am including in this patchset, because the 5th patch is built on top. Signed-off-by: Mike Christie <mchristi@redhat.com> --- drivers/target/target_core_pr.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c index 5e93169..cd2d32f 100644 --- a/drivers/target/target_core_pr.c +++ b/drivers/target/target_core_pr.c @@ -1176,15 +1176,6 @@ static struct t10_pr_registration *__core_scsi3_locate_pr_reg( * ISID, then we have found a match. */ if (!pr_reg->isid_present_at_reg) { - /* - * Determine if this SCSI device server requires that - * SCSI Intiatior TransportID w/ ISIDs is enforced - * for fabric modules (iSCSI) requiring them. - */ - if (tpg->se_tpg_tfo->sess_get_initiator_sid != NULL) { - if (dev->dev_attrib.enforce_pr_isids) - continue; - } atomic_inc_mb(&pr_reg->pr_res_holders); spin_unlock(&pr_tmpl->registration_lock); return pr_reg; @@ -1591,10 +1582,25 @@ static void core_scsi3_lunacl_undepend_item(struct se_dev_entry *se_deve) continue; dest_rtpi = tmp_lun->lun_rtpi; + iport_ptr = NULL; i_str = target_parse_pr_out_transport_id(tmp_tpg, ptr, &tid_len, &iport_ptr); if (!i_str) continue; + /* + * Determine if this SCSI device server requires that + * SCSI Intiatior TransportID w/ ISIDs is enforced + * for fabric modules (iSCSI) requiring them. + */ + if (tpg->se_tpg_tfo->sess_get_initiator_sid && + dev->dev_attrib.enforce_pr_isids && + !iport_ptr) { + pr_warn("SPC-PR: enforce_pr_isids is set but a isid has not been sent in the SPEC_I_PT data for %s.", + i_str); + ret = TCM_INVALID_PARAMETER_LIST; + spin_unlock(&dev->se_port_lock); + goto out_unmap; + } atomic_inc_mb(&tmp_tpg->tpg_pr_ref_count); spin_unlock(&dev->se_port_lock); -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Mike Christie <mchristi@redhat.com> To: bvanassche@acm.org, bstroesser@ts.fujitsu.com, martin.petersen@oracle.com, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Cc: Mike Christie <mchristi@redhat.com> Subject: [PATCH 01/11] target: check enforce_pr_isids during registration Date: Tue, 28 Apr 2020 01:10:59 -0500 [thread overview] Message-ID: <20200428061109.3042-2-mchristi@redhat.com> (raw) In-Reply-To: <20200428061109.3042-1-mchristi@redhat.com> Move the check for enforce_pr_isids to the registration code where we can fail at the time an initiator tries to register a path without an isid. In its current place in __core_scsi3_locate_pr_reg, it is too late because it can be registered and be reported in PR in commands and it is stuck in this state because we cannot unregister it. Note. I am including in this patchset, because the 5th patch is built on top. Signed-off-by: Mike Christie <mchristi@redhat.com> --- drivers/target/target_core_pr.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c index 5e93169..cd2d32f 100644 --- a/drivers/target/target_core_pr.c +++ b/drivers/target/target_core_pr.c @@ -1176,15 +1176,6 @@ static struct t10_pr_registration *__core_scsi3_locate_pr_reg( * ISID, then we have found a match. */ if (!pr_reg->isid_present_at_reg) { - /* - * Determine if this SCSI device server requires that - * SCSI Intiatior TransportID w/ ISIDs is enforced - * for fabric modules (iSCSI) requiring them. - */ - if (tpg->se_tpg_tfo->sess_get_initiator_sid != NULL) { - if (dev->dev_attrib.enforce_pr_isids) - continue; - } atomic_inc_mb(&pr_reg->pr_res_holders); spin_unlock(&pr_tmpl->registration_lock); return pr_reg; @@ -1591,10 +1582,25 @@ static void core_scsi3_lunacl_undepend_item(struct se_dev_entry *se_deve) continue; dest_rtpi = tmp_lun->lun_rtpi; + iport_ptr = NULL; i_str = target_parse_pr_out_transport_id(tmp_tpg, ptr, &tid_len, &iport_ptr); if (!i_str) continue; + /* + * Determine if this SCSI device server requires that + * SCSI Intiatior TransportID w/ ISIDs is enforced + * for fabric modules (iSCSI) requiring them. + */ + if (tpg->se_tpg_tfo->sess_get_initiator_sid && + dev->dev_attrib.enforce_pr_isids && + !iport_ptr) { + pr_warn("SPC-PR: enforce_pr_isids is set but a isid has not been sent in the SPEC_I_PT data for %s.", + i_str); + ret = TCM_INVALID_PARAMETER_LIST; + spin_unlock(&dev->se_port_lock); + goto out_unmap; + } atomic_inc_mb(&tmp_tpg->tpg_pr_ref_count); spin_unlock(&dev->se_port_lock); -- 1.8.3.1
next prev parent reply other threads:[~2020-04-28 6:10 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-28 6:10 [PATCH 00/11] target: add sysfs support Mike Christie 2020-04-28 6:10 ` Mike Christie 2020-04-28 6:10 ` Mike Christie [this message] 2020-04-28 6:10 ` [PATCH 01/11] target: check enforce_pr_isids during registration Mike Christie 2020-04-28 6:11 ` [PATCH 02/11] target: separate acl name from port ids Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 16:14 ` Bart Van Assche 2020-04-28 16:14 ` Bart Van Assche 2020-04-28 6:11 ` [PATCH 03/11] iscsi target: setup transport_id Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 6:11 ` [PATCH 04/11] target: use tpid in target_stat_iport_port_ident_show Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 6:11 ` [PATCH 05/11] target: drop sess_get_initiator_sid from PR code Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 6:11 ` [PATCH 06/11] target: drop sess_get_initiator_sid Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 16:25 ` Bart Van Assche 2020-04-28 16:25 ` Bart Van Assche 2020-04-28 6:11 ` [PATCH 07/11] target: add sysfs support Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 16:29 ` Bart Van Assche 2020-04-28 16:29 ` Bart Van Assche 2020-04-28 16:33 ` Mike Christie 2020-04-28 16:33 ` Mike Christie 2020-04-28 6:11 ` [PATCH 08/11] target: add sysfs session helper functions Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 16:43 ` Bart Van Assche 2020-04-28 16:43 ` Bart Van Assche 2020-04-28 17:06 ` Mike Christie 2020-04-28 17:06 ` Mike Christie 2020-04-28 6:11 ` [PATCH 09/11] target: add target_setup_session sysfs support Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 6:11 ` [PATCH 10/11] iscsi target: use session sysfs helpers Mike Christie 2020-04-28 6:11 ` Mike Christie 2020-04-28 6:11 ` [PATCH 11/11] target: drop sess_get_index Mike Christie 2020-04-28 6:11 ` Mike Christie
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200428061109.3042-2-mchristi@redhat.com \ --to=mchristi@redhat.com \ --cc=bstroesser@ts.fujitsu.com \ --cc=bvanassche@acm.org \ --cc=linux-scsi@vger.kernel.org \ --cc=martin.petersen@oracle.com \ --cc=target-devel@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.