Skip to contentSkip to conversation

target: fix the pgr/alua_support_store functions

PATCH Applied Maurizio Lombardi 3 participants 3 messages Sep 6, 2021 – Sep 14, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 target: fix the pgr/alua_support_store functions

Commit 356ba2a8bc8d ("scsi: target: tcmu: Make pgr_support and alua_support attributes writable")
introduced support for changeable alua_support and pgr_support target attributes. They can only be changed
if the backstore is user-backed, otherwise the kernel returns -EINVAL.

This triggers a warning in the targetcli/rtslib code when performing a target restore that includes non-userbacked backstores:

#targetctl restore
Storage Object block/storage1: Cannot set attribute alua_support:
[Errno 22] Invalid argument, skipped
Storage Object block/storage1: Cannot set attribute pgr_support:
[Errno 22] Invalid argument, skipped

Fix this warning by returning an error code only if we are really going to flip the PGR/ALUA bit in the transport_flags field, otherwise we'll do nothing and return success.

Return ENOSYS instead of EINVAL if the pgr/alua attributes can't be changed, this way it'll be possible for userspace to understand if the operation failed because an invalid value has been passed to strtobool() or because the attributes are fixed.

Fixes 356ba2a8bc8d ("scsi: target: tcmu: Make pgr_support and alua_support attributes writable")

v2: replace EOPNOTSUPP with ENOSYS

---
 drivers/target/target_core_configfs.c | 32 +++++++++++++++++----------
 1 file changed, 20 insertions(+), 12 deletions(-)
drivers/target/target_core_configfs.c +20 -12
index 102ec644bc8a..023bd4516a68 100644
@@ -1110,20 +1110,24 @@ static ssize_t alua_support_store(struct config_item *item,
 {
 	struct se_dev_attrib *da = to_attrib(item);
 	struct se_device *dev = da->da_dev;
-	bool flag;
+	bool flag, oldflag;
 	int ret;
 
+	ret = strtobool(page, &flag);
+	if (ret < 0)
+		return ret;
+
+	oldflag = !(dev->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_ALUA);
+	if (flag == oldflag)
+		return count;
+
 	if (!(dev->transport->transport_flags_changeable &
 	      TRANSPORT_FLAG_PASSTHROUGH_ALUA)) {
 		pr_err("dev[%p]: Unable to change SE Device alua_support:"
 			" alua_support has fixed value\n", dev);
-		return -EINVAL;
+		return -ENOSYS;
 	}
 
-	ret = strtobool(page, &flag);
-	if (ret < 0)
-		return ret;
-
 	if (flag)
 		dev->transport_flags &= ~TRANSPORT_FLAG_PASSTHROUGH_ALUA;
 	else
@@ -1145,20 +1149,24 @@ static ssize_t pgr_support_store(struct config_item *item,
 {
 	struct se_dev_attrib *da = to_attrib(item);
 	struct se_device *dev = da->da_dev;
-	bool flag;
+	bool flag, oldflag;
 	int ret;
 
+	ret = strtobool(page, &flag);
+	if (ret < 0)
+		return ret;
+
+	oldflag = !(dev->transport_flags & TRANSPORT_FLAG_PASSTHROUGH_PGR);
+	if (flag == oldflag)
+		return count;
+
 	if (!(dev->transport->transport_flags_changeable &
 	      TRANSPORT_FLAG_PASSTHROUGH_PGR)) {
 		pr_err("dev[%p]: Unable to change SE Device pgr_support:"
 			" pgr_support has fixed value\n", dev);
-		return -EINVAL;
+		return -ENOSYS;
 	}
 
-	ret = strtobool(page, &flag);
-	if (ret < 0)
-		return ret;
-
 	if (flag)
 		dev->transport_flags &= ~TRANSPORT_FLAG_PASSTHROUGH_PGR;
 	else
Signature · 1 line
2.27.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 24 lines · Maurizio Lombardi

Commit 356ba2a8bc8d ("scsi: target: tcmu: Make pgr_support and alua_support attributes writable")
introduced support for changeable alua_support and pgr_support target attributes. They can only be changed
if the backstore is user-backed, otherwise the kernel returns -EINVAL.

This triggers a warning in the targetcli/rtslib code when performing a target restore that includes non-userbacked backstores:

#targetctl restore
Storage Object block/storage1: Cannot set attribute alua_support:
[Errno 22] Invalid argument, skipped
Storage Object block/storage1: Cannot set attribute pgr_support:
[Errno 22] Invalid argument, skipped

Fix this warning by returning an error code only if we are really going to flip the PGR/ALUA bit in the transport_flags field, otherwise we'll do nothing and return success.

Return ENOSYS instead of EINVAL if the pgr/alua attributes can't be changed, this way it'll be possible for userspace to understand if the operation failed because an invalid value has been passed to strtobool() or because the attributes are fixed.

Quoted 6 lines
Fixes 356ba2a8bc8d ("scsi: target: tcmu: Make pgr_support and alua_support attributes writable")

v2: replace EOPNOTSUPP with ENOSYS

---

#2 lore raw
In reply to Maurizio Lombardi
Quoted 10 lines · Maurizio Lombardi

Commit 356ba2a8bc8d ("scsi: target: tcmu: Make pgr_support and alua_support attributes writable")
introduced support for changeable alua_support and pgr_support target attributes. They can only be changed
if the backstore is user-backed, otherwise the kernel returns -EINVAL.

This triggers a warning in the targetcli/rtslib code when performing a target restore that includes non-userbacked backstores:

[...]

Applied to 5.15/scsi-fixes, thanks!

[1/1] target: fix the pgr/alua_support_store functions

      https://git.kernel.org/mkp/scsi/c/ef7ae7f746e9
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering