[PATCH net 0/5] rxrpc: Fix use of skb_cow_data()
From: David Howells
Date: Thu Aug 29 2019 - 09:06:16 EST
Here's a series of patches that replaces the use of skb_cow_data() in rxrpc
with skb_unshare() early on in the input process. The problem that is
being seen is that skb_cow_data() indirectly requires that the maximum
usage count on an sk_buff be 1, and it may generate an assertion failure in
pskb_expand_head() if not.
This can occur because rxrpc_input_data() may be still holding a ref when
it has just attached the sk_buff to the rx ring and given that attachment
its own ref. If recvmsg happens fast enough, skb_cow_data() can see the
ref still held by the softirq handler.
Further, a packet may contain multiple subpackets, each of which gets its
own attachment to the ring and its own ref - also making skb_cow_data() go
Fix this by:
(1) The DATA packet is currently parsed for subpackets twice by the input
routines. Parse it just once instead and make notes in the sk_buff
(2) Use the notes from (1) when attaching the packet to the ring multiple
times. Once the packet is attached to the ring, recvmsg can see it
and start modifying it, so the softirq handler is not permitted to
look inside it from that point.
(3) Pass the ref from the input code to the ring rather than getting an
extra ref. rxrpc_input_data() uses a ref on the second refcount to
prevent the packet from evaporating under it.
(4) Call skb_unshare() on secured DATA packets in rxrpc_input_packet()
before we take call->input_lock. Other sorts of packets don't get
modified and so can be left.
A trace is emitted if skb_unshare() eats the skb. Note that
skb_share() for our accounting in this regard as we can't see the
parameters in the packet to log in a trace line if it releases it.
(5) Remove the calls to skb_cow_data(). These are then no longer
There are also patches to improve the rxrpc_skb tracepoint to make sure
that Tx-derived buffers are identified separately from Rx-derived buffers
in the trace.
The patches are tagged here:
and can also be found on the following branch:
David Howells (5):
rxrpc: Pass the input handler's data skb reference to the Rx ring
rxrpc: Abstract out rxtx ring cleanup
rxrpc: Add a private skb flag to indicate transmission-phase skbs
rxrpc: Use the tx-phase skb flag to simplify tracing
rxrpc: Use skb_unshare() rather than skb_cow_data()
include/trace/events/rxrpc.h | 59 ++++++++++++++++++++----------------------
net/rxrpc/ar-internal.h | 3 ++
net/rxrpc/call_event.c | 8 +++---
net/rxrpc/call_object.c | 33 +++++++++++------------
net/rxrpc/conn_event.c | 6 ++--
net/rxrpc/input.c | 52 ++++++++++++++++++++++++++++---------
net/rxrpc/local_event.c | 4 +--
net/rxrpc/output.c | 6 ++--
net/rxrpc/peer_event.c | 10 ++++---
net/rxrpc/recvmsg.c | 6 ++--
net/rxrpc/rxkad.c | 32 ++++++-----------------
net/rxrpc/sendmsg.c | 13 +++++----
net/rxrpc/skbuff.c | 40 ++++++++++++++++++++--------
13 files changed, 151 insertions(+), 121 deletions(-)