From: Julian Anastasov <ja@ssi.bg>
To: guodeqing <geffrey.guo@huawei.com>
Cc: wensong@linux-vs.org, horms@verge.net.au, pablo@netfilter.org,
kadlec@netfilter.org, fw@strlen.de, davem@davemloft.net,
kuba@kernel.org, netdev@vger.kernel.org,
lvs-devel@vger.kernel.org, netfilter-devel@vger.kernel.org
Subject: Re: [PATCH,v2] ipvs: fix the connection sync failed in some cases
Date: Sun, 19 Jul 2020 09:08:39 +0300 (EEST) [thread overview]
Message-ID: <alpine.LFD.2.23.451.2007190837120.3463@ja.home.ssi.bg> (raw)
In-Reply-To: <1594887128-7453-1-git-send-email-geffrey.guo@huawei.com>
Hello,
On Thu, 16 Jul 2020, guodeqing wrote:
> The sync_thread_backup only checks sk_receive_queue is empty or not,
> there is a situation which cannot sync the connection entries when
> sk_receive_queue is empty and sk_rmem_alloc is larger than sk_rcvbuf,
> the sync packets are dropped in __udp_enqueue_schedule_skb, this is
> because the packets in reader_queue is not read, so the rmem is
> not reclaimed.
>
> Here I add the check of whether the reader_queue of the udp sock is
> empty or not to solve this problem.
>
> Fixes: 2276f58ac589 ("udp: use a separate rx queue for packet reception")
> Reported-by: zhouxudong <zhouxudong8@huawei.com>
> Signed-off-by: guodeqing <geffrey.guo@huawei.com>
Looks good to me, thanks!
Acked-by: Julian Anastasov <ja@ssi.bg>
Simon, Pablo, this patch should be applied to the nf tree.
As the reader_queue appears in 4.13, this patch can be backported
to 4.14, 4.19, 5.4, etc, they all have skb_queue_empty_lockless.
> ---
> net/netfilter/ipvs/ip_vs_sync.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
> index 605e0f6..2b8abbf 100644
> --- a/net/netfilter/ipvs/ip_vs_sync.c
> +++ b/net/netfilter/ipvs/ip_vs_sync.c
> @@ -1717,6 +1717,8 @@ static int sync_thread_backup(void *data)
> {
> struct ip_vs_sync_thread_data *tinfo = data;
> struct netns_ipvs *ipvs = tinfo->ipvs;
> + struct sock *sk = tinfo->sock->sk;
> + struct udp_sock *up = udp_sk(sk);
> int len;
>
> pr_info("sync thread started: state = BACKUP, mcast_ifn = %s, "
> @@ -1724,12 +1726,14 @@ static int sync_thread_backup(void *data)
> ipvs->bcfg.mcast_ifn, ipvs->bcfg.syncid, tinfo->id);
>
> while (!kthread_should_stop()) {
> - wait_event_interruptible(*sk_sleep(tinfo->sock->sk),
> - !skb_queue_empty(&tinfo->sock->sk->sk_receive_queue)
> - || kthread_should_stop());
> + wait_event_interruptible(*sk_sleep(sk),
> + !skb_queue_empty_lockless(&sk->sk_receive_queue) ||
> + !skb_queue_empty_lockless(&up->reader_queue) ||
> + kthread_should_stop());
>
> /* do we have data now? */
> - while (!skb_queue_empty(&(tinfo->sock->sk->sk_receive_queue))) {
> + while (!skb_queue_empty_lockless(&sk->sk_receive_queue) ||
> + !skb_queue_empty_lockless(&up->reader_queue)) {
> len = ip_vs_receive(tinfo->sock, tinfo->buf,
> ipvs->bcfg.sync_maxlen);
> if (len <= 0) {
> --
> 2.7.4
Regards
--
Julian Anastasov <ja@ssi.bg>
next prev parent reply other threads:[~2020-07-19 6:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-16 8:12 [PATCH,v2] ipvs: fix the connection sync failed in some cases guodeqing
2020-07-19 6:08 ` Julian Anastasov [this message]
2020-07-21 23:23 ` Pablo Neira Ayuso
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=alpine.LFD.2.23.451.2007190837120.3463@ja.home.ssi.bg \
--to=ja@ssi.bg \
--cc=davem@davemloft.net \
--cc=fw@strlen.de \
--cc=geffrey.guo@huawei.com \
--cc=horms@verge.net.au \
--cc=kadlec@netfilter.org \
--cc=kuba@kernel.org \
--cc=lvs-devel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=wensong@linux-vs.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;
as well as URLs for NNTP newsgroup(s).