Enable xfs error reporting to print out error codes
[email protected]
maintainerv3 cover Enable xfs error reporting to print out error codes
From: Carlos Maiolino <[email protected]>
Hello,
this is the V3 of this series addressing last round of reviews.
Darrich, I believe I addressed all your comments, could you please double-check it? I kept your RwB.
Carlos Maiolino (3):
xfs: add xfs_error_report the ability to display an error code
xfs: enable xfs_trans_cancel() to report and error code
xfs: make xfs_iomap_write_direct() report an error to xfs_trans_cancel
fs/xfs/xfs_error.c | 16 +++++++++++----- fs/xfs/xfs_error.h | 9 +++++---- fs/xfs/xfs_exchmaps_item.c | 9 ++++++--- fs/xfs/xfs_inode_item.c | 3 ++- fs/xfs/xfs_iomap.c | 2 +- fs/xfs/xfs_log_recover.c | 3 ++- fs/xfs/xfs_trans.c | 8 +++++--- fs/xfs/xfs_trans.h | 6 +++++- 8 files changed, 37 insertions(+), 19 deletions(-)
Signature · 1 line
2.55.0
[email protected]
maintainerPATCH v3 1/3 xfs: add xfs_error_report the ability to display an error code
From: Carlos Maiolino <[email protected]>
Users could opt to request an error code to be printed now.
---
V3:
- Remove stale description aboutt ERRNAME
V2:
- Fix commit description s/_NAME/_ERRNAME
- xfs_corruption_error should call xfs_error_report with -EFSCORRUPTED
- Modify xfs_error_report to only print out the error number if it received an error from the caller.
- Don't use errname() anymore.
fs/xfs/xfs_error.c | 16 +++++++++++----- fs/xfs/xfs_error.h | 9 +++++---- fs/xfs/xfs_exchmaps_item.c | 9 ++++++--- fs/xfs/xfs_inode_item.c | 3 ++- fs/xfs/xfs_log_recover.c | 3 ++- fs/xfs/xfs_trans.c | 2 +- 6 files changed, 27 insertions(+), 15 deletions(-)
fs/xfs/xfs_error.c +11 -5
@@ -241,16 +241,21 @@ void xfs_error_report( const char *tag, int level, + int error, struct xfs_mount *mp, const char *filename, int linenum, xfs_failaddr_t failaddr) { if (level <= xfs_error_level) { - xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT, -"Internal error %s at line %d of file %s. Caller %pS" , - tag, linenum, filename, failaddr); - + if (error) + xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT, +"Internal error %s (%d) at line %d of file %s. Caller %pS" , + tag, error, linenum, filename, failaddr); + else + xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT, +"Internal error %s at line %d of file %s. Caller %pS" , + tag, linenum, filename, failaddr);xfs_stack_trace (); } }
@@ -268,7 +273,8 @@ xfs_corruption_error( {if (buf && level <= xfs_error_level)xfs_hex_dump (buf, bufsize); -xfs_error_report (tag, level, mp, filename, linenum, failaddr); +xfs_error_report (tag, level, -EFSCORRUPTED , mp, + filename, linenum, failaddr);xfs_alert (mp,"Corruption detected. Unmount and run xfs_repair" ); }
fs/xfs/xfs_error.h +5 -4
@@ -8,8 +8,9 @@struct xfs_mount ; -void xfs_error_report (const char *tag,int level,struct xfs_mount *mp, -const char *filename,int linenum,xfs_failaddr_t failaddr); +void xfs_error_report (const char *tag,int level,int error, +struct xfs_mount *mp,const char *filename, +int linenum,xfs_failaddr_t failaddr);void xfs_corruption_error (const char *tag,int level,struct xfs_mount *mp,const void *buf,size_t bufsize,const char *filename,int linenum,xfs_failaddr_t failaddr);
@@ -20,8 +21,8 @@ void xfs_verifier_error(struct xfs_buf *bp, int error, xfs_failaddr_t failaddr);void xfs_inode_verifier_error (struct xfs_inode *ip,int error,const char *name,const void *buf,size_t bufsz,xfs_failaddr_t failaddr); -#define XFS_ERROR_REPORT (e, lvl, mp) \ - xfs_error_report(e, lvl, mp, __FILE__, __LINE__, __return_address) +#define XFS_ERROR_REPORT (e, lvl, error, mp) \ + xfs_error_report(e, lvl, error, mp, __FILE__, __LINE__, __return_address)#define XFS_CORRUPTION_ERROR (e, lvl, mp, buf, bufsize) \ xfs_corruption_error(e, lvl, mp, buf, bufsize, \ __FILE__, __LINE__, __return_address)
fs/xfs/xfs_exchmaps_item.c +6 -3
@@ -573,13 +573,15 @@ xlog_recover_xmi_commit_pass2( len =sizeof (struct xfs_xmi_log_format );if (item->ri_buf[0 ].iov_len != len) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , log->l_mp); +XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , + -EFSCORRUPTED , log->l_mp);return -EFSCORRUPTED ; } xmi_formatp = item->ri_buf[0 ].iov_base;if (xmi_formatp->__pad !=0 ) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , log->l_mp); +XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , + -EFSCORRUPTED , log->l_mp);return -EFSCORRUPTED ; }
@@ -614,7 +616,8 @@ xlog_recover_xmd_commit_pass2( xmd_formatp = item->ri_buf[0 ].iov_base;if (item->ri_buf[0 ].iov_len !=sizeof (struct xfs_xmd_log_format )) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , log->l_mp); +XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , + -EFSCORRUPTED , log->l_mp);return -EFSCORRUPTED ; }
fs/xfs/xfs_inode_item.c +2 -1
@@ -1229,7 +1229,8 @@ xfs_inode_item_format_convert(struct xfs_inode_log_format_32 *in_f32 = buf->iov_base;if (buf->iov_len !=sizeof (*in_f32)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW ,NULL ); +XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , + -EFSCORRUPTED ,NULL );return -EFSCORRUPTED ; }
fs/xfs/xfs_log_recover.c +2 -1
@@ -2948,7 +2948,8 @@ xlog_recover_process(* fatal log corruption failure. */ if (xfs_has_crc (log->l_mp)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , log->l_mp); +XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , + -EFSCORRUPTED , log->l_mp);return -EFSCORRUPTED ; } }
fs/xfs/xfs_trans.c +1 -1
@@ -971,7 +971,7 @@ xfs_trans_cancel(* here. */ if (dirty && !xfs_is_shutdown (mp)) { -XFS_ERROR_REPORT ("xfs_trans_cancel" ,XFS_ERRLEVEL_LOW , mp); +XFS_ERROR_REPORT ("xfs_trans_cancel" ,XFS_ERRLEVEL_LOW ,0 , mp);xfs_force_shutdown (mp,SHUTDOWN_CORRUPT_INCORE ); }#ifdef DEBUG
Signature · 1 line
2.55.0
Re: [PATCH v3 1/3] xfs: add xfs_error_report the ability to display an error code
Quoted 5 lines · On Thu, Sep 17, 2026 at 12:35:46PM +0200, [email protected] wrote:
From: Carlos Maiolino <[email protected]>
Users could opt to request an error code to be printed now.
Signed-off-by Carlos Maiolino <[email protected]>
Looks good,
--D
Quoted 163 lines
---
V3:
- Remove stale description aboutt ERRNAME
V2:
- Fix commit description s/_NAME/_ERRNAME
-xfs_corruption_errorshould callxfs_error_reportwith-EFSCORRUPTED
- Modifyxfs_error_reportto only print out the error number if it received an error from the caller.
- Don't useerrname()anymore.fs/xfs/xfs_error.c | 16 +++++++++++----- fs/xfs/xfs_error.h | 9 +++++---- fs/xfs/xfs_exchmaps_item.c | 9 ++++++--- fs/xfs/xfs_inode_item.c | 3 ++- fs/xfs/xfs_log_recover.c | 3 ++- fs/xfs/xfs_trans.c | 2 +- 6 files changed, 27 insertions(+), 15 deletions(-)fs/xfs/xfs_error.c +11
-5@@ -241,16 +241,21 @@ void xfs_error_report( const char *tag, int level, + int error, struct xfs_mount *mp, const char *filename, int linenum, xfs_failaddr_t failaddr) { if (level <= xfs_error_level) { - xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT, -"Internal error %s at line %d of file %s. Caller %pS" , - tag, linenum, filename, failaddr); - + if (error) + xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT, +"Internal error %s (%d) at line %d of file %s. Caller %pS" , + tag, error, linenum, filename, failaddr); + else + xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT, +"Internal error %s at line %d of file %s. Caller %pS" , + tag, linenum, filename, failaddr);xfs_stack_trace (); } }@@ -268,7 +273,8 @@ xfs_corruption_error( {if (buf && level <= xfs_error_level)xfs_hex_dump (buf, bufsize); -xfs_error_report (tag, level, mp, filename, linenum, failaddr); +xfs_error_report (tag, level, -EFSCORRUPTED , mp, + filename, linenum, failaddr);xfs_alert (mp,"Corruption detected. Unmount and run xfs_repair" ); }fs/xfs/xfs_error.h +5
-4@@ -8,8 +8,9 @@struct xfs_mount ; -void xfs_error_report (const char *tag,int level,struct xfs_mount *mp, -const char *filename,int linenum,xfs_failaddr_t failaddr); +void xfs_error_report (const char *tag,int level,int error, +struct xfs_mount *mp,const char *filename, +int linenum,xfs_failaddr_t failaddr);void xfs_corruption_error (const char *tag,int level,struct xfs_mount *mp,const void *buf,size_t bufsize,const char *filename,int linenum,xfs_failaddr_t failaddr);@@ -20,8 +21,8 @@ void xfs_verifier_error(struct xfs_buf *bp, int error, xfs_failaddr_t failaddr);void xfs_inode_verifier_error (struct xfs_inode *ip,int error,const char *name,const void *buf,size_t bufsz,xfs_failaddr_t failaddr); -#define XFS_ERROR_REPORT (e, lvl, mp) \ - xfs_error_report(e, lvl, mp, __FILE__, __LINE__, __return_address) +#define XFS_ERROR_REPORT (e, lvl, error, mp) \ + xfs_error_report(e, lvl, error, mp, __FILE__, __LINE__, __return_address)#define XFS_CORRUPTION_ERROR (e, lvl, mp, buf, bufsize) \ xfs_corruption_error(e, lvl, mp, buf, bufsize, \ __FILE__, __LINE__, __return_address)fs/xfs/xfs_exchmaps_item.c +6
-3@@ -573,13 +573,15 @@ xlog_recover_xmi_commit_pass2( len =sizeof (struct xfs_xmi_log_format );if (item->ri_buf[0 ].iov_len != len) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , log->l_mp); +XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , + -EFSCORRUPTED , log->l_mp);return -EFSCORRUPTED ; } xmi_formatp = item->ri_buf[0 ].iov_base;if (xmi_formatp->__pad !=0 ) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , log->l_mp); +XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , + -EFSCORRUPTED , log->l_mp);return -EFSCORRUPTED ; }@@ -614,7 +616,8 @@ xlog_recover_xmd_commit_pass2( xmd_formatp = item->ri_buf[0 ].iov_base;if (item->ri_buf[0 ].iov_len !=sizeof (struct xfs_xmd_log_format )) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , log->l_mp); +XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , + -EFSCORRUPTED , log->l_mp);return -EFSCORRUPTED ; }fs/xfs/xfs_inode_item.c +2
-1@@ -1229,7 +1229,8 @@ xfs_inode_item_format_convert(struct xfs_inode_log_format_32 *in_f32 = buf->iov_base;if (buf->iov_len !=sizeof (*in_f32)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW ,NULL ); +XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , + -EFSCORRUPTED ,NULL );return -EFSCORRUPTED ; }fs/xfs/xfs_log_recover.c +2
-1@@ -2948,7 +2948,8 @@ xlog_recover_process(* fatal log corruption failure. */ if (xfs_has_crc (log->l_mp)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , log->l_mp); +XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , + -EFSCORRUPTED , log->l_mp);return -EFSCORRUPTED ; } }fs/xfs/xfs_trans.c +1
-1@@ -971,7 +971,7 @@ xfs_trans_cancel(* here. */ if (dirty && !xfs_is_shutdown (mp)) { -XFS_ERROR_REPORT ("xfs_trans_cancel" ,XFS_ERRLEVEL_LOW , mp); +XFS_ERROR_REPORT ("xfs_trans_cancel" ,XFS_ERRLEVEL_LOW ,0 , mp);xfs_force_shutdown (mp,SHUTDOWN_CORRUPT_INCORE ); }#ifdef DEBUG Signature · 1 line
2.55.0
Re: [PATCH v3 1/3] xfs: add xfs_error_report the ability to display an error code
In reply to [email protected]Looks good:
[email protected]
maintainerPATCH v3 2/3 xfs: enable xfs_trans_cancel() to report and error code
In reply to [email protected]From: Carlos Maiolino <[email protected]>
Once in a while it's useful to know exactly what kind of error caused a transaction to be cancelled.
Enable xfs_trans_cancel() to receive an error code to be reported.
---
V3:
- Kill typedef from __xfs_trans_cancel
- Remove uneeded wrap of parameter 0
V2:
- Parenthesize macro parameters
fs/xfs/xfs_trans.c | 8 +++++--- fs/xfs/xfs_trans.h | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-)
fs/xfs/xfs_trans.c +5 -3
@@ -943,8 +943,9 @@ xfs_trans_commit(* xfs_trans_commit(). */ void -xfs_trans_cancel ( -struct xfs_trans *tp) +__xfs_trans_cancel ( +struct xfs_trans *tp, +int error) {struct xfs_mount *mp = tp->t_mountp;struct xlog *log = mp->m_log;
@@ -971,7 +972,8 @@ xfs_trans_cancel(* here. */ if (dirty && !xfs_is_shutdown (mp)) { -XFS_ERROR_REPORT ("xfs_trans_cancel" ,XFS_ERRLEVEL_LOW ,0 , mp); +XFS_ERROR_REPORT ("xfs_trans_cancel" ,XFS_ERRLEVEL_LOW , + error, mp);xfs_force_shutdown (mp,SHUTDOWN_CORRUPT_INCORE ); }#ifdef DEBUG
fs/xfs/xfs_trans.h +5 -1
@@ -213,6 +213,11 @@ xfs_trans_read_buf( flags, bpp, ops); } +void __xfs_trans_cancel (struct xfs_trans *,int ); + +#define xfs_trans_cancel (tp) __xfs_trans_cancel((tp), 0) +#define xfs_trans_cancel_error (tp, error) __xfs_trans_cancel((tp), (error)) +struct xfs_buf *xfs_trans_getsb (struct xfs_trans *);struct xfs_buf *xfs_trans_getrtsb (struct xfs_trans *tp);
@@ -237,7 +242,6 @@ void xfs_trans_log_inode(xfs_trans_t *, struct xfs_inode *, uint);int xfs_trans_commit (struct xfs_trans *);int xfs_trans_roll (struct xfs_trans **);int xfs_trans_roll_inode (struct xfs_trans **,struct xfs_inode *); -void xfs_trans_cancel (xfs_trans_t *);int xfs_trans_ail_init (struct xfs_mount *);void xfs_trans_ail_destroy (struct xfs_mount *);
Signature · 1 line
2.55.0
Re: [PATCH v3 2/3] xfs: enable xfs_trans_cancel() to report and error code
Quoted 50 lines · On Thu, Sep 17, 2026 at 12:35:47PM +0200, [email protected] wrote:
From: Carlos Maiolino <[email protected]>
Once in a while it's useful to know exactly what kind of error caused a transaction to be cancelled.
Enablexfs_trans_cancel()to receive an error code to be reported.Signed-off-by Carlos Maiolino <[email protected]>Reviewed-by "Darrick J. Wong" <[email protected]>---
V3:
- Kill typedef from__xfs_trans_cancel
- Remove uneeded wrap of parameter 0
V2:
- Parenthesize macro parametersfs/xfs/xfs_trans.c | 8 +++++--- fs/xfs/xfs_trans.h | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-)fs/xfs/xfs_trans.c +5
-3@@ -943,8 +943,9 @@ xfs_trans_commit(* xfs_trans_commit(). */ void -xfs_trans_cancel ( -struct xfs_trans *tp) +__xfs_trans_cancel ( +struct xfs_trans *tp, +int error) {struct xfs_mount *mp = tp->t_mountp;struct xlog *log = mp->m_log;@@ -971,7 +972,8 @@ xfs_trans_cancel(* here. */ if (dirty && !xfs_is_shutdown (mp)) { -XFS_ERROR_REPORT ("xfs_trans_cancel" ,XFS_ERRLEVEL_LOW ,0 , mp); +XFS_ERROR_REPORT ("xfs_trans_cancel" ,XFS_ERRLEVEL_LOW , + error, mp);xfs_force_shutdown (mp,SHUTDOWN_CORRUPT_INCORE ); }#ifdef DEBUG fs/xfs/xfs_trans.h +0
-0
fs/xfs/xfs_trans.h xfs_trans_read_buf( · line 219
Quoted 7 lines
fs/xfs/xfs_trans.h +4
-0@@ -213,6 +213,11 @@ xfs_trans_read_buf( flags, bpp, ops); } +void __xfs_trans_cancel (struct xfs_trans *,int ); + +#define xfs_trans_cancel (tp) __xfs_trans_cancel((tp), 0) +#define xfs_trans_cancel_error (tp, error) __xfs_trans_cancel((tp), (error))
Can we turn these into inlines instead of macros?
And do away with the pointless __xfs_trans_cancel, just implement xfs_trans_cancel_error in xfs_trans.c, and wrap xfs_trans_cancel around it.
Carlos Maiolino
maintainerRe: [PATCH v3 2/3] xfs: enable xfs_trans_cancel() to report and error code
Quoted 54 lines · Christoph Hellwig
Quoted 53 lines · On Thu, Sep 17, 2026 at 12:35:47PM +0200, [email protected] wrote:
From: Carlos Maiolino <[email protected]>
Once in a while it's useful to know exactly what kind of error caused a transaction to be cancelled.
Enablexfs_trans_cancel()to receive an error code to be reported.Signed-off-by Carlos Maiolino <[email protected]>Reviewed-by "Darrick J. Wong" <[email protected]>---
V3:
- Kill typedef from__xfs_trans_cancel
- Remove uneeded wrap of parameter 0
V2:
- Parenthesize macro parametersfs/xfs/xfs_trans.c | 8 +++++--- fs/xfs/xfs_trans.h | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-)fs/xfs/xfs_trans.c +5
-3@@ -943,8 +943,9 @@ xfs_trans_commit(* xfs_trans_commit(). */ void -xfs_trans_cancel ( -struct xfs_trans *tp) +__xfs_trans_cancel ( +struct xfs_trans *tp, +int error) {struct xfs_mount *mp = tp->t_mountp;struct xlog *log = mp->m_log;@@ -971,7 +972,8 @@ xfs_trans_cancel(* here. */ if (dirty && !xfs_is_shutdown (mp)) { -XFS_ERROR_REPORT ("xfs_trans_cancel" ,XFS_ERRLEVEL_LOW ,0 , mp); +XFS_ERROR_REPORT ("xfs_trans_cancel" ,XFS_ERRLEVEL_LOW , + error, mp);xfs_force_shutdown (mp,SHUTDOWN_CORRUPT_INCORE ); }#ifdef DEBUG fs/xfs/xfs_trans.h +0
-0@@ -213,6 +213,11 @@ xfs_trans_read_buf( flags, bpp, ops); }
Quoted 6 lines
fs/xfs/xfs_trans.h xfs_trans_read_buf( · line 219
Quoted 4 lines
fs/xfs/xfs_trans.h +4
-0+void __xfs_trans_cancel (struct xfs_trans *,int ); + +#define xfs_trans_cancel (tp) __xfs_trans_cancel((tp), 0) +#define xfs_trans_cancel_error (tp, error) __xfs_trans_cancel((tp), (error))Can we turn these into inlines instead of macros?
This sounds good.
Quoted 4 lines
And do away with the pointless
__xfs_trans_cancel, just implementxfs_trans_cancel_errorinxfs_trans.c, and wrapxfs_trans_cancelaround it.
The main reason I created __xfs_trans_cancel was to avoid a fs/xfs/* change of calls to xfs_trans_cancel().
If you think that's a must, I can do that in this patch, otherwise I'd prefer to add it on a separate patch just removing the call, without any logic change.
What do you think?
Cheers.
Re: [PATCH v3 2/3] xfs: enable xfs_trans_cancel() to report and error code
Quoted 6 lines · Carlos Maiolino
Quoted 3 lines
And do away with the pointless
__xfs_trans_cancel, just implementxfs_trans_cancel_errorinxfs_trans.c, and wrapxfs_trans_cancelaround it.The main reason I created
__xfs_trans_cancelwas to avoid afs/xfs/*change of calls toxfs_trans_cancel().
And that's a good idea. But we don't need the extra __xfs_trans_cancel vs xfs_trans_cancel_error indirection. Just rename what is __xfs_trans_cancel in this series to xfs_trans_cancel_error, and make xfs_trans_cancel an inline wrapper around that.
[email protected]
maintainerPATCH v3 3/3 xfs: make xfs_iomap_write_direct() report an error to xfs_trans_cancel
In reply to [email protected]From: Carlos Maiolino <[email protected]>
I've been in the situation a few times where the transaction got cancelled by some reason. Most of time because bmapi_write failed and I start a guessing game trying to understand why.
So if xfs_iomap_write_direct fails and it causes the transaction to be cancelled, send the error to xfs_trans_cancel so the error gets logged into the kernel log buffer.
--- fs/xfs/xfs_iomap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/xfs/xfs_iomap.c +1 -1
@@ -358,7 +358,7 @@ xfs_iomap_write_direct(return error; out_trans_cancel: -xfs_trans_cancel (tp); +xfs_trans_cancel_error (tp, error); goto out_unlock; }
Signature · 1 line
2.55.0
Re: [PATCH v3 3/3] xfs: make xfs_iomap_write_direct() report an error to xfs_trans_cancel
Looks good: