From: wangyufen <wangyufen@huawei.com>
To: Cong Wang <xiyou.wangcong@gmail.com>
Cc: <john.fastabend@gmail.com>, <daniel@iogearbox.net>,
<jakub@cloudflare.com>, <lmb@cloudflare.com>,
<davem@davemloft.net>, <edumazet@google.com>,
<yoshfuji@linux-ipv6.org>, <dsahern@kernel.org>,
<kuba@kernel.org>, <ast@kernel.org>, <andrii@kernel.org>,
<kafai@fb.com>, <songliubraving@fb.com>, <yhs@fb.com>,
<kpsingh@kernel.org>, <netdev@vger.kernel.org>,
<bpf@vger.kernel.org>
Subject: Re: [PATCH bpf-next v2 1/4] bpf, sockmap: Fix memleak in sk_psock_queue_msg
Date: Fri, 4 Mar 2022 14:45:58 +0800 [thread overview]
Message-ID: <2ebeeba1-f06d-9ebf-b59c-b0289ad89885@huawei.com> (raw)
In-Reply-To: <YiAOxRWZBHWDTpAs@pop-os.localdomain>
在 2022/3/3 8:41, Cong Wang 写道:
> On Wed, Mar 02, 2022 at 10:27:52AM +0800, Wang Yufen wrote:
>> diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h
>> index fdb5375f0562..c5a2d6f50f25 100644
>> --- a/include/linux/skmsg.h
>> +++ b/include/linux/skmsg.h
>> @@ -304,21 +304,16 @@ static inline void sock_drop(struct sock *sk, struct sk_buff *skb)
>> kfree_skb(skb);
>> }
>>
>> -static inline void drop_sk_msg(struct sk_psock *psock, struct sk_msg *msg)
>> -{
>> - if (msg->skb)
>> - sock_drop(psock->sk, msg->skb);
>> - kfree(msg);
>> -}
>> -
>> static inline void sk_psock_queue_msg(struct sk_psock *psock,
>> struct sk_msg *msg)
>> {
>> spin_lock_bh(&psock->ingress_lock);
>> if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED))
>> list_add_tail(&msg->list, &psock->ingress_msg);
>> - else
>> - drop_sk_msg(psock, msg);
>> + else {
>> + sk_msg_free(psock->sk, msg);
> __sk_msg_free() calls sk_msg_init() at the end.
>
>> + kfree(msg);
> Now you free it, hence the above sk_msg_init() is completely
> unnecessary.
Invoking of sk_msg_free() does not always follow kfree().
That is, sk_msg needs to be reused in some cases.
We can implement sk_msg_free_xx() without sk_msg_init(),
but I don't think it is necessary.
Thanks
>
> Thanks.
> .
next prev parent reply other threads:[~2022-03-04 6:46 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-02 2:27 [PATCH bpf-next v2 0/4] bpf, sockmap: Fix memleaks and issues of mem charge/uncharge Wang Yufen
2022-03-02 2:27 ` [PATCH bpf-next v2 1/4] bpf, sockmap: Fix memleak in sk_psock_queue_msg Wang Yufen
2022-03-03 0:41 ` Cong Wang
2022-03-04 6:45 ` wangyufen [this message]
2022-03-02 2:27 ` [PATCH bpf-next v2 2/4] bpf, sockmap: Fix memleak in tcp_bpf_sendmsg while sk msg is full Wang Yufen
2022-03-03 0:48 ` Cong Wang
2022-03-04 6:51 ` wangyufen
2022-03-02 2:27 ` [PATCH bpf-next v2 3/4] bpf, sockmap: Fix more uncharged while msg has more_data Wang Yufen
2022-03-03 6:14 ` Cong Wang
2022-03-04 7:08 ` wangyufen
2022-03-02 2:27 ` [PATCH bpf-next v2 4/4] bpf, sockmap: Fix double uncharge the mem of sk_msg Wang Yufen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2ebeeba1-f06d-9ebf-b59c-b0289ad89885@huawei.com \
--to=wangyufen@huawei.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=jakub@cloudflare.com \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=lmb@cloudflare.com \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=xiyou.wangcong@gmail.com \
--cc=yhs@fb.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox