From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2824C4332F for ; Thu, 17 Mar 2022 18:54:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235402AbiCQS4C (ORCPT ); Thu, 17 Mar 2022 14:56:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237734AbiCQSzx (ORCPT ); Thu, 17 Mar 2022 14:55:53 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45DAF165A83 for ; Thu, 17 Mar 2022 11:54:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D754C617AF for ; Thu, 17 Mar 2022 18:54:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA9F8C340F4; Thu, 17 Mar 2022 18:54:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647543275; bh=Qxq6bFQqs97ZGol2Bl4IAnUjZc2GO9IEYORGx8CyF1g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ei4s9ZRPjVHI6w8xoxPjIiXs/14EQRFRqcjugR1Tljgqae2k2Op0HcdK4NeadvyIE MBCgi69amykYRhX4ZDxNrw67UWPKsfSb35AemIUHZIcDwTph7C8cM0nQOlpE1zer2A K353uaWdecsMkXMjzQJLzR6GJy66AZtqzv6V9VzdhH7xnpNuykQqrgU1WlJbbsqrHU US/YTEcdc3JYj+Ej2T0akSPqDgvJyfQKCQmOXvljPN9APKMohg78sLf/ooc0Ql1gbq 0rkFbii39RQl+tufz8o8o8f8XZ4UtjzmBpRkwFP0TFQBEXaAWyEeAdVDUxOrSV0zYi 95NnD5eXazdcQ== From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Paul Blakey , Maor Dickman , Saeed Mahameed Subject: [net-next 13/15] net/mlx5: CT: Remove extra rhashtable remove on tuple entries Date: Thu, 17 Mar 2022 11:54:22 -0700 Message-Id: <20220317185424.287982-14-saeed@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220317185424.287982-1-saeed@kernel.org> References: <20220317185424.287982-1-saeed@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Paul Blakey On tuple offload del command, tuples are tried to be removed twice from the hashtable, once directly via mlx5_tc_ct_entry_remove_from_tuples() and a second time in the following mlx5_tc_ct_entry_put()-> mlx5_tc_ct_entry_del()->mlx5_tc_ct_entry_remove_from_tuples() call. This doesn't cause any issue since rhashtable first checks if the removed object exists in the hashtable. Remove the extra mlx5_tc_ct_entry_remove_from_tuples(). Signed-off-by: Paul Blakey Reviewed-by: Maor Dickman Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c index 7db9d8ee1304..e49f51124c74 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c @@ -1161,7 +1161,6 @@ mlx5_tc_ct_block_flow_offload_del(struct mlx5_ct_ft *ft, } rhashtable_remove_fast(&ft->ct_entries_ht, &entry->node, cts_ht_params); - mlx5_tc_ct_entry_remove_from_tuples(entry); spin_unlock_bh(&ct_priv->ht_lock); mlx5_tc_ct_entry_put(entry); -- 2.35.1