net: sched: cleanup qdisc_run and __qdisc_run semantics

Currently __qdisc_run calls qdisc_run_end() but does not call
qdisc_run_begin(). This makes it hard to track pairs of
qdisc_run_{begin,end} across function calls.

To simplify reading these code paths this patch moves begin/end calls
into qdisc_run().

Signed-off-by: John Fastabend <john.fastabend@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 d1f413f06c72b1fd431ad0bc355ef5313533872c..4eea7198898ebef6e1b0b32d7588262e33ed1759 100644 (file)
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -113,8 +113,10 @@ void __qdisc_run(struct Qdisc *q);
 
 static inline void qdisc_run(struct Qdisc *q)
 {
-       if (qdisc_run_begin(q))
+       if (qdisc_run_begin(q)) {
                __qdisc_run(q);
+               qdisc_run_end(q);
+       }
 }
 
 static inline __be16 tc_skb_protocol(const struct sk_buff *skb)

diff --git a/net/core/dev.c b/net/core/dev.c
index 6bea8931bb622f37129dc75b13a60243ea57360b..44c7de365f559f9db48c036c0f20eee537ce6406 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3192,9 +3192,9 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
                                contended = false;
                        }
                        __qdisc_run(q);
-               } else
-                       qdisc_run_end(q);
+               }
 
+               qdisc_run_end(q);
                rc = NET_XMIT_SUCCESS;
        } else {
                rc = q->enqueue(skb, q, &to_free) & NET_XMIT_MASK;
@@ -3204,6 +3204,7 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
                                contended = false;
                        }
                        __qdisc_run(q);
+                       qdisc_run_end(q);
                }
        }
        spin_unlock(root_lock);

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 3839cbbdc32b1eadd2cae6a42a6b8c998ca88a15..f6803e1d67839645504e794382fc46dcda3eb8e1 100644 (file)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -266,8 +266,6 @@ void __qdisc_run(struct Qdisc *q)
                        break;
                }
        }
-
-       qdisc_run_end(q);
 }
 
 unsigned long dev_trans_start(struct net_device *dev)