Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be119913 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sch-action-tstamp' 



Jamal Hadi Salim says:

====================
net sched action timestamp improvements

Various aggregations of duplicated code, fixes and introduction of firstused
timestamp

v2: add const for source time info per suggestion from Cong
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e69985c6 48d8ee16

include/net/act_api.h

+10 −0
Original line number Diff line number Diff line
@@ -76,6 +76,16 @@ static inline void tcf_lastuse_update(struct tcf_t *tm) 


	if (tm->lastuse != now)

		tm->lastuse = now;

	if (unlikely(!tm->firstuse))

		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 {

include/uapi/linux/pkt_cls.h

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ struct tcf_t { 
	__u64   install;

	__u64   lastuse;

	__u64   expires;

	__u64   firstuse;

};



struct tc_cnt {

net/sched/act_api.c

+1 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ int tcf_hash_create(struct tc_action_net *tn, u32 index, struct nlattr *est, 
	p->tcfc_index = index ? index : tcf_hash_new_index(tn);

	p->tcfc_tm.install = jiffies;

	p->tcfc_tm.lastuse = jiffies;

	p->tcfc_tm.firstuse = 0;

	if (est) {

		err = gen_new_estimator(&p->tcfc_bstats, p->cpu_bstats,

					&p->tcfc_rate_est,

net/sched/act_bpf.c

+1 −4
Original line number Diff line number Diff line
@@ -154,10 +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.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

+2 −4
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static int tcf_connmark(struct sk_buff *skb, const struct tc_action *a, 
	int proto;



	spin_lock(&ca->tcf_lock);

	ca->tcf_tm.lastuse = jiffies;

	tcf_lastuse_update(&ca->tcf_tm);

	bstats_update(&ca->tcf_bstats, skb);



	if (skb->protocol == htons(ETH_P_IP)) {
@@ -160,9 +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);

	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;