afs: Fix error handling with lookup via FS.InlineBulkStatus
Subsystems (3)
David Howells
maintainerPATCH 1/1 afs: Fix error handling with lookup via FS.InlineBulkStatus
When afs does a lookup, it tries to use FS.InlineBulkStatus to preemptively look up a bunch of files in the parent directory and cache this locally, on the basis that we might want to look at them too (for example if someone does an ls on a directory, they may want want to then stat every file listed).
FS.InlineBulkStatus can be considered a compound op with the normal abort code applying to the compound as a whole. Each status fetch within the compound is then given its own individual abort code - but assuming no error that prevents the bulk fetch from returning the compound result will be 0, even if all the constituent status fetches failed.
At the conclusion of afs_do_lookup(), we should use the abort code from the appropriate status to determine the error to return, if any - but instead it is assumed that we were successful if the op as a whole succeeded and we return an incompletely initialised inode, resulting in ENOENT, no matter the actual reason. In the particular instance reported, a vnode with no permission granted to be accessed is being given a UAEACCES abort code which should be reported as EACCES, but is instead being reported as ENOENT.
Fix this by abandoning the inode (which will be cleaned up with the op) if file[1] has an abort code indicated and turn that abort code into an error instead.
Whilst we're at it, add a tracepoint so that the abort codes of the individual subrequests of FS.InlineBulkStatus can be logged. At the moment only the container abort code can be 0.
--- fs/afs/dir.c | 12 +++++++++--- include/trace/events/afs.h | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-)
fs/afs/dir.c +9 -3
@@ -708,6 +708,8 @@ static void afs_do_lookup_success(struct afs_operation *op)break ; } +if (vp->scb.status.abort_code) +trace_afs_bulkstat_error (op, &vp->fid, i, vp->scb.status.abort_code);if (!vp->scb.have_status && !vp->scb.have_error)continue ;
@@ -897,12 +899,16 @@ static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry,afs_begin_vnode_operation (op);afs_wait_for_operation (op); } - inode =ERR_PTR (afs_op_error (op)); out_op:if (!afs_op_error (op)) { - inode = &op->file[1 ].vnode->netfs.inode; - op->file[1 ].vnode =NULL ; +if (op->file[1 ].scb.status.abort_code) { +afs_op_accumulate_error (op, -ECONNABORTED , + op->file[1 ].scb.status.abort_code); + }else { + inode = &op->file[1 ].vnode->netfs.inode; + op->file[1 ].vnode =NULL ; + } }if (op->file[0 ].scb.have_status)
include/trace/events/afs.h +25 -0
@@ -1102,6 +1102,31 @@ TRACE_EVENT(afs_file_error, __print_symbolic(__entry->where, afs_file_errors)) ); +TRACE_EVENT (afs_bulkstat_error, + TP_PROTO(struct afs_operation *op, struct afs_fid *fid, unsigned int index, s32 abort), + +TP_ARGS (op, fid, index, abort), + +TP_STRUCT__entry ( + __field_struct(struct afs_fid, fid) + __field(unsigned int, op) + __field(unsigned int, index) +__field (s32, abort) + ), + +TP_fast_assign ( + __entry->op = op->debug_id; + __entry->fid = *fid; + __entry->index = index; + __entry->abort = abort; + ), + +TP_printk ("OP=%08x[%02x] %llx:%llx:%x a=%d" , + __entry->op, __entry->index, + __entry->fid.vid, __entry->fid.vnode, __entry->fid.unique, + __entry->abort) + ); + TRACE_EVENT(afs_cm_no_server, TP_PROTO(struct afs_call *call, struct sockaddr_rxrpc *srx),
Quoted 98 lines · David Howells
When afs does a lookup, it tries to use FS.InlineBulkStatus to preemptively look up a bunch of files in the parent directory and cache this locally, on the basis that we might want to look at them too (for example if someone does an ls on a directory, they may want want to then stat every file listed).
FS.InlineBulkStatus can be considered a compound op with the normal abort code applying to the compound as a whole. Each status fetch within the compound is then given its own individual abort code - but assuming no error that prevents the bulk fetch from returning the compound result will be 0, even if all the constituent status fetches failed.
At the conclusion of
afs_do_lookup(), we should use the abort code from the appropriate status to determine the error to return, if any - but instead it is assumed that we were successful if the op as a whole succeeded and we return an incompletely initialised inode, resulting in ENOENT, no matter the actual reason. In the particular instance reported, a vnode with no permission granted to be accessed is being given a UAEACCES abort code which should be reported as EACCES, but is instead being reported as ENOENT.Fix this by abandoning the inode (which will be cleaned up with the op) if file[1] has an abort code indicated and turn that abort code into an error instead.
Whilst we're at it, add a tracepoint so that the abort codes of the individual subrequests of FS.InlineBulkStatus can be logged. At the moment only the container abort code can be 0.
Fixes e49c7b2f6de7 ("afs: Build an abstraction around an "operation" concept")Reported-by Jeffrey Altman <[email protected]>Signed-off-by David Howells <[email protected]>cc Marc Dionne <[email protected]>--- fs/afs/dir.c | 12 +++++++++--- include/trace/events/afs.h | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-)fs/afs/dir.c +9
-3@@ -708,6 +708,8 @@ static void afs_do_lookup_success(struct afs_operation *op)break ; } +if (vp->scb.status.abort_code) +trace_afs_bulkstat_error (op, &vp->fid, i, vp->scb.status.abort_code);if (!vp->scb.have_status && !vp->scb.have_error)continue ;@@ -897,12 +899,16 @@ static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry,afs_begin_vnode_operation (op);afs_wait_for_operation (op); } - inode =ERR_PTR (afs_op_error (op)); out_op:if (!afs_op_error (op)) { - inode = &op->file[1 ].vnode->netfs.inode; - op->file[1 ].vnode =NULL ; +if (op->file[1 ].scb.status.abort_code) { +afs_op_accumulate_error (op, -ECONNABORTED , + op->file[1 ].scb.status.abort_code); + }else { + inode = &op->file[1 ].vnode->netfs.inode; + op->file[1 ].vnode =NULL ; + } }if (op->file[0 ].scb.have_status)include/trace/events/afs.h +17
-0@@ -1102,6 +1102,31 @@ TRACE_EVENT(afs_file_error, __print_symbolic(__entry->where, afs_file_errors)) ); +TRACE_EVENT(afs_bulkstat_error, + TP_PROTO(struct afs_operation *op, struct afs_fid *fid, unsigned int index, s32 abort), + + TP_ARGS(op, fid, index, abort), + + TP_STRUCT__entry( + __field_struct(struct afs_fid, fid) + __field(unsigned int, op) + __field(unsigned int, index) + __field(s32, abort) + ), + + TP_fast_assign( + __entry->op = op->debug_id; + __entry->fid = *fid; + __entry->index = index; + __entry->abort = abort;
include/trace/events/afs.h TRACE_EVENT(afs_file_error, · line 1131
Quoted 10 lines
include/trace/events/afs.h +8
-0+ ), + +TP_printk ("OP=%08x[%02x] %llx:%llx:%x a=%d" , + __entry->op, __entry->index, + __entry->fid.vid, __entry->fid.vnode, __entry->fid.unique, + __entry->abort) + ); + TRACE_EVENT(afs_cm_no_server, TP_PROTO(struct afs_call *call, struct sockaddr_rxrpc *srx),
Marc
David Howells
maintainerHere's a version of the patch against v6.7-rc7 rather than my afs-fix-rotation branch.
---
afs: Fix error handling with lookup via FS.InlineBulkStatus
When afs does a lookup, it tries to use FS.InlineBulkStatus to preemptively look up a bunch of files in the parent directory and cache this locally, on the basis that we might want to look at them too (for example if someone does an ls on a directory, they may want want to then stat every file listed).
FS.InlineBulkStatus can be considered a compound op with the normal abort code applying to the compound as a whole. Each status fetch within the compound is then given its own individual abort code - but assuming no error that prevents the bulk fetch from returning the compound result will be 0, even if all the constituent status fetches failed.
At the conclusion of afs_do_lookup(), we should use the abort code from the appropriate status to determine the error to return, if any - but instead it is assumed that we were successful if the op as a whole succeeded and we return an incompletely initialised inode, resulting in ENOENT, no matter the actual reason. In the particular instance reported, a vnode with no permission granted to be accessed is being given a UAEACCES abort code which should be reported as EACCES, but is instead being reported as ENOENT.
Fix this by abandoning the inode (which will be cleaned up with the op) if file[1] has an abort code indicated and turn that abort code into an error instead.
Whilst we're at it, add a tracepoint so that the abort codes of the individual subrequests of FS.InlineBulkStatus can be logged. At the moment only the container abort code can be 0.
--- fs/afs/dir.c | 11 ++++++++--- include/trace/events/afs.h | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-)
fs/afs/dir.c +8 -3
@@ -707,6 +707,8 @@ static void afs_do_lookup_success(struct afs_operation *op)break ; } +if (vp->scb.status.abort_code) +trace_afs_bulkstat_error (op, &vp->fid, i, vp->scb.status.abort_code);if (!vp->scb.have_status && !vp->scb.have_error)continue ;
@@ -895,12 +897,15 @@ static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry,afs_begin_vnode_operation (op);afs_wait_for_operation (op); } - inode =ERR_PTR (op->error); out_op:if (op->error ==0 ) { - inode = &op->file[1 ].vnode->netfs.inode; - op->file[1 ].vnode =NULL ; +if (op->file[1 ].scb.status.abort_code) { + op->error =afs_abort_to_error (op->file[1 ].scb.status.abort_code); + }else { + inode = &op->file[1 ].vnode->netfs.inode; + op->file[1 ].vnode =NULL ; + } }if (op->file[0 ].scb.have_status)
include/trace/events/afs.h +25 -0
@@ -1216,6 +1216,31 @@ TRACE_EVENT(afs_file_error, __print_symbolic(__entry->where, afs_file_errors)) ); +TRACE_EVENT (afs_bulkstat_error, + TP_PROTO(struct afs_operation *op, struct afs_fid *fid, unsigned int index, s32 abort), + +TP_ARGS (op, fid, index, abort), + +TP_STRUCT__entry ( + __field_struct(struct afs_fid, fid) + __field(unsigned int, op) + __field(unsigned int, index) +__field (s32, abort) + ), + +TP_fast_assign ( + __entry->op = op->debug_id; + __entry->fid = *fid; + __entry->index = index; + __entry->abort = abort; + ), + +TP_printk ("OP=%08x[%02x] %llx:%llx:%x a=%d" , + __entry->op, __entry->index, + __entry->fid.vid, __entry->fid.vnode, __entry->fid.unique, + __entry->abort) + ); + TRACE_EVENT(afs_cm_no_server, TP_PROTO(struct afs_call *call, struct sockaddr_rxrpc *srx),