Commit 4fc68c4c authored by David Howells's avatar David Howells Committed by David S. Miller
Browse files

rxrpc: Fix skbuff cleanup of call's recvmsg_queue and rx_oos_queue 



Fix rxrpc_cleanup_ring() to use rxrpc_purge_queue() rather than
skb_queue_purge() so that the count of outstanding skbuffs is correctly
updated when a failed call is cleaned up.

Without this rmmod may hang waiting for rxrpc_n_rx_skbs to become zero.

Fixes: 5d7edbc9 ("rxrpc: Get rid of the Rx ring")
Reported-by: default avatarMarc Dionne <marc.dionne@auristor.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: "David S. Miller" <davem@davemloft.net>
cc: Eric Dumazet <edumazet@google.com>
cc: Jakub Kicinski <kuba@kernel.org>
cc: Paolo Abeni <pabeni@redhat.com>
cc: linux-afs@lists.infradead.org
cc: netdev@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a460f4a6

net/rxrpc/call_object.c

+2 −2
Original line number Diff line number Diff line
@@ -545,8 +545,8 @@ void rxrpc_get_call(struct rxrpc_call *call, enum rxrpc_call_trace why) 
 */

static void rxrpc_cleanup_ring(struct rxrpc_call *call)

{

	skb_queue_purge(&call->recvmsg_queue);

	skb_queue_purge(&call->rx_oos_queue);

	rxrpc_purge_queue(&call->recvmsg_queue);

	rxrpc_purge_queue(&call->rx_oos_queue);

}



/*