diff mbox series

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

Message ID 1366725.1704474341@warthog.procyon.org.uk
State New
Headers
Series rxrpc: Fix skbuff cleanup of call's recvmsg_queue and rx_oos_queue |

Commit Message

David Howells Jan. 5, 2024, 5:05 p.m. UTC 
  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 <marc.dionne@auristor.com>
Signed-off-by: David 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
---
 net/rxrpc/call_object.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

David Howells Jan. 5, 2024, 9:24 p.m. UTC | #1 
David Howells <dhowells@redhat.com> 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 <marc.dionne@auristor.com>
> Signed-off-by: David 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

Fixes: 5d7edbc9231e ("rxrpc: Get rid of the Rx ring")
patchwork-bot+netdevbpf@kernel.org Jan. 7, 2024, 3:30 p.m. UTC | #2 
Hello:

This patch was applied to netdev/net.git (main)
by David S. Miller <davem@davemloft.net>:

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 <marc.dionne@auristor.com>
> Signed-off-by: David 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
> 
> [...]

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!
diff mbox series

Patch

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);
 }
 
 /*