Commit 38a4614
committed
rxrpc: Tidy up abort generation infrastructure
jira LE-1907
Rebuild_History Non-Buildable kernel-rt-5.14.0-284.30.1.rt14.315.el9_2
commit-author David Howells <dhowells@redhat.com>
commit 57af281
Empty-Commit: Cherry-Pick Conflicts during history rebuild.
Will be included in final tarball splat. Ref for failed cherry-pick at:
ciq/ciq_backports/kernel-rt-5.14.0-284.30.1.rt14.315.el9_2/57af281e.failed
Tidy up the abort generation infrastructure in the following ways:
(1) Create an enum and string mapping table to list the reasons an abort
might be generated in tracing.
(2) Replace the 3-char string with the values from (1) in the places that
use that to log the abort source. This gets rid of a memcpy() in the
tracepoint.
(3) Subsume the rxrpc_rx_eproto tracepoint with the rxrpc_abort tracepoint
and use values from (1) to indicate the trace reason.
(4) Always make a call to an abort function at the point of the abort
rather than stashing the values into variables and using goto to get
to a place where it reported. The C optimiser will collapse the calls
together as appropriate. The abort functions return a value that can
be returned directly if appropriate.
Note that this extends into afs also at the points where that generates an
abort. To aid with this, the afs sources need to #define
RXRPC_TRACE_ONLY_DEFINE_ENUMS before including the rxrpc tracing header
because they don't have access to the rxrpc internal structures that some
of the tracepoints make use of.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
(cherry picked from commit 57af281)
Signed-off-by: Jonathan Maple <jmaple@ciq.com>
# Conflicts:
# include/trace/events/rxrpc.h
# net/rxrpc/ar-internal.h
# net/rxrpc/call_accept.c
# net/rxrpc/call_event.c
# net/rxrpc/call_object.c
# net/rxrpc/conn_event.c
# net/rxrpc/input.c
# net/rxrpc/insecure.c
# net/rxrpc/io_thread.c
# net/rxrpc/recvmsg.c
# net/rxrpc/rxkad.c
# net/rxrpc/sendmsg.c1 parent daff779 commit 38a4614
File tree
1 file changed
+1894
-0
lines changed- ciq/ciq_backports/kernel-rt-5.14.0-284.30.1.rt14.315.el9_2
1 file changed
+1894
-0
lines changed
0 commit comments