nvme-multipath: report "none" iopolicy for discovery subsystems
PATCH 1/1 nvme-multipath: report "none" iopolicy for discovery subsystems
A discovery subsystem never exposes namespaces, so it has no multipath head and no I/O paths to select between. Nevertheless the per-subsystem iopolicy attribute is registered unconditionally and reads back the driver-wide default which is 'numa' for the discovery subsystems too. This can be misleading as it suggests a path selection policy is in effect when nothing is ever selected, and writing the attribute silently mutates state that can never be used.
Report "none" instead for a discovery subsystem, and reject writes with -EOPNOTSUPP. Report "none" from iopolicies as well, so that the value read from iopolicy always remains a member of the set advertised by iopolicies; otherwise userspace validating the current policy against the available ones would reject its own subsystem.
And while at it, document iopolicies too, which was not covered when it was added previously.
--- Documentation/ABI/stable/sysfs-nvme | 15 +++++++++++++++ drivers/nvme/host/multipath.c | 12 ++++++++++++ 2 files changed, 27 insertions(+)
Documentation/ABI/stable/sysfs-nvme +15 -0
@@ -465,6 +465,21 @@ Description: selections. Only available when CONFIG_NVME_MULTIPATH is enabled. + A discovery subsystem has no namespaces and hence no I/O + paths to select from: reading returns "none" and writing + fails with EOPNOTSUPP. + +What: /sys/class/nvme-subsystem/nvme-subsysX/iopolicies +Date: September 2026 +KernelVersion: 7.4 +Contact: Laurence Oberman <[email protected]> +Description: + Shows the I/O path selection policies that may be written + to the iopolicy attribute of this subsystem, separated by + spaces: "numa round-robin queue-depth". A discovery + subsystem accepts no policy at all and reports "none". + Only available when CONFIG_NVME_MULTIPATH is enabled. + What: /sys/class/nvme-subsystem/nvme-subsysX/subsystype Date: September 2021 KernelVersion: 5.16
drivers/nvme/host/multipath.c +12 -0
@@ -1054,6 +1054,10 @@ static ssize_t nvme_subsys_iopolicy_show(struct device *dev,struct nvme_subsystem *subsys = container_of(dev, struct nvme_subsystem, dev); +/* A discovery subsystem has no namespaces and hence no I/O paths */ +if (subsys->subtype ==NVME_NQN_DISC ) +return sysfs_emit (buf,"none\n" ); +return sysfs_emit (buf,"%s\n" , nvme_iopolicy_names[READ_ONCE (subsys->iopolicy)]); }
@@ -1088,6 +1092,9 @@ static ssize_t nvme_subsys_iopolicy_store(struct device *dev, container_of(dev, struct nvme_subsystem, dev);int policy; +if (subsys->subtype ==NVME_NQN_DISC ) +return -EOPNOTSUPP ; + policy =nvme_iopolicy_parse (buf);if (policy <0 )return policy;
@@ -1101,8 +1108,13 @@ SUBSYS_ATTR_RW(iopolicy, S_IRUGO | S_IWUSR,static ssize_t iopolicies_show (struct device *dev,struct device_attribute *attr,char *buf) { +struct nvme_subsystem *subsys = + container_of(dev, struct nvme_subsystem, dev);int i, len =0 ; +if (subsys->subtype ==NVME_NQN_DISC ) +return sysfs_emit (buf,"none\n" ); +for (i =0 ; i <ARRAY_SIZE (nvme_iopolicy_names); i++) len +=sysfs_emit_at (buf, len,"%s%s" , i ?" " :"" , nvme_iopolicy_names[i]);
Signature · 1 line
2.43.0
Quoted 104 lines · Martin George
A discovery subsystem never exposes namespaces, so it has no multipath
head and no I/O paths to select between. Nevertheless the per- subsystem
iopolicy attribute is registered unconditionally and reads back the driver-wide default which is 'numa' for the discovery subsystems too. This can be misleading as it suggests a path selection policy is in effect when nothing is ever selected, and writing the attribute silently
mutates state that can never be used.Report "none" instead for a discovery subsystem, and reject writes with
-EOPNOTSUPP. Report "none" from iopolicies as well, so that the value read from iopolicy always remains a member of the set advertised
by iopolicies; otherwise userspace validating the current policy against the available ones would reject its own subsystem.And while at it, document iopolicies too, which was not covered when it
was added previously.Signed-off-by Martin George <[email protected]>---
Documentation/ABI/stable/sysfs-nvme | 15 +++++++++++++++ drivers/nvme/host/multipath.c | 12 ++++++++++++2 files changed, 27 insertions(+)Documentation/ABI/stable/sysfs-nvme +0
-0@@ -465,6 +465,21 @@ Description:selections. Only available when
CONFIG_NVME_MULTIPATHis
enabled.Documentation/ABI/stable/sysfs-nvme +1
-0+ A discovery subsystem has no namespaces and hence noI/O
Documentation/ABI/stable/sysfs-nvme +1
-0+ paths to select from: reading returns "none" andwriting
Documentation/ABI/stable/sysfs-nvme +8
-0+ fails with EOPNOTSUPP. + +What: /sys/class/nvme-subsystem/nvme-subsysX/iopolicies +Date: September 2026 +KernelVersion: 7.4 +Contact: Laurence Oberman <[email protected]> +Description: + Shows the I/O path selection policies that may bewritten
Documentation/ABI/stable/sysfs-nvme +1
-0+ to the iopolicy attribute of this subsystem,separated by
Documentation/ABI/stable/sysfs-nvme +2
-0+ spaces: "numa round-robin queue-depth". A discovery + subsystem accepts no policy at all and reports"none".
Documentation/ABI/stable/sysfs-nvme +1
-0+ Only available when CONFIG_NVME_MULTIPATH isenabled.
+
What:/sys/class/nvme-subsystem/nvme-subsysX/subsystype
Date: September 2021
KernelVersion: 5.16drivers/nvme/host/multipath.c +0
-0@@ -1054,6 +1054,10 @@ static ssize_t nvme_subsys_iopolicy_show(struct device *dev,struct
nvme_subsystem*subsys =container_of(dev, struct nvme_subsystem, dev);drivers/nvme/host/multipath.c +1
-0+/* A discovery subsystem has no namespaces and hence no I/O paths */
drivers/nvme/host/multipath.c +3
-0+if (subsys->subtype ==NVME_NQN_DISC ) +return sysfs_emit (buf,"none\n" ); +return sysfs_emit(buf, "%s\n", nvme_iopolicy_names[READ_ONCE(subsys-
Quoted 1 line
iopolicy)]);
}
drivers/nvme/host/multipath.c +0
-0@@ -1088,6 +1092,9 @@ static ssize_t nvme_subsys_iopolicy_store(struct device *dev, container_of(dev, struct nvme_subsystem, dev); int policy;drivers/nvme/host/multipath.c +3
-0+if (subsys->subtype ==NVME_NQN_DISC ) +return -EOPNOTSUPP ; +policy =
nvme_iopolicy_parse(buf);
if (policy < 0)
return policy;drivers/nvme/host/multipath.c +0
-0@@ -1101,8 +1108,13 @@ SUBSYS_ATTR_RW(iopolicy, S_IRUGO | S_IWUSR, static ssize_t iopolicies_show(struct device *dev,struct
device_attribute*attr, char *buf)
{drivers/nvme/host/multipath.c +2
-0+struct nvme_subsystem *subsys = + container_of(dev, struct nvme_subsystem, dev);int i, len = 0;
drivers/nvme/host/multipath.c +3
-0+if (subsys->subtype ==NVME_NQN_DISC ) +return sysfs_emit (buf,"none\n" ); +
Quoted 3 lines
for (i = 0; i <
ARRAY_SIZE(nvme_iopolicy_names); i++) len +=sysfs_emit_at(buf, len, "%s%s", i ? " " : "", nvme_iopolicy_names[i]);
Hi Martin, thank you, yes, an oversight on my part not to update the documentation.
Thanks for adding that patch.
In addition, your discovery patch change looks good to me.
Looks good:
Quoted 8 lines · Martin George
A discovery subsystem never exposes namespaces, so it has no multipath head and no I/O paths to select between. Nevertheless the per-subsystem iopolicy attribute is registered unconditionally and reads back the driver-wide default which is 'numa' for the discovery subsystems too. This can be misleading as it suggests a path selection policy is in effect when nothing is ever selected, and writing the attribute silently mutates state that can never be used.
Quoted 8 lines
Report "none" instead for a discovery subsystem, and reject writes with
-EOPNOTSUPP. Report "none" from iopolicies as well, so that the value read from iopolicy always remains a member of the set advertised by iopolicies; otherwise userspace validating the current policy against the available ones would reject its own subsystem.And while at it, document iopolicies too, which was not covered when it was added previously.
Thanks, applied to nvme-7.4.