From: Raed Salem <raeds@nvidia.com>

Date: Tue, 8 Nov 2022 14:30:33 +0200

Subject: net/mlx5e: MACsec, fix Tx SA active field update

Patch-mainline: v6.1-rc8

Git-commit: 7c5578e29963c35bb14d08b15df77a0c11f71fc5

References: jsc#PED-1549

Currently during update Tx security association (SA) flow, the Tx SA

active state is updated only if the Tx SA in question is the same SA

that the MACsec interface is using for Tx,in consequence when the

MACsec interface chose to work with this Tx SA later, where this SA

for example should have been updated to active state and it was not,

the relevant Tx SA HW context won't be installed, hence the MACSec

flow won't be offloaded.

Fix by update Tx SA active state as part of update flow regardless

whether the SA in question is the same Tx SA used by the MACsec

interface.

Fixes: 8ff0ac5be144 ("net/mlx5: Add MACsec offload Tx command support")

Signed-off-by: Raed Salem <raeds@nvidia.com>

Reviewed-by: Emeel Hakim <ehakim@nvidia.com>

Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c |    3 +--

 1 file changed, 1 insertion(+), 2 deletions(-)

--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c

+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c

@@ -618,6 +618,7 @@ static int mlx5e_macsec_upd_txsa(struct

 	if (tx_sa->active == ctx_tx_sa->active)

 		goto out;

+	tx_sa->active = ctx_tx_sa->active;

 	if (tx_sa->assoc_num != tx_sc->encoding_sa)

 		goto out;

@@ -633,8 +634,6 @@ static int mlx5e_macsec_upd_txsa(struct

 		mlx5e_macsec_cleanup_sa(macsec, tx_sa, true);

 	}

-

-	tx_sa->active = ctx_tx_sa->active;

 out:

 	mutex_unlock(&macsec->lock);