Commit 9cef24c8 authored by Lior Nahmanson's avatar Lior Nahmanson Committed by Jakub Kicinski
Browse files

net: macsec: Fix offload support for NETDEV_UNREGISTER event 



Current macsec netdev notify handler handles NETDEV_UNREGISTER event by
releasing relevant SW resources only, this causes resources leak in case
of macsec HW offload, as the underlay driver was not notified to clean
it's macsec offload resources.

Fix by calling the underlay driver to clean it's relevant resources
by moving offload handling from macsec_dellink() to macsec_common_dellink()
when handling NETDEV_UNREGISTER event.

Fixes: 3cf3227a ("net: macsec: hardware offloading infrastructure")
Signed-off-by: default avatarLior Nahmanson <liorna@nvidia.com>
Reviewed-by: default avatarRaed Salem <raeds@nvidia.com>
Signed-off-by: default avatarRaed Salem <raeds@nvidia.com>
Reviewed-by: default avatarAntoine Tenart <atenart@kernel.org>
Link: https://lore.kernel.org/r/1643542141-28956-1-git-send-email-raeds@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 7af037c3

drivers/net/macsec.c

+12 −12
Original line number Diff line number Diff line
@@ -3870,6 +3870,18 @@ static void macsec_common_dellink(struct net_device *dev, struct list_head *head 
	struct macsec_dev *macsec = macsec_priv(dev);

	struct net_device *real_dev = macsec->real_dev;



	/* If h/w offloading is available, propagate to the device */

	if (macsec_is_offloaded(macsec)) {

		const struct macsec_ops *ops;

		struct macsec_context ctx;



		ops = macsec_get_ops(netdev_priv(dev), &ctx);

		if (ops) {

			ctx.secy = &macsec->secy;

			macsec_offload(ops->mdo_del_secy, &ctx);

		}

	}



	unregister_netdevice_queue(dev, head);

	list_del_rcu(&macsec->secys);

	macsec_del_dev(macsec);
@@ -3884,18 +3896,6 @@ static void macsec_dellink(struct net_device *dev, struct list_head *head) 
	struct net_device *real_dev = macsec->real_dev;

	struct macsec_rxh_data *rxd = macsec_data_rtnl(real_dev);



	/* If h/w offloading is available, propagate to the device */

	if (macsec_is_offloaded(macsec)) {

		const struct macsec_ops *ops;

		struct macsec_context ctx;



		ops = macsec_get_ops(netdev_priv(dev), &ctx);

		if (ops) {

			ctx.secy = &macsec->secy;

			macsec_offload(ops->mdo_del_secy, &ctx);

		}

	}



	macsec_common_dellink(dev, head);



	if (list_empty(&rxd->secys)) {