rxrpc: Remove the flags from the rxrpc_skb tracepoint
Remove the flags from the rxrpc_skb tracepoint as we're no longer going to be using this for the transmission buffers and so marking which are transmission buffers isn't going to be necessary. Note that this also remove the rxrpc skb flag that indicates if this is a transmission buffer and so the count is not updated for the moment. 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:
+7
-13
@@ -14,8 +14,7 @@
|
||||
#include <net/af_rxrpc.h>
|
||||
#include "ar-internal.h"
|
||||
|
||||
#define is_tx_skb(skb) (rxrpc_skb(skb)->rx_flags & RXRPC_SKB_TX_BUFFER)
|
||||
#define select_skb_count(skb) (is_tx_skb(skb) ? &rxrpc_n_tx_skbs : &rxrpc_n_rx_skbs)
|
||||
#define select_skb_count(skb) (&rxrpc_n_rx_skbs)
|
||||
|
||||
/*
|
||||
* Note the allocation or reception of a socket buffer.
|
||||
@@ -24,8 +23,7 @@ void rxrpc_new_skb(struct sk_buff *skb, enum rxrpc_skb_trace op)
|
||||
{
|
||||
const void *here = __builtin_return_address(0);
|
||||
int n = atomic_inc_return(select_skb_count(skb));
|
||||
trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n,
|
||||
rxrpc_skb(skb)->rx_flags, here);
|
||||
trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n, here);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -36,8 +34,7 @@ void rxrpc_see_skb(struct sk_buff *skb, enum rxrpc_skb_trace op)
|
||||
const void *here = __builtin_return_address(0);
|
||||
if (skb) {
|
||||
int n = atomic_read(select_skb_count(skb));
|
||||
trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n,
|
||||
rxrpc_skb(skb)->rx_flags, here);
|
||||
trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n, here);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,8 +45,7 @@ void rxrpc_get_skb(struct sk_buff *skb, enum rxrpc_skb_trace op)
|
||||
{
|
||||
const void *here = __builtin_return_address(0);
|
||||
int n = atomic_inc_return(select_skb_count(skb));
|
||||
trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n,
|
||||
rxrpc_skb(skb)->rx_flags, here);
|
||||
trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n, here);
|
||||
skb_get(skb);
|
||||
}
|
||||
|
||||
@@ -60,7 +56,7 @@ void rxrpc_eaten_skb(struct sk_buff *skb, enum rxrpc_skb_trace op)
|
||||
{
|
||||
const void *here = __builtin_return_address(0);
|
||||
int n = atomic_inc_return(&rxrpc_n_rx_skbs);
|
||||
trace_rxrpc_skb(skb, op, 0, n, 0, here);
|
||||
trace_rxrpc_skb(skb, op, 0, n, here);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -72,8 +68,7 @@ void rxrpc_free_skb(struct sk_buff *skb, enum rxrpc_skb_trace op)
|
||||
if (skb) {
|
||||
int n;
|
||||
n = atomic_dec_return(select_skb_count(skb));
|
||||
trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n,
|
||||
rxrpc_skb(skb)->rx_flags, here);
|
||||
trace_rxrpc_skb(skb, op, refcount_read(&skb->users), n, here);
|
||||
kfree_skb(skb);
|
||||
}
|
||||
}
|
||||
@@ -88,8 +83,7 @@ void rxrpc_purge_queue(struct sk_buff_head *list)
|
||||
while ((skb = skb_dequeue((list))) != NULL) {
|
||||
int n = atomic_dec_return(select_skb_count(skb));
|
||||
trace_rxrpc_skb(skb, rxrpc_skb_purged,
|
||||
refcount_read(&skb->users), n,
|
||||
rxrpc_skb(skb)->rx_flags, here);
|
||||
refcount_read(&skb->users), n, here);
|
||||
kfree_skb(skb);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user