Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69ea0582 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge mlx5-next into rdma for-next 

From git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux



Required for dependencies in the next patches.

Resolved the conflicts:
 - esw_destroy_offloads_acl_tables() use the newer mlx5_esw_for_all_vports()
   version
 - esw_offloads_steering_init() drop the cap test
 - esw_offloads_init() drop the extra function arguments

* branch 'mlx5-next': (39 commits)
  net/mlx5: Expose device definitions for object events
  net/mlx5: Report EQE data upon CQ completion
  net/mlx5: Report a CQ error event only when a handler was set
  net/mlx5: mlx5_core_create_cq() enhancements
  net/mlx5: Expose the API to register for ANY event
  net/mlx5: Use event mask based on device capabilities
  net/mlx5: Fix mlx5_core_destroy_cq() error flow
  net/mlx5: E-Switch, Handle UC address change in switchdev mode
  net/mlx5: E-Switch, Consider host PF for inline mode and vlan pop
  net/mlx5: E-Switch, Use iterator for vlan and min-inline setups
  net/mlx5: E-Switch, Reg/unreg function changed event at correct stage
  net/mlx5: E-Switch, Consolidate eswitch function number of VFs
  net/mlx5: E-Switch, Refactor eswitch SR-IOV interface
  net/mlx5: Handle host PF vport mac/guid for ECPF
  net/mlx5: E-Switch, Use correct flags when configuring vlan
  net/mlx5: Reduce dependency on enabled_vfs counter and num_vfs
  net/mlx5: Don't handle VF func change if host PF is disabled
  net/mlx5: Limit scope of mlx5_get_next_phys_dev() to PCI PF devices
  net/mlx5: Move pci status reg access mutex to mlx5_pci_init
  net/mlx5: Rename mlx5_pci_dev_type to mlx5_coredev_type
  ...

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parents 2f40cf30 e4075c44

drivers/infiniband/hw/mlx5/cq.c

+7 −6
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include "mlx5_ib.h"

#include "srq.h"



static void mlx5_ib_cq_comp(struct mlx5_core_cq *cq)

static void mlx5_ib_cq_comp(struct mlx5_core_cq *cq, struct mlx5_eqe *eqe)

{

	struct ib_cq *ibcq = &to_mibcq(cq)->ibcq;
@@ -522,8 +522,8 @@ static int mlx5_poll_one(struct mlx5_ib_cq *cq, 
	case MLX5_CQE_SIG_ERR:

		sig_err_cqe = (struct mlx5_sig_err_cqe *)cqe64;



		read_lock(&dev->mdev->priv.mkey_table.lock);

		mmkey = __mlx5_mr_lookup(dev->mdev,

		xa_lock(&dev->mdev->priv.mkey_table);

		mmkey = xa_load(&dev->mdev->priv.mkey_table,

				mlx5_base_mkey(be32_to_cpu(sig_err_cqe->mkey)));

		mr = to_mibmr(mmkey);

		get_sig_err_item(sig_err_cqe, &mr->sig->err_item);
@@ -537,7 +537,7 @@ static int mlx5_poll_one(struct mlx5_ib_cq *cq, 
			     mr->sig->err_item.expected,

			     mr->sig->err_item.actual);



		read_unlock(&dev->mdev->priv.mkey_table.lock);

		xa_unlock(&dev->mdev->priv.mkey_table);

		goto repoll;

	}
@@ -892,6 +892,7 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, 
	int vector = attr->comp_vector;

	struct mlx5_ib_dev *dev = to_mdev(ibdev);

	struct mlx5_ib_cq *cq = to_mcq(ibcq);

	u32 out[MLX5_ST_SZ_DW(create_cq_out)];

	int uninitialized_var(index);

	int uninitialized_var(inlen);

	u32 *cqb = NULL;
@@ -954,7 +955,7 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, 
	if (cq->create_flags & IB_UVERBS_CQ_FLAGS_IGNORE_OVERRUN)

		MLX5_SET(cqc, cqc, oi, 1);



	err = mlx5_core_create_cq(dev->mdev, &cq->mcq, cqb, inlen);

	err = mlx5_core_create_cq(dev->mdev, &cq->mcq, cqb, inlen, out, sizeof(out));

	if (err)

		goto err_cqb;

drivers/infiniband/hw/mlx5/devx.c

+4 −14
Original line number Diff line number Diff line
@@ -1043,13 +1043,10 @@ static int devx_handle_mkey_indirect(struct devx_obj *obj, 
				     struct mlx5_ib_dev *dev,

				     void *in, void *out)

{

	struct mlx5_mkey_table *table = &dev->mdev->priv.mkey_table;

	struct mlx5_ib_devx_mr *devx_mr = &obj->devx_mr;

	unsigned long flags;

	struct mlx5_core_mkey *mkey;

	void *mkc;

	u8 key;

	int err;



	mkey = &devx_mr->mmkey;

	mkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);
@@ -1062,11 +1059,8 @@ static int devx_handle_mkey_indirect(struct devx_obj *obj, 
	mkey->pd = MLX5_GET(mkc, mkc, pd);

	devx_mr->ndescs = MLX5_GET(mkc, mkc, translations_octword_size);



	write_lock_irqsave(&table->lock, flags);

	err = radix_tree_insert(&table->tree, mlx5_base_mkey(mkey->key),

				mkey);

	write_unlock_irqrestore(&table->lock, flags);

	return err;

	return xa_err(xa_store(&dev->mdev->priv.mkey_table,

			       mlx5_base_mkey(mkey->key), mkey, GFP_KERNEL));

}



static int devx_handle_mkey_create(struct mlx5_ib_dev *dev,
@@ -1117,12 +1111,8 @@ static void devx_free_indirect_mkey(struct rcu_head *rcu) 
 */

static void devx_cleanup_mkey(struct devx_obj *obj)

{

	struct mlx5_mkey_table *table = &obj->mdev->priv.mkey_table;

	unsigned long flags;



	write_lock_irqsave(&table->lock, flags);

	radix_tree_delete(&table->tree, mlx5_base_mkey(obj->devx_mr.mmkey.key));

	write_unlock_irqrestore(&table->lock, flags);

	xa_erase(&obj->mdev->priv.mkey_table,

		 mlx5_base_mkey(obj->devx_mr.mmkey.key));

}



static int devx_obj_cleanup(struct ib_uobject *uobject,

drivers/infiniband/hw/mlx5/flow.c

+8 −5
Original line number Diff line number Diff line
@@ -65,11 +65,12 @@ static const struct uverbs_attr_spec mlx5_ib_flow_type[] = { 
static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)(

	struct uverbs_attr_bundle *attrs)

{

	struct mlx5_flow_act flow_act = {.flow_tag = MLX5_FS_DEFAULT_FLOW_TAG};

	struct mlx5_flow_context flow_context = {.flow_tag = MLX5_FS_DEFAULT_FLOW_TAG};

	struct mlx5_ib_flow_handler *flow_handler;

	struct mlx5_ib_flow_matcher *fs_matcher;

	struct ib_uobject **arr_flow_actions;

	struct ib_uflow_resources *uflow_res;

	struct mlx5_flow_act flow_act = {};

	void *devx_obj;

	int dest_id, dest_type;

	void *cmd_in;
@@ -172,17 +173,19 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)( 
				   arr_flow_actions[i]->object);

	}



	ret = uverbs_copy_from(&flow_act.flow_tag, attrs,

	ret = uverbs_copy_from(&flow_context.flow_tag, attrs,

			       MLX5_IB_ATTR_CREATE_FLOW_TAG);

	if (!ret) {

		if (flow_act.flow_tag >= BIT(24)) {

		if (flow_context.flow_tag >= BIT(24)) {

			ret = -EINVAL;

			goto err_out;

		}

		flow_act.flags |= FLOW_ACT_HAS_TAG;

		flow_context.flags |= FLOW_CONTEXT_HAS_TAG;

	}



	flow_handler = mlx5_ib_raw_fs_rule_add(dev, fs_matcher, &flow_act,

	flow_handler = mlx5_ib_raw_fs_rule_add(dev, fs_matcher,

					       &flow_context,

					       &flow_act,

					       counter_id,

					       cmd_in, inlen,

					       dest_id, dest_type);

drivers/infiniband/hw/mlx5/ib_rep.c

+13 −9
Original line number Diff line number Diff line
@@ -14,9 +14,10 @@ mlx5_ib_set_vport_rep(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep) 
	int vport_index;



	ibdev = mlx5_ib_get_uplink_ibdev(dev->priv.eswitch);

	vport_index = ibdev->free_port++;

	vport_index = rep->vport_index;



	ibdev->port[vport_index].rep = rep;

	rep->rep_data[REP_IB].priv = ibdev;

	write_lock(&ibdev->port[vport_index].roce.netdev_lock);

	ibdev->port[vport_index].roce.netdev =

		mlx5_ib_get_rep_netdev(dev->priv.eswitch, rep->vport);
@@ -50,7 +51,7 @@ mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep) 
	}



	ibdev->is_rep = true;

	vport_index = ibdev->free_port++;

	vport_index = rep->vport_index;

	ibdev->port[vport_index].rep = rep;

	ibdev->port[vport_index].roce.netdev =

		mlx5_ib_get_rep_netdev(dev->priv.eswitch, rep->vport);
@@ -68,15 +69,18 @@ mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep) 
static void

mlx5_ib_vport_rep_unload(struct mlx5_eswitch_rep *rep)

{

	struct mlx5_ib_dev *dev;

	struct mlx5_ib_dev *dev = mlx5_ib_rep_to_dev(rep);

	struct mlx5_ib_port *port;



	if (!rep->rep_data[REP_IB].priv ||

	    rep->vport != MLX5_VPORT_UPLINK)

		return;

	port = &dev->port[rep->vport_index];

	write_lock(&port->roce.netdev_lock);

	port->roce.netdev = NULL;

	write_unlock(&port->roce.netdev_lock);

	rep->rep_data[REP_IB].priv = NULL;

	port->rep = NULL;



	dev = mlx5_ib_rep_to_dev(rep);

	if (rep->vport == MLX5_VPORT_UPLINK)

		__mlx5_ib_remove(dev, dev->profile, MLX5_IB_STAGE_MAX);

	rep->rep_data[REP_IB].priv = NULL;

}



static void *mlx5_ib_vport_get_proto_dev(struct mlx5_eswitch_rep *rep)

drivers/infiniband/hw/mlx5/ib_rep.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw, 
#else /* CONFIG_MLX5_ESWITCH */

static inline u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw)

{

	return SRIOV_NONE;

	return MLX5_ESWITCH_NONE;

}



static inline