Commit 0099baa8 authored Sep 09, 2022 by Linus Torvalds

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

Pull rdma fixes from Jason Gunthorpe:
 "Many bug fixes in several drivers:

   - Fix misuse of the DMA API in rtrs

   - Several irdma issues: hung task due to SQ flushing, incorrect
     capability reporting to userspace, improper error handling for MW
     corners, touching an uninitialized SGL for during invalidation.

   - hns was using the wrong page size limits for the HW, an incorrect
     calculation of wqe_shift causing WQE corruption, and mis computed a
     timer id.

   - Fix a crash in SRP triggered by blktests

   - Fix compiler errors by calling virt_to_page() with the proper type
     in siw

   - Userspace triggerable deadlock in ODP

   - mlx5 could use the wrong profile due to some driver loading races,
     counters were not working in some device configurations, and a
     crash on error unwind"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/irdma: Report RNR NAK generation in device caps
  RDMA/irdma: Use s/g array in post send only when its valid
  RDMA/irdma: Return correct WC error for bind operation failure
  RDMA/irdma: Return error on MR deregister CQP failure
  RDMA/irdma: Report the correct max cqes from query device
  MAINTAINERS: Update maintainers of HiSilicon RoCE
  RDMA/mlx5: Fix UMR cleanup on error flow of driver init
  RDMA/mlx5: Set local port to one when accessing counters
  RDMA/mlx5: Rely on RoCE fw cap instead of devlink when setting profile
  IB/core: Fix a nested dead lock as part of ODP flow
  RDMA/siw: Pass a pointer to virt_to_page()
  RDMA/srp: Set scmnd->result only when scmnd is not NULL
  RDMA/hns: Remove the num_qpc_timer variable
  RDMA/hns: Fix wrong fixed value of qp->rq.wqe_shift
  RDMA/hns: Fix supported page size
  RDMA/cma: Fix arguments order in net device validation
  RDMA/irdma: Fix drain SQ hang with no completion
  RDMA/rtrs-srv: Pass the correct number of entries for dma mapped SGL
  RDMA/rtrs-clt: Use the right sg_cnt after ib_dma_map_sg

parents b7e00d6f a261786f

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -9208,8 +9208,8 @@ F: Documentation/ABI/testing/debugfs-hisi-zip
		F: drivers/crypto/hisilicon/zip/

		HISILICON ROCE DRIVER
		M: Haoyue Xu <xuhaoyue1@hisilicon.com>
		M: Wenpeng Liang <liangwenpeng@huawei.com>
		M: Weihang Li <liweihang@huawei.com>
		L: linux-rdma@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/infiniband/hisilicon-hns-roce.txt

drivers/infiniband/core/cma.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1841,8 +1841,8 @@ cma_ib_id_from_event(struct ib_cm_id *cm_id,
		}

		if (!validate_net_dev(*net_dev,
		(struct sockaddr *)&req->listen_addr_storage,
		(struct sockaddr *)&req->src_addr_storage)) {
		(struct sockaddr *)&req->src_addr_storage,
		(struct sockaddr *)&req->listen_addr_storage)) {
		id_priv = ERR_PTR(-EHOSTUNREACH);
		goto err;
		}

drivers/infiniband/core/umem_odp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -462,7 +462,7 @@ int ib_umem_odp_map_dma_and_lock(struct ib_umem_odp *umem_odp, u64 user_virt,
		mutex_unlock(&umem_odp->umem_mutex);

		out_put_mm:
		mmput(owning_mm);
		mmput_async(owning_mm);
		out_put_task:
		if (owning_process)
		put_task_struct(owning_process);

drivers/infiniband/hw/hns/hns_roce_device.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -730,7 +730,6 @@ struct hns_roce_caps {
		u32 num_qps;
		u32 num_pi_qps;
		u32 reserved_qps;
		int num_qpc_timer;
		u32 num_srqs;
		u32 max_wqes;
		u32 max_srq_wrs;

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1977,7 +1977,7 @@ static void set_default_caps(struct hns_roce_dev *hr_dev)

		caps->num_mtpts = HNS_ROCE_V2_MAX_MTPT_NUM;
		caps->num_pds = HNS_ROCE_V2_MAX_PD_NUM;
		caps->num_qpc_timer = HNS_ROCE_V2_MAX_QPC_TIMER_NUM;
		caps->qpc_timer_bt_num = HNS_ROCE_V2_MAX_QPC_TIMER_BT_NUM;
		caps->cqc_timer_bt_num = HNS_ROCE_V2_MAX_CQC_TIMER_BT_NUM;

		caps->max_qp_init_rdma = HNS_ROCE_V2_MAX_QP_INIT_RDMA;
		@@ -2273,7 +2273,6 @@ static int hns_roce_query_pf_caps(struct hns_roce_dev *hr_dev)
		caps->max_rq_sg = le16_to_cpu(resp_a->max_rq_sg);
		caps->max_rq_sg = roundup_pow_of_two(caps->max_rq_sg);
		caps->max_extend_sg = le32_to_cpu(resp_a->max_extend_sg);
		caps->num_qpc_timer = le16_to_cpu(resp_a->num_qpc_timer);
		caps->max_srq_sges = le16_to_cpu(resp_a->max_srq_sges);
		caps->max_srq_sges = roundup_pow_of_two(caps->max_srq_sges);
		caps->num_aeq_vectors = resp_a->num_aeq_vectors;