From: Yunsheng Lin <linyunsheng@huawei.com>
To: Eric Dumazet <eric.dumazet@gmail.com>,
Cong Wang <xiyou.wangcong@gmail.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>,
Jiri Pirko <jiri@resnulli.us>,
"David Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
"Linux Kernel Network Developers" <netdev@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>, <linuxarm@huawei.com>
Subject: Re: [PATCH net-next] net: sch_generic: aviod concurrent reset and enqueue op for lockless qdisc
Date: Thu, 3 Sep 2020 09:14:41 +0800 [thread overview]
Message-ID: <041539d7-fb42-908d-5638-49ca51d758f1@huawei.com> (raw)
In-Reply-To: <df8423fb-63ed-604d-df4d-a94be5b47b31@gmail.com>
On 2020/9/2 17:20, Eric Dumazet wrote:
>
>
> On 9/2/20 1:14 AM, Yunsheng Lin wrote:
>> On 2020/9/2 15:32, Eric Dumazet wrote:
>>>
>>>
>>> On 9/1/20 11:34 PM, Yunsheng Lin wrote:
>>>
>>>>
>>>> I am not familiar with TCQ_F_CAN_BYPASS.
>>>> From my understanding, the problem is that there is no order between
>>>> qdisc enqueuing and qdisc reset.
>>>
>>> Thw qdisc_reset() should be done after rcu grace period, when there is guarantee no enqueue is in progress.
>>>
>>> qdisc_destroy() already has a qdisc_reset() call, I am not sure why qdisc_deactivate() is also calling qdisc_reset()
>>
>> That is a good point.
>> Do we allow skb left in qdisc when the qdisc is deactivated state?
>> And qdisc_destroy() is not always called after qdisc_deactivate() is called.
>> If we allow skb left in qdisc when the qdisc is deactivated state, then it is
>> huge change of semantics for qdisc_deactivate(), and I am not sure how many
>> cases will affected by this change.
>
> All I am saying is that the qdisc_reset() in qdisc_deactivate() seems
> at the wrong place.
>
> This certainly can be deferred _after_ the rcu grace period we already have in dev_deactivate_many()
>
> Something like this nicer patch.
Thanks for clarifying and the nicer patch.
Reusing the existing synchronize_net() is a good idea.
Some minor comment inline.
>
> net/sched/sch_generic.c | 22 ++++------------------
> 1 file changed, 4 insertions(+), 18 deletions(-)
>
>
> diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
> index 265a61d011dfaa7ec0f8fb8aaede920784f690c9..0eaa99e4f8de643724c0942ee1a2e9516eed65c0 100644
> --- a/net/sched/sch_generic.c
> +++ b/net/sched/sch_generic.c
> @@ -1131,24 +1131,10 @@ EXPORT_SYMBOL(dev_activate);
>
> static void qdisc_deactivate(struct Qdisc *qdisc)
> {
> - bool nolock = qdisc->flags & TCQ_F_NOLOCK;
> -
> if (qdisc->flags & TCQ_F_BUILTIN)
> return;
> - if (test_bit(__QDISC_STATE_DEACTIVATED, &qdisc->state))
> - return;
> -
> - if (nolock)
> - spin_lock_bh(&qdisc->seqlock);
> - spin_lock_bh(qdisc_lock(qdisc));
>
> set_bit(__QDISC_STATE_DEACTIVATED, &qdisc->state);
> -
> - qdisc_reset(qdisc);
> -
> - spin_unlock_bh(qdisc_lock(qdisc));
> - if (nolock)
> - spin_unlock_bh(&qdisc->seqlock);
> }
>
> static void dev_deactivate_queue(struct net_device *dev,
> @@ -1184,6 +1170,9 @@ static bool some_qdisc_is_busy(struct net_device *dev)
> val = (qdisc_is_running(q) ||
> test_bit(__QDISC_STATE_SCHED, &q->state));
>
> + if (!val)
> + qdisc_reset(q);
It seems semantics for some_qdisc_is_busy() is changed, which does not only do
the checking, but also do the reseting?
Also, qdisc_reset() could be called multi times for the same qdisc if some_qdisc_is_busy()
return true multi times?
> +
> spin_unlock_bh(root_lock);
>
> if (val)
> @@ -1213,10 +1202,7 @@ void dev_deactivate_many(struct list_head *head)
> dev_watchdog_down(dev);
> }
>
> - /* Wait for outstanding qdisc-less dev_queue_xmit calls.
> - * This is avoided if all devices are in dismantle phase :
> - * Caller will call synchronize_net() for us
> - */
> + /* Wait for outstanding dev_queue_xmit calls. */
> synchronize_net();
>
> /* Wait for outstanding qdisc_run calls. */
>
>
> .
>
next prev parent reply other threads:[~2020-09-03 1:14 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-01 0:55 [PATCH net-next] net: sch_generic: aviod concurrent reset and enqueue op for lockless qdisc Yunsheng Lin
2020-09-01 6:48 ` Eric Dumazet
2020-09-01 7:27 ` Yunsheng Lin
2020-09-01 18:34 ` David Miller
2020-09-02 1:43 ` Yunsheng Lin
2020-09-01 18:24 ` Cong Wang
2020-09-02 1:42 ` Yunsheng Lin
2020-09-02 4:41 ` Cong Wang
2020-09-02 6:34 ` Yunsheng Lin
2020-09-02 7:32 ` Eric Dumazet
2020-09-02 8:14 ` Yunsheng Lin
2020-09-02 9:20 ` Eric Dumazet
2020-09-03 1:14 ` Yunsheng Lin [this message]
2020-09-03 7:24 ` Eric Dumazet
2020-09-04 8:10 ` Yunsheng Lin
2020-09-03 0:35 ` Cong Wang
2020-09-03 1:21 ` Yunsheng Lin
2020-09-03 1:48 ` Cong Wang
2020-09-03 2:22 ` Yunsheng Lin
2020-09-03 2:53 ` Cong Wang
2020-09-04 1:30 ` John Fastabend
2020-09-04 8:08 ` Yunsheng Lin
2020-09-06 8:52 ` [net] 6fd0d0dede: hwsim.ap_ht40_5ghz_switch.fail kernel test robot
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=041539d7-fb42-908d-5638-49ca51d758f1@huawei.com \
--to=linyunsheng@huawei.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=jhs@mojatatu.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=xiyou.wangcong@gmail.com \
/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).