Commit c7a66f8d authored by Baowen Zheng's avatar Baowen Zheng Committed by David S. Miller
Browse files

flow_offload: add process to update action stats from hardware 



When collecting stats for actions update them using both
hardware and software counters.

Stats update process should not run in context of preempt_disable.

Signed-off-by: default avatarBaowen Zheng <baowen.zheng@corigine.com>
Signed-off-by: default avatarLouis Peens <louis.peens@corigine.com>
Signed-off-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bcd64368

include/net/act_api.h

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ void tcf_action_update_stats(struct tc_action *a, u64 bytes, u64 packets, 
			     u64 drops, bool hw);

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



int tcf_action_update_hw_stats(struct tc_action *action);

int tcf_action_check_ctrlact(int action, struct tcf_proto *tp,

			     struct tcf_chain **handle,

			     struct netlink_ext_ack *newchain);

include/net/pkt_cls.h

+10 −8
Original line number Diff line number Diff line
@@ -273,18 +273,20 @@ tcf_exts_hw_stats_update(const struct tcf_exts *exts, 
#ifdef CONFIG_NET_CLS_ACT

	int i;



	preempt_disable();



	for (i = 0; i < exts->nr_actions; i++) {

		struct tc_action *a = exts->actions[i];



		/* if stats from hw, just skip */

		if (tcf_action_update_hw_stats(a)) {

			preempt_disable();

			tcf_action_stats_update(a, bytes, packets, drops,

						lastuse, true);

			preempt_enable();



			a->used_hw_stats = used_hw_stats;

			a->used_hw_stats_valid = used_hw_stats_valid;

		}



	preempt_enable();

	}

#endif

}

net/sched/act_api.c

+34 −0
Original line number Diff line number Diff line
@@ -246,6 +246,37 @@ static int tcf_action_offload_add(struct tc_action *action, 
	return err;

}



int tcf_action_update_hw_stats(struct tc_action *action)

{

	struct flow_offload_action fl_act = {};

	int err;



	if (!tc_act_in_hw(action))

		return -EOPNOTSUPP;



	err = offload_action_init(&fl_act, action, FLOW_ACT_STATS, NULL);

	if (err)

		return err;



	err = tcf_action_offload_cmd(&fl_act, NULL, NULL);

	if (!err) {

		preempt_disable();

		tcf_action_stats_update(action, fl_act.stats.bytes,

					fl_act.stats.pkts,

					fl_act.stats.drops,

					fl_act.stats.lastused,

					true);

		preempt_enable();

		action->used_hw_stats = fl_act.stats.used_hw_stats;

		action->used_hw_stats_valid = true;

	} else {

		return -EOPNOTSUPP;

	}



	return 0;

}

EXPORT_SYMBOL(tcf_action_update_hw_stats);



static int tcf_action_offload_del(struct tc_action *action)

{

	struct flow_offload_action fl_act = {};
@@ -1318,6 +1349,9 @@ int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *p, 
	if (p == NULL)

		goto errout;



	/* update hw stats for this action */

	tcf_action_update_hw_stats(p);



	/* compat_mode being true specifies a call that is supposed

	 * to add additional backward compatibility statistic TLVs.

	 */