]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mptcp: leverage skb deferral free
authorPaolo Abeni <pabeni@redhat.com>
Sat, 27 Sep 2025 09:40:37 +0000 (11:40 +0200)
committerJakub Kicinski <kuba@kernel.org>
Tue, 30 Sep 2025 01:23:34 +0000 (18:23 -0700)
Usage of the skb deferral API is straight-forward; with multiple
subflows actives this allow moving part of the received application
load into multiple CPUs.

Also fix a typo in the related comment.

Reviewed-by: Geliang Tang <geliang@kernel.org>
Tested-by: Geliang Tang <geliang@kernel.org>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250927-net-next-mptcp-rcv-path-imp-v1-1-5da266aa9c1a@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/mptcp/protocol.c

index 735a209d40725f077de1056de5e1c64ffec77f55..62cdd2bcff9da12783b97fd40813ede85b5c83d9 100644 (file)
@@ -1943,12 +1943,13 @@ static int __mptcp_recvmsg_mskq(struct sock *sk,
                }
 
                if (!(flags & MSG_PEEK)) {
-                       /* avoid the indirect call, we know the destructor is sock_wfree */
+                       /* avoid the indirect call, we know the destructor is sock_rfree */
                        skb->destructor = NULL;
+                       skb->sk = NULL;
                        atomic_sub(skb->truesize, &sk->sk_rmem_alloc);
                        sk_mem_uncharge(sk, skb->truesize);
                        __skb_unlink(skb, &sk->sk_receive_queue);
-                       __kfree_skb(skb);
+                       skb_attempt_defer_free(skb);
                        msk->bytes_consumed += count;
                }