From: Saeed Mahameed <saeed@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Eric Dumazet <edumazet@google.com>
Cc: Saeed Mahameed <saeedm@nvidia.com>,
netdev@vger.kernel.org, Tariq Toukan <tariqt@nvidia.com>,
Emeel Hakim <ehakim@nvidia.com>
Subject: [PATCH net-next V3 03/10] net/mlx5e: Fix MACsec initialization error path
Date: Wed, 21 Sep 2022 11:10:47 -0700 [thread overview]
Message-ID: <20220921181054.40249-4-saeed@kernel.org> (raw)
In-Reply-To: <20220921181054.40249-1-saeed@kernel.org>
From: Emeel Hakim <ehakim@nvidia.com>
Currently MACsec initialization error path does not
destroy sci hash table in case of failure.
Fix by destroying hash table in case of failure.
Fixes: 9515978eee0b ("net/mlx5e: Implement MACsec Tx data path using MACsec skb_metadata_dst")
Signed-off-by: Emeel Hakim <ehakim@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
index ea362072a984..0600c03ccc73 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c
@@ -1285,7 +1285,7 @@ int mlx5e_macsec_init(struct mlx5e_priv *priv)
if (err) {
mlx5_core_err(mdev, "MACsec offload: Failed to init SCI hash table, err=%d\n",
err);
- goto err_out;
+ goto err_hash;
}
xa_init_flags(&macsec->sc_xarray, XA_FLAGS_ALLOC1);
@@ -1307,6 +1307,8 @@ int mlx5e_macsec_init(struct mlx5e_priv *priv)
return 0;
err_out:
+ rhashtable_destroy(&macsec->sci_hash);
+err_hash:
mlx5_core_dealloc_pd(priv->mdev, macsec->aso_pdn);
err_pd:
kfree(macsec);
--
2.37.3
next prev parent reply other threads:[~2022-09-21 18:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-21 18:10 [PATCH net-next V3 00/10] mlx5 MACSec Extended packet number and replay window offload Saeed Mahameed
2022-09-21 18:10 ` [PATCH net-next V3 01/10] net: macsec: Expose extended packet number (EPN) properties to macsec offload Saeed Mahameed
2022-09-21 18:10 ` [PATCH net-next V3 02/10] net/mlx5: Fix fields name prefix in MACsec Saeed Mahameed
2022-09-21 18:10 ` Saeed Mahameed [this message]
2022-09-21 18:10 ` [PATCH net-next V3 04/10] net/mlx5e: Fix MACsec initial packet number Saeed Mahameed
2022-09-21 18:10 ` [PATCH net-next V3 05/10] net/mlx5: Add ifc bits for MACsec extended packet number (EPN) and replay protection Saeed Mahameed
2022-09-21 18:10 ` [PATCH net-next V3 06/10] net/mlx5e: Expose memory key creation (mkey) function Saeed Mahameed
2022-09-21 18:10 ` [PATCH net-next V3 07/10] net/mlx5e: Create advanced steering operation (ASO) object for MACsec Saeed Mahameed
2022-09-21 18:10 ` [PATCH net-next V3 08/10] net/mlx5e: Move MACsec initialization from profile init stage to profile enable stage Saeed Mahameed
2022-09-21 18:10 ` [PATCH net-next V3 09/10] net/mlx5e: Support MACsec offload extended packet number (EPN) Saeed Mahameed
2022-09-21 18:10 ` [PATCH net-next V3 10/10] net/mlx5e: Support MACsec offload replay window Saeed Mahameed
2022-09-23 2:30 ` [PATCH net-next V3 00/10] mlx5 MACSec Extended packet number and replay window offload patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220921181054.40249-4-saeed@kernel.org \
--to=saeed@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=ehakim@nvidia.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=saeedm@nvidia.com \
--cc=tariqt@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.