From 4b7b3e2c58ed8c3d6213a1f0db697aaa638f6d2a Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 27 Jul 2022 20:13:39 -0700 Subject: [PATCH] ib_srpt: Remove obsolete parameters and update documentation Support for the ib_srpt_target_ target port names was removed in 2015. Update the documentation that still uses this target port name format. Remove all references to the obsolete ib_srpt kernel module parameters use_port_guid_in_session_name and use_node_guid_in_target_name. Remove the references from srpt/README to target port name formats that are no longer supported. --- scstadmin/examples/scst.conf.sysfs | 12 ++++++------ scstadmin/scstadmin.sysfs/man5/scst.conf.5 | 14 +++++++------- srpt/README | 6 ++---- srpt/src/ib_srpt.c | 11 ----------- 4 files changed, 15 insertions(+), 28 deletions(-) diff --git a/scstadmin/examples/scst.conf.sysfs b/scstadmin/examples/scst.conf.sysfs index 873614ac6..b20dfb62d 100644 --- a/scstadmin/examples/scst.conf.sysfs +++ b/scstadmin/examples/scst.conf.sysfs @@ -79,14 +79,14 @@ TARGET_DRIVER qla2x00t { } TARGET_DRIVER ib_srpt { - TARGET ib_srpt_target_0 { + TARGET fe80:0000:0000:0000:0002:c903:0005:f34b { enabled 1 LUN 0 disk1 LUN 1 disk2 } - TARGET ib_srpt_target_1 { + TARGET fe80:0000:0000:0000:0002:c903:0005:f34c { enabled 1 LUN 0 disk1 @@ -101,7 +101,7 @@ DEVICE_GROUP dgroup1 { group_id 1 state active - TARGET ib_srpt_target_0 { + TARGET fe80:0000:0000:0000:0002:c903:0005:f34b { rel_tgt_id 1 } } @@ -110,7 +110,7 @@ DEVICE_GROUP dgroup1 { group_id 2 state offline - TARGET ib_srpt_target_1 { + TARGET fe80:0000:0000:0000:0002:c903:0005:f34c { rel_tgt_id 2 } } @@ -123,7 +123,7 @@ DEVICE_GROUP dgroup2 { group_id 1 state offline - TARGET ib_srpt_target_0 { + TARGET fe80:0000:0000:0000:0002:c903:0005:f34b { rel_tgt_id 1 } } @@ -132,7 +132,7 @@ DEVICE_GROUP dgroup2 { group_id 2 state active - TARGET ib_srpt_target_1 { + TARGET fe80:0000:0000:0000:0002:c903:0005:f34c { rel_tgt_id 2 } } diff --git a/scstadmin/scstadmin.sysfs/man5/scst.conf.5 b/scstadmin/scstadmin.sysfs/man5/scst.conf.5 index 1bf2f52b0..edf733eb5 100644 --- a/scstadmin/scstadmin.sysfs/man5/scst.conf.5 +++ b/scstadmin/scstadmin.sysfs/man5/scst.conf.5 @@ -250,7 +250,7 @@ TARGET_DRIVER qla2x00t { .IP TARGET_DRIVER ib_srpt { .br - TARGET ib_srpt_target_0 { + TARGET fe80:0000:0000:0000:0002:c903:0005:f34b { .br enabled 1 .IP @@ -260,7 +260,7 @@ TARGET_DRIVER ib_srpt { .br } .IP - TARGET ib_srpt_target_1 { + TARGET fe80:0000:0000:0000:0002:c903:0005:f34c { .br enabled 1 .IP @@ -306,7 +306,7 @@ DEVICE_GROUP dgroup1 { .br state active .IP - TARGET ib_srpt_target_0 { + TARGET fe80:0000:0000:0000:0002:c903:0005:f34b { .br rel_tgt_id 1 .br @@ -320,7 +320,7 @@ DEVICE_GROUP dgroup1 { .br state offline .IP - TARGET ib_srpt_target_1 { + TARGET fe80:0000:0000:0000:0002:c903:0005:f34c { .br rel_tgt_id 2 .br @@ -340,7 +340,7 @@ DEVICE_GROUP dgroup2 { .br state offline .IP - TARGET ib_srpt_target_0 { + TARGET fe80:0000:0000:0000:0002:c903:0005:f34b { .br rel_tgt_id 1 .br @@ -354,7 +354,7 @@ DEVICE_GROUP dgroup2 { .br state active .IP - TARGET ib_srpt_target_1 { + TARGET fe80:0000:0000:0000:0002:c903:0005:f34c { .br rel_tgt_id 2 .br @@ -368,7 +368,7 @@ Some SCST settings cannot be configured via scst.conf but only as a kernel module parameter. Parameters for an SCST kernel module can be configured in /etc/modprobe.d/99-local.conf just like for any other kernel module. An example: .IP -options ib_srpt use_node_guid_in_target_name=1 +options ib_srpt rdma_cm_port=5000 .SH FILES .IP "/etc/scst.conf" The configuration file read by diff --git a/srpt/README b/srpt/README index 334fb5fcc..b57457419 100644 --- a/srpt/README +++ b/srpt/README @@ -175,10 +175,8 @@ the disk names assigned on the SCST target ("disk01" in the example below): Target names ------------ -The name assigned by the ib_srpt target driver to an SCST target is either -ib_srpt_target_, the node GUID of a HCA in hexadecimal form with a colon -after every fourth digit or the port GID with a colon afer every fourth -digit. The HCA node GUID and the port GIDs can be obtained via the +The name assigned by the ib_srpt target driver to an SCST target is the port +GID with a colon afer every fourth digit. The port GIDs can be obtained via the ibv_devinfo command. An example: # ibv_devinfo -v | grep -E '[^a-z]port:|guid|GID' diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c index cf1d0692f..866ea10ad 100644 --- a/srpt/src/ib_srpt.c +++ b/srpt/src/ib_srpt.c @@ -121,17 +121,6 @@ static int srpt_sq_size = DEF_SRPT_SQ_SIZE; module_param(srpt_sq_size, int, 0444); MODULE_PARM_DESC(srpt_sq_size, "Per-channel send queue (SQ) size."); -static bool use_port_guid_in_session_name; -module_param(use_port_guid_in_session_name, bool, 0444); -MODULE_PARM_DESC(use_port_guid_in_session_name, - "Use target port ID in the session name such that" - " redundant paths between multiport systems can be masked."); - -static bool use_node_guid_in_target_name; -module_param(use_node_guid_in_target_name, bool, 0444); -MODULE_PARM_DESC(use_node_guid_in_target_name, - "Use HCA node GUID as SCST target name."); - #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) static int srpt_get_u64_x(char *buffer, struct kernel_param *kp) #else