Commit 5c632cc3 authored by Jiri Pirko's avatar Jiri Pirko Committed by Saeed Mahameed
Browse files

net/mlx5: Relax mlx5_devlink_eswitch_get() return value checking 



If called from port ops, it is not needed to perform the checks in
mlx5_devlink_eswitch_get(). The reason is devlink port would not be
registered if the checks are not true. Introduce relaxed version
mlx5_devlink_eswitch_nocheck_get() and use it in port ops.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Reviewed-by: default avatarShay Drory <shayd@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent c0ae0092

drivers/net/ethernet/mellanox/mlx5/core/eswitch.c

+17 −4
Original line number Diff line number Diff line
@@ -77,18 +77,31 @@ static int mlx5_eswitch_check(const struct mlx5_core_dev *dev) 
	return 0;

}



struct mlx5_eswitch *mlx5_devlink_eswitch_get(struct devlink *devlink)

static struct mlx5_eswitch *__mlx5_devlink_eswitch_get(struct devlink *devlink, bool check)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	int err;



	if (check) {

		err = mlx5_eswitch_check(dev);

		if (err)

			return ERR_PTR(err);

	}



	return dev->priv.eswitch;

}



struct mlx5_eswitch *__must_check

mlx5_devlink_eswitch_get(struct devlink *devlink)

{

	return __mlx5_devlink_eswitch_get(devlink, true);

}



struct mlx5_eswitch *mlx5_devlink_eswitch_nocheck_get(struct devlink *devlink)

{

	return __mlx5_devlink_eswitch_get(devlink, false);

}



struct mlx5_vport *__must_check

mlx5_eswitch_get_vport(struct mlx5_eswitch *esw, u16 vport_num)

{

drivers/net/ethernet/mellanox/mlx5/core/eswitch.h

+5 −1
Original line number Diff line number Diff line
@@ -679,7 +679,11 @@ void mlx5e_tc_clean_fdb_peer_flows(struct mlx5_eswitch *esw); 
			  MLX5_CAP_GEN_2((esw->dev), ec_vf_vport_base) +\

			  (last) - 1)



struct mlx5_eswitch *mlx5_devlink_eswitch_get(struct devlink *devlink);

struct mlx5_eswitch *__must_check

mlx5_devlink_eswitch_get(struct devlink *devlink);



struct mlx5_eswitch *mlx5_devlink_eswitch_nocheck_get(struct devlink *devlink);



struct mlx5_vport *__must_check

mlx5_eswitch_get_vport(struct mlx5_eswitch *esw, u16 vport_num);

drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c

+7 −32
Original line number Diff line number Diff line
@@ -3634,7 +3634,7 @@ static bool esw_offloads_devlink_ns_eq_netdev_ns(struct devlink *devlink) 
	struct net *devl_net, *netdev_net;

	struct mlx5_eswitch *esw;



	esw = mlx5_devlink_eswitch_get(devlink);

	esw = mlx5_devlink_eswitch_nocheck_get(devlink);

	netdev_net = dev_net(esw->dev->mlx5e_res.uplink_netdev);

	devl_net = devlink_net(devlink);
@@ -4222,13 +4222,10 @@ int mlx5_devlink_port_fn_hw_addr_get(struct devlink_port *port, 
				     u8 *hw_addr, int *hw_addr_len,

				     struct netlink_ext_ack *extack)

{

	struct mlx5_eswitch *esw;

	struct mlx5_eswitch *esw = mlx5_devlink_eswitch_nocheck_get(port->devlink);

	struct mlx5_vport *vport;

	u16 vport_num;



	esw = mlx5_devlink_eswitch_get(port->devlink);

	if (IS_ERR(esw))

		return PTR_ERR(esw);



	vport_num = mlx5_esw_devlink_port_index_to_vport_num(port->index);
@@ -4249,15 +4246,9 @@ int mlx5_devlink_port_fn_hw_addr_set(struct devlink_port *port, 
				     const u8 *hw_addr, int hw_addr_len,

				     struct netlink_ext_ack *extack)

{

	struct mlx5_eswitch *esw;

	struct mlx5_eswitch *esw = mlx5_devlink_eswitch_nocheck_get(port->devlink);

	u16 vport_num;



	esw = mlx5_devlink_eswitch_get(port->devlink);

	if (IS_ERR(esw)) {

		NL_SET_ERR_MSG_MOD(extack, "Eswitch doesn't support set hw_addr");

		return PTR_ERR(esw);

	}



	vport_num = mlx5_esw_devlink_port_index_to_vport_num(port->index);

	return mlx5_eswitch_set_vport_mac(esw, vport_num, hw_addr);

}
@@ -4277,13 +4268,9 @@ mlx5_devlink_port_fn_get_vport(struct devlink_port *port, struct mlx5_eswitch *e 
int mlx5_devlink_port_fn_migratable_get(struct devlink_port *port, bool *is_enabled,

					struct netlink_ext_ack *extack)

{

	struct mlx5_eswitch *esw;

	struct mlx5_eswitch *esw = mlx5_devlink_eswitch_nocheck_get(port->devlink);

	struct mlx5_vport *vport;



	esw = mlx5_devlink_eswitch_get(port->devlink);

	if (IS_ERR(esw))

		return PTR_ERR(esw);



	if (!MLX5_CAP_GEN(esw->dev, migration)) {

		NL_SET_ERR_MSG_MOD(extack, "Device doesn't support migration");

		return -EOPNOTSUPP;
@@ -4304,17 +4291,13 @@ int mlx5_devlink_port_fn_migratable_get(struct devlink_port *port, bool *is_enab 
int mlx5_devlink_port_fn_migratable_set(struct devlink_port *port, bool enable,

					struct netlink_ext_ack *extack)

{

	struct mlx5_eswitch *esw = mlx5_devlink_eswitch_nocheck_get(port->devlink);

	int query_out_sz = MLX5_ST_SZ_BYTES(query_hca_cap_out);

	struct mlx5_eswitch *esw;

	struct mlx5_vport *vport;

	void *query_ctx;

	void *hca_caps;

	int err;



	esw = mlx5_devlink_eswitch_get(port->devlink);

	if (IS_ERR(esw))

		return PTR_ERR(esw);



	if (!MLX5_CAP_GEN(esw->dev, migration)) {

		NL_SET_ERR_MSG_MOD(extack, "Device doesn't support migration");

		return -EOPNOTSUPP;
@@ -4368,13 +4351,9 @@ int mlx5_devlink_port_fn_migratable_set(struct devlink_port *port, bool enable, 
int mlx5_devlink_port_fn_roce_get(struct devlink_port *port, bool *is_enabled,

				  struct netlink_ext_ack *extack)

{

	struct mlx5_eswitch *esw;

	struct mlx5_eswitch *esw = mlx5_devlink_eswitch_nocheck_get(port->devlink);

	struct mlx5_vport *vport;



	esw = mlx5_devlink_eswitch_get(port->devlink);

	if (IS_ERR(esw))

		return PTR_ERR(esw);



	vport = mlx5_devlink_port_fn_get_vport(port, esw);

	if (IS_ERR(vport)) {

		NL_SET_ERR_MSG_MOD(extack, "Invalid port");
@@ -4390,18 +4369,14 @@ int mlx5_devlink_port_fn_roce_get(struct devlink_port *port, bool *is_enabled, 
int mlx5_devlink_port_fn_roce_set(struct devlink_port *port, bool enable,

				  struct netlink_ext_ack *extack)

{

	struct mlx5_eswitch *esw = mlx5_devlink_eswitch_nocheck_get(port->devlink);

	int query_out_sz = MLX5_ST_SZ_BYTES(query_hca_cap_out);

	struct mlx5_eswitch *esw;

	struct mlx5_vport *vport;

	void *query_ctx;

	void *hca_caps;

	u16 vport_num;

	int err;



	esw = mlx5_devlink_eswitch_get(port->devlink);

	if (IS_ERR(esw))

		return PTR_ERR(esw);



	vport = mlx5_devlink_port_fn_get_vport(port, esw);

	if (IS_ERR(vport)) {

		NL_SET_ERR_MSG_MOD(extack, "Invalid port");