2020-09-04 08:28:06

by Xiongfeng Wang

Subject: [PATCH] EDAC/mc_sysfs: add missing newlines when printing 'max(dimm)_location'

When I cat 'max_location' and 'dimm_location' by sysfs, it displays as
follows. It's better to add a newline for easy reading.

[root@localhost /]# cat /sys/devices/system/edac/mc/mc0/max_location
memory 3 [root@localhost /]# cat /sys/devices/system/edac/mc/mc0/dimm0/dimm_location
memory 0 [root@localhost /]#

Signed-off-by: Xiongfeng Wang <[email protected]>

---
I am not sure if there are some userspace tools using this file.
---
drivers/edac/edac_mc_sysfs.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index 4e6aca5..5d7b079 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -474,8 +474,12 @@ static ssize_t dimmdev_location_show(struct device *dev,
struct device_attribute *mattr, char *data)
{
struct dimm_info *dimm = to_dimm(dev);
+ ssize_t count;

- return edac_dimm_info_location(dimm, data, PAGE_SIZE);
+ count = edac_dimm_info_location(dimm, data, PAGE_SIZE);
+ count += snprintf(data + count, PAGE_SIZE - count, "\n");
+
+ return count;
}

static ssize_t dimmdev_label_show(struct device *dev,
@@ -821,6 +825,7 @@ static ssize_t mci_max_location_show(struct device *dev,
edac_layer_name[mci->layers[i].type],
mci->layers[i].size - 1);
}
+ p += sprintf(p, "\n");

return p - data;
}
--
1.7.12.4

2020-09-10 11:05:08

by Borislav Petkov

Subject: Re: [PATCH] EDAC/mc_sysfs: add missing newlines when printing 'max(dimm)_location'

On Fri, Sep 04, 2020 at 04:19:23PM +0800, Xiongfeng Wang wrote:
> When I cat 'max_location' and 'dimm_location' by sysfs, it displays as
> follows. It's better to add a newline for easy reading.
>
> [root@localhost /]# cat /sys/devices/system/edac/mc/mc0/max_location
> memory 3 [root@localhost /]# cat /sys/devices/system/edac/mc/mc0/dimm0/dimm_location
> memory 0 [root@localhost /]#

Please use this commit message for your next version:

EDAC/mc_sysfs: Add missing newlines when printing {max,dimm}_location

Reading those sysfs entries gives:

[root@localhost /]# cat /sys/devices/system/edac/mc/mc0/max_location
memory 3 [root@localhost /]# cat /sys/devices/system/edac/mc/mc0/dimm0/dimm_location
memory 0 [root@localhost /]#

Add newlines after the value it prints for better readability.

> @@ -821,6 +825,7 @@ static ssize_t mci_max_location_show(struct device *dev,
> edac_layer_name[mci->layers[i].type],
> mci->layers[i].size - 1);
> }
> + p += sprintf(p, "\n");

No size checking here?

--
Regards/Gruss,
Boris.

https://people.kernel.org/tglx/notes-about-netiquette

2020-09-11 08:07:43

by Xiongfeng Wang

Subject: Re: [PATCH] EDAC/mc_sysfs: add missing newlines when printing 'max(dimm)_location'

On 2020/9/10 19:00, Borislav Petkov wrote:
> On Fri, Sep 04, 2020 at 04:19:23PM +0800, Xiongfeng Wang wrote:
>> When I cat 'max_location' and 'dimm_location' by sysfs, it displays as
>> follows. It's better to add a newline for easy reading.
>>
>> [root@localhost /]# cat /sys/devices/system/edac/mc/mc0/max_location
>> memory 3 [root@localhost /]# cat /sys/devices/system/edac/mc/mc0/dimm0/dimm_location
>> memory 0 [root@localhost /]#
>
> Please use this commit message for your next version:
>
> EDAC/mc_sysfs: Add missing newlines when printing {max,dimm}_location
>
> Reading those sysfs entries gives:
>
> [root@localhost /]# cat /sys/devices/system/edac/mc/mc0/max_location
> memory 3 [root@localhost /]# cat /sys/devices/system/edac/mc/mc0/dimm0/dimm_location
> memory 0 [root@localhost /]#
>
> Add newlines after the value it prints for better readability.

Thanks for your advice. I will add it in the next version.

>
>> @@ -821,6 +825,7 @@ static ssize_t mci_max_location_show(struct device *dev,
>> edac_layer_name[mci->layers[i].type],
>> mci->layers[i].size - 1);
>> }
>> + p += sprintf(p, "\n");
>
> No size checking here?

I can check if it's larger than PAGE_SIZE.

Thanks,
Xiongfeng

>