bpf, sockmap: Fix the sk->sk_forward_alloc warning of sk_stream_kill_queues

[platform/kernel/linux-starfive.git] / net / ipv4 / tcp_bpf.c

diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c
index c501c32..cf9c3e8 100644 (file)
--- a/net/ipv4/tcp_bpf.c
+++ b/net/ipv4/tcp_bpf.c
@@ -278,7 +278,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock,
 {
        bool cork = false, enospc = sk_msg_full(msg);
        struct sock *sk_redir;
-       u32 tosend, delta = 0;
+       u32 tosend, origsize, sent, delta = 0;
        u32 eval = __SK_NONE;
        int ret;
 
@@ -333,10 +333,12 @@ more_data:
                        cork = true;
                        psock->cork = NULL;
                }
-               sk_msg_return(sk, msg, msg->sg.size);
+               sk_msg_return(sk, msg, tosend);
                release_sock(sk);
 
+               origsize = msg->sg.size;
                ret = tcp_bpf_sendmsg_redir(sk_redir, msg, tosend, flags);
+               sent = origsize - msg->sg.size;
 
                if (eval == __SK_REDIRECT)
                        sock_put(sk_redir);
@@ -375,7 +377,7 @@ more_data:
                    msg->sg.data[msg->sg.start].page_link &&
                    msg->sg.data[msg->sg.start].length) {
                        if (eval == __SK_REDIRECT)
-                               sk_mem_charge(sk, msg->sg.size);
+                               sk_mem_charge(sk, tosend - sent);
                        goto more_data;
                }
        }