Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 021a17ed authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

pfifo_fast: drop unneeded additional lock on dequeue 



After the previous patch, for NOLOCK qdiscs, q->seqlock is
always held when the dequeue() is invoked, we can drop
any additional locking to protect such operation.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 96009c7d

include/linux/skb_array.h

+5 −0
Original line number Diff line number Diff line
@@ -97,6 +97,11 @@ static inline bool skb_array_empty_any(struct skb_array *a) 
	return ptr_ring_empty_any(&a->ring);

}



static inline struct sk_buff *__skb_array_consume(struct skb_array *a)

{

	return __ptr_ring_consume(&a->ring);

}



static inline struct sk_buff *skb_array_consume(struct skb_array *a)

{

	return ptr_ring_consume(&a->ring);

net/sched/sch_generic.c

+2 −2
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc) 
		if (__skb_array_empty(q))

			continue;



		skb = skb_array_consume_bh(q);

		skb = __skb_array_consume(q);

	}

	if (likely(skb)) {

		qdisc_qstats_cpu_backlog_dec(qdisc, skb);
@@ -697,7 +697,7 @@ static void pfifo_fast_reset(struct Qdisc *qdisc) 
		if (!q->ring.queue)

			continue;



		while ((skb = skb_array_consume_bh(q)) != NULL)

		while ((skb = __skb_array_consume(q)) != NULL)

			kfree_skb(skb);

	}