net: Define accessors to manipulate QDISC_STATE_RUNNING

Define three helpers to manipulate QDISC_STATE_RUNNIG flag, that a
second patch will move on another location.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 9d4d87cc970e3b487c5c0879008bb0588a0e87dd..d9549af6929a1d4c7567ba94a1811cd31a996ac4 100644 (file)
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -95,7 +95,7 @@ extern void __qdisc_run(struct Qdisc *q);
 
 static inline void qdisc_run(struct Qdisc *q)
 {
-       if (!test_and_set_bit(__QDISC_STATE_RUNNING, &q->state))
+       if (qdisc_run_begin(q))
                __qdisc_run(q);
 }
 

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 03ca5d826757bb0459b3e612b5fdf5ae03757e9b..9707daed761e4fd0b101cfe721d9ed61a39ec892 100644 (file)
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -76,6 +76,21 @@ struct Qdisc {
        struct rcu_head     rcu_head;
 };
 
+static inline bool qdisc_is_running(struct Qdisc *qdisc)
+{
+       return test_bit(__QDISC_STATE_RUNNING, &qdisc->state);
+}
+
+static inline bool qdisc_run_begin(struct Qdisc *qdisc)
+{
+       return !test_and_set_bit(__QDISC_STATE_RUNNING, &qdisc->state);
+}
+
+static inline void qdisc_run_end(struct Qdisc *qdisc)
+{
+       clear_bit(__QDISC_STATE_RUNNING, &qdisc->state);
+}
+
 struct Qdisc_class_ops {
        /* Child qdisc manipulation */
        struct netdev_queue *   (*select_queue)(struct Qdisc *, struct tcmsg *);

diff --git a/net/core/dev.c b/net/core/dev.c
index 983a3c1d65c44a5a9eb3cfc5e842c94c6ecb61e7..2733226d90b2584c6ba9361028a35294e9e4f15c 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2047,7 +2047,7 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
                kfree_skb(skb);
                rc = NET_XMIT_DROP;
        } else if ((q->flags & TCQ_F_CAN_BYPASS) && !qdisc_qlen(q) &&
-                  !test_and_set_bit(__QDISC_STATE_RUNNING, &q->state)) {
+                  qdisc_run_begin(q)) {
                /*
                 * This is a work-conserving queue; there are no old skbs
                 * waiting to be sent out; and the qdisc is not running -
@@ -2059,7 +2059,7 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
                if (sch_direct_xmit(skb, q, dev, txq, root_lock))
                        __qdisc_run(q);
                else
-                       clear_bit(__QDISC_STATE_RUNNING, &q->state);
+                       qdisc_run_end(q);
 
                rc = NET_XMIT_SUCCESS;
        } else {

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index bd1892fe4b213c16cb705ebf7f3aee80242eebe2..37b86eab6779b410cd7abd270b4d0961dc95d1ac 100644 (file)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -205,7 +205,7 @@ void __qdisc_run(struct Qdisc *q)
                }
        }
 
-       clear_bit(__QDISC_STATE_RUNNING, &q->state);
+       qdisc_run_end(q);
 }
 
 unsigned long dev_trans_start(struct net_device *dev)
@@ -797,7 +797,7 @@ static bool some_qdisc_is_busy(struct net_device *dev)
 
                spin_lock_bh(root_lock);
 
-               val = (test_bit(__QDISC_STATE_RUNNING, &q->state) ||
+               val = (qdisc_is_running(q) ||
                       test_bit(__QDISC_STATE_SCHED, &q->state));
 
                spin_unlock_bh(root_lock);