Commit a6c1aea0 authored Aug 25, 2015 by WANG Cong Committed by David S. Miller Aug 25, 2015

cls_u32: complete the check for non-forced case in u32_destroy()



In commit 1e052be6 ("net_sched: destroy proto tp when all filters are gone")
I added a check in u32_destroy() to see if all real filters are gone
for each tp, however, that is only done for root_ht, same is needed
for others.

This can be reproduced by the following tc commands:

tc filter add dev eth0 parent 1:0 prio 5 handle 15: protocol ip u32 divisor 256
tc filter add dev eth0 protocol ip parent 1: prio 5 handle 15:2:2 u32
ht 15:2: match ip src 10.0.0.2 flowid 1:10
tc filter add dev eth0 protocol ip parent 1: prio 5 handle 15:2:3 u32
ht 15:2: match ip src 10.0.0.3 flowid 1:10

Fixes: 1e052be6 ("net_sched: destroy proto tp when all filters are gone")
Reported-by: Akshat Kakkar <akshat.1984@gmail.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent aac27c7a

net/sched/cls_u32.c

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -490,6 +490,19 @@ static bool u32_destroy(struct tcf_proto *tp, bool force)
	return false;		return false;
	}		}
	}		}

			if (tp_c->refcnt > 1)
			return false;

			if (tp_c->refcnt == 1) {
			struct tc_u_hnode *ht;

			for (ht = rtnl_dereference(tp_c->hlist);
			ht;
			ht = rtnl_dereference(ht->next))
			if (!ht_empty(ht))
			return false;
			}
	}		}

	if (root_ht && --root_ht->refcnt == 0)		if (root_ht && --root_ht->refcnt == 0)