Commit 2b17992f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma 

Pull rdma fixes from Jason Gunthorpe:
 "This is a bit later than usual for our first -rc but I'm not seeing
  anything worry-some in the RDMA tree right now. Quiet so far this -rc
  cycle, only a few internal driver related bugs and a small series
  fixing ODP bugs found by more advanced testing.

  A set of small driver and core code fixes:

   - Small series fixing longtime user triggerable bugs in the ODP
     processing inside mlx5 and core code

   - Various small driver malfunctions and crashes (use after, free,
     error unwind, implementation bugs)

   - A misfunction of the RDMA GID cache that can be triggered by the
     administrator"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/mlx5: Initialize return variable in case pagefault was skipped
  IB/mlx5: Fix page fault handling for MW
  IB/umem: Set correct address to the invalidation function
  IB/mlx5: Skip non-ODP MR when handling a page fault
  RDMA/hns: Bugfix pbl configuration for rereg mr
  iser: set sector for ambiguous mr status errors
  RDMA/rdmavt: Fix rvt_create_ah function signature
  IB/mlx5: Avoid load failure due to unknown link width
  IB/mlx5: Fix XRC QP support after introducing extended atomic
  RDMA/bnxt_re: Avoid accessing the device structure after it is freed
  RDMA/bnxt_re: Fix system hang when registration with L2 driver fails
  RDMA/core: Add GIDs while changing MAC addr only for registered ndev
  RDMA/mlx5: Fix fence type for IB_WR_LOCAL_INV WR
  net/mlx5: Fix XRC SRQ umem valid bits
parents 94f371cb 7bca603a

drivers/infiniband/core/roce_gid_mgmt.c

+4 −2
Original line number Diff line number Diff line
@@ -767,8 +767,10 @@ static int netdevice_event(struct notifier_block *this, unsigned long event, 


	case NETDEV_CHANGEADDR:

		cmds[0] = netdev_del_cmd;

		if (ndev->reg_state == NETREG_REGISTERED) {

			cmds[1] = add_default_gid_cmd;

			cmds[2] = add_cmd;

		}

		break;



	case NETDEV_CHANGEUPPER:

drivers/infiniband/core/umem_odp.c

+6 −14
Original line number Diff line number Diff line
@@ -137,15 +137,6 @@ static void ib_umem_notifier_release(struct mmu_notifier *mn, 
	up_read(&per_mm->umem_rwsem);

}



static int invalidate_page_trampoline(struct ib_umem_odp *item, u64 start,

				      u64 end, void *cookie)

{

	ib_umem_notifier_start_account(item);

	item->umem.context->invalidate_range(item, start, start + PAGE_SIZE);

	ib_umem_notifier_end_account(item);

	return 0;

}



static int invalidate_range_start_trampoline(struct ib_umem_odp *item,

					     u64 start, u64 end, void *cookie)

{
@@ -553,12 +544,13 @@ out: 
		put_page(page);



	if (remove_existing_mapping && umem->context->invalidate_range) {

		invalidate_page_trampoline(

		ib_umem_notifier_start_account(umem_odp);

		umem->context->invalidate_range(

			umem_odp,

			ib_umem_start(umem) + (page_index >> umem->page_shift),

			ib_umem_start(umem) + ((page_index + 1) >>

					       umem->page_shift),

			NULL);

			ib_umem_start(umem) + (page_index << umem->page_shift),

			ib_umem_start(umem) +

				((page_index + 1) << umem->page_shift));

		ib_umem_notifier_end_account(umem_odp);

		ret = -EAGAIN;

	}

drivers/infiniband/hw/bnxt_re/main.c

+3 −0
Original line number Diff line number Diff line
@@ -1268,6 +1268,7 @@ static int bnxt_re_ib_reg(struct bnxt_re_dev *rdev) 
	/* Registered a new RoCE device instance to netdev */

	rc = bnxt_re_register_netdev(rdev);

	if (rc) {

		rtnl_unlock();

		pr_err("Failed to register with netedev: %#x\n", rc);

		return -EINVAL;

	}
@@ -1466,6 +1467,7 @@ static void bnxt_re_task(struct work_struct *work) 
				"Failed to register with IB: %#x", rc);

			bnxt_re_remove_one(rdev);

			bnxt_re_dev_unreg(rdev);

			goto exit;

		}

		break;

	case NETDEV_UP:
@@ -1489,6 +1491,7 @@ static void bnxt_re_task(struct work_struct *work) 
	}

	smp_mb__before_atomic();

	atomic_dec(&rdev->sched_count);

exit:

	kfree(re_work);

}

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+60 −68
Original line number Diff line number Diff line
@@ -1756,10 +1756,9 @@ static int hns_roce_v2_set_mac(struct hns_roce_dev *hr_dev, u8 phy_port, 
	return hns_roce_cmq_send(hr_dev, &desc, 1);

}



static int hns_roce_v2_write_mtpt(void *mb_buf, struct hns_roce_mr *mr,

				  unsigned long mtpt_idx)

static int set_mtpt_pbl(struct hns_roce_v2_mpt_entry *mpt_entry,

			struct hns_roce_mr *mr)

{

	struct hns_roce_v2_mpt_entry *mpt_entry;

	struct scatterlist *sg;

	u64 page_addr;

	u64 *pages;
@@ -1767,6 +1766,53 @@ static int hns_roce_v2_write_mtpt(void *mb_buf, struct hns_roce_mr *mr, 
	int len;

	int entry;



	mpt_entry->pbl_size = cpu_to_le32(mr->pbl_size);

	mpt_entry->pbl_ba_l = cpu_to_le32(lower_32_bits(mr->pbl_ba >> 3));

	roce_set_field(mpt_entry->byte_48_mode_ba,

		       V2_MPT_BYTE_48_PBL_BA_H_M, V2_MPT_BYTE_48_PBL_BA_H_S,

		       upper_32_bits(mr->pbl_ba >> 3));



	pages = (u64 *)__get_free_page(GFP_KERNEL);

	if (!pages)

		return -ENOMEM;



	i = 0;

	for_each_sg(mr->umem->sg_head.sgl, sg, mr->umem->nmap, entry) {

		len = sg_dma_len(sg) >> PAGE_SHIFT;

		for (j = 0; j < len; ++j) {

			page_addr = sg_dma_address(sg) +

				(j << mr->umem->page_shift);

			pages[i] = page_addr >> 6;

			/* Record the first 2 entry directly to MTPT table */

			if (i >= HNS_ROCE_V2_MAX_INNER_MTPT_NUM - 1)

				goto found;

			i++;

		}

	}

found:

	mpt_entry->pa0_l = cpu_to_le32(lower_32_bits(pages[0]));

	roce_set_field(mpt_entry->byte_56_pa0_h, V2_MPT_BYTE_56_PA0_H_M,

		       V2_MPT_BYTE_56_PA0_H_S, upper_32_bits(pages[0]));



	mpt_entry->pa1_l = cpu_to_le32(lower_32_bits(pages[1]));

	roce_set_field(mpt_entry->byte_64_buf_pa1, V2_MPT_BYTE_64_PA1_H_M,

		       V2_MPT_BYTE_64_PA1_H_S, upper_32_bits(pages[1]));

	roce_set_field(mpt_entry->byte_64_buf_pa1,

		       V2_MPT_BYTE_64_PBL_BUF_PG_SZ_M,

		       V2_MPT_BYTE_64_PBL_BUF_PG_SZ_S,

		       mr->pbl_buf_pg_sz + PG_SHIFT_OFFSET);



	free_page((unsigned long)pages);



	return 0;

}



static int hns_roce_v2_write_mtpt(void *mb_buf, struct hns_roce_mr *mr,

				  unsigned long mtpt_idx)

{

	struct hns_roce_v2_mpt_entry *mpt_entry;

	int ret;



	mpt_entry = mb_buf;

	memset(mpt_entry, 0, sizeof(*mpt_entry));
@@ -1781,7 +1827,6 @@ static int hns_roce_v2_write_mtpt(void *mb_buf, struct hns_roce_mr *mr, 
		       mr->pbl_ba_pg_sz + PG_SHIFT_OFFSET);

	roce_set_field(mpt_entry->byte_4_pd_hop_st, V2_MPT_BYTE_4_PD_M,

		       V2_MPT_BYTE_4_PD_S, mr->pd);

	mpt_entry->byte_4_pd_hop_st = cpu_to_le32(mpt_entry->byte_4_pd_hop_st);



	roce_set_bit(mpt_entry->byte_8_mw_cnt_en, V2_MPT_BYTE_8_RA_EN_S, 0);

	roce_set_bit(mpt_entry->byte_8_mw_cnt_en, V2_MPT_BYTE_8_R_INV_EN_S, 1);
@@ -1796,13 +1841,11 @@ static int hns_roce_v2_write_mtpt(void *mb_buf, struct hns_roce_mr *mr, 
		     (mr->access & IB_ACCESS_REMOTE_WRITE ? 1 : 0));

	roce_set_bit(mpt_entry->byte_8_mw_cnt_en, V2_MPT_BYTE_8_LW_EN_S,

		     (mr->access & IB_ACCESS_LOCAL_WRITE ? 1 : 0));

	mpt_entry->byte_8_mw_cnt_en = cpu_to_le32(mpt_entry->byte_8_mw_cnt_en);



	roce_set_bit(mpt_entry->byte_12_mw_pa, V2_MPT_BYTE_12_PA_S,

		     mr->type == MR_TYPE_MR ? 0 : 1);

	roce_set_bit(mpt_entry->byte_12_mw_pa, V2_MPT_BYTE_12_INNER_PA_VLD_S,

		     1);

	mpt_entry->byte_12_mw_pa = cpu_to_le32(mpt_entry->byte_12_mw_pa);



	mpt_entry->len_l = cpu_to_le32(lower_32_bits(mr->size));

	mpt_entry->len_h = cpu_to_le32(upper_32_bits(mr->size));
@@ -1813,53 +1856,9 @@ static int hns_roce_v2_write_mtpt(void *mb_buf, struct hns_roce_mr *mr, 
	if (mr->type == MR_TYPE_DMA)

		return 0;



	mpt_entry->pbl_size = cpu_to_le32(mr->pbl_size);

	ret = set_mtpt_pbl(mpt_entry, mr);



	mpt_entry->pbl_ba_l = cpu_to_le32(lower_32_bits(mr->pbl_ba >> 3));

	roce_set_field(mpt_entry->byte_48_mode_ba, V2_MPT_BYTE_48_PBL_BA_H_M,

		       V2_MPT_BYTE_48_PBL_BA_H_S,

		       upper_32_bits(mr->pbl_ba >> 3));

	mpt_entry->byte_48_mode_ba = cpu_to_le32(mpt_entry->byte_48_mode_ba);



	pages = (u64 *)__get_free_page(GFP_KERNEL);

	if (!pages)

		return -ENOMEM;



	i = 0;

	for_each_sg(mr->umem->sg_head.sgl, sg, mr->umem->nmap, entry) {

		len = sg_dma_len(sg) >> PAGE_SHIFT;

		for (j = 0; j < len; ++j) {

			page_addr = sg_dma_address(sg) +

				    (j << mr->umem->page_shift);

			pages[i] = page_addr >> 6;



			/* Record the first 2 entry directly to MTPT table */

			if (i >= HNS_ROCE_V2_MAX_INNER_MTPT_NUM - 1)

				goto found;

			i++;

		}

	}



found:

	mpt_entry->pa0_l = cpu_to_le32(lower_32_bits(pages[0]));

	roce_set_field(mpt_entry->byte_56_pa0_h, V2_MPT_BYTE_56_PA0_H_M,

		       V2_MPT_BYTE_56_PA0_H_S,

		       upper_32_bits(pages[0]));

	mpt_entry->byte_56_pa0_h = cpu_to_le32(mpt_entry->byte_56_pa0_h);



	mpt_entry->pa1_l = cpu_to_le32(lower_32_bits(pages[1]));

	roce_set_field(mpt_entry->byte_64_buf_pa1, V2_MPT_BYTE_64_PA1_H_M,

		       V2_MPT_BYTE_64_PA1_H_S, upper_32_bits(pages[1]));



	free_page((unsigned long)pages);



	roce_set_field(mpt_entry->byte_64_buf_pa1,

		       V2_MPT_BYTE_64_PBL_BUF_PG_SZ_M,

		       V2_MPT_BYTE_64_PBL_BUF_PG_SZ_S,

		       mr->pbl_buf_pg_sz + PG_SHIFT_OFFSET);

	mpt_entry->byte_64_buf_pa1 = cpu_to_le32(mpt_entry->byte_64_buf_pa1);



	return 0;

	return ret;

}



static int hns_roce_v2_rereg_write_mtpt(struct hns_roce_dev *hr_dev,
@@ -1868,6 +1867,7 @@ static int hns_roce_v2_rereg_write_mtpt(struct hns_roce_dev *hr_dev, 
					u64 size, void *mb_buf)

{

	struct hns_roce_v2_mpt_entry *mpt_entry = mb_buf;

	int ret = 0;



	if (flags & IB_MR_REREG_PD) {

		roce_set_field(mpt_entry->byte_4_pd_hop_st, V2_MPT_BYTE_4_PD_M,
@@ -1881,13 +1881,13 @@ static int hns_roce_v2_rereg_write_mtpt(struct hns_roce_dev *hr_dev, 
			     (mr_access_flags & IB_ACCESS_MW_BIND ? 1 : 0));

		roce_set_bit(mpt_entry->byte_8_mw_cnt_en,

			     V2_MPT_BYTE_8_ATOMIC_EN_S,

			   (mr_access_flags & IB_ACCESS_REMOTE_ATOMIC ? 1 : 0));

			     mr_access_flags & IB_ACCESS_REMOTE_ATOMIC ? 1 : 0);

		roce_set_bit(mpt_entry->byte_8_mw_cnt_en, V2_MPT_BYTE_8_RR_EN_S,

			     (mr_access_flags & IB_ACCESS_REMOTE_READ ? 1 : 0));

			     mr_access_flags & IB_ACCESS_REMOTE_READ ? 1 : 0);

		roce_set_bit(mpt_entry->byte_8_mw_cnt_en, V2_MPT_BYTE_8_RW_EN_S,

			    (mr_access_flags & IB_ACCESS_REMOTE_WRITE ? 1 : 0));

			     mr_access_flags & IB_ACCESS_REMOTE_WRITE ? 1 : 0);

		roce_set_bit(mpt_entry->byte_8_mw_cnt_en, V2_MPT_BYTE_8_LW_EN_S,

			     (mr_access_flags & IB_ACCESS_LOCAL_WRITE ? 1 : 0));

			     mr_access_flags & IB_ACCESS_LOCAL_WRITE ? 1 : 0);

	}



	if (flags & IB_MR_REREG_TRANS) {
@@ -1896,21 +1896,13 @@ static int hns_roce_v2_rereg_write_mtpt(struct hns_roce_dev *hr_dev, 
		mpt_entry->len_l = cpu_to_le32(lower_32_bits(size));

		mpt_entry->len_h = cpu_to_le32(upper_32_bits(size));



		mpt_entry->pbl_size = cpu_to_le32(mr->pbl_size);

		mpt_entry->pbl_ba_l =

				cpu_to_le32(lower_32_bits(mr->pbl_ba >> 3));

		roce_set_field(mpt_entry->byte_48_mode_ba,

			       V2_MPT_BYTE_48_PBL_BA_H_M,

			       V2_MPT_BYTE_48_PBL_BA_H_S,

			       upper_32_bits(mr->pbl_ba >> 3));

		mpt_entry->byte_48_mode_ba =

				cpu_to_le32(mpt_entry->byte_48_mode_ba);



		mr->iova = iova;

		mr->size = size;



		ret = set_mtpt_pbl(mpt_entry, mr);

	}



	return 0;

	return ret;

}



static int hns_roce_v2_frmr_write_mtpt(void *mb_buf, struct hns_roce_mr *mr)

drivers/infiniband/hw/mlx5/main.c

+11 −18
Original line number Diff line number Diff line
@@ -1094,31 +1094,26 @@ enum mlx5_ib_width { 
	MLX5_IB_WIDTH_12X	= 1 << 4

};



static int translate_active_width(struct ib_device *ibdev, u8 active_width,

static void translate_active_width(struct ib_device *ibdev, u8 active_width,

				  u8 *ib_width)

{

	struct mlx5_ib_dev *dev = to_mdev(ibdev);

	int err = 0;



	if (active_width & MLX5_IB_WIDTH_1X) {

	if (active_width & MLX5_IB_WIDTH_1X)

		*ib_width = IB_WIDTH_1X;

	} else if (active_width & MLX5_IB_WIDTH_2X) {

		mlx5_ib_dbg(dev, "active_width %d is not supported by IB spec\n",

			    (int)active_width);

		err = -EINVAL;

	} else if (active_width & MLX5_IB_WIDTH_4X) {

	else if (active_width & MLX5_IB_WIDTH_4X)

		*ib_width = IB_WIDTH_4X;

	} else if (active_width & MLX5_IB_WIDTH_8X) {

	else if (active_width & MLX5_IB_WIDTH_8X)

		*ib_width = IB_WIDTH_8X;

	} else if (active_width & MLX5_IB_WIDTH_12X) {

	else if (active_width & MLX5_IB_WIDTH_12X)

		*ib_width = IB_WIDTH_12X;

	} else {

		mlx5_ib_dbg(dev, "Invalid active_width %d\n",

	else {

		mlx5_ib_dbg(dev, "Invalid active_width %d, setting width to default value: 4x\n",

			    (int)active_width);

		err = -EINVAL;

		*ib_width = IB_WIDTH_4X;

	}



	return err;

	return;

}



static int mlx5_mtu_to_ib_mtu(int mtu)
@@ -1225,10 +1220,8 @@ static int mlx5_query_hca_port(struct ib_device *ibdev, u8 port, 
	if (err)

		goto out;



	err = translate_active_width(ibdev, ib_link_width_oper,

				     &props->active_width);

	if (err)

		goto out;

	translate_active_width(ibdev, ib_link_width_oper, &props->active_width);



	err = mlx5_query_port_ib_proto_oper(mdev, &props->active_speed, port);

	if (err)

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE