Replace printk_ratelimited with dev_err_ratelimited which
adds dev_printk meta data. This is used by journald to
add disk ID information to the journal entry.
This re-worked change is from a different patch series
and utilizes the following suggestions.
- Reduce indentation level (Andy Shevchenko)
- Remove unneeded () for conditional operator (Sergei Shtylyov)
Signed-off-by: Tony Asleson <[email protected]>
---
fs/buffer.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/fs/buffer.c b/fs/buffer.c
index 50bbc99e3d96..18175fbb1101 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -125,10 +125,17 @@ EXPORT_SYMBOL(__wait_on_buffer);
static void buffer_io_error(struct buffer_head *bh, char *msg)
{
- if (!test_bit(BH_Quiet, &bh->b_state))
- printk_ratelimited(KERN_ERR
- "Buffer I/O error on dev %pg, logical block %llu%s\n",
- bh->b_bdev, (unsigned long long)bh->b_blocknr, msg);
+ struct device *gendev;
+
+ if (test_bit(BH_Quiet, &bh->b_state))
+ return;
+
+ gendev = bh->b_bdev->bd_disk ?
+ disk_to_dev(bh->b_bdev->bd_disk) : NULL;
+
+ dev_err_ratelimited(gendev,
+ "Buffer I/O error, logical block %llu%s\n",
+ (unsigned long long)bh->b_blocknr, msg);
}
/*
base-commit: bbf5c979011a099af5dc76498918ed7df445635b
--
2.26.2
On Mon, Oct 26, 2020 at 10:59 PM Tony Asleson <[email protected]> wrote:
>
> Replace printk_ratelimited with dev_err_ratelimited which
> adds dev_printk meta data. This is used by journald to
> add disk ID information to the journal entry.
> This re-worked change is from a different patch series
> and utilizes the following suggestions.
>
> - Reduce indentation level (Andy Shevchenko)
> - Remove unneeded () for conditional operator (Sergei Shtylyov)
This should go as a changelog after the cutter '---' line...
> Signed-off-by: Tony Asleson <[email protected]>
> ---
...somewhere here.
...
> - if (!test_bit(BH_Quiet, &bh->b_state))
> - printk_ratelimited(KERN_ERR
> - "Buffer I/O error on dev %pg, logical block %llu%s\n",
> - bh->b_bdev, (unsigned long long)bh->b_blocknr, msg);
> + struct device *gendev;
> +
> + if (test_bit(BH_Quiet, &bh->b_state))
> + return;
> +
> + gendev = bh->b_bdev->bd_disk ?
> + disk_to_dev(bh->b_bdev->bd_disk) : NULL;
I'm not sure it's a good idea to print '(null)'.
Perhaps
if (bh->b_bdev->bd_disk)
dev_err_ratelimit(disk_to_dev(bh->b_bdev->bd_disk), ...);
else
pr_err_ratelimit(...);
?
> + dev_err_ratelimited(gendev,
> + "Buffer I/O error, logical block %llu%s\n",
> + (unsigned long long)bh->b_blocknr, msg);
It's a u64 always (via sector_t), do we really need a casting?
> }
--
With Best Regards,
Andy Shevchenko
On 10/28/20 3:45 PM, Tony Asleson wrote:
> On 10/26/20 5:07 PM, Andy Shevchenko wrote:
>>> + dev_err_ratelimited(gendev,
>>> + "Buffer I/O error, logical block %llu%s\n",
>>
>>> + (unsigned long long)bh->b_blocknr, msg);
>>
>> It's a u64 always (via sector_t), do we really need a casting?
>
> That's a good question, grepping around shows *many* instances of this
> being done. I do agree that this doesn't seem to be needed, but maybe
> there is a reason why it's done?
According to this:
https://www.kernel.org/doc/html/v5.9/core-api/printk-formats.html
This should be left as it is, because 'sector_t' is dependent on a
config option.
-Tony
On Wed, Oct 28, 2020 at 11:05 PM Tony Asleson <[email protected]> wrote:
> On 10/28/20 3:45 PM, Tony Asleson wrote:
> > On 10/26/20 5:07 PM, Andy Shevchenko wrote:
>
> >>> + dev_err_ratelimited(gendev,
> >>> + "Buffer I/O error, logical block %llu%s\n",
> >>
> >>> + (unsigned long long)bh->b_blocknr, msg);
> >>
> >> It's a u64 always (via sector_t), do we really need a casting?
> >
> > That's a good question, grepping around shows *many* instances of this
> > being done. I do agree that this doesn't seem to be needed, but maybe
> > there is a reason why it's done?
>
> According to this:
>
> https://www.kernel.org/doc/html/v5.9/core-api/printk-formats.html
>
> This should be left as it is, because 'sector_t' is dependent on a
> config option.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/include/linux/types.h?id=72deb455b5ec619ff043c30bc90025aa3de3cdda
Staled documentation. You may send a patch to fix it (I Cc'ed
Christoph and Jonathan).
It means that it doesn't go under this category and the example should
be changed to something else.
--
With Best Regards,
Andy Shevchenko
On 10/26/20 5:07 PM, Andy Shevchenko wrote:
> On Mon, Oct 26, 2020 at 10:59 PM Tony Asleson <[email protected]> wrote:
>>
>> Replace printk_ratelimited with dev_err_ratelimited which
>> adds dev_printk meta data. This is used by journald to
>> add disk ID information to the journal entry.
>
>
>> This re-worked change is from a different patch series
>> and utilizes the following suggestions.
>>
>> - Reduce indentation level (Andy Shevchenko)
>> - Remove unneeded () for conditional operator (Sergei Shtylyov)
>
> This should go as a changelog after the cutter '---' line...
Thanks, I'll correct this.
>> Signed-off-by: Tony Asleson <[email protected]>
>> ---
>
> ...somewhere here.
>
> ...
>
>> - if (!test_bit(BH_Quiet, &bh->b_state))
>> - printk_ratelimited(KERN_ERR
>> - "Buffer I/O error on dev %pg, logical block %llu%s\n",
>> - bh->b_bdev, (unsigned long long)bh->b_blocknr, msg);
>> + struct device *gendev;
>> +
>> + if (test_bit(BH_Quiet, &bh->b_state))
>> + return;
>> +
>
>> + gendev = bh->b_bdev->bd_disk ?
>> + disk_to_dev(bh->b_bdev->bd_disk) : NULL;
>
> I'm not sure it's a good idea to print '(null)'.
I've not seen any cases where we end up with null here, but I've only
tested ATA, SCSI, and NVMe subsystems.
However, I would think that if this does occur it would be more obvious
that it's an issue that needs to be corrected if the null ends up in the
logs instead of having the same output that we have today?
> Perhaps
>
> if (bh->b_bdev->bd_disk)
> dev_err_ratelimit(disk_to_dev(bh->b_bdev->bd_disk), ...);
> else
> pr_err_ratelimit(...);
>
> ?
>
>> + dev_err_ratelimited(gendev,
>> + "Buffer I/O error, logical block %llu%s\n",
>
>> + (unsigned long long)bh->b_blocknr, msg);
>
> It's a u64 always (via sector_t), do we really need a casting?
That's a good question, grepping around shows *many* instances of this
being done. I do agree that this doesn't seem to be needed, but maybe
there is a reason why it's done?
-Tony
On 10/28/20 6:22 PM, Andy Shevchenko wrote:
> Staled documentation. You may send a patch to fix it (I Cc'ed
> Christoph and Jonathan).
> It means that it doesn't go under this category and the example should
> be changed to something else.
I'm looking into a suitable replacement example. Will post
documentation patch when I find one.
Thanks,
Tony