Commit 759ae57f authored by Cong Wang's avatar Cong Wang Committed by David S. Miller

net_sched: get rid of unnecessary dev_qdisc_reset()

Resetting old qdisc on dev_queue->qdisc_sleeping in
dev_qdisc_reset() is redundant, because this qdisc,
even if not same with dev_queue->qdisc, is reset via
qdisc_put() right after calling dev_graft_qdisc() when
hitting refcnt 0.

This is very easy to observe with qdisc_reset() tracepoint
and stack traces.
Reported-by: default avatarVáclav Zindulka <vaclav.zindulka@tlapnet.cz>
Tested-by: default avatarVáclav Zindulka <vaclav.zindulka@tlapnet.cz>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 70f50965
...@@ -1191,16 +1191,6 @@ static bool some_qdisc_is_busy(struct net_device *dev) ...@@ -1191,16 +1191,6 @@ static bool some_qdisc_is_busy(struct net_device *dev)
return false; return false;
} }
static void dev_qdisc_reset(struct net_device *dev,
struct netdev_queue *dev_queue,
void *none)
{
struct Qdisc *qdisc = dev_queue->qdisc_sleeping;
if (qdisc)
qdisc_reset(qdisc);
}
/** /**
* dev_deactivate_many - deactivate transmissions on several devices * dev_deactivate_many - deactivate transmissions on several devices
* @head: list of devices to deactivate * @head: list of devices to deactivate
...@@ -1237,12 +1227,6 @@ void dev_deactivate_many(struct list_head *head) ...@@ -1237,12 +1227,6 @@ void dev_deactivate_many(struct list_head *head)
*/ */
schedule_timeout_uninterruptible(1); schedule_timeout_uninterruptible(1);
} }
/* The new qdisc is assigned at this point so we can safely
* unwind stale skb lists and qdisc statistics
*/
netdev_for_each_tx_queue(dev, dev_qdisc_reset, NULL);
if (dev_ingress_queue(dev))
dev_qdisc_reset(dev, dev_ingress_queue(dev), NULL);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment