public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rxrpc: trace: Don't use __builtin_return_address for rxrpc_peer tracing

Browse source 
In rxrpc tracing, use enums to generate lists of points of interest rather
than __builtin_return_address() for the rxrpc_peer tracepoint

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
This commit is contained in:
David Howells 2022-10-21 13:39:34 +01:00
parent 0fde882fc9
commit 47c810a798
10 changed files with 65 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
include/trace/events/rxrpc.h
View file

@ -63,10 +63,23 @@
E_(rxrpc_local_use_work, "USE work ") E_(rxrpc_local_use_work, "USE work ")
#define rxrpc_peer_traces \ #define rxrpc_peer_traces \
EM(rxrpc_peer_got, "GOT") \ EM(rxrpc_peer_free, "FREE ") \
EM(rxrpc_peer_new, "NEW") \ EM(rxrpc_peer_get_accept, "GET accept ") \
EM(rxrpc_peer_processing, "PRO") \ EM(rxrpc_peer_get_activate_call, "GET act-call") \
E_(rxrpc_peer_put, "PUT") EM(rxrpc_peer_get_bundle, "GET bundle ") \
EM(rxrpc_peer_get_client_conn, "GET cln-conn") \
EM(rxrpc_peer_get_input_error, "GET inpt-err") \
EM(rxrpc_peer_get_keepalive, "GET keepaliv") \
EM(rxrpc_peer_get_lookup_client, "GET look-cln") \
EM(rxrpc_peer_get_service_conn, "GET srv-conn") \
EM(rxrpc_peer_new_client, "NEW client ") \
EM(rxrpc_peer_new_prealloc, "NEW prealloc") \
EM(rxrpc_peer_put_bundle, "PUT bundle ") \
EM(rxrpc_peer_put_call, "PUT call ") \
EM(rxrpc_peer_put_conn, "PUT conn ") \
EM(rxrpc_peer_put_discard_tmp, "PUT disc-tmp") \
EM(rxrpc_peer_put_input_error, "PUT inpt-err") \
E_(rxrpc_peer_put_keepalive, "PUT keepaliv")
#define rxrpc_conn_traces \ #define rxrpc_conn_traces \
EM(rxrpc_conn_got, "GOT") \ EM(rxrpc_conn_got, "GOT") \
@ -394,30 +407,26 @@ TRACE_EVENT(rxrpc_local,
); );
TRACE_EVENT(rxrpc_peer, TRACE_EVENT(rxrpc_peer,
TP_PROTO(unsigned int peer_debug_id, enum rxrpc_peer_trace op, TP_PROTO(unsigned int peer_debug_id, int ref, enum rxrpc_peer_trace why),
int usage, const void *where),
TP_ARGS(peer_debug_id, op, usage, where), TP_ARGS(peer_debug_id, ref, why),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(unsigned int, peer ) __field(unsigned int, peer )
__field(int, op ) __field(int, ref )
__field(int, usage ) __field(int, why )
__field(const void *, where )
), ),
TP_fast_assign( TP_fast_assign(
__entry->peer = peer_debug_id; __entry->peer = peer_debug_id;
__entry->op = op; __entry->ref = ref;
__entry->usage = usage; __entry->why = why;
__entry->where = where;
), ),
TP_printk("P=%08x %s u=%d sp=%pSR", TP_printk("P=%08x %s r=%d",
__entry->peer, __entry->peer,
__print_symbolic(__entry->op, rxrpc_peer_traces), __print_symbolic(__entry->why, rxrpc_peer_traces),
__entry->usage, __entry->ref)
__entry->where)
); );
TRACE_EVENT(rxrpc_conn, TRACE_EVENT(rxrpc_conn,

2
net/rxrpc/af_rxrpc.c
View file

@ -328,7 +328,7 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock,
mutex_unlock(&call->user_mutex); mutex_unlock(&call->user_mutex);
} }
rxrpc_put_peer(cp.peer); rxrpc_put_peer(cp.peer, rxrpc_peer_put_discard_tmp);
_leave(" = %p", call); _leave(" = %p", call);
return call; return call;
} }

11
net/rxrpc/ar-internal.h
View file

@ -1063,14 +1063,15 @@ struct rxrpc_peer *rxrpc_lookup_peer_rcu(struct rxrpc_local *,
const struct sockaddr_rxrpc *); const struct sockaddr_rxrpc *);
struct rxrpc_peer *rxrpc_lookup_peer(struct rxrpc_sock *, struct rxrpc_local *, struct rxrpc_peer *rxrpc_lookup_peer(struct rxrpc_sock *, struct rxrpc_local *,
struct sockaddr_rxrpc *, gfp_t); struct sockaddr_rxrpc *, gfp_t);
struct rxrpc_peer *rxrpc_alloc_peer(struct rxrpc_local *, gfp_t); struct rxrpc_peer *rxrpc_alloc_peer(struct rxrpc_local *, gfp_t,
enum rxrpc_peer_trace);
void rxrpc_new_incoming_peer(struct rxrpc_sock *, struct rxrpc_local *, void rxrpc_new_incoming_peer(struct rxrpc_sock *, struct rxrpc_local *,
struct rxrpc_peer *); struct rxrpc_peer *);
void rxrpc_destroy_all_peers(struct rxrpc_net *); void rxrpc_destroy_all_peers(struct rxrpc_net *);
struct rxrpc_peer *rxrpc_get_peer(struct rxrpc_peer *); struct rxrpc_peer *rxrpc_get_peer(struct rxrpc_peer *, enum rxrpc_peer_trace);
struct rxrpc_peer *rxrpc_get_peer_maybe(struct rxrpc_peer *); struct rxrpc_peer *rxrpc_get_peer_maybe(struct rxrpc_peer *, enum rxrpc_peer_trace);
void rxrpc_put_peer(struct rxrpc_peer *); void rxrpc_put_peer(struct rxrpc_peer *, enum rxrpc_peer_trace);
void rxrpc_put_peer_locked(struct rxrpc_peer *); void rxrpc_put_peer_locked(struct rxrpc_peer *, enum rxrpc_peer_trace);
/* /*
* proc.c * proc.c

8
net/rxrpc/call_accept.c
View file

@ -70,7 +70,9 @@ static int rxrpc_service_prealloc_one(struct rxrpc_sock *rx,
head = b->peer_backlog_head; head = b->peer_backlog_head;
tail = READ_ONCE(b->peer_backlog_tail); tail = READ_ONCE(b->peer_backlog_tail);
if (CIRC_CNT(head, tail, size) < max) { if (CIRC_CNT(head, tail, size) < max) {
struct rxrpc_peer *peer = rxrpc_alloc_peer(rx->local, gfp); struct rxrpc_peer *peer;
peer = rxrpc_alloc_peer(rx->local, gfp, rxrpc_peer_new_prealloc);
if (!peer) if (!peer)
return -ENOMEM; return -ENOMEM;
b->peer_backlog[head] = peer; b->peer_backlog[head] = peer;
@ -286,7 +288,7 @@ static struct rxrpc_call *rxrpc_alloc_incoming_call(struct rxrpc_sock *rx,
return NULL; return NULL;
if (!conn) { if (!conn) {
if (peer && !rxrpc_get_peer_maybe(peer)) if (peer && !rxrpc_get_peer_maybe(peer, rxrpc_peer_get_service_conn))
peer = NULL; peer = NULL;
if (!peer) { if (!peer) {
peer = b->peer_backlog[peer_tail]; peer = b->peer_backlog[peer_tail];
@ -323,7 +325,7 @@ static struct rxrpc_call *rxrpc_alloc_incoming_call(struct rxrpc_sock *rx,
call->conn = conn; call->conn = conn;
call->security = conn->security; call->security = conn->security;
call->security_ix = conn->security_ix; call->security_ix = conn->security_ix;
call->peer = rxrpc_get_peer(conn->peer); call->peer = rxrpc_get_peer(conn->peer, rxrpc_peer_get_accept);
call->cong_ssthresh = call->peer->cong_ssthresh; call->cong_ssthresh = call->peer->cong_ssthresh;
call->tx_last_sent = ktime_get_real(); call->tx_last_sent = ktime_get_real();
return call; return call;

2
net/rxrpc/call_object.c
View file

@ -636,7 +636,7 @@ static void rxrpc_destroy_call(struct work_struct *work)
rxrpc_delete_call_timer(call); rxrpc_delete_call_timer(call);
rxrpc_put_connection(call->conn); rxrpc_put_connection(call->conn);
rxrpc_put_peer(call->peer); rxrpc_put_peer(call->peer, rxrpc_peer_put_call);
kmem_cache_free(rxrpc_call_jar, call); kmem_cache_free(rxrpc_call_jar, call);
if (atomic_dec_and_test(&rxnet->nr_calls)) if (atomic_dec_and_test(&rxnet->nr_calls))
wake_up_var(&rxnet->nr_calls); wake_up_var(&rxnet->nr_calls);

8
net/rxrpc/conn_client.c
View file

@ -123,7 +123,7 @@ static struct rxrpc_bundle *rxrpc_alloc_bundle(struct rxrpc_conn_parameters *cp,
bundle = kzalloc(sizeof(*bundle), gfp); bundle = kzalloc(sizeof(*bundle), gfp);
if (bundle) { if (bundle) {
bundle->local = cp->local; bundle->local = cp->local;
bundle->peer = rxrpc_get_peer(cp->peer); bundle->peer = rxrpc_get_peer(cp->peer, rxrpc_peer_get_bundle);
bundle->key = cp->key; bundle->key = cp->key;
bundle->exclusive = cp->exclusive; bundle->exclusive = cp->exclusive;
bundle->upgrade = cp->upgrade; bundle->upgrade = cp->upgrade;
@ -145,7 +145,7 @@ struct rxrpc_bundle *rxrpc_get_bundle(struct rxrpc_bundle *bundle)
static void rxrpc_free_bundle(struct rxrpc_bundle *bundle) static void rxrpc_free_bundle(struct rxrpc_bundle *bundle)
{ {
rxrpc_put_peer(bundle->peer); rxrpc_put_peer(bundle->peer, rxrpc_peer_put_bundle);
kfree(bundle); kfree(bundle);
} }
@ -207,7 +207,7 @@ rxrpc_alloc_client_connection(struct rxrpc_bundle *bundle, gfp_t gfp)
write_unlock(&rxnet->conn_lock); write_unlock(&rxnet->conn_lock);
rxrpc_get_bundle(bundle); rxrpc_get_bundle(bundle);
rxrpc_get_peer(conn->peer); rxrpc_get_peer(conn->peer, rxrpc_peer_get_client_conn);
rxrpc_get_local(conn->local, rxrpc_local_get_client_conn); rxrpc_get_local(conn->local, rxrpc_local_get_client_conn);
key_get(conn->key); key_get(conn->key);
@ -543,7 +543,7 @@ static void rxrpc_activate_one_channel(struct rxrpc_connection *conn,
rxrpc_see_call(call); rxrpc_see_call(call);
list_del_init(&call->chan_wait_link); list_del_init(&call->chan_wait_link);
call->peer = rxrpc_get_peer(conn->peer); call->peer = rxrpc_get_peer(conn->peer, rxrpc_peer_get_activate_call);
call->conn = rxrpc_get_connection(conn); call->conn = rxrpc_get_connection(conn);
call->cid = conn->proto.cid | channel; call->cid = conn->proto.cid | channel;
call->call_id = call_id; call->call_id = call_id;

2
net/rxrpc/conn_object.c
View file

@ -362,7 +362,7 @@ static void rxrpc_destroy_connection(struct rcu_head *rcu)
conn->security->clear(conn); conn->security->clear(conn);
key_put(conn->key); key_put(conn->key);
rxrpc_put_bundle(conn->bundle); rxrpc_put_bundle(conn->bundle);
rxrpc_put_peer(conn->peer); rxrpc_put_peer(conn->peer, rxrpc_peer_put_conn);
if (atomic_dec_and_test(&conn->local->rxnet->nr_conns)) if (atomic_dec_and_test(&conn->local->rxnet->nr_conns))
wake_up_var(&conn->local->rxnet->nr_conns); wake_up_var(&conn->local->rxnet->nr_conns);

8
net/rxrpc/peer_event.c
View file

@ -168,7 +168,7 @@ void rxrpc_error_report(struct sock *sk)
} }
peer = rxrpc_lookup_peer_local_rcu(local, skb, &srx); peer = rxrpc_lookup_peer_local_rcu(local, skb, &srx);
if (peer && !rxrpc_get_peer_maybe(peer)) if (peer && !rxrpc_get_peer_maybe(peer, rxrpc_peer_get_input_error))
peer = NULL; peer = NULL;
if (!peer) { if (!peer) {
rcu_read_unlock(); rcu_read_unlock();
@ -190,7 +190,7 @@ void rxrpc_error_report(struct sock *sk)
out: out:
rcu_read_unlock(); rcu_read_unlock();
rxrpc_free_skb(skb, rxrpc_skb_freed); rxrpc_free_skb(skb, rxrpc_skb_freed);
rxrpc_put_peer(peer); rxrpc_put_peer(peer, rxrpc_peer_put_input_error);
_leave(""); _leave("");
} }
@ -263,7 +263,7 @@ static void rxrpc_peer_keepalive_dispatch(struct rxrpc_net *rxnet,
struct rxrpc_peer, keepalive_link); struct rxrpc_peer, keepalive_link);
list_del_init(&peer->keepalive_link); list_del_init(&peer->keepalive_link);
if (!rxrpc_get_peer_maybe(peer)) if (!rxrpc_get_peer_maybe(peer, rxrpc_peer_get_keepalive))
continue; continue;
if (__rxrpc_use_local(peer->local, rxrpc_local_use_peer_keepalive)) { if (__rxrpc_use_local(peer->local, rxrpc_local_use_peer_keepalive)) {
@ -291,7 +291,7 @@ static void rxrpc_peer_keepalive_dispatch(struct rxrpc_net *rxnet,
&rxnet->peer_keepalive[slot & mask]); &rxnet->peer_keepalive[slot & mask]);
rxrpc_unuse_local(peer->local, rxrpc_local_unuse_peer_keepalive); rxrpc_unuse_local(peer->local, rxrpc_local_unuse_peer_keepalive);
} }
rxrpc_put_peer_locked(peer); rxrpc_put_peer_locked(peer, rxrpc_peer_put_keepalive);
} }
spin_unlock_bh(&rxnet->peer_hash_lock); spin_unlock_bh(&rxnet->peer_hash_lock);

34
net/rxrpc/peer_object.c
View file

@ -205,9 +205,9 @@ static void rxrpc_assess_MTU_size(struct rxrpc_sock *rx,
/* /*
* Allocate a peer. * Allocate a peer.
*/ */
struct rxrpc_peer *rxrpc_alloc_peer(struct rxrpc_local *local, gfp_t gfp) struct rxrpc_peer *rxrpc_alloc_peer(struct rxrpc_local *local, gfp_t gfp,
enum rxrpc_peer_trace why)
{ {
const void *here = __builtin_return_address(0);
struct rxrpc_peer *peer; struct rxrpc_peer *peer;
_enter(""); _enter("");
@ -226,7 +226,7 @@ struct rxrpc_peer *rxrpc_alloc_peer(struct rxrpc_local *local, gfp_t gfp)
rxrpc_peer_init_rtt(peer); rxrpc_peer_init_rtt(peer);
peer->cong_ssthresh = RXRPC_TX_MAX_WINDOW; peer->cong_ssthresh = RXRPC_TX_MAX_WINDOW;
trace_rxrpc_peer(peer->debug_id, rxrpc_peer_new, 1, here); trace_rxrpc_peer(peer->debug_id, why, 1);
} }
_leave(" = %p", peer); _leave(" = %p", peer);
@ -282,7 +282,7 @@ static struct rxrpc_peer *rxrpc_create_peer(struct rxrpc_sock *rx,
_enter(""); _enter("");
peer = rxrpc_alloc_peer(local, gfp); peer = rxrpc_alloc_peer(local, gfp, rxrpc_peer_new_client);
if (peer) { if (peer) {
memcpy(&peer->srx, srx, sizeof(*srx)); memcpy(&peer->srx, srx, sizeof(*srx));
rxrpc_init_peer(rx, peer, hash_key); rxrpc_init_peer(rx, peer, hash_key);
@ -294,6 +294,7 @@ static struct rxrpc_peer *rxrpc_create_peer(struct rxrpc_sock *rx,
static void rxrpc_free_peer(struct rxrpc_peer *peer) static void rxrpc_free_peer(struct rxrpc_peer *peer)
{ {
trace_rxrpc_peer(peer->debug_id, 0, rxrpc_peer_free);
rxrpc_put_local(peer->local, rxrpc_local_put_peer); rxrpc_put_local(peer->local, rxrpc_local_put_peer);
kfree_rcu(peer, rcu); kfree_rcu(peer, rcu);
} }
@ -334,7 +335,7 @@ struct rxrpc_peer *rxrpc_lookup_peer(struct rxrpc_sock *rx,
/* search the peer list first */ /* search the peer list first */
rcu_read_lock(); rcu_read_lock();
peer = __rxrpc_lookup_peer_rcu(local, srx, hash_key); peer = __rxrpc_lookup_peer_rcu(local, srx, hash_key);
if (peer && !rxrpc_get_peer_maybe(peer)) if (peer && !rxrpc_get_peer_maybe(peer, rxrpc_peer_get_lookup_client))
peer = NULL; peer = NULL;
rcu_read_unlock(); rcu_read_unlock();
@ -352,7 +353,7 @@ struct rxrpc_peer *rxrpc_lookup_peer(struct rxrpc_sock *rx,
/* Need to check that we aren't racing with someone else */ /* Need to check that we aren't racing with someone else */
peer = __rxrpc_lookup_peer_rcu(local, srx, hash_key); peer = __rxrpc_lookup_peer_rcu(local, srx, hash_key);
if (peer && !rxrpc_get_peer_maybe(peer)) if (peer && !rxrpc_get_peer_maybe(peer, rxrpc_peer_get_lookup_client))
peer = NULL; peer = NULL;
if (!peer) { if (!peer) {
hash_add_rcu(rxnet->peer_hash, hash_add_rcu(rxnet->peer_hash,
@ -376,27 +377,26 @@ struct rxrpc_peer *rxrpc_lookup_peer(struct rxrpc_sock *rx,
/* /*
* Get a ref on a peer record. * Get a ref on a peer record.
*/ */
struct rxrpc_peer *rxrpc_get_peer(struct rxrpc_peer *peer) struct rxrpc_peer *rxrpc_get_peer(struct rxrpc_peer *peer, enum rxrpc_peer_trace why)
{ {
const void *here = __builtin_return_address(0);
int r; int r;
__refcount_inc(&peer->ref, &r); __refcount_inc(&peer->ref, &r);
trace_rxrpc_peer(peer->debug_id, rxrpc_peer_got, r + 1, here); trace_rxrpc_peer(peer->debug_id, why, r + 1);
return peer; return peer;
} }
/* /*
* Get a ref on a peer record unless its usage has already reached 0. * Get a ref on a peer record unless its usage has already reached 0.
*/ */
struct rxrpc_peer *rxrpc_get_peer_maybe(struct rxrpc_peer *peer) struct rxrpc_peer *rxrpc_get_peer_maybe(struct rxrpc_peer *peer,
enum rxrpc_peer_trace why)
{ {
const void *here = __builtin_return_address(0);
int r; int r;
if (peer) { if (peer) {
if (__refcount_inc_not_zero(&peer->ref, &r)) if (__refcount_inc_not_zero(&peer->ref, &r))
trace_rxrpc_peer(peer->debug_id, rxrpc_peer_got, r + 1, here); trace_rxrpc_peer(peer->debug_id, r + 1, why);
else else
peer = NULL; peer = NULL;
} }
@ -423,9 +423,8 @@ static void __rxrpc_put_peer(struct rxrpc_peer *peer)
/* /*
* Drop a ref on a peer record. * Drop a ref on a peer record.
*/ */
void rxrpc_put_peer(struct rxrpc_peer *peer) void rxrpc_put_peer(struct rxrpc_peer *peer, enum rxrpc_peer_trace why)
{ {
const void *here = __builtin_return_address(0);
unsigned int debug_id; unsigned int debug_id;
bool dead; bool dead;
int r; int r;
@ -433,7 +432,7 @@ void rxrpc_put_peer(struct rxrpc_peer *peer)
if (peer) { if (peer) {
debug_id = peer->debug_id; debug_id = peer->debug_id;
dead = __refcount_dec_and_test(&peer->ref, &r); dead = __refcount_dec_and_test(&peer->ref, &r);
trace_rxrpc_peer(debug_id, rxrpc_peer_put, r - 1, here); trace_rxrpc_peer(debug_id, r - 1, why);
if (dead) if (dead)
__rxrpc_put_peer(peer); __rxrpc_put_peer(peer);
} }
@ -443,15 +442,14 @@ void rxrpc_put_peer(struct rxrpc_peer *peer)
* Drop a ref on a peer record where the caller already holds the * Drop a ref on a peer record where the caller already holds the
* peer_hash_lock. * peer_hash_lock.
*/ */
void rxrpc_put_peer_locked(struct rxrpc_peer *peer) void rxrpc_put_peer_locked(struct rxrpc_peer *peer, enum rxrpc_peer_trace why)
{ {
const void *here = __builtin_return_address(0);
unsigned int debug_id = peer->debug_id; unsigned int debug_id = peer->debug_id;
bool dead; bool dead;
int r; int r;
dead = __refcount_dec_and_test(&peer->ref, &r); dead = __refcount_dec_and_test(&peer->ref, &r);
trace_rxrpc_peer(debug_id, rxrpc_peer_put, r - 1, here); trace_rxrpc_peer(debug_id, r - 1, why);
if (dead) { if (dead) {
hash_del_rcu(&peer->hash_link); hash_del_rcu(&peer->hash_link);
list_del_init(&peer->keepalive_link); list_del_init(&peer->keepalive_link);

2
net/rxrpc/sendmsg.c
View file

@ -604,7 +604,7 @@ rxrpc_new_client_call_for_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg,
atomic_inc_return(&rxrpc_debug_id)); atomic_inc_return(&rxrpc_debug_id));
/* The socket is now unlocked */ /* The socket is now unlocked */
rxrpc_put_peer(cp.peer); rxrpc_put_peer(cp.peer, rxrpc_peer_put_discard_tmp);
_leave(" = %p\n", call); _leave(" = %p\n", call);
return call; return call;
} }