Commit 8aa74869 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:
 "Primarily rtrs and irdma fixes:

   - Fix uninitialized value in ib_get_eth_speed()

   - Fix hns refusing to work if userspace doesn't select the correct
     congestion control algorithm

   - Several irdma fixes - unreliable Send Queue Drain, use after free,
     64k page size bugs, device removal races

   - Several rtrs bug fixes - crashes, memory leaks, use after free, bad
     credit accounting, bogus WARN_ON

   - Typos and a MAINTAINER update"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/irdma: Avoid free the non-cqp_request scratch
  RDMA/irdma: Fix support for 64k pages
  RDMA/irdma: Ensure iWarp QP queue memory is OS paged aligned
  RDMA/core: Fix umem iterator when PAGE_SIZE is greater then HCA pgsz
  RDMA/irdma: Fix UAF in irdma_sc_ccq_get_cqe_info()
  RDMA/bnxt_re: Correct module description string
  RDMA/rtrs-clt: Remove the warnings for req in_use check
  RDMA/rtrs-clt: Fix the max_send_wr setting
  RDMA/rtrs-srv: Destroy path files after making sure no IOs in-flight
  RDMA/rtrs-srv: Free srv_mr iu only when always_invalidate is true
  RDMA/rtrs-srv: Check return values while processing info request
  RDMA/rtrs-clt: Start hb after path_up
  RDMA/rtrs-srv: Do not unconditionally enable irq
  MAINTAINERS: Add Chengchang Tang as Hisilicon RoCE maintainer
  RDMA/irdma: Add wait for suspend on SQD
  RDMA/irdma: Do not modify to SQD on error
  RDMA/hns: Fix unnecessary err return when using invalid congest control algorithm
  RDMA/core: Fix uninit-value access in ib_get_eth_speed()
parents 081ed90a e3e82fcb

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -9573,6 +9573,7 @@ F: drivers/crypto/hisilicon/sgl.c 
F:	include/linux/hisi_acc_qm.h









HISILICON ROCE DRIVER









M:	Chengchang Tang <tangchengchang@huawei.com>









M:	Junxian Huang <huangjunxian6@hisilicon.com>









L:	linux-rdma@vger.kernel.org









S:	Maintained
































drivers/infiniband/core/umem.c



+0
−6






























Original line number
Diff line number
Diff line







@@ -96,12 +96,6 @@ unsigned long ib_umem_find_best_pgsz(struct ib_umem *umem,







		return page_size;









	}



















	/* rdma_for_each_block() has a bug if the page size is smaller than the









	 * page size used to build the umem. For now prevent smaller page sizes









	 * from being returned.









	 */









	pgsz_bitmap &= GENMASK(BITS_PER_LONG - 1, PAGE_SHIFT);



















	/* The best result is the smallest page size that results in the minimum









	 * number of required pages. Compute the largest page size that could









	 * work based on VA address bits that don't change.
































drivers/infiniband/core/verbs.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1971,7 +1971,7 @@ int ib_get_eth_speed(struct ib_device *dev, u32 port_num, u16 *speed, u8 *width)







	int rc;









	u32 netdev_speed;









	struct net_device *netdev;









	struct ethtool_link_ksettings lksettings;









	struct ethtool_link_ksettings lksettings = {};



















	if (rdma_port_get_link_layer(dev, port_num) != IB_LINK_LAYER_ETHERNET)









		return -EINVAL;
































drivers/infiniband/hw/bnxt_re/main.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -71,7 +71,7 @@ static char version[] =







		BNXT_RE_DESC "\n";



















MODULE_AUTHOR("Eddie Wai <eddie.wai@broadcom.com>");









MODULE_DESCRIPTION(BNXT_RE_DESC " Driver");









MODULE_DESCRIPTION(BNXT_RE_DESC);









MODULE_LICENSE("Dual BSD/GPL");



















/* globals */
































drivers/infiniband/hw/hns/hns_roce_hw_v2.c



+9
−4






























Original line number
Diff line number
Diff line







@@ -4760,10 +4760,15 @@ static int check_cong_type(struct ib_qp *ibqp,







		cong_alg->wnd_mode_sel = WND_LIMIT;









		break;









	default:









		ibdev_err(&hr_dev->ib_dev,









			  "error type(%u) for congestion selection.\n",









		ibdev_warn(&hr_dev->ib_dev,









			   "invalid type(%u) for congestion selection.\n",









			   hr_dev->caps.cong_type);









		return -EINVAL;









		hr_dev->caps.cong_type = CONG_TYPE_DCQCN;









		cong_alg->alg_sel = CONG_DCQCN;









		cong_alg->alg_sub_sel = UNSUPPORT_CONG_LEVEL;









		cong_alg->dip_vld = DIP_INVALID;









		cong_alg->wnd_mode_sel = WND_LIMIT;









		break;









	}



















	return 0;