lkml.org 
[lkml]   [2018]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 42/96] net/sched: Fix update of lastuse in act modules implementing stats_update
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Roi Dayan <roid@mellanox.com>


    [ Upstream commit 3bb23421a504f01551b7cb9dff0e41dbf16656b0 ]

    We need to update lastuse to to the most updated value between what
    is already set and the new value.
    If HW matching fails, i.e. because of an issue, the stats are not updated
    but it could be that software did match and updated lastuse.

    Fixes: 5712bf9c5c30 ("net/sched: act_mirred: Use passed lastuse argument")
    Fixes: 9fea47d93bcc ("net/sched: act_gact: Update statistics when offloaded to hardware")
    Signed-off-by: Roi Dayan <roid@mellanox.com>
    Reviewed-by: Paul Blakey <paulb@mellanox.com>
    Acked-by: Jiri Pirko <jiri@mellanox.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/sched/act_gact.c | 2 +-
    net/sched/act_mirred.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    --- a/net/sched/act_gact.c
    +++ b/net/sched/act_gact.c
    @@ -161,7 +161,7 @@ static void tcf_gact_stats_update(struct
    if (action == TC_ACT_SHOT)
    this_cpu_ptr(gact->common.cpu_qstats)->drops += packets;

    - tm->lastuse = lastuse;
    + tm->lastuse = max_t(u64, tm->lastuse, lastuse);
    }

    static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a,
    --- a/net/sched/act_mirred.c
    +++ b/net/sched/act_mirred.c
    @@ -211,7 +211,7 @@ static void tcf_stats_update(struct tc_a
    struct tcf_t *tm = &m->tcf_tm;

    _bstats_cpu_update(this_cpu_ptr(a->cpu_bstats), bytes, packets);
    - tm->lastuse = lastuse;
    + tm->lastuse = max_t(u64, tm->lastuse, lastuse);
    }

    static int tcf_mirred_dump(struct sk_buff *skb, struct tc_action *a, int bind,

    \
     
     \ /
      Last update: 2018-01-15 14:49    [W:4.136 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site