Commit ac5c66f2 authored by Petr Machata's avatar Petr Machata Committed by Jakub Kicinski
Browse files

Revert "net: sched: Pass root lock to Qdisc_ops.enqueue" 



This reverts commit aebe4426.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 55f656cd

include/net/sch_generic.h

+2 −4
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ struct qdisc_skb_head { 
struct Qdisc {

	int 			(*enqueue)(struct sk_buff *skb,

					   struct Qdisc *sch,

					   spinlock_t *root_lock,

					   struct sk_buff **to_free);

	struct sk_buff *	(*dequeue)(struct Qdisc *sch);

	unsigned int		flags;
@@ -242,7 +241,6 @@ struct Qdisc_ops { 


	int 			(*enqueue)(struct sk_buff *skb,

					   struct Qdisc *sch,

					   spinlock_t *root_lock,

					   struct sk_buff **to_free);

	struct sk_buff *	(*dequeue)(struct Qdisc *);

	struct sk_buff *	(*peek)(struct Qdisc *);
@@ -790,11 +788,11 @@ static inline void qdisc_calculate_pkt_len(struct sk_buff *skb, 
#endif

}



static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch, spinlock_t *root_lock,

static inline int qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch,

				struct sk_buff **to_free)

{

	qdisc_calculate_pkt_len(skb, sch);

	return sch->enqueue(skb, sch, root_lock, to_free);

	return sch->enqueue(skb, sch, to_free);

}



static inline void _bstats_update(struct gnet_stats_basic_packed *bstats,

net/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -3749,7 +3749,7 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q, 
	qdisc_calculate_pkt_len(skb, q);



	if (q->flags & TCQ_F_NOLOCK) {

		rc = q->enqueue(skb, q, NULL, &to_free) & NET_XMIT_MASK;

		rc = q->enqueue(skb, q, &to_free) & NET_XMIT_MASK;

		qdisc_run(q);



		if (unlikely(to_free))
@@ -3792,7 +3792,7 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q, 
		qdisc_run_end(q);

		rc = NET_XMIT_SUCCESS;

	} else {

		rc = q->enqueue(skb, q, root_lock, &to_free) & NET_XMIT_MASK;

		rc = q->enqueue(skb, q, &to_free) & NET_XMIT_MASK;

		if (qdisc_run_begin(q)) {

			if (unlikely(contended)) {

				spin_unlock(&q->busylock);

net/sched/sch_atm.c

+2 −2
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static struct tcf_block *atm_tc_tcf_block(struct Qdisc *sch, unsigned long cl, 


/* --------------------------- Qdisc operations ---------------------------- */



static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch, spinlock_t *root_lock,

static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch,

			  struct sk_buff **to_free)

{

	struct atm_qdisc_data *p = qdisc_priv(sch);
@@ -432,7 +432,7 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch, spinlock_t *ro 
#endif

	}



	ret = qdisc_enqueue(skb, flow->q, root_lock, to_free);

	ret = qdisc_enqueue(skb, flow->q, to_free);

	if (ret != NET_XMIT_SUCCESS) {

drop: __maybe_unused

		if (net_xmit_drop_count(ret)) {

net/sched/sch_blackhole.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/skbuff.h>

#include <net/pkt_sched.h>



static int blackhole_enqueue(struct sk_buff *skb, struct Qdisc *sch, spinlock_t *root_lock,

static int blackhole_enqueue(struct sk_buff *skb, struct Qdisc *sch,

			     struct sk_buff **to_free)

{

	qdisc_drop(skb, sch, to_free);

net/sched/sch_cake.c

+1 −1
Original line number Diff line number Diff line
@@ -1687,7 +1687,7 @@ static u32 cake_classify(struct Qdisc *sch, struct cake_tin_data **t, 


static void cake_reconfigure(struct Qdisc *sch);



static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch, spinlock_t *root_lock,

static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch,

			struct sk_buff **to_free)

{

	struct cake_sched_data *q = qdisc_priv(sch);