On Mon, Oct 31, 2022 at 01:24:07PM +0200, Roi Dayan wrote:
On 31/10/2022 12:30, Sasha Levin wrote:This is a note to let you know that I've just added the patch titled net/mlx5e: TC, Fix cloned flow attr instance dests are not zeroed to the 6.0-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-mlx5e-tc-fix-cloned-flow-attr-instance-dests-are.patch and it can be found in the queue-6.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. commit e47ec25c93bd242a89398498f2f29ab1a8cd8533 Author: Roi Dayan <roid@xxxxxxxxxx> Date: Wed Oct 26 14:51:47 2022 +0100 net/mlx5e: TC, Fix cloned flow attr instance dests are not zeroed [ Upstream commit 94d651739e17b0ee9b556e60f206fe538d06dc05 ] On multi table split the driver creates a new attr instance with data being copied from prev attr instance zeroing action flags. Also need to reset dests properties to avoid incorrect dests per attr. Fixes: 8300f225268b ("net/mlx5e: Create new flow attr for multi table actions") Signed-off-by: Roi Dayan <roid@xxxxxxxxxx> Reviewed-by: Maor Dickman <maord@xxxxxxxxxx> Signed-off-by: Saeed Mahameed <saeedm@xxxxxxxxxx> Link: https://lore.kernel.org/r/20221026135153.154807-10-saeed@xxxxxxxxxx Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index a687f047e3ae..8998450c61a3 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -3619,6 +3619,10 @@ mlx5e_clone_flow_attr_for_post_act(struct mlx5_flow_attr *attr, attr2->action = 0; attr2->flags = 0; attr2->parse_attr = parse_attr; + attr2->esw_attr->out_count = 0; + attr2->esw_attr->split_count = 0; + attr2->dest_chain = 0; + attr2->dest_ft = NULL; return attr2; }Hi, There is a bug with this patch discovered late. I sent a small fix commit yesterday to Saeed so it's better to avoid merging this commit in the stable branch for now and maybe merge it later with the fix commit.
Will do, let me know if/when it should be reapplied. -- Thanks, Sasha
