Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Volodymyr Mytnyk <volodymyr.mytnyk@plvision.eu>
To:     netdev@vger.kernel.org
Cc:     Taras Chornyi <taras.chornyi@plvision.eu>,
        Mickey Rachamim <mickeyr@marvell.com>,
        Serhiy Pshyk <serhiy.pshyk@plvision.eu>,
        Volodymyr Mytnyk <vmytnyk@marvell.com>,
        Taras Chornyi <tchornyi@marvell.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>, linux-kernel@vger.kernel.org
Subject: [PATCH net-next] net: prestera: flower: fix destroy tmpl in chain
Date:   Wed, 16 Feb 2022 16:43:44 +0200
Message-Id: <1645022624-2010-1-git-send-email-volodymyr.mytnyk@plvision.eu>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6+oJ9qUyPyRledV1Z0/Dwy5Y8UufxRBHIFAFMRLmvgu5fTmlFJrFI+OqkWUY?=
 =?us-ascii?Q?Gi3s/V+8zMT9FDbrPJVdOo2tBykP/1bdjVkeyl3iUlCcHjEoc/eRedQEXnn9?=
 =?us-ascii?Q?GO23rl02lPwBWwwc8y8ix/WUG7bzJPpq7OnNSCP1zgEOxlO0TM/g2elpeZU7?=
 =?us-ascii?Q?dH6JH9QNPsiE5+xsjqmTV7F4In4IymGNYAWdY6PIRNNpBXr3gWCNezQSk6SB?=
 =?us-ascii?Q?zJ5rn8mm/p205ovdG3rz0o7oy7UI5xKnTbxe/YgeukfNlgiiDR+jMJKz7xb6?=
 =?us-ascii?Q?J+7CcazWlRGwdCUS/VmK/aJYZywkmGOy+SrEX0yvhCQiA97NY2o49C716nBG?=
 =?us-ascii?Q?uBfiXG+nPrF/1tvbClTCKfdAE5JJ9psONCfiPsuPbWFXe0bModADJ3QVflsd?=
 =?us-ascii?Q?yyZb0+MZBKALeSIUAvbdPCNisVhYpx6jVebp/3HUYXDvXCP1TgfPXcIDGb+a?=
 =?us-ascii?Q?J9lBmmBmE8ecmuNk45K09urG+QZuLq6+NvN1WAjJCq1wR7OS2Du7p4w+nKcs?=
 =?us-ascii?Q?ArMKah6xuGjW4jipEZiIBmKjB106qj75TPQ/X0PVu3dCmnPojISFZVoBOVZf?=
 =?us-ascii?Q?qwCUG40XZZ+RgOUQ1+try2XGtHp9IfWVua04n9MgQEVnQ6qC3ahvv3iOBnF3?=
 =?us-ascii?Q?nIqMhAjX8ryMCZW1FsOfGHA48UP2ac7bmZ+mFEvsPj9USdTuLQj+CDEjCw9A?=
 =?us-ascii?Q?6vWeuRFCcm6xUBlIUTe/PXxCPPTR+jxXFnw1ZeqpbeNk89k52Q10Xfl/sM4n?=
 =?us-ascii?Q?WC18dC9qAADAl7N3qq+ZOURt+r4q2YXyEqYB+gZRtX6cwxuHvXt03fp0/HJ6?=
 =?us-ascii?Q?UYG8xO1VGbLlwK0LvDwe+cKbiKgGw7xlKLBrUhcjk00aTjhaSPxQpzycugGX?=
 =?us-ascii?Q?MJy0uyUHVrW88n4qdGdruxYVTtjnMCJHXKpvmkstJQu1fk04M6vYiAKVOgSQ?=
 =?us-ascii?Q?qQSLjfF2G9kX06Ybo9hGww0NZ+cOiEY5jBc09PW8c7lhSQDLz9hXwNyQWsjr?=
 =?us-ascii?Q?JncqnTUrglXj0aypINyoY8t5CDEKooSTgN8LNa1r/K8oRazUHOeNIa0d4cQ0?=
 =?us-ascii?Q?cbgU4scNHeSQ/z3EtabCA5kXD7RLlrUivS1kjS8guKym4XO7lCt/Te17nZiT?=
 =?us-ascii?Q?t1dxrHEu1ZljVltC6LTK0JA3n4j7hsyPunrXpLY3rX5zDML1wJ1NPKnhx4i/?=
 =?us-ascii?Q?qN0H3WTRWlmII+QLsIFSMIGOAW0sVlplQl+WcBX+oDqZMVwIa9Yfdf2UatnW?=
 =?us-ascii?Q?Nq+YQfUXrPSqS1pkKGVoK62BeCt0iiW0G1J1utrtnD21ROglU6ubT7IswemF?=
 =?us-ascii?Q?GQChUE1+PPZjzZA4oveJcJeQd26BZ0W06cgkz1h7SIXScMkQBbTi8rnnUGJy?=
 =?us-ascii?Q?qbgoM+QB3hmHyiFNkG4FrxwfHjhtOGlMWRUvGWx+7U2TGl17SyVi5MUE1Ngb?=
 =?us-ascii?Q?xMRmslqZ/OBDFWcKWpAZCOEVJxcasvEA42yQHQOq4+CIZ2/YzeQXa4BySdV0?=
 =?us-ascii?Q?NI7+F7g1vdKXa+HpwcHAPObgrUEeE7rSv2rpes4Lz1D/sYDJA+Z7dS++BrJ3?=
 =?us-ascii?Q?Y4JqJbd2olBwYTfdX5bOZZea35/UmIWeGny03oBwTeWyiQoVQoZEqoWXsyYZ?=
 =?us-ascii?Q?pV/lbGbMckbjMZDHu/sFOSvWkzMpQphN/h8rpciIo2OXENFAhAccWK5+nH0m?=
 =?us-ascii?Q?eWxXmQ=3D=3D?=
X-OriginatorOrg: plvision.eu
X-MS-Exchange-CrossTenant-Network-Message-Id: c327926c-a238-4abf-f9d8-08d9f15ace4a
X-MS-Exchange-CrossTenant-AuthSource: VI1P190MB0734.EURP190.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2022 14:44:16.5492
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 03707b74-30f3-46b6-a0e0-ff0a7438c9c4
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: orcVCPC+xhJUZ4AHTp+MRBS2ILy2rY+pY9FyAV7QVaTT79fKTNSoXe/Rghkw6l646dVDovQsNyyb/Eb8grvEew27kr3TZBSeTAFOn0DN9tc=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1P190MB0496
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Volodymyr Mytnyk <vmytnyk@marvell.com>

Fix flower destroy template callback to release template
only for specific tc chain instead of all chain tempaltes.

The issue was intruduced by previous commit that introduced
multi-chain support.

Fixes: fa5d824ce5dd ("net: prestera: acl: add multi-chain support offload")

Signed-off-by: Volodymyr Mytnyk <vmytnyk@marvell.com>
---
 .../ethernet/marvell/prestera/prestera_flower.c    | 24 ++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_flower.c b/drivers/net/ethernet/marvell/prestera/prestera_flower.c
index 580fb986496a..9587707e3148 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_flower.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_flower.c
@@ -12,6 +12,14 @@ struct prestera_flower_template {
 	u32 chain_index;
 };
 
+static void
+prestera_flower_template_free(struct prestera_flower_template *template)
+{
+	prestera_acl_ruleset_put(template->ruleset);
+	list_del(&template->list);
+	kfree(template);
+}
+
 void prestera_flower_template_cleanup(struct prestera_flow_block *block)
 {
 	struct prestera_flower_template *template;
@@ -20,9 +28,7 @@ void prestera_flower_template_cleanup(struct prestera_flow_block *block)
 	/* put the reference to all rulesets kept in tmpl create */
 	list_for_each_safe(pos, n, &block->template_list) {
 		template = list_entry(pos, typeof(*template), list);
-		prestera_acl_ruleset_put(template->ruleset);
-		list_del(&template->list);
-		kfree(template);
+		prestera_flower_template_free(template);
 	}
 }
 
@@ -423,7 +429,17 @@ int prestera_flower_tmplt_create(struct prestera_flow_block *block,
 void prestera_flower_tmplt_destroy(struct prestera_flow_block *block,
 				   struct flow_cls_offload *f)
 {
-	prestera_flower_template_cleanup(block);
+	struct prestera_flower_template *template;
+	struct list_head *pos, *n;
+
+	list_for_each_safe(pos, n, &block->template_list) {
+		template = list_entry(pos, typeof(*template), list);
+		if (template->chain_index == f->common.chain_index) {
+			/* put the reference to the ruleset kept in create */
+			prestera_flower_template_free(template);
+			return;
+		}
+	}
 }
 
 int prestera_flower_stats(struct prestera_flow_block *block,
-- 
2.7.4