On Thu, 6 Sep 2018 18:37:23 +0300, Vlad Buslov wrote:
> Change flower in_hw_count type to fixed-size u32 and dump it as
> TCA_FLOWER_IN_HW_COUNT. This change is necessary to properly test shared
> blocks and re-offload functionality.
>
> Signed-off-by: Vlad Buslov <vla...@mellanox.com>
> Acked-by: Jiri Pirko <j...@mellanox.com>
> ---
> include/net/sch_generic.h | 2 +-
> include/uapi/linux/pkt_cls.h | 2 ++
> net/sched/cls_flower.c | 5 ++++-
> 3 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
> index a6d00093f35e..d68ac55539a5 100644
> --- a/include/net/sch_generic.h
> +++ b/include/net/sch_generic.h
> @@ -362,7 +362,7 @@ static inline void tcf_block_offload_dec(struct tcf_block
> *block, u32 *flags)
> }
>
> static inline void
> -tc_cls_offload_cnt_update(struct tcf_block *block, unsigned int *cnt,
> +tc_cls_offload_cnt_update(struct tcf_block *block, u32 *cnt,
> u32 *flags, bool add)
> {
> if (add) {
> diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
> index be382fb0592d..2824fb7ed1c9 100644
> --- a/include/uapi/linux/pkt_cls.h
> +++ b/include/uapi/linux/pkt_cls.h
> @@ -483,6 +483,8 @@ enum {
> TCA_FLOWER_KEY_ENC_OPTS,
> TCA_FLOWER_KEY_ENC_OPTS_MASK,
>
> + TCA_FLOWER_IN_HW_COUNT, /* be32 */
Why be32?
I wish there was a good way to share this attribute between
classifiers :(
> __TCA_FLOWER_MAX,
> };
>
> diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
> index 6fd9bdd93796..4b8dd37dd4f8 100644
> --- a/net/sched/cls_flower.c
> +++ b/net/sched/cls_flower.c
> @@ -98,7 +98,7 @@ struct cls_fl_filter {
> struct list_head list;
> u32 handle;
> u32 flags;
> - unsigned int in_hw_count;
> + u32 in_hw_count;
> struct rcu_work rwork;
> struct net_device *hw_dev;
> };
> @@ -1880,6 +1880,9 @@ static int fl_dump(struct net *net, struct tcf_proto
> *tp, void *fh,
> if (f->flags && nla_put_u32(skb, TCA_FLOWER_FLAGS, f->flags))
> goto nla_put_failure;
>
> + if (nla_put_u32(skb, TCA_FLOWER_IN_HW_COUNT, f->in_hw_count))
> + goto nla_put_failure;
> +
> if (tcf_exts_dump(skb, &f->exts))
> goto nla_put_failure;
>
