Commit 7d17c544 authored by Paul Blakey's avatar Paul Blakey Committed by Saeed Mahameed
Browse files

net: sched: Pass ingress block to tcf_classify_ingress 



On ingress and cls_act qdiscs init, save the block on ingress
mini_Qdisc and and pass it on to ingress classification, so it
can be used for the looking up a specified chain index.

Co-developed-by: default avatarVlad Buslov <vladbu@mellanox.com>
Signed-off-by: default avatarVlad Buslov <vladbu@mellanox.com>
Signed-off-by: default avatarPaul Blakey <paulb@mellanox.com>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 9410c940

include/net/pkt_cls.h

+5 −2
Original line number Diff line number Diff line
@@ -72,8 +72,10 @@ static inline struct Qdisc *tcf_block_q(struct tcf_block *block) 


int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp,

		 struct tcf_result *res, bool compat_mode);

int tcf_classify_ingress(struct sk_buff *skb, const struct tcf_proto *tp,

			 struct tcf_result *res, bool compat_mode);

int tcf_classify_ingress(struct sk_buff *skb,

			 const struct tcf_block *ingress_block,

			 const struct tcf_proto *tp, struct tcf_result *res,

			 bool compat_mode);



#else

static inline bool tcf_block_shared(struct tcf_block *block)
@@ -137,6 +139,7 @@ static inline int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp, 
}



static inline int tcf_classify_ingress(struct sk_buff *skb,

				       const struct tcf_block *ingress_block,

				       const struct tcf_proto *tp,

				       struct tcf_result *res, bool compat_mode)

{

include/net/sch_generic.h

+3 −0
Original line number Diff line number Diff line
@@ -1269,6 +1269,7 @@ static inline void psched_ratecfg_getrate(struct tc_ratespec *res, 
 */

struct mini_Qdisc {

	struct tcf_proto *filter_list;

	struct tcf_block *block;

	struct gnet_stats_basic_cpu __percpu *cpu_bstats;

	struct gnet_stats_queue	__percpu *cpu_qstats;

	struct rcu_head rcu;
@@ -1295,6 +1296,8 @@ void mini_qdisc_pair_swap(struct mini_Qdisc_pair *miniqp, 
			  struct tcf_proto *tp_head);

void mini_qdisc_pair_init(struct mini_Qdisc_pair *miniqp, struct Qdisc *qdisc,

			  struct mini_Qdisc __rcu **p_miniq);

void mini_qdisc_pair_block_init(struct mini_Qdisc_pair *miniqp,

				struct tcf_block *block);



static inline int skb_tc_reinsert(struct sk_buff *skb, struct tcf_result *res)

{

net/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -4860,8 +4860,8 @@ sch_handle_ingress(struct sk_buff *skb, struct packet_type **pt_prev, int *ret, 
	skb->tc_at_ingress = 1;

	mini_qdisc_bstats_cpu_update(miniq, skb);



	switch (tcf_classify_ingress(skb, miniq->filter_list, &cl_res,

				     false)) {

	switch (tcf_classify_ingress(skb, miniq->block, miniq->filter_list,

				     &cl_res, false)) {

	case TC_ACT_OK:

	case TC_ACT_RECLASSIFY:

		skb->tc_index = TC_H_MIN(cl_res.classid);

net/sched/cls_api.c

+3 −1
Original line number Diff line number Diff line
@@ -1623,7 +1623,9 @@ int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp, 
}

EXPORT_SYMBOL(tcf_classify);



int tcf_classify_ingress(struct sk_buff *skb, const struct tcf_proto *tp,

int tcf_classify_ingress(struct sk_buff *skb,

			 const struct tcf_block *ingress_block,

			 const struct tcf_proto *tp,

			 struct tcf_result *res, bool compat_mode)

{

#if !IS_ENABLED(CONFIG_NET_TC_SKB_EXT)

net/sched/sch_generic.c

+8 −0
Original line number Diff line number Diff line
@@ -1391,6 +1391,14 @@ void mini_qdisc_pair_swap(struct mini_Qdisc_pair *miniqp, 
}

EXPORT_SYMBOL(mini_qdisc_pair_swap);



void mini_qdisc_pair_block_init(struct mini_Qdisc_pair *miniqp,

				struct tcf_block *block)

{

	miniqp->miniq1.block = block;

	miniqp->miniq2.block = block;

}

EXPORT_SYMBOL(mini_qdisc_pair_block_init);



void mini_qdisc_pair_init(struct mini_Qdisc_pair *miniqp, struct Qdisc *qdisc,

			  struct mini_Qdisc __rcu **p_miniq)

{