Patch "net/sched: act_police: allow 'continue' action offload" has been added to the 5.18-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

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

    net/sched: act_police: allow 'continue' action offload

to the 5.18-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-act_police-allow-continue-action-offload.patch
and it can be found in the queue-5.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 6d882078c1cbc2283812b52f553d16e50178c56d
Author: Vlad Buslov <vladbu@xxxxxxxxxx>
Date:   Mon Jul 4 22:44:04 2022 +0200

    net/sched: act_police: allow 'continue' action offload
    
    [ Upstream commit 052f744f44462cc49b88a125b0f7b93a9e47a9dd ]
    
    Offloading police with action TC_ACT_UNSPEC was erroneously disabled even
    though it was supported by mlx5 matchall offload implementation, which
    didn't verify the action type but instead assumed that any single police
    action attached to matchall classifier is a 'continue' action. Lack of
    action type check made it non-obvious what mlx5 matchall implementation
    actually supports and caused implementers and reviewers of referenced
    commits to disallow it as a part of improved validation code.
    
    Fixes: b8cd5831c61c ("net: flow_offload: add tc police action parameters")
    Fixes: b50e462bc22d ("net/sched: act_police: Add extack messages for offload failure")
    Signed-off-by: Vlad Buslov <vladbu@xxxxxxxxxx>
    Reviewed-by: Ido Schimmel <idosch@xxxxxxxxxx>
    Tested-by: Ido Schimmel <idosch@xxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h
index 6484095a8c01..7ac313858037 100644
--- a/include/net/flow_offload.h
+++ b/include/net/flow_offload.h
@@ -152,6 +152,7 @@ enum flow_action_id {
 	FLOW_ACTION_PIPE,
 	FLOW_ACTION_VLAN_PUSH_ETH,
 	FLOW_ACTION_VLAN_POP_ETH,
+	FLOW_ACTION_CONTINUE,
 	NUM_FLOW_ACTIONS,
 };
 
diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index 79c8901f66ab..b759628a47c2 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -442,7 +442,7 @@ static int tcf_police_act_to_flow_act(int tc_act, u32 *extval,
 		act_id = FLOW_ACTION_JUMP;
 		*extval = tc_act & TC_ACT_EXT_VAL_MASK;
 	} else if (tc_act == TC_ACT_UNSPEC) {
-		NL_SET_ERR_MSG_MOD(extack, "Offload not supported when conform/exceed action is \"continue\"");
+		act_id = FLOW_ACTION_CONTINUE;
 	} else {
 		NL_SET_ERR_MSG_MOD(extack, "Unsupported conform/exceed action offload");
 	}