Browse Source

net_sched: remove redundant qdisc lock classes

We no longer take any spinlock on RX path for ingress qdisc,
so this lockdep annotation is no longer needed.

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cong Wang 7 years ago
parent
commit
8ecc7c8a1c
1 changed files with 0 additions and 7 deletions
  1. 0 7
      net/sched/sch_api.c

+ 0 - 7
net/sched/sch_api.c

@@ -27,7 +27,6 @@
 #include <linux/kmod.h>
 #include <linux/kmod.h>
 #include <linux/list.h>
 #include <linux/list.h>
 #include <linux/hrtimer.h>
 #include <linux/hrtimer.h>
-#include <linux/lockdep.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <linux/hashtable.h>
 #include <linux/hashtable.h>
 
 
@@ -1053,10 +1052,6 @@ static int qdisc_block_indexes_set(struct Qdisc *sch, struct nlattr **tca,
 	return 0;
 	return 0;
 }
 }
 
 
-/* lockdep annotation is needed for ingress; egress gets it only for name */
-static struct lock_class_key qdisc_tx_lock;
-static struct lock_class_key qdisc_rx_lock;
-
 /*
 /*
    Allocate and initialize new qdisc.
    Allocate and initialize new qdisc.
 
 
@@ -1121,7 +1116,6 @@ static struct Qdisc *qdisc_create(struct net_device *dev,
 	if (handle == TC_H_INGRESS) {
 	if (handle == TC_H_INGRESS) {
 		sch->flags |= TCQ_F_INGRESS;
 		sch->flags |= TCQ_F_INGRESS;
 		handle = TC_H_MAKE(TC_H_INGRESS, 0);
 		handle = TC_H_MAKE(TC_H_INGRESS, 0);
-		lockdep_set_class(qdisc_lock(sch), &qdisc_rx_lock);
 	} else {
 	} else {
 		if (handle == 0) {
 		if (handle == 0) {
 			handle = qdisc_alloc_handle(dev);
 			handle = qdisc_alloc_handle(dev);
@@ -1129,7 +1123,6 @@ static struct Qdisc *qdisc_create(struct net_device *dev,
 			if (handle == 0)
 			if (handle == 0)
 				goto err_out3;
 				goto err_out3;
 		}
 		}
-		lockdep_set_class(qdisc_lock(sch), &qdisc_tx_lock);
 		if (!netif_is_multiqueue(dev))
 		if (!netif_is_multiqueue(dev))
 			sch->flags |= TCQ_F_ONETXQUEUE;
 			sch->flags |= TCQ_F_ONETXQUEUE;
 	}
 	}