2024-01-05 17:06:03

by David Howells

Subject: [PATCH] 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.

Reported-by: Marc Dionne <[email protected]>
Signed-off-by: David Howells <[email protected]>
cc: "David S. Miller" <[email protected]>
cc: Eric Dumazet <[email protected]>
cc: Jakub Kicinski <[email protected]>
cc: Paolo Abeni <[email protected]>
cc: [email protected]
cc: [email protected]
---
net/rxrpc/call_object.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c
index 773eecd1e979..f10b37c14772 100644
--- a/net/rxrpc/call_object.c
+++ b/net/rxrpc/call_object.c
@@ -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);
}

/*

2024-01-05 21:25:12

by David Howells

Subject: Re: [PATCH] rxrpc: Fix skbuff cleanup of call's recvmsg_queue and rx_oos_queue

David Howells <[email protected]> wrote:

> 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.
>
> Reported-by: Marc Dionne <[email protected]>
> Signed-off-by: David Howells <[email protected]>
> cc: "David S. Miller" <[email protected]>
> cc: Eric Dumazet <[email protected]>
> cc: Jakub Kicinski <[email protected]>
> cc: Paolo Abeni <[email protected]>
> cc: [email protected]
> cc: [email protected]

Fixes: 5d7edbc9231e ("rxrpc: Get rid of the Rx ring")

2024-01-07 15:30:53

by patchwork-bot+netdevbpf

Subject: Re: [PATCH] rxrpc: Fix skbuff cleanup of call's recvmsg_queue and rx_oos_queue

Hello:

This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:

On Fri, 05 Jan 2024 17:05:41 +0000 you wrote:
> 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.
>
> Reported-by: Marc Dionne <[email protected]>
> Signed-off-by: David Howells <[email protected]>
> cc: "David S. Miller" <[email protected]>
> cc: Eric Dumazet <[email protected]>
> cc: Jakub Kicinski <[email protected]>
> cc: Paolo Abeni <[email protected]>
> cc: [email protected]
> cc: [email protected]
>
> [...]

Here is the summary with links:
- rxrpc: Fix skbuff cleanup of call's recvmsg_queue and rx_oos_queue
https://git.kernel.org/netdev/net/c/4fc68c4c1a11

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html