Skip to contentSkip to conversation

Patch "net/sched: Fix update of lastuse in act modules implementing stats_update" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 13, 2018

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

net/sched: Fix update of lastuse in act modules implementing stats_update

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
net-sched-fix-update-of-lastuse-in-act-modules-implementing-stats_update.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Sat Jan 13 10:51:19 CET 2018

From: Roi Dayan <[email protected]>
Date: Tue, 26 Dec 2017 07:48:51 +0200
Subject: net/sched: Fix update of lastuse in act modules implementing stats_update

From: Roi Dayan <[email protected]>

[ 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")
---
 net/sched/act_gact.c   |    2 +-
 net/sched/act_mirred.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
net/sched/act_gact.c +1 -1
@@ -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,
net/sched/act_mirred.c +1 -1
@@ -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,

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/net-sched-fix-update-of-lastuse-in-act-modules-implementing-stats_update.patch