sched: align nlattr properly when needed
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
b676338fb3
commit
9854518ea0
33 changed files with 72 additions and 37 deletions
|
@ -33,7 +33,8 @@ my_dumping_routine(struct sk_buff *skb, ...)
|
||||||
{
|
{
|
||||||
struct gnet_dump dump;
|
struct gnet_dump dump;
|
||||||
|
|
||||||
if (gnet_stats_start_copy(skb, TCA_STATS2, &mystruct->lock, &dump) < 0)
|
if (gnet_stats_start_copy(skb, TCA_STATS2, &mystruct->lock, &dump,
|
||||||
|
TCA_PAD) < 0)
|
||||||
goto rtattr_failure;
|
goto rtattr_failure;
|
||||||
|
|
||||||
if (gnet_stats_copy_basic(&dump, &mystruct->bstats) < 0 ||
|
if (gnet_stats_copy_basic(&dump, &mystruct->bstats) < 0 ||
|
||||||
|
@ -56,7 +57,8 @@ existing TLV types.
|
||||||
my_dumping_routine(struct sk_buff *skb, ...)
|
my_dumping_routine(struct sk_buff *skb, ...)
|
||||||
{
|
{
|
||||||
if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS,
|
if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS,
|
||||||
TCA_XSTATS, &mystruct->lock, &dump) < 0)
|
TCA_XSTATS, &mystruct->lock, &dump,
|
||||||
|
TCA_PAD) < 0)
|
||||||
goto rtattr_failure;
|
goto rtattr_failure;
|
||||||
...
|
...
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,17 +19,19 @@ struct gnet_dump {
|
||||||
/* Backward compatibility */
|
/* Backward compatibility */
|
||||||
int compat_tc_stats;
|
int compat_tc_stats;
|
||||||
int compat_xstats;
|
int compat_xstats;
|
||||||
|
int padattr;
|
||||||
void * xstats;
|
void * xstats;
|
||||||
int xstats_len;
|
int xstats_len;
|
||||||
struct tc_stats tc_stats;
|
struct tc_stats tc_stats;
|
||||||
};
|
};
|
||||||
|
|
||||||
int gnet_stats_start_copy(struct sk_buff *skb, int type, spinlock_t *lock,
|
int gnet_stats_start_copy(struct sk_buff *skb, int type, spinlock_t *lock,
|
||||||
struct gnet_dump *d);
|
struct gnet_dump *d, int padattr);
|
||||||
|
|
||||||
int gnet_stats_start_copy_compat(struct sk_buff *skb, int type,
|
int gnet_stats_start_copy_compat(struct sk_buff *skb, int type,
|
||||||
int tc_stats_type, int xstats_type,
|
int tc_stats_type, int xstats_type,
|
||||||
spinlock_t *lock, struct gnet_dump *d);
|
spinlock_t *lock, struct gnet_dump *d,
|
||||||
|
int padattr);
|
||||||
|
|
||||||
int gnet_stats_copy_basic(struct gnet_dump *d,
|
int gnet_stats_copy_basic(struct gnet_dump *d,
|
||||||
struct gnet_stats_basic_cpu __percpu *cpu,
|
struct gnet_stats_basic_cpu __percpu *cpu,
|
||||||
|
|
|
@ -10,6 +10,7 @@ enum {
|
||||||
TCA_STATS_QUEUE,
|
TCA_STATS_QUEUE,
|
||||||
TCA_STATS_APP,
|
TCA_STATS_APP,
|
||||||
TCA_STATS_RATE_EST64,
|
TCA_STATS_RATE_EST64,
|
||||||
|
TCA_STATS_PAD,
|
||||||
__TCA_STATS_MAX,
|
__TCA_STATS_MAX,
|
||||||
};
|
};
|
||||||
#define TCA_STATS_MAX (__TCA_STATS_MAX - 1)
|
#define TCA_STATS_MAX (__TCA_STATS_MAX - 1)
|
||||||
|
|
|
@ -66,6 +66,7 @@ enum {
|
||||||
TCA_ACT_OPTIONS,
|
TCA_ACT_OPTIONS,
|
||||||
TCA_ACT_INDEX,
|
TCA_ACT_INDEX,
|
||||||
TCA_ACT_STATS,
|
TCA_ACT_STATS,
|
||||||
|
TCA_ACT_PAD,
|
||||||
__TCA_ACT_MAX
|
__TCA_ACT_MAX
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -173,6 +174,7 @@ enum {
|
||||||
TCA_U32_PCNT,
|
TCA_U32_PCNT,
|
||||||
TCA_U32_MARK,
|
TCA_U32_MARK,
|
||||||
TCA_U32_FLAGS,
|
TCA_U32_FLAGS,
|
||||||
|
TCA_U32_PAD,
|
||||||
__TCA_U32_MAX
|
__TCA_U32_MAX
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -542,6 +542,7 @@ enum {
|
||||||
TCA_FCNT,
|
TCA_FCNT,
|
||||||
TCA_STATS2,
|
TCA_STATS2,
|
||||||
TCA_STAB,
|
TCA_STAB,
|
||||||
|
TCA_PAD,
|
||||||
__TCA_MAX
|
__TCA_MAX
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,7 @@ enum {
|
||||||
TCA_ACT_BPF_OPS,
|
TCA_ACT_BPF_OPS,
|
||||||
TCA_ACT_BPF_FD,
|
TCA_ACT_BPF_FD,
|
||||||
TCA_ACT_BPF_NAME,
|
TCA_ACT_BPF_NAME,
|
||||||
|
TCA_ACT_BPF_PAD,
|
||||||
__TCA_ACT_BPF_MAX,
|
__TCA_ACT_BPF_MAX,
|
||||||
};
|
};
|
||||||
#define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)
|
#define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)
|
||||||
|
|
|
@ -15,6 +15,7 @@ enum {
|
||||||
TCA_CONNMARK_UNSPEC,
|
TCA_CONNMARK_UNSPEC,
|
||||||
TCA_CONNMARK_PARMS,
|
TCA_CONNMARK_PARMS,
|
||||||
TCA_CONNMARK_TM,
|
TCA_CONNMARK_TM,
|
||||||
|
TCA_CONNMARK_PAD,
|
||||||
__TCA_CONNMARK_MAX
|
__TCA_CONNMARK_MAX
|
||||||
};
|
};
|
||||||
#define TCA_CONNMARK_MAX (__TCA_CONNMARK_MAX - 1)
|
#define TCA_CONNMARK_MAX (__TCA_CONNMARK_MAX - 1)
|
||||||
|
|
|
@ -10,6 +10,7 @@ enum {
|
||||||
TCA_CSUM_UNSPEC,
|
TCA_CSUM_UNSPEC,
|
||||||
TCA_CSUM_PARMS,
|
TCA_CSUM_PARMS,
|
||||||
TCA_CSUM_TM,
|
TCA_CSUM_TM,
|
||||||
|
TCA_CSUM_PAD,
|
||||||
__TCA_CSUM_MAX
|
__TCA_CSUM_MAX
|
||||||
};
|
};
|
||||||
#define TCA_CSUM_MAX (__TCA_CSUM_MAX - 1)
|
#define TCA_CSUM_MAX (__TCA_CSUM_MAX - 1)
|
||||||
|
|
|
@ -12,6 +12,7 @@ enum {
|
||||||
TCA_DEF_TM,
|
TCA_DEF_TM,
|
||||||
TCA_DEF_PARMS,
|
TCA_DEF_PARMS,
|
||||||
TCA_DEF_DATA,
|
TCA_DEF_DATA,
|
||||||
|
TCA_DEF_PAD,
|
||||||
__TCA_DEF_MAX
|
__TCA_DEF_MAX
|
||||||
};
|
};
|
||||||
#define TCA_DEF_MAX (__TCA_DEF_MAX - 1)
|
#define TCA_DEF_MAX (__TCA_DEF_MAX - 1)
|
||||||
|
|
|
@ -25,6 +25,7 @@ enum {
|
||||||
TCA_GACT_TM,
|
TCA_GACT_TM,
|
||||||
TCA_GACT_PARMS,
|
TCA_GACT_PARMS,
|
||||||
TCA_GACT_PROB,
|
TCA_GACT_PROB,
|
||||||
|
TCA_GACT_PAD,
|
||||||
__TCA_GACT_MAX
|
__TCA_GACT_MAX
|
||||||
};
|
};
|
||||||
#define TCA_GACT_MAX (__TCA_GACT_MAX - 1)
|
#define TCA_GACT_MAX (__TCA_GACT_MAX - 1)
|
||||||
|
|
|
@ -23,6 +23,7 @@ enum {
|
||||||
TCA_IFE_SMAC,
|
TCA_IFE_SMAC,
|
||||||
TCA_IFE_TYPE,
|
TCA_IFE_TYPE,
|
||||||
TCA_IFE_METALST,
|
TCA_IFE_METALST,
|
||||||
|
TCA_IFE_PAD,
|
||||||
__TCA_IFE_MAX
|
__TCA_IFE_MAX
|
||||||
};
|
};
|
||||||
#define TCA_IFE_MAX (__TCA_IFE_MAX - 1)
|
#define TCA_IFE_MAX (__TCA_IFE_MAX - 1)
|
||||||
|
|
|
@ -14,6 +14,7 @@ enum {
|
||||||
TCA_IPT_CNT,
|
TCA_IPT_CNT,
|
||||||
TCA_IPT_TM,
|
TCA_IPT_TM,
|
||||||
TCA_IPT_TARG,
|
TCA_IPT_TARG,
|
||||||
|
TCA_IPT_PAD,
|
||||||
__TCA_IPT_MAX
|
__TCA_IPT_MAX
|
||||||
};
|
};
|
||||||
#define TCA_IPT_MAX (__TCA_IPT_MAX - 1)
|
#define TCA_IPT_MAX (__TCA_IPT_MAX - 1)
|
||||||
|
|
|
@ -20,6 +20,7 @@ enum {
|
||||||
TCA_MIRRED_UNSPEC,
|
TCA_MIRRED_UNSPEC,
|
||||||
TCA_MIRRED_TM,
|
TCA_MIRRED_TM,
|
||||||
TCA_MIRRED_PARMS,
|
TCA_MIRRED_PARMS,
|
||||||
|
TCA_MIRRED_PAD,
|
||||||
__TCA_MIRRED_MAX
|
__TCA_MIRRED_MAX
|
||||||
};
|
};
|
||||||
#define TCA_MIRRED_MAX (__TCA_MIRRED_MAX - 1)
|
#define TCA_MIRRED_MAX (__TCA_MIRRED_MAX - 1)
|
||||||
|
|
|
@ -10,6 +10,7 @@ enum {
|
||||||
TCA_NAT_UNSPEC,
|
TCA_NAT_UNSPEC,
|
||||||
TCA_NAT_PARMS,
|
TCA_NAT_PARMS,
|
||||||
TCA_NAT_TM,
|
TCA_NAT_TM,
|
||||||
|
TCA_NAT_PAD,
|
||||||
__TCA_NAT_MAX
|
__TCA_NAT_MAX
|
||||||
};
|
};
|
||||||
#define TCA_NAT_MAX (__TCA_NAT_MAX - 1)
|
#define TCA_NAT_MAX (__TCA_NAT_MAX - 1)
|
||||||
|
|
|
@ -10,6 +10,7 @@ enum {
|
||||||
TCA_PEDIT_UNSPEC,
|
TCA_PEDIT_UNSPEC,
|
||||||
TCA_PEDIT_TM,
|
TCA_PEDIT_TM,
|
||||||
TCA_PEDIT_PARMS,
|
TCA_PEDIT_PARMS,
|
||||||
|
TCA_PEDIT_PAD,
|
||||||
__TCA_PEDIT_MAX
|
__TCA_PEDIT_MAX
|
||||||
};
|
};
|
||||||
#define TCA_PEDIT_MAX (__TCA_PEDIT_MAX - 1)
|
#define TCA_PEDIT_MAX (__TCA_PEDIT_MAX - 1)
|
||||||
|
|
|
@ -39,6 +39,7 @@ enum {
|
||||||
TCA_SKBEDIT_PRIORITY,
|
TCA_SKBEDIT_PRIORITY,
|
||||||
TCA_SKBEDIT_QUEUE_MAPPING,
|
TCA_SKBEDIT_QUEUE_MAPPING,
|
||||||
TCA_SKBEDIT_MARK,
|
TCA_SKBEDIT_MARK,
|
||||||
|
TCA_SKBEDIT_PAD,
|
||||||
__TCA_SKBEDIT_MAX
|
__TCA_SKBEDIT_MAX
|
||||||
};
|
};
|
||||||
#define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1)
|
#define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1)
|
||||||
|
|
|
@ -28,6 +28,7 @@ enum {
|
||||||
TCA_VLAN_PARMS,
|
TCA_VLAN_PARMS,
|
||||||
TCA_VLAN_PUSH_VLAN_ID,
|
TCA_VLAN_PUSH_VLAN_ID,
|
||||||
TCA_VLAN_PUSH_VLAN_PROTOCOL,
|
TCA_VLAN_PUSH_VLAN_PROTOCOL,
|
||||||
|
TCA_VLAN_PAD,
|
||||||
__TCA_VLAN_MAX,
|
__TCA_VLAN_MAX,
|
||||||
};
|
};
|
||||||
#define TCA_VLAN_MAX (__TCA_VLAN_MAX - 1)
|
#define TCA_VLAN_MAX (__TCA_VLAN_MAX - 1)
|
||||||
|
|
|
@ -25,9 +25,9 @@
|
||||||
|
|
||||||
|
|
||||||
static inline int
|
static inline int
|
||||||
gnet_stats_copy(struct gnet_dump *d, int type, void *buf, int size)
|
gnet_stats_copy(struct gnet_dump *d, int type, void *buf, int size, int padattr)
|
||||||
{
|
{
|
||||||
if (nla_put(d->skb, type, size, buf))
|
if (nla_put_64bit(d->skb, type, size, buf, padattr))
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
@ -59,7 +59,8 @@ gnet_stats_copy(struct gnet_dump *d, int type, void *buf, int size)
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
gnet_stats_start_copy_compat(struct sk_buff *skb, int type, int tc_stats_type,
|
gnet_stats_start_copy_compat(struct sk_buff *skb, int type, int tc_stats_type,
|
||||||
int xstats_type, spinlock_t *lock, struct gnet_dump *d)
|
int xstats_type, spinlock_t *lock,
|
||||||
|
struct gnet_dump *d, int padattr)
|
||||||
__acquires(lock)
|
__acquires(lock)
|
||||||
{
|
{
|
||||||
memset(d, 0, sizeof(*d));
|
memset(d, 0, sizeof(*d));
|
||||||
|
@ -71,16 +72,17 @@ gnet_stats_start_copy_compat(struct sk_buff *skb, int type, int tc_stats_type,
|
||||||
d->skb = skb;
|
d->skb = skb;
|
||||||
d->compat_tc_stats = tc_stats_type;
|
d->compat_tc_stats = tc_stats_type;
|
||||||
d->compat_xstats = xstats_type;
|
d->compat_xstats = xstats_type;
|
||||||
|
d->padattr = padattr;
|
||||||
|
|
||||||
if (d->tail)
|
if (d->tail)
|
||||||
return gnet_stats_copy(d, type, NULL, 0);
|
return gnet_stats_copy(d, type, NULL, 0, padattr);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(gnet_stats_start_copy_compat);
|
EXPORT_SYMBOL(gnet_stats_start_copy_compat);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gnet_stats_start_copy_compat - start dumping procedure in compatibility mode
|
* gnet_stats_start_copy - start dumping procedure in compatibility mode
|
||||||
* @skb: socket buffer to put statistics TLVs into
|
* @skb: socket buffer to put statistics TLVs into
|
||||||
* @type: TLV type for top level statistic TLV
|
* @type: TLV type for top level statistic TLV
|
||||||
* @lock: statistics lock
|
* @lock: statistics lock
|
||||||
|
@ -94,9 +96,9 @@ EXPORT_SYMBOL(gnet_stats_start_copy_compat);
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
gnet_stats_start_copy(struct sk_buff *skb, int type, spinlock_t *lock,
|
gnet_stats_start_copy(struct sk_buff *skb, int type, spinlock_t *lock,
|
||||||
struct gnet_dump *d)
|
struct gnet_dump *d, int padattr)
|
||||||
{
|
{
|
||||||
return gnet_stats_start_copy_compat(skb, type, 0, 0, lock, d);
|
return gnet_stats_start_copy_compat(skb, type, 0, 0, lock, d, padattr);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(gnet_stats_start_copy);
|
EXPORT_SYMBOL(gnet_stats_start_copy);
|
||||||
|
|
||||||
|
@ -169,7 +171,8 @@ gnet_stats_copy_basic(struct gnet_dump *d,
|
||||||
memset(&sb, 0, sizeof(sb));
|
memset(&sb, 0, sizeof(sb));
|
||||||
sb.bytes = bstats.bytes;
|
sb.bytes = bstats.bytes;
|
||||||
sb.packets = bstats.packets;
|
sb.packets = bstats.packets;
|
||||||
return gnet_stats_copy(d, TCA_STATS_BASIC, &sb, sizeof(sb));
|
return gnet_stats_copy(d, TCA_STATS_BASIC, &sb, sizeof(sb),
|
||||||
|
TCA_STATS_PAD);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -208,11 +211,13 @@ gnet_stats_copy_rate_est(struct gnet_dump *d,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (d->tail) {
|
if (d->tail) {
|
||||||
res = gnet_stats_copy(d, TCA_STATS_RATE_EST, &est, sizeof(est));
|
res = gnet_stats_copy(d, TCA_STATS_RATE_EST, &est, sizeof(est),
|
||||||
|
TCA_STATS_PAD);
|
||||||
if (res < 0 || est.bps == r->bps)
|
if (res < 0 || est.bps == r->bps)
|
||||||
return res;
|
return res;
|
||||||
/* emit 64bit stats only if needed */
|
/* emit 64bit stats only if needed */
|
||||||
return gnet_stats_copy(d, TCA_STATS_RATE_EST64, r, sizeof(*r));
|
return gnet_stats_copy(d, TCA_STATS_RATE_EST64, r, sizeof(*r),
|
||||||
|
TCA_STATS_PAD);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -286,7 +291,8 @@ gnet_stats_copy_queue(struct gnet_dump *d,
|
||||||
|
|
||||||
if (d->tail)
|
if (d->tail)
|
||||||
return gnet_stats_copy(d, TCA_STATS_QUEUE,
|
return gnet_stats_copy(d, TCA_STATS_QUEUE,
|
||||||
&qstats, sizeof(qstats));
|
&qstats, sizeof(qstats),
|
||||||
|
TCA_STATS_PAD);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -316,7 +322,8 @@ gnet_stats_copy_app(struct gnet_dump *d, void *st, int len)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (d->tail)
|
if (d->tail)
|
||||||
return gnet_stats_copy(d, TCA_STATS_APP, st, len);
|
return gnet_stats_copy(d, TCA_STATS_APP, st, len,
|
||||||
|
TCA_STATS_PAD);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
@ -347,12 +354,12 @@ gnet_stats_finish_copy(struct gnet_dump *d)
|
||||||
|
|
||||||
if (d->compat_tc_stats)
|
if (d->compat_tc_stats)
|
||||||
if (gnet_stats_copy(d, d->compat_tc_stats, &d->tc_stats,
|
if (gnet_stats_copy(d, d->compat_tc_stats, &d->tc_stats,
|
||||||
sizeof(d->tc_stats)) < 0)
|
sizeof(d->tc_stats), d->padattr) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (d->compat_xstats && d->xstats) {
|
if (d->compat_xstats && d->xstats) {
|
||||||
if (gnet_stats_copy(d, d->compat_xstats, d->xstats,
|
if (gnet_stats_copy(d, d->compat_xstats, d->xstats,
|
||||||
d->xstats_len) < 0)
|
d->xstats_len, d->padattr) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -657,12 +657,15 @@ int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *a,
|
||||||
if (compat_mode) {
|
if (compat_mode) {
|
||||||
if (a->type == TCA_OLD_COMPAT)
|
if (a->type == TCA_OLD_COMPAT)
|
||||||
err = gnet_stats_start_copy_compat(skb, 0,
|
err = gnet_stats_start_copy_compat(skb, 0,
|
||||||
TCA_STATS, TCA_XSTATS, &p->tcfc_lock, &d);
|
TCA_STATS,
|
||||||
|
TCA_XSTATS,
|
||||||
|
&p->tcfc_lock, &d,
|
||||||
|
TCA_PAD);
|
||||||
else
|
else
|
||||||
return 0;
|
return 0;
|
||||||
} else
|
} else
|
||||||
err = gnet_stats_start_copy(skb, TCA_ACT_STATS,
|
err = gnet_stats_start_copy(skb, TCA_ACT_STATS,
|
||||||
&p->tcfc_lock, &d);
|
&p->tcfc_lock, &d, TCA_ACT_PAD);
|
||||||
|
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto errout;
|
goto errout;
|
||||||
|
|
|
@ -156,7 +156,8 @@ static int tcf_bpf_dump(struct sk_buff *skb, struct tc_action *act,
|
||||||
tm.lastuse = jiffies_to_clock_t(jiffies - prog->tcf_tm.lastuse);
|
tm.lastuse = jiffies_to_clock_t(jiffies - prog->tcf_tm.lastuse);
|
||||||
tm.expires = jiffies_to_clock_t(prog->tcf_tm.expires);
|
tm.expires = jiffies_to_clock_t(prog->tcf_tm.expires);
|
||||||
|
|
||||||
if (nla_put(skb, TCA_ACT_BPF_TM, sizeof(tm), &tm))
|
if (nla_put_64bit(skb, TCA_ACT_BPF_TM, sizeof(tm), &tm,
|
||||||
|
TCA_ACT_BPF_PAD))
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
|
|
||||||
return skb->len;
|
return skb->len;
|
||||||
|
|
|
@ -163,7 +163,8 @@ static inline int tcf_connmark_dump(struct sk_buff *skb, struct tc_action *a,
|
||||||
t.install = jiffies_to_clock_t(jiffies - ci->tcf_tm.install);
|
t.install = jiffies_to_clock_t(jiffies - ci->tcf_tm.install);
|
||||||
t.lastuse = jiffies_to_clock_t(jiffies - ci->tcf_tm.lastuse);
|
t.lastuse = jiffies_to_clock_t(jiffies - ci->tcf_tm.lastuse);
|
||||||
t.expires = jiffies_to_clock_t(ci->tcf_tm.expires);
|
t.expires = jiffies_to_clock_t(ci->tcf_tm.expires);
|
||||||
if (nla_put(skb, TCA_CONNMARK_TM, sizeof(t), &t))
|
if (nla_put_64bit(skb, TCA_CONNMARK_TM, sizeof(t), &t,
|
||||||
|
TCA_CONNMARK_PAD))
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
|
|
||||||
return skb->len;
|
return skb->len;
|
||||||
|
|
|
@ -549,7 +549,7 @@ static int tcf_csum_dump(struct sk_buff *skb,
|
||||||
t.install = jiffies_to_clock_t(jiffies - p->tcf_tm.install);
|
t.install = jiffies_to_clock_t(jiffies - p->tcf_tm.install);
|
||||||
t.lastuse = jiffies_to_clock_t(jiffies - p->tcf_tm.lastuse);
|
t.lastuse = jiffies_to_clock_t(jiffies - p->tcf_tm.lastuse);
|
||||||
t.expires = jiffies_to_clock_t(p->tcf_tm.expires);
|
t.expires = jiffies_to_clock_t(p->tcf_tm.expires);
|
||||||
if (nla_put(skb, TCA_CSUM_TM, sizeof(t), &t))
|
if (nla_put_64bit(skb, TCA_CSUM_TM, sizeof(t), &t, TCA_CSUM_PAD))
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
|
|
||||||
return skb->len;
|
return skb->len;
|
||||||
|
|
|
@ -177,7 +177,7 @@ static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a, int bind, int
|
||||||
t.install = jiffies_to_clock_t(jiffies - gact->tcf_tm.install);
|
t.install = jiffies_to_clock_t(jiffies - gact->tcf_tm.install);
|
||||||
t.lastuse = jiffies_to_clock_t(jiffies - gact->tcf_tm.lastuse);
|
t.lastuse = jiffies_to_clock_t(jiffies - gact->tcf_tm.lastuse);
|
||||||
t.expires = jiffies_to_clock_t(gact->tcf_tm.expires);
|
t.expires = jiffies_to_clock_t(gact->tcf_tm.expires);
|
||||||
if (nla_put(skb, TCA_GACT_TM, sizeof(t), &t))
|
if (nla_put_64bit(skb, TCA_GACT_TM, sizeof(t), &t, TCA_GACT_PAD))
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
return skb->len;
|
return skb->len;
|
||||||
|
|
||||||
|
|
|
@ -550,7 +550,7 @@ static int tcf_ife_dump(struct sk_buff *skb, struct tc_action *a, int bind,
|
||||||
t.install = jiffies_to_clock_t(jiffies - ife->tcf_tm.install);
|
t.install = jiffies_to_clock_t(jiffies - ife->tcf_tm.install);
|
||||||
t.lastuse = jiffies_to_clock_t(jiffies - ife->tcf_tm.lastuse);
|
t.lastuse = jiffies_to_clock_t(jiffies - ife->tcf_tm.lastuse);
|
||||||
t.expires = jiffies_to_clock_t(ife->tcf_tm.expires);
|
t.expires = jiffies_to_clock_t(ife->tcf_tm.expires);
|
||||||
if (nla_put(skb, TCA_IFE_TM, sizeof(t), &t))
|
if (nla_put_64bit(skb, TCA_IFE_TM, sizeof(t), &t, TCA_IFE_PAD))
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
|
|
||||||
if (!is_zero_ether_addr(ife->eth_dst)) {
|
if (!is_zero_ether_addr(ife->eth_dst)) {
|
||||||
|
|
|
@ -275,7 +275,7 @@ static int tcf_ipt_dump(struct sk_buff *skb, struct tc_action *a, int bind, int
|
||||||
tm.install = jiffies_to_clock_t(jiffies - ipt->tcf_tm.install);
|
tm.install = jiffies_to_clock_t(jiffies - ipt->tcf_tm.install);
|
||||||
tm.lastuse = jiffies_to_clock_t(jiffies - ipt->tcf_tm.lastuse);
|
tm.lastuse = jiffies_to_clock_t(jiffies - ipt->tcf_tm.lastuse);
|
||||||
tm.expires = jiffies_to_clock_t(ipt->tcf_tm.expires);
|
tm.expires = jiffies_to_clock_t(ipt->tcf_tm.expires);
|
||||||
if (nla_put(skb, TCA_IPT_TM, sizeof (tm), &tm))
|
if (nla_put_64bit(skb, TCA_IPT_TM, sizeof(tm), &tm, TCA_IPT_PAD))
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
kfree(t);
|
kfree(t);
|
||||||
return skb->len;
|
return skb->len;
|
||||||
|
|
|
@ -214,7 +214,7 @@ static int tcf_mirred_dump(struct sk_buff *skb, struct tc_action *a, int bind, i
|
||||||
t.install = jiffies_to_clock_t(jiffies - m->tcf_tm.install);
|
t.install = jiffies_to_clock_t(jiffies - m->tcf_tm.install);
|
||||||
t.lastuse = jiffies_to_clock_t(jiffies - m->tcf_tm.lastuse);
|
t.lastuse = jiffies_to_clock_t(jiffies - m->tcf_tm.lastuse);
|
||||||
t.expires = jiffies_to_clock_t(m->tcf_tm.expires);
|
t.expires = jiffies_to_clock_t(m->tcf_tm.expires);
|
||||||
if (nla_put(skb, TCA_MIRRED_TM, sizeof(t), &t))
|
if (nla_put_64bit(skb, TCA_MIRRED_TM, sizeof(t), &t, TCA_MIRRED_PAD))
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
return skb->len;
|
return skb->len;
|
||||||
|
|
||||||
|
|
|
@ -267,7 +267,7 @@ static int tcf_nat_dump(struct sk_buff *skb, struct tc_action *a,
|
||||||
t.install = jiffies_to_clock_t(jiffies - p->tcf_tm.install);
|
t.install = jiffies_to_clock_t(jiffies - p->tcf_tm.install);
|
||||||
t.lastuse = jiffies_to_clock_t(jiffies - p->tcf_tm.lastuse);
|
t.lastuse = jiffies_to_clock_t(jiffies - p->tcf_tm.lastuse);
|
||||||
t.expires = jiffies_to_clock_t(p->tcf_tm.expires);
|
t.expires = jiffies_to_clock_t(p->tcf_tm.expires);
|
||||||
if (nla_put(skb, TCA_NAT_TM, sizeof(t), &t))
|
if (nla_put_64bit(skb, TCA_NAT_TM, sizeof(t), &t, TCA_NAT_PAD))
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
|
|
||||||
return skb->len;
|
return skb->len;
|
||||||
|
|
|
@ -203,7 +203,7 @@ static int tcf_pedit_dump(struct sk_buff *skb, struct tc_action *a,
|
||||||
t.install = jiffies_to_clock_t(jiffies - p->tcf_tm.install);
|
t.install = jiffies_to_clock_t(jiffies - p->tcf_tm.install);
|
||||||
t.lastuse = jiffies_to_clock_t(jiffies - p->tcf_tm.lastuse);
|
t.lastuse = jiffies_to_clock_t(jiffies - p->tcf_tm.lastuse);
|
||||||
t.expires = jiffies_to_clock_t(p->tcf_tm.expires);
|
t.expires = jiffies_to_clock_t(p->tcf_tm.expires);
|
||||||
if (nla_put(skb, TCA_PEDIT_TM, sizeof(t), &t))
|
if (nla_put_64bit(skb, TCA_PEDIT_TM, sizeof(t), &t, TCA_PEDIT_PAD))
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
kfree(opt);
|
kfree(opt);
|
||||||
return skb->len;
|
return skb->len;
|
||||||
|
|
|
@ -155,7 +155,7 @@ static int tcf_simp_dump(struct sk_buff *skb, struct tc_action *a,
|
||||||
t.install = jiffies_to_clock_t(jiffies - d->tcf_tm.install);
|
t.install = jiffies_to_clock_t(jiffies - d->tcf_tm.install);
|
||||||
t.lastuse = jiffies_to_clock_t(jiffies - d->tcf_tm.lastuse);
|
t.lastuse = jiffies_to_clock_t(jiffies - d->tcf_tm.lastuse);
|
||||||
t.expires = jiffies_to_clock_t(d->tcf_tm.expires);
|
t.expires = jiffies_to_clock_t(d->tcf_tm.expires);
|
||||||
if (nla_put(skb, TCA_DEF_TM, sizeof(t), &t))
|
if (nla_put_64bit(skb, TCA_DEF_TM, sizeof(t), &t, TCA_DEF_PAD))
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
return skb->len;
|
return skb->len;
|
||||||
|
|
||||||
|
|
|
@ -167,7 +167,7 @@ static int tcf_skbedit_dump(struct sk_buff *skb, struct tc_action *a,
|
||||||
t.install = jiffies_to_clock_t(jiffies - d->tcf_tm.install);
|
t.install = jiffies_to_clock_t(jiffies - d->tcf_tm.install);
|
||||||
t.lastuse = jiffies_to_clock_t(jiffies - d->tcf_tm.lastuse);
|
t.lastuse = jiffies_to_clock_t(jiffies - d->tcf_tm.lastuse);
|
||||||
t.expires = jiffies_to_clock_t(d->tcf_tm.expires);
|
t.expires = jiffies_to_clock_t(d->tcf_tm.expires);
|
||||||
if (nla_put(skb, TCA_SKBEDIT_TM, sizeof(t), &t))
|
if (nla_put_64bit(skb, TCA_SKBEDIT_TM, sizeof(t), &t, TCA_SKBEDIT_PAD))
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
return skb->len;
|
return skb->len;
|
||||||
|
|
||||||
|
|
|
@ -175,7 +175,7 @@ static int tcf_vlan_dump(struct sk_buff *skb, struct tc_action *a,
|
||||||
t.install = jiffies_to_clock_t(jiffies - v->tcf_tm.install);
|
t.install = jiffies_to_clock_t(jiffies - v->tcf_tm.install);
|
||||||
t.lastuse = jiffies_to_clock_t(jiffies - v->tcf_tm.lastuse);
|
t.lastuse = jiffies_to_clock_t(jiffies - v->tcf_tm.lastuse);
|
||||||
t.expires = jiffies_to_clock_t(v->tcf_tm.expires);
|
t.expires = jiffies_to_clock_t(v->tcf_tm.expires);
|
||||||
if (nla_put(skb, TCA_VLAN_TM, sizeof(t), &t))
|
if (nla_put_64bit(skb, TCA_VLAN_TM, sizeof(t), &t, TCA_VLAN_PAD))
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
return skb->len;
|
return skb->len;
|
||||||
|
|
||||||
|
|
|
@ -1140,9 +1140,10 @@ static int u32_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
|
||||||
gpf->kcnts[i] += pf->kcnts[i];
|
gpf->kcnts[i] += pf->kcnts[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nla_put(skb, TCA_U32_PCNT,
|
if (nla_put_64bit(skb, TCA_U32_PCNT,
|
||||||
sizeof(struct tc_u32_pcnt) + n->sel.nkeys*sizeof(u64),
|
sizeof(struct tc_u32_pcnt) +
|
||||||
gpf)) {
|
n->sel.nkeys * sizeof(u64),
|
||||||
|
gpf, TCA_U32_PAD)) {
|
||||||
kfree(gpf);
|
kfree(gpf);
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1365,7 +1365,8 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid,
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
|
|
||||||
if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS, TCA_XSTATS,
|
if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS, TCA_XSTATS,
|
||||||
qdisc_root_sleeping_lock(q), &d) < 0)
|
qdisc_root_sleeping_lock(q), &d,
|
||||||
|
TCA_PAD) < 0)
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
|
|
||||||
if (q->ops->dump_stats && q->ops->dump_stats(q, &d) < 0)
|
if (q->ops->dump_stats && q->ops->dump_stats(q, &d) < 0)
|
||||||
|
@ -1679,7 +1680,8 @@ static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q,
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
|
|
||||||
if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS, TCA_XSTATS,
|
if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS, TCA_XSTATS,
|
||||||
qdisc_root_sleeping_lock(q), &d) < 0)
|
qdisc_root_sleeping_lock(q), &d,
|
||||||
|
TCA_PAD) < 0)
|
||||||
goto nla_put_failure;
|
goto nla_put_failure;
|
||||||
|
|
||||||
if (cl_ops->dump_stats && cl_ops->dump_stats(q, cl, &d) < 0)
|
if (cl_ops->dump_stats && cl_ops->dump_stats(q, cl, &d) < 0)
|
||||||
|
|
Loading…
Reference in a new issue