Commit 3c99bace authored by Subbaraya Sundeep's avatar Subbaraya Sundeep Committed by Paolo Abeni
Browse files

octeontx2-pf: mcs: Do not reset PN while updating secy 



After creating SecYs, SCs and SAs a SecY can be modified
to change attributes like validation mode, protect frames
mode etc. During this SecY update, packet number is reset to
initial user given value by mistake. Hence do not reset
PN when updating SecY parameters.

Fixes: c54ffc73 ("octeontx2-pf: mcs: Introduce MACSEC hardware offloading")
Signed-off-by: default avatarSubbaraya Sundeep <sbhatta@marvell.com>
Signed-off-by: default avatarSunil Goutham <sgoutham@marvell.com>
Signed-off-by: default avatarGeetha sowjanya <gakula@marvell.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 9bdfe610

drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c

+10 −5
Original line number Diff line number Diff line
@@ -1134,6 +1134,7 @@ static int cn10k_mdo_upd_secy(struct macsec_context *ctx) 
	struct macsec_secy *secy = ctx->secy;

	struct macsec_tx_sa *sw_tx_sa;

	struct cn10k_mcs_txsc *txsc;

	bool active;

	u8 sa_num;

	int err;
@@ -1141,15 +1142,19 @@ static int cn10k_mdo_upd_secy(struct macsec_context *ctx) 
	if (!txsc)

		return -ENOENT;



	/* Encoding SA got changed */

	if (txsc->encoding_sa != secy->tx_sc.encoding_sa) {

		txsc->encoding_sa = secy->tx_sc.encoding_sa;



		sa_num = txsc->encoding_sa;

		sw_tx_sa = rcu_dereference_bh(secy->tx_sc.sa[sa_num]);

		active = sw_tx_sa ? sw_tx_sa->active : false;

		cn10k_mcs_link_tx_sa2sc(pfvf, secy, txsc, sa_num, active);

	}



	if (netif_running(secy->netdev)) {

		cn10k_mcs_sync_stats(pfvf, secy, txsc);



		err = cn10k_mcs_secy_tx_cfg(pfvf, secy, txsc, sw_tx_sa, sa_num);

		err = cn10k_mcs_secy_tx_cfg(pfvf, secy, txsc, NULL, 0);

		if (err)

			return err;

	}