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

Commit 752fbcc3 authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

net_sched: no need to free qdisc in RCU callback 



gen estimator has been rewritten in commit 1c0d32fd
("net_sched: gen_estimator: complete rewrite of rate estimators"),
the caller no longer needs to wait for a grace period. So this
patch gets rid of it.

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd7d2106

include/net/sch_generic.h

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ struct Qdisc { 
	unsigned long		state;

	struct Qdisc            *next_sched;

	struct sk_buff		*skb_bad_txq;

	struct rcu_head		rcu_head;

	int			padded;

	refcount_t		refcnt;

net/sched/sch_generic.c

+2 −8
Original line number Diff line number Diff line
@@ -688,10 +688,8 @@ void qdisc_reset(struct Qdisc *qdisc) 
}

EXPORT_SYMBOL(qdisc_reset);



static void qdisc_rcu_free(struct rcu_head *head)

static void qdisc_free(struct Qdisc *qdisc)

{

	struct Qdisc *qdisc = container_of(head, struct Qdisc, rcu_head);



	if (qdisc_is_percpu_stats(qdisc)) {

		free_percpu(qdisc->cpu_bstats);

		free_percpu(qdisc->cpu_qstats);
@@ -724,11 +722,7 @@ void qdisc_destroy(struct Qdisc *qdisc) 


	kfree_skb_list(qdisc->gso_skb);

	kfree_skb(qdisc->skb_bad_txq);

	/*

	 * gen_estimator est_timer() might access qdisc->q.lock,

	 * wait a RCU grace period before freeing qdisc.

	 */

	call_rcu(&qdisc->rcu_head, qdisc_rcu_free);

	qdisc_free(qdisc);

}

EXPORT_SYMBOL(qdisc_destroy);