Commit 26b537a8 authored by Vlad Buslov's avatar Vlad Buslov Committed by David S. Miller
Browse files

net: sched: extract qstats update code into functions 



Extract common code that increments cpu_qstats counters into standalone act
API functions. Change hardware offloaded actions that use percpu counter
allocation to use the new functions instead of accessing cpu_qstats
directly.

This commit doesn't change functionality.

Signed-off-by: default avatarVlad Buslov <vladbu@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e1ad95b

include/net/act_api.h

+16 −0
Original line number Diff line number Diff line
@@ -193,6 +193,22 @@ static inline void tcf_action_update_bstats(struct tc_action *a, 
	bstats_cpu_update(this_cpu_ptr(a->cpu_bstats), skb);

}



static inline struct gnet_stats_queue *

tcf_action_get_qstats(struct tc_action *a)

{

	return this_cpu_ptr(a->cpu_qstats);

}



static inline void tcf_action_inc_drop_qstats(struct tc_action *a)

{

	qstats_drop_inc(this_cpu_ptr(a->cpu_qstats));

}



static inline void tcf_action_inc_overlimit_qstats(struct tc_action *a)

{

	qstats_overlimit_inc(this_cpu_ptr(a->cpu_qstats));

}



void tcf_action_update_stats(struct tc_action *a, u64 bytes, u32 packets,

			     bool drop, bool hw);

int tcf_action_copy_stats(struct sk_buff *, struct tc_action *, int);

net/sched/act_csum.c

+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ out: 
	return action;



drop:

	qstats_drop_inc(this_cpu_ptr(p->common.cpu_qstats));

	tcf_action_inc_drop_qstats(&p->common);

	action = TC_ACT_SHOT;

	goto out;

}

net/sched/act_ct.c

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ out: 
	return retval;



drop:

	qstats_drop_inc(this_cpu_ptr(a->cpu_qstats));

	tcf_action_inc_drop_qstats(&c->common);

	return TC_ACT_SHOT;

}

net/sched/act_gact.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static int tcf_gact_act(struct sk_buff *skb, const struct tc_action *a, 
#endif

	tcf_action_update_bstats(&gact->common, skb);

	if (action == TC_ACT_SHOT)

		qstats_drop_inc(this_cpu_ptr(gact->common.cpu_qstats));

		tcf_action_inc_drop_qstats(&gact->common);



	tcf_lastuse_update(&gact->tcf_tm);

net/sched/act_mirred.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a, 


	if (err) {

out:

		qstats_overlimit_inc(this_cpu_ptr(m->common.cpu_qstats));

		tcf_action_inc_overlimit_qstats(&m->common);

		if (tcf_mirred_is_act_redirect(m_eaction))

			retval = TC_ACT_SHOT;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE