From: "Guodeqing (A)" <geffrey.guo@huawei.com>
To: Julian Anastasov <ja@ssi.bg>
Cc: "wensong@linux-vs.org" <wensong@linux-vs.org>,
"horms@verge.net.au" <horms@verge.net.au>,
"pablo@netfilter.org" <pablo@netfilter.org>,
"kadlec@netfilter.org" <kadlec@netfilter.org>,
"fw@strlen.de" <fw@strlen.de>,
"davem@davemloft.net" <davem@davemloft.net>,
"kuba@kernel.org" <kuba@kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"lvs-devel@vger.kernel.org" <lvs-devel@vger.kernel.org>,
"netfilter-devel@vger.kernel.org"
<netfilter-devel@vger.kernel.org>
Subject: 答复: [PATCH] ipvs: fix the connection sync failed in some cases
Date: Thu, 16 Jul 2020 08:16:41 +0000 [thread overview]
Message-ID: <4b51941de0ab441385c356cccfee7370@huawei.com> (raw)
In-Reply-To: <alpine.LFD.2.23.451.2007152016420.6034@ja.home.ssi.bg>
I do a ipvs connection sync test in a 3.10 version kernel which has the 7c13f97ffde6 commit which succeed. I will modify the fixes information of the patch and replace the skb_queue_empty with skb_queue_empty_lockless.
Thanks.
-----邮件原件-----
发件人: Julian Anastasov [mailto:ja@ssi.bg]
发送时间: Thursday, July 16, 2020 1:36
收件人: Guodeqing (A) <geffrey.guo@huawei.com>
抄送: 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
主题: Re: [PATCH] ipvs: fix the connection sync failed in some cases
Hello,
On Wed, 15 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.
Good catch. We missed this change in UDP...
> Here I add the check of whether the reader_queue of the udp sock is
> empty or not to solve this problem.
>
> Fixes: 7c13f97ffde6 ("udp: do fwd memory scheduling on dequeue")
Why this commit and not 2276f58ac589 which adds reader_queue to udp_poll() ? May be both?
> Reported-by: zhouxudong <zhouxudong8@huawei.com>
> Signed-off-by: guodeqing <geffrey.guo@huawei.com>
> ---
> 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..abe8d63 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(&sk->sk_receive_queue) ||
> + !skb_queue_empty(&up->reader_queue) ||
May be we should use skb_queue_empty_lockless for 5.4+ and skb_queue_empty() for backports to 4.14 and 4.19...
> + kthread_should_stop());
>
> /* do we have data now? */
> - while (!skb_queue_empty(&(tinfo->sock->sk->sk_receive_queue))) {
> + while (!skb_queue_empty(&sk->sk_receive_queue) ||
> + !skb_queue_empty(&up->reader_queue)) {
Here too
> len = ip_vs_receive(tinfo->sock, tinfo->buf,
> ipvs->bcfg.sync_maxlen);
> if (len <= 0) {
> --
> 2.7.4
Regards
--
Julian Anastasov <ja@ssi.bg>
prev parent reply other threads:[~2020-07-16 8:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 6:53 [PATCH] ipvs: fix the connection sync failed in some cases guodeqing
2020-07-15 17:35 ` Julian Anastasov
2020-07-16 8:16 ` Guodeqing (A) [this message]
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=4b51941de0ab441385c356cccfee7370@huawei.com \
--to=geffrey.guo@huawei.com \
--cc=davem@davemloft.net \
--cc=fw@strlen.de \
--cc=horms@verge.net.au \
--cc=ja@ssi.bg \
--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).