Skip to content

Commit 88df16f

Browse files
edumazetPaolo Abeni
authored andcommitted
net: sched: calls synchronize_net() only when needed
dev_deactivate_many() role is to remove the qdiscs of a network device. When/if a qdisc is dismantled, an rcu grace period is needed to make sure all outstanding qdisc enqueue are done before we proceed with a qdisc reset. Most virtual devices do not have a qdisc. We can call the expensive synchronize_net() only if needed. Note that dev_deactivate_many() does not have to deal with qdisc-less dev_queue_xmit, as an old comment was claiming. Signed-off-by: Eric Dumazet <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
1 parent a833fb8 commit 88df16f

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

net/sched/sch_generic.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,15 +1277,17 @@ static void qdisc_deactivate(struct Qdisc *qdisc)
12771277

12781278
static void dev_deactivate_queue(struct net_device *dev,
12791279
struct netdev_queue *dev_queue,
1280-
void *_qdisc_default)
1280+
void *_sync_needed)
12811281
{
1282-
struct Qdisc *qdisc_default = _qdisc_default;
1282+
bool *sync_needed = _sync_needed;
12831283
struct Qdisc *qdisc;
12841284

12851285
qdisc = rtnl_dereference(dev_queue->qdisc);
12861286
if (qdisc) {
1287+
if (qdisc->enqueue)
1288+
*sync_needed = true;
12871289
qdisc_deactivate(qdisc);
1288-
rcu_assign_pointer(dev_queue->qdisc, qdisc_default);
1290+
rcu_assign_pointer(dev_queue->qdisc, &noop_qdisc);
12891291
}
12901292
}
12911293

@@ -1352,24 +1354,22 @@ static bool some_qdisc_is_busy(struct net_device *dev)
13521354
*/
13531355
void dev_deactivate_many(struct list_head *head)
13541356
{
1357+
bool sync_needed = false;
13551358
struct net_device *dev;
13561359

13571360
list_for_each_entry(dev, head, close_list) {
13581361
netdev_for_each_tx_queue(dev, dev_deactivate_queue,
1359-
&noop_qdisc);
1362+
&sync_needed);
13601363
if (dev_ingress_queue(dev))
13611364
dev_deactivate_queue(dev, dev_ingress_queue(dev),
1362-
&noop_qdisc);
1365+
&sync_needed);
13631366

13641367
netdev_watchdog_down(dev);
13651368
}
13661369

1367-
/* Wait for outstanding qdisc-less dev_queue_xmit calls or
1368-
* outstanding qdisc enqueuing calls.
1369-
* This is avoided if all devices are in dismantle phase :
1370-
* Caller will call synchronize_net() for us
1371-
*/
1372-
synchronize_net();
1370+
/* Wait for outstanding qdisc enqueuing calls. */
1371+
if (sync_needed)
1372+
synchronize_net();
13731373

13741374
list_for_each_entry(dev, head, close_list) {
13751375
netdev_for_each_tx_queue(dev, dev_reset_queue, NULL);

0 commit comments

Comments
 (0)