net: macsec: Fix offload support for NETDEV_UNREGISTER event
Subsystems (3)
PATCH 1/1 net: macsec: Fix offload support for NETDEV_UNREGISTER event
From: Lior Nahmanson <[email protected]>
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.
--- drivers/net/macsec.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/net/macsec.c +12 -12
@@ -3870,6 +3870,18 @@ static void macsec_common_dellink(struct net_device *dev, struct list_head *headstruct 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)) {
Signature · 1 line
1.8.3.1
Quoting Raed Salem (2022-01-30 12:29:01)
Quoted 7 lines
From: Lior Nahmanson <[email protected]>
Current macsec netdev notify handler handles
NETDEV_UNREGISTERevent 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.
Quoted 8 lines
Fix by calling the underlay driver to clean it's relevant resources by moving offload handling from
macsec_dellink()tomacsec_common_dellink()when handlingNETDEV_UNREGISTERevent.Fixes 3cf3227a21d1 ("net: macsec: hardware offloading infrastructure")Signed-off-by Lior Nahmanson <[email protected]>Reviewed-by Raed Salem <[email protected]>Signed-off-by Raed Salem <[email protected]>
Thanks!
Antoine
Quoted 49 lines
--- drivers/net/macsec.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)drivers/net/macsec.c +12
-12@@ -3870,6 +3870,18 @@ static void macsec_common_dellink(struct net_device *dev, struct list_head *headstruct 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)) {Signature · 1 line
1.8.3.1
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Sun, 30 Jan 2022 13:29:01 +0200 you wrote:
From: Lior Nahmanson <[email protected]>
Current macsec netdev notify handler handles
NETDEV_UNREGISTERevent 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.[...]
Here is the summary with links:
- [net] net: macsec: Fix offload support for NETDEV_UNREGISTER event
https://git.kernel.org/netdev/net/c/9cef24c8b76c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html