Commit 48d8ee16 authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

net sched actions: aggregate dumping of actions timeinfo 



Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53eb440f

include/net/act_api.h

+8 −0
Original line number Diff line number Diff line
@@ -80,6 +80,14 @@ static inline void tcf_lastuse_update(struct tcf_t *tm) 
		tm->firstuse = now;

}



static inline void tcf_tm_dump(struct tcf_t *dtm, const struct tcf_t *stm)

{

	dtm->install = jiffies_to_clock_t(jiffies - stm->install);

	dtm->lastuse = jiffies_to_clock_t(jiffies - stm->lastuse);

	dtm->firstuse = jiffies_to_clock_t(jiffies - stm->firstuse);

	dtm->expires = jiffies_to_clock_t(stm->expires);

}



struct tc_action {

	void			*priv;

	const struct tc_action_ops	*ops;

net/sched/act_bpf.c

+1 −5
Original line number Diff line number Diff line
@@ -154,11 +154,7 @@ static int tcf_bpf_dump(struct sk_buff *skb, struct tc_action *act, 
	if (ret)

		goto nla_put_failure;



	tm.install = jiffies_to_clock_t(jiffies - prog->tcf_tm.install);

	tm.lastuse = jiffies_to_clock_t(jiffies - prog->tcf_tm.lastuse);

	tm.firstuse = jiffies_to_clock_t(jiffies - prog->tcf_tm.firstuse);

	tm.expires = jiffies_to_clock_t(prog->tcf_tm.expires);



	tcf_tm_dump(&tm, &prog->tcf_tm);

	if (nla_put_64bit(skb, TCA_ACT_BPF_TM, sizeof(tm), &tm,

			  TCA_ACT_BPF_PAD))

		goto nla_put_failure;

net/sched/act_connmark.c

+1 −4
Original line number Diff line number Diff line
@@ -160,10 +160,7 @@ static inline int tcf_connmark_dump(struct sk_buff *skb, struct tc_action *a, 
	if (nla_put(skb, TCA_CONNMARK_PARMS, sizeof(opt), &opt))

		goto nla_put_failure;



	t.install = jiffies_to_clock_t(jiffies - ci->tcf_tm.install);

	t.lastuse = jiffies_to_clock_t(jiffies - ci->tcf_tm.lastuse);

	t.expires = jiffies_to_clock_t(ci->tcf_tm.expires);

	t.firstuse = jiffies_to_clock_t(jiffies - ci->tcf_tm.firstuse);

	tcf_tm_dump(&t, &ci->tcf_tm);

	if (nla_put_64bit(skb, TCA_CONNMARK_TM, sizeof(t), &t,

			  TCA_CONNMARK_PAD))

		goto nla_put_failure;

net/sched/act_csum.c

+2 −4
Original line number Diff line number Diff line
@@ -546,10 +546,8 @@ static int tcf_csum_dump(struct sk_buff *skb, 


	if (nla_put(skb, TCA_CSUM_PARMS, sizeof(opt), &opt))

		goto nla_put_failure;

	t.install = jiffies_to_clock_t(jiffies - p->tcf_tm.install);

	t.lastuse = jiffies_to_clock_t(jiffies - p->tcf_tm.lastuse);

	t.firstuse = jiffies_to_clock_t(jiffies - p->tcf_tm.firstuse);

	t.expires = jiffies_to_clock_t(p->tcf_tm.expires);



	tcf_tm_dump(&t, &p->tcf_tm);

	if (nla_put_64bit(skb, TCA_CSUM_TM, sizeof(t), &t, TCA_CSUM_PAD))

		goto nla_put_failure;

net/sched/act_gact.c

+1 −4
Original line number Diff line number Diff line
@@ -188,10 +188,7 @@ static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a, int bind, int 
			goto nla_put_failure;

	}

#endif

	t.install = jiffies_to_clock_t(jiffies - gact->tcf_tm.install);

	t.lastuse = jiffies_to_clock_t(jiffies - gact->tcf_tm.lastuse);

	t.firstuse = jiffies_to_clock_t(jiffies - gact->tcf_tm.firstuse);

	t.expires = jiffies_to_clock_t(gact->tcf_tm.expires);

	tcf_tm_dump(&t, &gact->tcf_tm);

	if (nla_put_64bit(skb, TCA_GACT_TM, sizeof(t), &t, TCA_GACT_PAD))

		goto nla_put_failure;

	return skb->len;