Skip to content

Commit

Permalink
net/sched: taprio: remove unnecessary taprio_list_lock
Browse files Browse the repository at this point in the history
The 3 functions that want access to the taprio_list:
taprio_dev_notifier(), taprio_destroy() and taprio_init() are all called
with the rtnl_mutex held, therefore implicitly serialized with respect
to each other. A spin lock serves no purpose.

Signed-off-by: Vladimir Oltean <[email protected]>
Acked-by: Vinicius Costa Gomes <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
  • Loading branch information
vladimiroltean authored and kuba-moo committed Sep 23, 2022
1 parent 03d25cf commit a2c2a4d
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions net/sched/sch_taprio.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <net/tcp.h>

static LIST_HEAD(taprio_list);
static DEFINE_SPINLOCK(taprio_list_lock);

#define TAPRIO_ALL_GATES_OPEN -1

Expand Down Expand Up @@ -1082,15 +1081,13 @@ static int taprio_dev_notifier(struct notifier_block *nb, unsigned long event,
if (event != NETDEV_UP && event != NETDEV_CHANGE)
return NOTIFY_DONE;

spin_lock(&taprio_list_lock);
list_for_each_entry(q, &taprio_list, taprio_list) {
qdev = qdisc_dev(q->root);
if (qdev == dev) {
found = true;
break;
}
}
spin_unlock(&taprio_list_lock);

if (found)
taprio_set_picos_per_byte(dev, q);
Expand Down Expand Up @@ -1602,9 +1599,7 @@ static void taprio_destroy(struct Qdisc *sch)
struct sched_gate_list *oper, *admin;
unsigned int i;

spin_lock(&taprio_list_lock);
list_del(&q->taprio_list);
spin_unlock(&taprio_list_lock);

/* Note that taprio_reset() might not be called if an error
* happens in qdisc_create(), after taprio_init() has been called.
Expand Down Expand Up @@ -1653,9 +1648,7 @@ static int taprio_init(struct Qdisc *sch, struct nlattr *opt,
q->clockid = -1;
q->flags = TAPRIO_FLAGS_INVALID;

spin_lock(&taprio_list_lock);
list_add(&q->taprio_list, &taprio_list);
spin_unlock(&taprio_list_lock);

if (sch->parent != TC_H_ROOT) {
NL_SET_ERR_MSG_MOD(extack, "Can only be attached as root qdisc");
Expand Down

0 comments on commit a2c2a4d

Please sign in to comment.