Export fast_io_fail_tmo to sysfs
v2 cover Export fast_io_fail_tmo to sysfs
changes since v1:
- use sysfs_emit instead sprintf
- simplify logic in nvme_ctrl_loss_tmo_store() and nvme_ctrl_io_fail_tmo
- updated commit message (dropped wrong statement about hard coded value)
Daniel Wagner (3):
nvme: Use sysfs_emit instead of sprintf
nvme: Remove superflues else in nvme_ctrl_loss_tmo_store
nvme: Export fast_io_fail_tmo to sysfs
drivers/nvme/host/core.c | 73 +++++++++++++++++++++++++---------- drivers/nvme/host/multipath.c | 8 ++-- 2 files changed, 56 insertions(+), 25 deletions(-)
Signature · 7 lines
2.29.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
PATCH v2 1/3 nvme: Use sysfs_emit instead of sprintf
sysfs_emit is the recommended API to use for formatting strings to be returned to user space. It is equivalent to scnprintf and aware of the PAGE_SIZE buffer size.
--- drivers/nvme/host/core.c | 40 +++++++++++++++++------------------ drivers/nvme/host/multipath.c | 8 +++---- 2 files changed, 24 insertions(+), 24 deletions(-)
drivers/nvme/host/core.c +20 -20
@@ -2876,8 +2876,8 @@ static ssize_t subsys_##field##_show(struct device *dev, \ { \struct nvme_subsystem *subsys = \ container_of(dev, struct nvme_subsystem, dev); \ -return sprintf (buf,"%.*s\n" , \ - (int )sizeof (subsys->field), subsys->field); \ +return sysfs_emit (buf,"%.*s\n" , \ + (int )sizeof (subsys->field), subsys->field); \ } \ static SUBSYS_ATTR_RO(field, S_IRUGO, subsys_##field##_show);
@@ -3407,13 +3407,13 @@ static ssize_t wwid_show(struct device *dev, struct device_attribute *attr,int model_len =sizeof (subsys->model);if (!uuid_is_null (&ids->uuid)) -return sprintf (buf,"uuid.%pU\n" , &ids->uuid); +return sysfs_emit (buf,"uuid.%pU\n" , &ids->uuid);if (memchr_inv (ids->nguid,0 ,sizeof (ids->nguid))) -return sprintf (buf,"eui.%16phN\n" , ids->nguid); +return sysfs_emit (buf,"eui.%16phN\n" , ids->nguid);if (memchr_inv (ids->eui64,0 ,sizeof (ids->eui64))) -return sprintf (buf,"eui.%8phN\n" , ids->eui64); +return sysfs_emit (buf,"eui.%8phN\n" , ids->eui64);while (serial_len >0 && (subsys->serial[serial_len -1 ] ==' ' || subsys->serial[serial_len -1 ] =='\0' ))
@@ -3422,7 +3422,7 @@ static ssize_t wwid_show(struct device *dev, struct device_attribute *attr, subsys->model[model_len - 1] == '\0')) model_len--; -return sprintf (buf,"nvme.%04x-%*phN-%*phN-%08x\n" , subsys->vendor_id, +return sysfs_emit (buf,"nvme.%04x-%*phN-%*phN-%08x\n" , subsys->vendor_id, serial_len, subsys->serial, model_len, subsys->model, head->ns_id); }
@@ -3431,7 +3431,7 @@ static DEVICE_ATTR_RO(wwid);static ssize_t nguid_show (struct device *dev,struct device_attribute *attr,char *buf) { -return sprintf (buf,"%pU\n" ,dev_to_ns_head (dev)->ids.nguid); +return sysfs_emit (buf,"%pU\n" ,dev_to_ns_head (dev)->ids.nguid); }static DEVICE_ATTR_RO (nguid);
@@ -3446,23 +3446,23 @@ static ssize_t uuid_show(struct device *dev, struct device_attribute *attr,if (uuid_is_null (&ids->uuid)) {printk_ratelimited (KERN_WARNING "No UUID available providing old NGUID\n" ); -return sprintf (buf,"%pU\n" , ids->nguid); +return sysfs_emit (buf,"%pU\n" , ids->nguid); } -return sprintf (buf,"%pU\n" , &ids->uuid); +return sysfs_emit (buf,"%pU\n" , &ids->uuid); }static DEVICE_ATTR_RO (uuid);static ssize_t eui_show (struct device *dev,struct device_attribute *attr,char *buf) { -return sprintf (buf,"%8ph\n" ,dev_to_ns_head (dev)->ids.eui64); +return sysfs_emit (buf,"%8ph\n" ,dev_to_ns_head (dev)->ids.eui64); }static DEVICE_ATTR_RO (eui);static ssize_t nsid_show (struct device *dev,struct device_attribute *attr,char *buf) { -return sprintf (buf,"%d\n" ,dev_to_ns_head (dev)->ns_id); +return sysfs_emit (buf,"%d\n" ,dev_to_ns_head (dev)->ns_id); }static DEVICE_ATTR_RO (nsid);
@@ -3527,7 +3527,7 @@ static ssize_t field##_show(struct device *dev, \ struct device_attribute *attr, char *buf) \ { \ struct nvme_ctrl *ctrl = dev_get_drvdata(dev); \ -return sprintf (buf,"%.*s\n" , \ +return sysfs_emit (buf,"%.*s\n" , \ (int )sizeof (ctrl->subsys->field), ctrl->subsys->field); \ } \ static DEVICE_ATTR(field, S_IRUGO, field##_show, NULL);
@@ -3541,7 +3541,7 @@ static ssize_t field##_show(struct device *dev, \ struct device_attribute *attr, char *buf) \ { \ struct nvme_ctrl *ctrl = dev_get_drvdata(dev); \ -return sprintf (buf,"%d\n" , ctrl->field); \ +return sysfs_emit (buf,"%d\n" , ctrl->field); \ } \ static DEVICE_ATTR(field, S_IRUGO, field##_show, NULL);
@@ -3589,9 +3589,9 @@ static ssize_t nvme_sysfs_show_state(struct device *dev,if ((unsigned )ctrl->state <ARRAY_SIZE (state_name) && state_name[ctrl->state]) -return sprintf (buf,"%s\n" , state_name[ctrl->state]); +return sysfs_emit (buf,"%s\n" , state_name[ctrl->state]); -return sprintf (buf,"unknown state\n" ); +return sysfs_emit (buf,"unknown state\n" ); } static DEVICE_ATTR(state, S_IRUGO, nvme_sysfs_show_state, NULL);
@@ -3643,9 +3643,9 @@ static ssize_t nvme_ctrl_loss_tmo_show(struct device *dev,struct nvmf_ctrl_options *opts = ctrl->opts;if (ctrl->opts->max_reconnects ==-1 ) -return sprintf (buf,"off\n" ); -return sprintf (buf,"%d\n" , - opts->max_reconnects * opts->reconnect_delay); +return sysfs_emit (buf,"off\n" ); +return sysfs_emit (buf,"%d\n" , + opts->max_reconnects * opts->reconnect_delay); } static ssize_t nvme_ctrl_loss_tmo_store(struct device *dev,
@@ -3675,8 +3675,8 @@ static ssize_t nvme_ctrl_reconnect_delay_show(struct device *dev,struct nvme_ctrl *ctrl =dev_get_drvdata (dev);if (ctrl->opts->reconnect_delay ==-1 ) -return sprintf (buf,"off\n" ); -return sprintf (buf,"%d\n" , ctrl->opts->reconnect_delay); +return sysfs_emit (buf,"off\n" ); +return sysfs_emit (buf,"%d\n" , ctrl->opts->reconnect_delay); } static ssize_t nvme_ctrl_reconnect_delay_store(struct device *dev,
drivers/nvme/host/multipath.c +4 -4
@@ -602,8 +602,8 @@ static ssize_t nvme_subsys_iopolicy_show(struct device *dev,struct nvme_subsystem *subsys = container_of(dev, struct nvme_subsystem, dev); -return sprintf (buf,"%s\n" , - nvme_iopolicy_names[READ_ONCE (subsys->iopolicy)]); +return sysfs_emit (buf,"%s\n" , + nvme_iopolicy_names[READ_ONCE (subsys->iopolicy)]); } static ssize_t nvme_subsys_iopolicy_store(struct device *dev,
@@ -628,7 +628,7 @@ SUBSYS_ATTR_RW(iopolicy, S_IRUGO | S_IWUSR,static ssize_t ana_grpid_show (struct device *dev,struct device_attribute *attr,char *buf) { -return sprintf (buf,"%d\n" ,nvme_get_ns_from_dev (dev)->ana_grpid); +return sysfs_emit (buf,"%d\n" ,nvme_get_ns_from_dev (dev)->ana_grpid); }DEVICE_ATTR_RO (ana_grpid);
@@ -637,7 +637,7 @@ static ssize_t ana_state_show(struct device *dev, struct device_attribute *attr, {struct nvme_ns *ns =nvme_get_ns_from_dev (dev); -return sprintf (buf,"%s\n" , nvme_ana_state_names[ns->ana_state]); +return sysfs_emit (buf,"%s\n" , nvme_ana_state_names[ns->ana_state]); }DEVICE_ATTR_RO (ana_state);
Signature · 7 lines
2.29.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
PATCH v2 2/3 nvme: Remove superflues else in nvme_ctrl_loss_tmo_store
In reply to Daniel WagnerIf there is an error we will leave the function early. So there is no need for an else. Remove it.
--- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/core.c +1 -1
@@ -3659,7 +3659,7 @@ static ssize_t nvme_ctrl_loss_tmo_store(struct device *dev,if (err)return -EINVAL ; -else if (ctrl_loss_tmo <0 ) +if (ctrl_loss_tmo <0 ) opts->max_reconnects =-1 ;else opts->max_reconnects = DIV_ROUND_UP(ctrl_loss_tmo,
Signature · 7 lines
2.29.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Keith Busch
maintainerRe: [PATCH v2 2/3] nvme: Remove superflues else in nvme_ctrl_loss_tmo_store
For the subject, s/superflues/superfluous
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
PATCH v2 3/3 nvme: Export fast_io_fail_tmo to sysfs
In reply to Daniel WagnerCommit 8c4dfea97f15 ("nvme-fabrics: reject I/O to offline device") introduced fast_io_fail_tmo but didn't export the value to sysfs. The value can be set during the 'nvme connect'. Export the timeout value to user space via sysfs to allow runtime configuration.
--- drivers/nvme/host/core.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/nvme/host/core.c +31 -0
@@ -3696,6 +3696,36 @@ static ssize_t nvme_ctrl_reconnect_delay_store(struct device *dev, static DEVICE_ATTR(reconnect_delay, S_IRUGO | S_IWUSR, nvme_ctrl_reconnect_delay_show, nvme_ctrl_reconnect_delay_store); +static ssize_t nvme_ctrl_fast_io_fail_tmo_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct nvme_ctrl *ctrl =dev_get_drvdata (dev); + +if (ctrl->opts->fast_io_fail_tmo ==-1 ) +return sysfs_emit (buf,"off\n" ); +return sysfs_emit (buf,"%d\n" , ctrl->opts->fast_io_fail_tmo); +} + +static ssize_t nvme_ctrl_fast_io_fail_tmo_store (struct device *dev, +struct device_attribute *attr,const char *buf,size_t count) +{ +struct nvme_ctrl *ctrl =dev_get_drvdata (dev); +struct nvmf_ctrl_options *opts = ctrl->opts; +int fast_io_fail_tmo, err; + + err =kstrtoint (buf,10 , &fast_io_fail_tmo); +if (err) +return -EINVAL ; + +if (fast_io_fail_tmo <0 ) + opts->fast_io_fail_tmo =-1 ; +else + opts->fast_io_fail_tmo = fast_io_fail_tmo; +return count; +} +static DEVICE_ATTR(fast_io_fail_tmo, S_IRUGO | S_IWUSR, + nvme_ctrl_fast_io_fail_tmo_show, nvme_ctrl_fast_io_fail_tmo_store); +static struct attribute *nvme_dev_attrs[] = { &dev_attr_reset_controller.attr, &dev_attr_rescan_controller.attr,
@@ -3715,6 +3745,7 @@ static struct attribute *nvme_dev_attrs[] = { &dev_attr_hostid.attr, &dev_attr_ctrl_loss_tmo.attr, &dev_attr_reconnect_delay.attr, + &dev_attr_fast_io_fail_tmo.attr, NULL };
Signature · 7 lines
2.29.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Thanks,
applied to nvme-5.13.