2021-07-21 13:56:59

by Leon Romanovsky

Subject: [PATCH net-next] ionic: cleanly release devlink instance

From: Leon Romanovsky <[email protected]>

The failure to register devlink will leave the system with dangled
devlink resource, which is not cleaned if devlink_port_register() fails.

In order to remove access to ".registered" field of struct devlink_port,
require both devlink_register and devlink_port_register to success and
check it through device pointer.

Fixes: fbfb8031533c ("ionic: Add hardware init and device commands")
Reviewed-by: Moshe Shemesh <[email protected]>
Signed-off-by: Leon Romanovsky <[email protected]>
---
Future series will remove .registered field from the devlink.
---
.../net/ethernet/pensando/ionic/ionic_devlink.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_devlink.c b/drivers/net/ethernet/pensando/ionic/ionic_devlink.c
index b41301a5b0df..cd520e4c5522 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_devlink.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_devlink.c
@@ -91,20 +91,20 @@ int ionic_devlink_register(struct ionic *ionic)
attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;
devlink_port_attrs_set(&ionic->dl_port, &attrs);
err = devlink_port_register(dl, &ionic->dl_port, 0);
- if (err)
+ if (err) {
dev_err(ionic->dev, "devlink_port_register failed: %d\n", err);
- else
- devlink_port_type_eth_set(&ionic->dl_port,
- ionic->lif->netdev);
+ devlink_unregister(dl);
+ return err;
+ }

- return err;
+ devlink_port_type_eth_set(&ionic->dl_port, ionic->lif->netdev);
+ return 0;
}

void ionic_devlink_unregister(struct ionic *ionic)
{
struct devlink *dl = priv_to_devlink(ionic);

- if (ionic->dl_port.registered)
- devlink_port_unregister(&ionic->dl_port);
+ devlink_port_unregister(&ionic->dl_port);
devlink_unregister(dl);
}
--
2.31.1

2021-07-21 21:04:23

by Shannon Nelson

Subject: Re: [PATCH net-next] ionic: cleanly release devlink instance

On 7/21/21 5:39 AM, Leon Romanovsky wrote:
> From: Leon Romanovsky <[email protected]>
>
> The failure to register devlink will leave the system with dangled
> devlink resource, which is not cleaned if devlink_port_register() fails.
>
> In order to remove access to ".registered" field of struct devlink_port,
> require both devlink_register and devlink_port_register to success and
> check it through device pointer.
>
> Fixes: fbfb8031533c ("ionic: Add hardware init and device commands")
> Reviewed-by: Moshe Shemesh <[email protected]>
> Signed-off-by: Leon Romanovsky <[email protected]>

Sure, thanks.

Acked-by: Shannon Nelson <[email protected]>

> ---
> Future series will remove .registered field from the devlink.
> ---
> .../net/ethernet/pensando/ionic/ionic_devlink.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_devlink.c b/drivers/net/ethernet/pensando/ionic/ionic_devlink.c
> index b41301a5b0df..cd520e4c5522 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_devlink.c
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_devlink.c
> @@ -91,20 +91,20 @@ int ionic_devlink_register(struct ionic *ionic)
> attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;
> devlink_port_attrs_set(&ionic->dl_port, &attrs);
> err = devlink_port_register(dl, &ionic->dl_port, 0);
> - if (err)
> + if (err) {
> dev_err(ionic->dev, "devlink_port_register failed: %d\n", err);
> - else
> - devlink_port_type_eth_set(&ionic->dl_port,
> - ionic->lif->netdev);
> + devlink_unregister(dl);
> + return err;
> + }
>
> - return err;
> + devlink_port_type_eth_set(&ionic->dl_port, ionic->lif->netdev);
> + return 0;
> }
>
> void ionic_devlink_unregister(struct ionic *ionic)
> {
> struct devlink *dl = priv_to_devlink(ionic);
>
> - if (ionic->dl_port.registered)
> - devlink_port_unregister(&ionic->dl_port);
> + devlink_port_unregister(&ionic->dl_port);
> devlink_unregister(dl);
> }

2021-07-21 21:51:48

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net-next] ionic: cleanly release devlink instance

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

On Wed, 21 Jul 2021 15:39:44 +0300 you wrote:
> From: Leon Romanovsky <[email protected]>
>
> The failure to register devlink will leave the system with dangled
> devlink resource, which is not cleaned if devlink_port_register() fails.
>
> In order to remove access to ".registered" field of struct devlink_port,
> require both devlink_register and devlink_port_register to success and
> check it through device pointer.
>
> [...]

Here is the summary with links:
- [net-next] ionic: cleanly release devlink instance
https://git.kernel.org/netdev/net-next/c/c2255ff47768

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html