Skip to contentSkip to conversation

devlink reload simplification

PATCH Applied Leon Romanovsky 2 participants 8 messages Oct 12, 2021 – Oct 13, 2021

Subsystems (12)
Networking Network drivers InfiniBand Tracing +8 more subsystems
lore
Share & tools
lore

Leon Romanovsky

author
#0 lore raw

v4 cover devlink reload simplification

From: Leon Romanovsky <[email protected]>

Changelog:
v4:
* Removed legacy BUG_ON() in first patch.
* Added new patch that moves netdev_to_devlink functions to devlink.c.
* Rewrote devlink ops patch to use feature mask.
v3: https://lore.kernel.org/all/[email protected]
* Rewrote third patch to keep static const nature of ops. This is done by extracting reload ops to separate ops structure.
* Changed commit message in last patch as was suggested by Ido.
v2: https://lore.kernel.org/all/[email protected]
* Dropped const removal patch
* Added new patch to hide struct devlink
* Added new patch to annotate devlink API
* Implemented copy of all callback in devlink ops
v1: https://lore.kernel.org/all/[email protected]
* Missed removal of extra WARN_ON
* Added "ops parameter to macro as Dan suggested.
v0: https://lore.kernel.org/all/[email protected]

-------------------------------------------------------------------
Hi,

Simplify devlink reload APIs.

Thanks

Leon Romanovsky (6):
devlink: Reduce struct devlink exposure
devlink: Move netdev_to_devlink helpers to devlink.c
devlink: Annotate devlink API calls
devlink: Allow control devlink ops behavior through feature mask net/mlx5: Set devlink reload feature bit for supported devices only
devlink: Delete reload enable/disable interface

 .../hisilicon/hns3/hns3pf/hclge_devlink.c     |   4 +-
 .../hisilicon/hns3/hns3vf/hclgevf_devlink.c   |   4 +-
 drivers/net/ethernet/mellanox/mlx4/main.c     |   3 +-
 .../net/ethernet/mellanox/mlx5/core/devlink.c |   4 +
 .../net/ethernet/mellanox/mlx5/core/main.c    |   3 -
 .../mellanox/mlx5/core/sf/dev/driver.c        |   5 +-
 drivers/net/ethernet/mellanox/mlxfw/mlxfw.h   |   2 +-
 drivers/net/ethernet/mellanox/mlxsw/core.c    |   8 +-
 drivers/net/netdevsim/dev.c                   |   4 +-
 include/net/devlink.h                         |  79 ++-------
 include/trace/events/devlink.h                |  72 ++++----
 net/core/devlink.c                            | 164 +++++++++++++-----
 12 files changed, 181 insertions(+), 171 deletions(-)
Signature · 1 line
2.31.1
author
#1 lore raw

PATCH v4 1/6 devlink: Reduce struct devlink exposure

From: Leon Romanovsky <[email protected]>

The declaration of struct devlink in general header provokes the situation where internal fields can be accidentally used by the driver authors. In order to reduce such possible situations, let's reduce the namespace exposure of struct devlink.

Signed-off-by Leon Romanovsky <[email protected]>
---
 drivers/net/ethernet/mellanox/mlxfw/mlxfw.h |  2 +-
 include/net/devlink.h                       | 54 ++--------------
 include/trace/events/devlink.h              | 72 ++++++++++-----------
 net/core/devlink.c                          | 57 ++++++++++++++++
 4 files changed, 98 insertions(+), 87 deletions(-)
drivers/net/ethernet/mellanox/mlxfw/mlxfw.h +1 -1
index 7654841a05c2..e6475ea77cd1 100644
@@ -19,7 +19,7 @@ struct mlxfw_dev {
 static inline
 struct device *mlxfw_dev_dev(struct mlxfw_dev *mlxfw_dev)
 {
-	return mlxfw_dev->devlink->dev;
+	return devlink_to_dev(mlxfw_dev->devlink);
 }
 
 #define MLXFW_PRFX "mlxfw: "
include/net/devlink.h +4 -50

66 lines not on this page · raw message

include/trace/events/devlink.h +36 -36

141 lines not on this page · raw message

net/core/devlink.c +57 -0

63 lines not on this page · raw message

Signature · 1 line
2.31.1
author
#2 lore raw

PATCH v4 2/6 devlink: Move netdev_to_devlink helpers to devlink.c

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Both netdev_to_devlink and netdev_to_devlink_port are used in devlink.c only, so move them in order to reduce their scope.

Signed-off-by Leon Romanovsky <[email protected]>
---
 include/net/devlink.h | 17 -----------------
 net/core/devlink.c    | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 17 deletions(-)
include/net/devlink.h +0 -17
index ae03eb1c6cc9..7f44ad14e5ed 100644
@@ -1486,23 +1486,6 @@ void *devlink_priv(struct devlink *devlink);
 struct devlink *priv_to_devlink(void *priv);
 struct device *devlink_to_dev(const struct devlink *devlink);
 
-static inline struct devlink_port *
-netdev_to_devlink_port(struct net_device *dev)
-{
-	if (dev->netdev_ops->ndo_get_devlink_port)
-		return dev->netdev_ops->ndo_get_devlink_port(dev);
-	return NULL;
-}
-
-static inline struct devlink *netdev_to_devlink(struct net_device *dev)
-{
-	struct devlink_port *devlink_port = netdev_to_devlink_port(dev);
-
-	if (devlink_port)
-		return devlink_port->devlink;
-	return NULL;
-}
-
 struct ib_device;
 
 struct net *devlink_net(const struct devlink *devlink);
net/core/devlink.c +18 -0
index 87d1766ebdbf..e9e908c4cfb4 100644
@@ -11381,6 +11381,24 @@ static void __devlink_compat_running_version(struct devlink *devlink,
 	nlmsg_free(msg);
 }
 
+static struct devlink_port *netdev_to_devlink_port(struct net_device *dev)
+{
+	if (!dev->netdev_ops->ndo_get_devlink_port)
+		return NULL;
+
+	return dev->netdev_ops->ndo_get_devlink_port(dev);
+}
+
+static struct devlink *netdev_to_devlink(struct net_device *dev)
+{
+	struct devlink_port *devlink_port = netdev_to_devlink_port(dev);
+
+	if (!devlink_port)
+		return NULL;
+
+	return devlink_port->devlink;
+}
+
 void devlink_compat_running_version(struct net_device *dev,
 				    char *buf, size_t len)
 {
Signature · 1 line
2.31.1
author
#3 lore raw

PATCH v4 3/6 devlink: Annotate devlink API calls

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Initial annotation patch to separate calls that needs to be executed before or after devlink_register().

Signed-off-by Leon Romanovsky <[email protected]>
---
 net/core/devlink.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
net/core/devlink.c +26 -0
index e9e908c4cfb4..276e1e421eb4 100644
@@ -152,6 +152,22 @@ static const struct nla_policy devlink_function_nl_policy[DEVLINK_PORT_FUNCTION_
 static DEFINE_XARRAY_FLAGS(devlinks, XA_FLAGS_ALLOC);
 #define DEVLINK_REGISTERED XA_MARK_1
 
+/* devlink instances are open to the access from the user space after
+ * devlink_register() call. Such logical barrier allows us to have certain
+ * expectations related to locking.
+ *
+ * Before *_register() - we are in initialization stage and no parallel
+ * access possible to the devlink instance. All drivers perform that phase
+ * by implicitly holding device_lock.
+ *
+ * After *_register() - users and driver can access devlink instance at
+ * the same time.
+ */
+#define ASSERT_DEVLINK_REGISTERED(d)                                           \
+	WARN_ON_ONCE(!xa_get_mark(&devlinks, (d)->index, DEVLINK_REGISTERED))
+#define ASSERT_DEVLINK_NOT_REGISTERED(d)                                       \
+	WARN_ON_ONCE(xa_get_mark(&devlinks, (d)->index, DEVLINK_REGISTERED))
+
 /* devlink_mutex
  *
  * An overall lock guarding every operation coming from userspace.

@@ -9113,6 +9129,10 @@ static void devlink_notify_unregister(struct devlink *devlink)
  */
 void devlink_register(struct devlink *devlink)
 {
+	ASSERT_DEVLINK_NOT_REGISTERED(devlink);
+	/* Make sure that we are in .probe() routine */
+	device_lock_assert(devlink->dev);
+
 	mutex_lock(&devlink_mutex);
 	xa_set_mark(&devlinks, devlink->index, DEVLINK_REGISTERED);
 	devlink_notify_register(devlink);

@@ -9127,6 +9147,10 @@ EXPORT_SYMBOL_GPL(devlink_register);
  */
 void devlink_unregister(struct devlink *devlink)
 {
+	ASSERT_DEVLINK_REGISTERED(devlink);
+	/* Make sure that we are in .remove() routine */
+	device_lock_assert(devlink->dev);
+
 	devlink_put(devlink);
 	wait_for_completion(&devlink->comp);
 

@@ -9181,6 +9205,8 @@ EXPORT_SYMBOL_GPL(devlink_reload_disable);
  */
 void devlink_free(struct devlink *devlink)
 {
+	ASSERT_DEVLINK_NOT_REGISTERED(devlink);
+
 	mutex_destroy(&devlink->reporters_lock);
 	mutex_destroy(&devlink->lock);
 	WARN_ON(!list_empty(&devlink->trap_policer_list));
Signature · 1 line
2.31.1
author
#4 lore raw

PATCH v4 4/6 devlink: Allow control devlink ops behavior through feature mask

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Introduce new devlink call to set feature mask to control devlink behavior during device initialization phase after devlink_alloc() is already called.

This allows us to set reload ops based on device property which is not known at the beginning of driver initialization.

For the sake of simplicity, this API lacks any type of locking and needs to be called before devlink_register() to make sure that no parallel access to the ops is possible at this stage.

Signed-off-by Leon Romanovsky <[email protected]>
---
 .../hisilicon/hns3/hns3pf/hclge_devlink.c     |  1 +
 .../hisilicon/hns3/hns3vf/hclgevf_devlink.c   |  1 +
 drivers/net/ethernet/mellanox/mlx4/main.c     |  1 +
 .../net/ethernet/mellanox/mlx5/core/devlink.c |  1 +
 drivers/net/ethernet/mellanox/mlxsw/core.c    |  1 +
 drivers/net/netdevsim/dev.c                   |  1 +
 include/net/devlink.h                         |  6 +++++
 net/core/devlink.c                            | 24 +++++++++++++++++--
 8 files changed, 34 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c +1 -0
index 59b0ae7d59e0..438fe62fea4d 100644
@@ -119,6 +119,7 @@ int hclge_devlink_init(struct hclge_dev *hdev)
 	priv->hdev = hdev;
 	hdev->devlink = devlink;
 
+	devlink_set_features(devlink, DEVLINK_F_RELOAD);
 	devlink_register(devlink);
 	devlink_reload_enable(devlink);
 	return 0;
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.c +1 -0
index d60cc9426f70..519f4108422e 100644
@@ -121,6 +121,7 @@ int hclgevf_devlink_init(struct hclgevf_dev *hdev)
 	priv->hdev = hdev;
 	hdev->devlink = devlink;
 
+	devlink_set_features(devlink, DEVLINK_F_RELOAD);
 	devlink_register(devlink);
 	devlink_reload_enable(devlink);
 	return 0;
drivers/net/ethernet/mellanox/mlx4/main.c +1 -0
index 9541f3a920c8..05e850a40b36 100644
@@ -4025,6 +4025,7 @@ static int mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 		goto err_params_unregister;
 
 	pci_save_state(pdev);
+	devlink_set_features(devlink, DEVLINK_F_RELOAD);
 	devlink_register(devlink);
 	devlink_reload_enable(devlink);
 	return 0;
drivers/net/ethernet/mellanox/mlx5/core/devlink.c +1 -0
index b9a6cea03951..fa98b7b95990 100644
@@ -813,6 +813,7 @@ int mlx5_devlink_register(struct devlink *devlink)
 	if (err)
 		goto traps_reg_err;
 
+	devlink_set_features(devlink, DEVLINK_F_RELOAD);
 	return 0;
 
 traps_reg_err:
drivers/net/ethernet/mellanox/mlxsw/core.c +1 -0
index 9e831e8b607a..0f1567149a54 100644
@@ -2008,6 +2008,7 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,
 	}
 
 	if (!reload) {
+		devlink_set_features(devlink, DEVLINK_F_RELOAD);
 		devlink_register(devlink);
 		devlink_reload_enable(devlink);
 	}
drivers/net/netdevsim/dev.c +1 -0
index cb6645012a30..520c019dbad5 100644
@@ -1511,6 +1511,7 @@ int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev)
 		goto err_psample_exit;
 
 	nsim_dev->esw_mode = DEVLINK_ESWITCH_MODE_LEGACY;
+	devlink_set_features(devlink, DEVLINK_F_RELOAD);
 	devlink_register(devlink);
 	devlink_reload_enable(devlink);
 	return 0;
include/net/devlink.h +6 -0
index 7f44ad14e5ed..287f18b88293 100644
@@ -1186,6 +1186,11 @@ enum devlink_trap_group_generic_id {
 		.min_burst = _min_burst,				      \
 	}
 
+enum {
+	/* device supports reload operations */
+	DEVLINK_F_RELOAD = 1UL << 0,
+};
+
 struct devlink_ops {
 	/**
 	 * @supported_flash_update_params:

@@ -1503,6 +1508,7 @@ static inline struct devlink *devlink_alloc(const struct devlink_ops *ops,
 {
 	return devlink_alloc_ns(ops, priv_size, &init_net, dev);
 }
+void devlink_set_features(struct devlink *devlink, u64 features);
 void devlink_register(struct devlink *devlink);
 void devlink_unregister(struct devlink *devlink);
 void devlink_reload_enable(struct devlink *devlink);
net/core/devlink.c +22 -2
index 276e1e421eb4..1931caa0ce1e 100644
@@ -54,6 +54,7 @@ struct devlink {
 	struct list_head trap_group_list;
 	struct list_head trap_policer_list;
 	const struct devlink_ops *ops;
+	u64 features;
 	struct xarray snapshot_ids;
 	struct devlink_dev_stats stats;
 	struct device *dev;

@@ -4032,7 +4033,7 @@ static int devlink_reload(struct devlink *devlink, struct net *dest_net,
 	struct net *curr_net;
 	int err;
 
-	if (!devlink->reload_enabled)
+	if (!devlink->reload_enabled || !(devlink->features & DEVLINK_F_RELOAD))
 		return -EOPNOTSUPP;
 
 	memcpy(remote_reload_stats, devlink->stats.remote_reload_stats,

@@ -8985,6 +8986,25 @@ static bool devlink_reload_actions_valid(const struct devlink_ops *ops)
 	return true;
 }
 
+/**
+ *	devlink_set_features - Set devlink supported features
+ *
+ *	@devlink: devlink
+ *	@features: devlink support features
+ *
+ *	This interface allows us to set reload ops separatelly from
+ *	the devlink_alloc.
+ */
+void devlink_set_features(struct devlink *devlink, u64 features)
+{
+	ASSERT_DEVLINK_NOT_REGISTERED(devlink);
+
+	WARN_ON(features & DEVLINK_F_RELOAD &&
+		!devlink_reload_supported(devlink->ops));
+	devlink->features = features;
+}
+EXPORT_SYMBOL_GPL(devlink_set_features);
+
 /**
  *	devlink_alloc_ns - Allocate new devlink instance resources
  *	in specific namespace

@@ -9155,7 +9175,7 @@ void devlink_unregister(struct devlink *devlink)
 	wait_for_completion(&devlink->comp);
 
 	mutex_lock(&devlink_mutex);
-	WARN_ON(devlink_reload_supported(devlink->ops) &&
+	WARN_ON(devlink->features & DEVLINK_F_RELOAD &&
 		devlink->reload_enabled);
 	devlink_notify_unregister(devlink);
 	xa_clear_mark(&devlinks, devlink->index, DEVLINK_REGISTERED);
Signature · 1 line
2.31.1
author
#5 lore raw

PATCH v4 5/6 net/mlx5: Set devlink reload feature bit for supported devices only

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Mulitport slave device doesn't support devlink reload, so instead of complicating initialization flow with devlink_reload_enable() which will be removed in next patch, don't set DEVLINK_F_RELOAD feature bit for such devices.

This fixes an error when reload counters exposed (and equal zero) for the mode that is not supported at all.

Fixes d89ddaae1766 ("net/mlx5: Disable devlink reload for multi port slave device")
Signed-off-by Leon Romanovsky <[email protected]>
---
 drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/devlink.c +4 -1
index fa98b7b95990..a85341a41cd0 100644
@@ -796,6 +796,7 @@ static void mlx5_devlink_traps_unregister(struct devlink *devlink)
 
 int mlx5_devlink_register(struct devlink *devlink)
 {
+	struct mlx5_core_dev *dev = devlink_priv(devlink);
 	int err;
 
 	err = devlink_params_register(devlink, mlx5_devlink_params,

@@ -813,7 +814,9 @@ int mlx5_devlink_register(struct devlink *devlink)
 	if (err)
 		goto traps_reg_err;
 
-	devlink_set_features(devlink, DEVLINK_F_RELOAD);
+	if (!mlx5_core_is_mp_slave(dev))
+		devlink_set_features(devlink, DEVLINK_F_RELOAD);
+
 	return 0;
 
 traps_reg_err:
Signature · 1 line
2.31.1
author
#6 lore raw

PATCH v4 6/6 devlink: Delete reload enable/disable interface

In reply to Leon Romanovsky

From: Leon Romanovsky <[email protected]>

Commit a0c76345e3d3 ("devlink: disallow reload operation during device cleanup") added devlink_reload_{enable,disable}() APIs to prevent reload operation from racing with device probe/dismantle.

After recent changes to move devlink_register() to the end of device probe and devlink_unregister() to the beginning of device dismantle, these races can no longer happen. Reload operations will be denied if the devlink instance is unregistered and devlink_unregister() will block until all in-flight operations are done.

Therefore, remove these devlink_reload_{enable,disable}() APIs.

Signed-off-by Leon Romanovsky <[email protected]>
---
 .../hisilicon/hns3/hns3pf/hclge_devlink.c     |  3 --
 .../hisilicon/hns3/hns3vf/hclgevf_devlink.c   |  3 --
 drivers/net/ethernet/mellanox/mlx4/main.c     |  2 -
 .../net/ethernet/mellanox/mlx5/core/main.c    |  3 --
 .../mellanox/mlx5/core/sf/dev/driver.c        |  5 +-
 drivers/net/ethernet/mellanox/mlxsw/core.c    |  7 +--
 drivers/net/netdevsim/dev.c                   |  3 --
 include/net/devlink.h                         |  2 -
 net/core/devlink.c                            | 47 ++-----------------
 9 files changed, 6 insertions(+), 69 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c +0 -3
index 438fe62fea4d..4c441e6a5082 100644
@@ -121,7 +121,6 @@ int hclge_devlink_init(struct hclge_dev *hdev)
 
 	devlink_set_features(devlink, DEVLINK_F_RELOAD);
 	devlink_register(devlink);
-	devlink_reload_enable(devlink);
 	return 0;
 }
 

@@ -129,8 +128,6 @@ void hclge_devlink_uninit(struct hclge_dev *hdev)
 {
 	struct devlink *devlink = hdev->devlink;
 
-	devlink_reload_disable(devlink);
-
 	devlink_unregister(devlink);
 
 	devlink_free(devlink);
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.c +0 -3
index 519f4108422e..fdc19868b818 100644
@@ -123,7 +123,6 @@ int hclgevf_devlink_init(struct hclgevf_dev *hdev)
 
 	devlink_set_features(devlink, DEVLINK_F_RELOAD);
 	devlink_register(devlink);
-	devlink_reload_enable(devlink);
 	return 0;
 }
 

@@ -131,8 +130,6 @@ void hclgevf_devlink_uninit(struct hclgevf_dev *hdev)
 {
 	struct devlink *devlink = hdev->devlink;
 
-	devlink_reload_disable(devlink);
-
 	devlink_unregister(devlink);
 
 	devlink_free(devlink);
drivers/net/ethernet/mellanox/mlx4/main.c +0 -2
index 05e850a40b36..b187c210d4d6 100644
@@ -4027,7 +4027,6 @@ static int mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 	pci_save_state(pdev);
 	devlink_set_features(devlink, DEVLINK_F_RELOAD);
 	devlink_register(devlink);
-	devlink_reload_enable(devlink);
 	return 0;
 
 err_params_unregister:

@@ -4136,7 +4135,6 @@ static void mlx4_remove_one(struct pci_dev *pdev)
 	struct devlink *devlink = priv_to_devlink(priv);
 	int active_vfs = 0;
 
-	devlink_reload_disable(devlink);
 	devlink_unregister(devlink);
 
 	if (mlx4_is_slave(dev))
drivers/net/ethernet/mellanox/mlx5/core/main.c +0 -3
index 5893fdd5aedb..65313448a47c 100644
@@ -1538,8 +1538,6 @@ static int probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
 	pci_save_state(pdev);
 	devlink_register(devlink);
-	if (!mlx5_core_is_mp_slave(dev))
-		devlink_reload_enable(devlink);
 	return 0;
 
 err_init_one:

@@ -1559,7 +1557,6 @@ static void remove_one(struct pci_dev *pdev)
 	struct mlx5_core_dev *dev  = pci_get_drvdata(pdev);
 	struct devlink *devlink = priv_to_devlink(dev);
 
-	devlink_reload_disable(devlink);
 	devlink_unregister(devlink);
 	mlx5_crdump_disable(dev);
 	mlx5_drain_health_wq(dev);
drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c +1 -4
index 3cf272fa2164..7b4783ce213e 100644
@@ -47,7 +47,6 @@ static int mlx5_sf_dev_probe(struct auxiliary_device *adev, const struct auxilia
 		goto init_one_err;
 	}
 	devlink_register(devlink);
-	devlink_reload_enable(devlink);
 	return 0;
 
 init_one_err:

@@ -62,10 +61,8 @@ static int mlx5_sf_dev_probe(struct auxiliary_device *adev, const struct auxilia
 static void mlx5_sf_dev_remove(struct auxiliary_device *adev)
 {
 	struct mlx5_sf_dev *sf_dev = container_of(adev, struct mlx5_sf_dev, adev);
-	struct devlink *devlink;
+	struct devlink *devlink = priv_to_devlink(sf_dev->mdev);
 
-	devlink = priv_to_devlink(sf_dev->mdev);
-	devlink_reload_disable(devlink);
 	devlink_unregister(devlink);
 	mlx5_uninit_one(sf_dev->mdev);
 	iounmap(sf_dev->mdev->iseg);
drivers/net/ethernet/mellanox/mlxsw/core.c +2 -5
index 0f1567149a54..3fd3812b8f31 100644
@@ -2010,9 +2010,7 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,
 	if (!reload) {
 		devlink_set_features(devlink, DEVLINK_F_RELOAD);
 		devlink_register(devlink);
-		devlink_reload_enable(devlink);
 	}
-
 	return 0;
 
 err_driver_init:

@@ -2076,10 +2074,9 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core,
 {
 	struct devlink *devlink = priv_to_devlink(mlxsw_core);
 
-	if (!reload) {
-		devlink_reload_disable(devlink);
+	if (!reload)
 		devlink_unregister(devlink);
-	}
+
 	if (devlink_is_reload_failed(devlink)) {
 		if (!reload)
 			/* Only the parts that were not de-initialized in the
drivers/net/netdevsim/dev.c +0 -3
index 520c019dbad5..9661aca35703 100644
@@ -1513,7 +1513,6 @@ int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev)
 	nsim_dev->esw_mode = DEVLINK_ESWITCH_MODE_LEGACY;
 	devlink_set_features(devlink, DEVLINK_F_RELOAD);
 	devlink_register(devlink);
-	devlink_reload_enable(devlink);
 	return 0;
 
 err_psample_exit:

@@ -1567,9 +1566,7 @@ void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev)
 	struct nsim_dev *nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev);
 	struct devlink *devlink = priv_to_devlink(nsim_dev);
 
-	devlink_reload_disable(devlink);
 	devlink_unregister(devlink);
-
 	nsim_dev_reload_destroy(nsim_dev);
 
 	nsim_bpf_dev_exit(nsim_dev);
include/net/devlink.h +0 -2
index 287f18b88293..da3ceeb8b87b 100644
@@ -1511,8 +1511,6 @@ static inline struct devlink *devlink_alloc(const struct devlink_ops *ops,
 void devlink_set_features(struct devlink *devlink, u64 features);
 void devlink_register(struct devlink *devlink);
 void devlink_unregister(struct devlink *devlink);
-void devlink_reload_enable(struct devlink *devlink);
-void devlink_reload_disable(struct devlink *devlink);
 void devlink_free(struct devlink *devlink);
 int devlink_port_register(struct devlink *devlink,
 			  struct devlink_port *devlink_port,
net/core/devlink.c +3 -44

83 lines not on this page · raw message

Signature · 1 line
2.31.1
CI Applied
#7 lore raw
In reply to Leon Romanovsky
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Quoted 21 lines · On Tue, 12 Oct 2021 16:15:20 +0300 you wrote:

From: Leon Romanovsky <[email protected]>

Changelog:
v4:
* Removed legacy BUG_ON() in first patch.
* Added new patch that moves netdev_to_devlink functions to devlink.c.
* Rewrote devlink ops patch to use feature mask.
v3: https://lore.kernel.org/all/[email protected]
* Rewrote third patch to keep static const nature of ops. This is done by extracting reload ops to separate ops structure.
* Changed commit message in last patch as was suggested by Ido.
v2: https://lore.kernel.org/all/[email protected]
* Dropped const removal patch
* Added new patch to hide struct devlink
* Added new patch to annotate devlink API
* Implemented copy of all callback in devlink ops
v1: https://lore.kernel.org/all/[email protected]
* Missed removal of extra WARN_ON
* Added "ops parameter to macro as Dan suggested.
v0: https://lore.kernel.org/all/[email protected]

Quoted 1 line

[...]

Here is the summary with links:
- [net-next,v4,1/6] devlink: Reduce struct devlink exposure

    https://git.kernel.org/netdev/net-next/c/21314638c9f2
  - [net-next,v4,2/6] devlink: Move netdev_to_devlink helpers to devlink.c
    https://git.kernel.org/netdev/net-next/c/2bc50987dc1f
  - [net-next,v4,3/6] devlink: Annotate devlink API calls
    https://git.kernel.org/netdev/net-next/c/b88f7b1203bf
  - [net-next,v4,4/6] devlink: Allow control devlink ops behavior through feature mask
    https://git.kernel.org/netdev/net-next/c/bd032e35c568
  - [net-next,v4,5/6] net/mlx5: Set devlink reload feature bit for supported devices only
    https://git.kernel.org/netdev/net-next/c/96869f193cfd
  - [net-next,v4,6/6] devlink: Delete reload enable/disable interface
    https://git.kernel.org/netdev/net-next/c/82465bec3e97

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