From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDAFA1C13 for ; Fri, 25 Aug 2023 06:29:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77F89C433D9; Fri, 25 Aug 2023 06:29:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692944997; bh=RcLPeWfsxWIQHYfNQXHElUtwwOap1AVBrBMjci4wknQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bLJyIGWDjB5cN+/xg+5E+AGjf+pwHG9fjGcH39MT4aIjLA2lFD6JV7e+6kBwi0+te HKYxk2LFftZMVHQjRQWuVFqHQH90pZPEO/2VVHXsHy2gLgFKnYJ9u9OeoxUFxr0MhA tFU0jfTIY7A3DuUwe68Njn1sfo3OG9++BTVs30OIXLBv9Ro9qo/khiU3rsDf1+q49y 8cHrofDkUf4f85Zl+s9OJXZVyXiy13lK1WfE8ioQbXSMjcyNTeWkbSSx0rGTKrES42 hHAgDZZ/Y6vEuYjKJJVSroh/7QDT5q9tbFrKtPoo83ysjD38bhNlq6zNRSiFeC37VV PWzLWNCXSP68w== From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet Cc: Saeed Mahameed , netdev@vger.kernel.org, Tariq Toukan , Jiri Pirko , Leon Romanovsky Subject: [PATCH net-next V4 3/8] net/mlx5: Drop extra layer of locks in IPsec Date: Thu, 24 Aug 2023 23:28:31 -0700 Message-ID: <20230825062836.103744-4-saeed@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230825062836.103744-1-saeed@kernel.org> References: <20230825062836.103744-1-saeed@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Leon Romanovsky There is no need in holding devlink lock as it gives nothing compared to already used write mode_lock. Signed-off-by: Leon Romanovsky Signed-off-by: Saeed Mahameed --- .../mellanox/mlx5/core/eswitch_offloads.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c index 67eab99f95b1..28c4b9724e38 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c @@ -3903,38 +3903,28 @@ int mlx5_devlink_eswitch_inline_mode_get(struct devlink *devlink, u8 *mode) bool mlx5_eswitch_block_encap(struct mlx5_core_dev *dev) { - struct devlink *devlink = priv_to_devlink(dev); - struct mlx5_eswitch *esw; + struct mlx5_eswitch *esw = dev->priv.eswitch; - devl_lock(devlink); - esw = mlx5_devlink_eswitch_get(devlink); - if (IS_ERR(esw)) { - devl_unlock(devlink); - /* Failure means no eswitch => not possible to change encap */ + if (!mlx5_esw_allowed(esw)) return true; - } down_write(&esw->mode_lock); if (esw->mode != MLX5_ESWITCH_LEGACY && esw->offloads.encap != DEVLINK_ESWITCH_ENCAP_MODE_NONE) { up_write(&esw->mode_lock); - devl_unlock(devlink); return false; } esw->offloads.num_block_encap++; up_write(&esw->mode_lock); - devl_unlock(devlink); return true; } void mlx5_eswitch_unblock_encap(struct mlx5_core_dev *dev) { - struct devlink *devlink = priv_to_devlink(dev); - struct mlx5_eswitch *esw; + struct mlx5_eswitch *esw = dev->priv.eswitch; - esw = mlx5_devlink_eswitch_get(devlink); - if (IS_ERR(esw)) + if (!mlx5_esw_allowed(esw)) return; down_write(&esw->mode_lock); -- 2.41.0