Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <4d21f806-6653-5457-918c-563a3032d128@suse.com>
Date:   Tue, 22 Nov 2022 12:00:09 -0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.5.0
Subject: Re: [PATCH] scsi:iscsi: Record session's startup mode in kernel
Content-Language: en-US
To:     Wenchao Hao <haowenchao@huawei.com>,
        Chris Leech <cleech@redhat.com>,
        Mike Christie <michael.christie@oracle.com>,
        "James E . J . Bottomley" <jejb@linux.ibm.com>,
        "Martin K . Petersen" <martin.petersen@oracle.com>,
        open-iscsi@googlegroups.com, linux-scsi@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org, liuzhiqiang26@huawei.com,
        linfeilong@huawei.com
References: <20221122213040.4128105-1-haowenchao@huawei.com>
From:   Lee Duncan <lduncan@suse.com>
In-Reply-To: <20221122213040.4128105-1-haowenchao@huawei.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eXAyVlIyQU1hbmVHaCtONHBia0VHU2t0ZXBRRmhKTm14Y0I4eVBZZFY1Z0gw?=
 =?utf-8?B?djE2Unc0azBUUFhsMjZvSVZYRUFZNHVWWjNtWHBKcTZQSmhmMDlWcHg4MkpC?=
 =?utf-8?B?OXN6cDZHUFh0cldYUzRRZGJaandGQ1A3TXk2NEJZV2phRS9XaGNSNStUSjJl?=
 =?utf-8?B?OEd0TXlvOTQ4T1BmSEtmcjk5S2lZeFRVSHdQTWIzRFptMU5hVW1FNThZTHpE?=
 =?utf-8?B?UEZSd2ZWQUJtcmpxY281Rk9hKzlYSld6L004NG9kdXVzdm16SEQzOHV6bG9L?=
 =?utf-8?B?R0xCU0V2dlloSGF1S2JzRnYyWHNlbXdnSEF1QW5yZktHOUU5UEtLc2x3TXFH?=
 =?utf-8?B?eXVTbVNUazYyT245dFVaaFJQYW1Pdjg1cUt6MXBNdS9HcEluYmIwMWVPQkJS?=
 =?utf-8?B?MmRoRU9iRXZRQXhERnlYT1c1ZzdRbElEUlFSSWhYYXMwR3RXMzU5MUcyUmNp?=
 =?utf-8?B?Z1lURVViUWY1dGkyeUVTQ0w0ME9kUXVuRCtvN05RTHI2Ui9GMUNKMmhHcVMv?=
 =?utf-8?B?WHNJNTdLSi9zY0wxUjgyckRINzNSbFdxeTRHWlFNR0FIUS8zT1E5UUE5ZXdU?=
 =?utf-8?B?WlY5WWJ5cmxNY2xaRGtHVEE0MlhoanpEQnh3S0JYcHVQWXFCM3N6eFVicEFl?=
 =?utf-8?B?M3UyQjlaTW1DbDBPOFVaS3F0SHNuTTVtbXIvTG5nSThTRG12dXNXNGdpb3RO?=
 =?utf-8?B?V3NQY2x1OVZPM3c5R3JCN0Y4b2NNTjFrcm54VjRndXZSRnZGb21FdGczQUxV?=
 =?utf-8?B?K3lZMUtDMnVPUGhmTzNoMWFsM2JCOWVRKzZUZDdoVVZsTEhEUWRuUlgvellX?=
 =?utf-8?B?bmFhdzY5QWp5bWR6aGRUYThmVVZYaEZHeTMya243MkN1K3ZyRzNzbGlhcDRP?=
 =?utf-8?B?TDYzUFloR2QrbHNycy9XU3l0Z2tLU2dkUXBoVnJQc3A3Z21FQUhKeHVuUDQ4?=
 =?utf-8?B?aERLTDJpb1pJbzJzdzdNUnIrVTlsVy9WcVRad2hRaEVZV0I1RnhNbjZ0Z2No?=
 =?utf-8?B?K3ROUFcrRHdCWHpBUkZsalg0Y2VqeTBIZjhZdHFXREpxdnlIdHZ4dUxrSkpW?=
 =?utf-8?B?cXJwVVl6WjBhL3pNUmpaUWtybTcrN2dlQTNlKzMrZitiZksxWDBISUFjMDdv?=
 =?utf-8?B?eVNDRzc1UXd1bmRtVGQ0S29YOTlsVTdRUXhnZml2U3lwUFNoVzI2cFV0SG1O?=
 =?utf-8?B?Z0lndUxhalhtL2pNcm1wVHdjelltOXRPQWYwYWJrZjFDWlRWcE8rZHk0Vmhi?=
 =?utf-8?B?cUZxMll2U2NHQWlLd0lOaXlRL0kzaC9CUnlzVEFkYXZOM2NWZllkcUIrMUxw?=
 =?utf-8?B?SURuMHFXNXhlclNRYjgvVDFRYkhGOGYwN3NBakhWVGorVzNNbEV0NzZiT2Zo?=
 =?utf-8?B?eE1DSnV0Tmwvc3JWcVhENEpBd2x0aUkzaGtmbit2eE5OZlAvUi9mcitNTlE0?=
 =?utf-8?B?dTN4ZFVhWXBXVVh3OWcycElYQXBPbnlIWVN6bnBINEhLZ0ZoUmdFcjAzTjUv?=
 =?utf-8?B?ZC9VUkx3RGFVek55NUFoS2J6YTdDSjdLbkU3Z240Rmd1LzRPVEdPeE11aHhR?=
 =?utf-8?B?bEhxZXk2cWhVait4RE1ZdUFJMU5oZ3pON1hRa2lUTll3b3M2VjNUYVBmcWhP?=
 =?utf-8?B?dHl3eGV3Nm1pVGRKWU9WZktoWGtWOTBuNDllNWNCNll2M0JBRDg0Y0s5UzVH?=
 =?utf-8?B?R3o5a1VpODU5YmZ1aWRRTndqNFBJdFJUMEJuK1Zld1RJZEovdG1WQ3dkYVFi?=
 =?utf-8?B?ZThLU28rOGtnWXo2eUovY3hXZGNMYXdPWUhHN1Ywc09iNVFsb2ZDQTd1aTNO?=
 =?utf-8?B?VEJQK0lNTzhTeFhTcGx6cEVsVkNTQWJNSU9hTTBGYUpwQ1ByZmZUQ3VMcmdL?=
 =?utf-8?B?bWZqRnZtWVhrZXRUTDNRUU82UkthVEdHenZxMlltand0MmYrbE5vUWpLeUdN?=
 =?utf-8?B?NndIRUNIZjFhWnRpNWpVbGFhcXd5RVo4b2xrNk5aQ2dkdU5UNTBwbkJ5TUcw?=
 =?utf-8?B?b1R5SkJSQWc4bEtwMXgxK2dIUXBrWnJ1STZKVkkwMXJuL25XRUxHRzVvcmNm?=
 =?utf-8?B?RkI4TnowMi83UmxSNVRCeVJrajdvc21DNVMvd1AzYXladEhmZkhXUG0xT0py?=
 =?utf-8?Q?gaVcoByKGQB9kEx65eyG8T+6T?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ad1f6243-f5ef-4567-34c5-08daccc42c71
X-MS-Exchange-CrossTenant-AuthSource: AM5PR04MB3089.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2022 20:00:15.9025
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: div1SbLpXS1wwMa7qxJrY9Qan8IA5pL/n7xzAm+8/Hkz7EapQDPPSsJ/U1q3S6vLrnNZgxclMjkjmKdcJHQDkA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8751
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 11/22/22 13:30, Wenchao Hao wrote:
> There are 3 iscsi session's startup mode which are onboot, manual and
> automatic. We can boot from iSCSI disks with help of dracut's service
> in initrd, which would set node's startup mode to onboot, then create
> iSCSI sessions.
> 
> While the configure of onboot mode is recorded in file of initrd stage
> and would be lost when switch to rootfs. Even if we update the startup
> mode to onboot by hand after switch to rootfs, it is possible that the
> configure would be covered by another discovery command.
> 
> root would be mounted on iSCSI disks when boot from iSCSI disks, if the
> sessions is logged out, the related disks would be removed, which would
> cause the whole system halt.
> 
> So we need record session's start up mode in kernel and check this
> mode before logout this session.
> 
> Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
> ---
>   drivers/infiniband/ulp/iser/iscsi_iser.c | 1 +
>   drivers/scsi/be2iscsi/be_iscsi.c         | 1 +
>   drivers/scsi/bnx2i/bnx2i_iscsi.c         | 1 +
>   drivers/scsi/cxgbi/libcxgbi.c            | 1 +
>   drivers/scsi/iscsi_tcp.c                 | 1 +
>   drivers/scsi/libiscsi.c                  | 5 +++++
>   drivers/scsi/qedi/qedi_iscsi.c           | 1 +
>   drivers/scsi/qla4xxx/ql4_os.c            | 1 +
>   drivers/scsi/scsi_transport_iscsi.c      | 4 ++++
>   include/scsi/iscsi_if.h                  | 1 +
>   include/scsi/libiscsi.h                  | 1 +
>   11 files changed, 18 insertions(+)
> 
> diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
> index 620ae5b2d80d..778c023673ea 100644
> --- a/drivers/infiniband/ulp/iser/iscsi_iser.c
> +++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
> @@ -947,6 +947,7 @@ static umode_t iser_attr_is_visible(int param_type, int param)
>   		case ISCSI_PARAM_IFACE_NAME:
>   		case ISCSI_PARAM_INITIATOR_NAME:
>   		case ISCSI_PARAM_DISCOVERY_SESS:
> +		case ISCSI_PARAM_NODE_STARTUP:
>   			return S_IRUGO;
>   		default:
>   			return 0;
> diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c
> index 8aeaddc93b16..a21a4d9ab8b8 100644
> --- a/drivers/scsi/be2iscsi/be_iscsi.c
> +++ b/drivers/scsi/be2iscsi/be_iscsi.c
> @@ -1401,6 +1401,7 @@ umode_t beiscsi_attr_is_visible(int param_type, int param)
>   		case ISCSI_PARAM_LU_RESET_TMO:
>   		case ISCSI_PARAM_IFACE_NAME:
>   		case ISCSI_PARAM_INITIATOR_NAME:
> +		case ISCSI_PARAM_NODE_STARTUP:
>   			return S_IRUGO;
>   		default:
>   			return 0;
> diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c
> index a3c800e04a2e..d1fb06d8a92e 100644
> --- a/drivers/scsi/bnx2i/bnx2i_iscsi.c
> +++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c
> @@ -2237,6 +2237,7 @@ static umode_t bnx2i_attr_is_visible(int param_type, int param)
>   		case ISCSI_PARAM_BOOT_ROOT:
>   		case ISCSI_PARAM_BOOT_NIC:
>   		case ISCSI_PARAM_BOOT_TARGET:
> +		case ISCSI_PARAM_NODE_STARTUP:
>   			return S_IRUGO;
>   		default:
>   			return 0;
> diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
> index af281e271f88..111b2ac78964 100644
> --- a/drivers/scsi/cxgbi/libcxgbi.c
> +++ b/drivers/scsi/cxgbi/libcxgbi.c
> @@ -3063,6 +3063,7 @@ umode_t cxgbi_attr_is_visible(int param_type, int param)
>   		case ISCSI_PARAM_TGT_RESET_TMO:
>   		case ISCSI_PARAM_IFACE_NAME:
>   		case ISCSI_PARAM_INITIATOR_NAME:
> +		case ISCSI_PARAM_NODE_STARTUP:
>   			return S_IRUGO;
>   		default:
>   			return 0;
> diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
> index 5fb1f364e815..47a73fb3e4b0 100644
> --- a/drivers/scsi/iscsi_tcp.c
> +++ b/drivers/scsi/iscsi_tcp.c
> @@ -1036,6 +1036,7 @@ static umode_t iscsi_sw_tcp_attr_is_visible(int param_type, int param)
>   		case ISCSI_PARAM_TGT_RESET_TMO:
>   		case ISCSI_PARAM_IFACE_NAME:
>   		case ISCSI_PARAM_INITIATOR_NAME:
> +		case ISCSI_PARAM_NODE_STARTUP:
>   			return S_IRUGO;
>   		default:
>   			return 0;
> diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
> index d95f4bcdeb2e..1f2b0a9a029e 100644
> --- a/drivers/scsi/libiscsi.c
> +++ b/drivers/scsi/libiscsi.c
> @@ -3576,6 +3576,8 @@ int iscsi_set_param(struct iscsi_cls_conn *cls_conn,
>   		break;
>   	case ISCSI_PARAM_LOCAL_IPADDR:
>   		return iscsi_switch_str_param(&conn->local_ipaddr, buf);
> +	case ISCSI_PARAM_NODE_STARTUP:
> +		return iscsi_switch_str_param(&session->node_startup, buf);
>   	default:
>   		return -ENOSYS;
>   	}
> @@ -3712,6 +3714,9 @@ int iscsi_session_get_param(struct iscsi_cls_session *cls_session,
>   		else
>   			len = sysfs_emit(buf, "\n");
>   		break;
> +	case ISCSI_PARAM_NODE_STARTUP:
> +		len = sysfs_emit(buf, "%s\n", session->node_startup);
> +		break;
>   	default:
>   		return -ENOSYS;
>   	}
> diff --git a/drivers/scsi/qedi/qedi_iscsi.c b/drivers/scsi/qedi/qedi_iscsi.c
> index 31ec429104e2..b947a5bca380 100644
> --- a/drivers/scsi/qedi/qedi_iscsi.c
> +++ b/drivers/scsi/qedi/qedi_iscsi.c
> @@ -1437,6 +1437,7 @@ static umode_t qedi_attr_is_visible(int param_type, int param)
>   		case ISCSI_PARAM_BOOT_ROOT:
>   		case ISCSI_PARAM_BOOT_NIC:
>   		case ISCSI_PARAM_BOOT_TARGET:
> +		case ISCSI_PARAM_NODE_STARTUP:
>   			return 0444;
>   		default:
>   			return 0;
> diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
> index 9e849f6b0d0f..1cb7c6dbe9d3 100644
> --- a/drivers/scsi/qla4xxx/ql4_os.c
> +++ b/drivers/scsi/qla4xxx/ql4_os.c
> @@ -468,6 +468,7 @@ static umode_t qla4_attr_is_visible(int param_type, int param)
>   		case ISCSI_PARAM_DISCOVERY_PARENT_IDX:
>   		case ISCSI_PARAM_DISCOVERY_PARENT_TYPE:
>   		case ISCSI_PARAM_LOCAL_IPADDR:
> +		case ISCSI_PARAM_NODE_STARTUP:
>   			return S_IRUGO;
>   		default:
>   			return 0;
> diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
> index c3fe5ecfee59..39c14d2a8aad 100644
> --- a/drivers/scsi/scsi_transport_iscsi.c
> +++ b/drivers/scsi/scsi_transport_iscsi.c
> @@ -4367,6 +4367,7 @@ iscsi_session_attr(tsid, ISCSI_PARAM_TSID, 0);
>   iscsi_session_attr(def_taskmgmt_tmo, ISCSI_PARAM_DEF_TASKMGMT_TMO, 0);
>   iscsi_session_attr(discovery_parent_idx, ISCSI_PARAM_DISCOVERY_PARENT_IDX, 0);
>   iscsi_session_attr(discovery_parent_type, ISCSI_PARAM_DISCOVERY_PARENT_TYPE, 0);
> +iscsi_session_attr(node_startup, ISCSI_PARAM_NODE_STARTUP, 0);
>   
>   static ssize_t
>   show_priv_session_state(struct device *dev, struct device_attribute *attr,
> @@ -4488,6 +4489,7 @@ static struct attribute *iscsi_session_attrs[] = {
>   	&dev_attr_sess_def_taskmgmt_tmo.attr,
>   	&dev_attr_sess_discovery_parent_idx.attr,
>   	&dev_attr_sess_discovery_parent_type.attr,
> +	&dev_attr_sess_node_startup.attr,
>   	NULL,
>   };
>   
> @@ -4587,6 +4589,8 @@ static umode_t iscsi_session_attr_is_visible(struct kobject *kobj,
>   		return S_IRUGO;
>   	else if (attr == &dev_attr_priv_sess_target_id.attr)
>   		return S_IRUGO;
> +	else if (attr == &dev_attr_sess_node_startup.attr)
> +		param = ISCSI_PARAM_NODE_STARTUP;
>   	else {
>   		WARN_ONCE(1, "Invalid session attr");
>   		return 0;
> diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
> index 5225a23f2d0e..e46e69c1fd02 100644
> --- a/include/scsi/iscsi_if.h
> +++ b/include/scsi/iscsi_if.h
> @@ -610,6 +610,7 @@ enum iscsi_param {
>   	ISCSI_PARAM_DISCOVERY_PARENT_IDX,
>   	ISCSI_PARAM_DISCOVERY_PARENT_TYPE,
>   	ISCSI_PARAM_LOCAL_IPADDR,
> +	ISCSI_PARAM_NODE_STARTUP,
>   	/* must always be last */
>   	ISCSI_PARAM_MAX,
>   };
> diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
> index 654cc3918c94..af4ccdcc1140 100644
> --- a/include/scsi/libiscsi.h
> +++ b/include/scsi/libiscsi.h
> @@ -327,6 +327,7 @@ struct iscsi_session {
>   	char			*boot_target;
>   	char			*portal_type;
>   	char			*discovery_parent_type;
> +	char			*node_startup;
>   	uint16_t		discovery_parent_idx;
>   	uint16_t		def_taskmgmt_tmo;
>   	uint16_t		tsid;

The iscsiadm/iscsid tools refuse to logout of an ONBOOT session.

-- 
Lee Duncan