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

Commit 51ce5f33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull rdma fixes from Doug Ledford:

 "I had thought at the time of the last pull request that there wouldn't
  be much more to go, but several things just kept trickling in over the
  last week.

  Instead of just the six patches to bnxt_re that I had anticipated,
  there are another five IPoIB patches, two qedr patches, and a few
  other miscellaneous patches.

  The bnxt_re patches are more lines of diff than I like to submit this
  late in the game. That's mostly because of the first two patches in
  the series of six. I almost dropped them just because of the lines of
  churn, but on a close review, a lot of the churn came from removing
  duplicated code sections and consolidating them into callable
  routines. I felt like this made the number of lines of change more
  acceptable, and they address problems, so I left them. The remainder
  of the patches are all small, well contained, and well understood.

  These have passed 0day testing, but have not been submitted to
  linux-next (but a local merge test with your current master was
  without any conflicts).

  Summary:

   - A fix for fix eea40b8f ("infiniband: call ipv6 route lookup via
     the stub interface")

   - Six patches against bnxt_re...the first two are considerably larger
     than I would like, but as they address real issues I went ahead and
     submitted them (it also helped that a good deal of the churn was
     removing code repeated in multiple places and consolidating it to
     one common function)

   - Two fixes against qedr that just came in

   - One fix against rxe that took a few revisions to get right plus
     time to get the proper reviews

   - Five late breaking IPoIB fixes

   - One late cxgb4 fix"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  rdma/cxgb4: Fix memory leaks during module exit
  IB/ipoib: Fix memory leak in create child syscall
  IB/ipoib: Fix access to un-initialized napi struct
  IB/ipoib: Delete napi in device uninit default
  IB/ipoib: Limit call to free rdma_netdev for capable devices
  IB/ipoib: Fix memory leaks for child interfaces priv
  rxe: Fix a sleep-in-atomic bug in post_one_send
  RDMA/qedr: Add 64KB PAGE_SIZE support to user-space queues
  RDMA/qedr: Initialize byte_len in WC of READ and SEND commands
  RDMA/bnxt_re: Remove FMR support
  RDMA/bnxt_re: Fix RQE posting logic
  RDMA/bnxt_re: Add HW workaround for avoiding stall for UD QPs
  RDMA/bnxt_re: Dereg MR in FW before freeing the fast_reg_page_list
  RDMA/bnxt_re: HW workarounds for handling specific conditions
  RDMA/bnxt_re: Fixing the Control path command and response handling
  IB/addr: Fix setting source address in addr6_resolve()
parents f69d64de d4702645

drivers/infiniband/core/addr.c

+1 −9
Original line number Diff line number Diff line
@@ -449,12 +449,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in, 
		return ret;



	rt = (struct rt6_info *)dst;

	if (ipv6_addr_any(&fl6.saddr)) {

		ret = ipv6_dev_get_saddr(addr->net, ip6_dst_idev(dst)->dev,

					 &fl6.daddr, 0, &fl6.saddr);

		if (ret)

			goto put;



	if (ipv6_addr_any(&src_in->sin6_addr)) {

		src_in->sin6_family = AF_INET6;

		src_in->sin6_addr = fl6.saddr;

	}
@@ -471,9 +466,6 @@ static int addr6_resolve(struct sockaddr_in6 *src_in, 


	*pdst = dst;

	return 0;

put:

	dst_release(dst);

	return ret;

}

#else

static int addr6_resolve(struct sockaddr_in6 *src_in,

drivers/infiniband/hw/bnxt_re/bnxt_re.h

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,10 @@ 
#define BNXT_RE_MAX_SRQC_COUNT		(64 * 1024)

#define BNXT_RE_MAX_CQ_COUNT		(64 * 1024)



#define BNXT_RE_UD_QP_HW_STALL		0x400000



#define BNXT_RE_RQ_WQE_THRESHOLD	32



struct bnxt_re_work {

	struct work_struct	work;

	unsigned long		event;

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+347 −124

File changed.

Preview size limit exceeded, changes collapsed.

drivers/infiniband/hw/bnxt_re/ib_verbs.h

+16 −6
Original line number Diff line number Diff line
@@ -44,11 +44,23 @@ struct bnxt_re_gid_ctx { 
	u32			refcnt;

};



#define BNXT_RE_FENCE_BYTES	64

struct bnxt_re_fence_data {

	u32 size;

	u8 va[BNXT_RE_FENCE_BYTES];

	dma_addr_t dma_addr;

	struct bnxt_re_mr *mr;

	struct ib_mw *mw;

	struct bnxt_qplib_swqe bind_wqe;

	u32 bind_rkey;

};



struct bnxt_re_pd {

	struct bnxt_re_dev	*rdev;

	struct ib_pd		ib_pd;

	struct bnxt_qplib_pd	qplib_pd;

	struct bnxt_qplib_dpi	dpi;

	struct bnxt_re_fence_data fence;

};



struct bnxt_re_ah {
@@ -62,6 +74,7 @@ struct bnxt_re_qp { 
	struct bnxt_re_dev	*rdev;

	struct ib_qp		ib_qp;

	spinlock_t		sq_lock;	/* protect sq */

	spinlock_t		rq_lock;	/* protect rq */

	struct bnxt_qplib_qp	qplib_qp;

	struct ib_umem		*sumem;

	struct ib_umem		*rumem;
@@ -181,12 +194,9 @@ int bnxt_re_map_mr_sg(struct ib_mr *ib_mr, struct scatterlist *sg, int sg_nents, 
struct ib_mr *bnxt_re_alloc_mr(struct ib_pd *ib_pd, enum ib_mr_type mr_type,

			       u32 max_num_sg);

int bnxt_re_dereg_mr(struct ib_mr *mr);

struct ib_fmr *bnxt_re_alloc_fmr(struct ib_pd *pd, int mr_access_flags,

				 struct ib_fmr_attr *fmr_attr);

int bnxt_re_map_phys_fmr(struct ib_fmr *fmr, u64 *page_list, int list_len,

			 u64 iova);

int bnxt_re_unmap_fmr(struct list_head *fmr_list);

int bnxt_re_dealloc_fmr(struct ib_fmr *fmr);

struct ib_mw *bnxt_re_alloc_mw(struct ib_pd *ib_pd, enum ib_mw_type type,

			       struct ib_udata *udata);

int bnxt_re_dealloc_mw(struct ib_mw *mw);

struct ib_mr *bnxt_re_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,

				  u64 virt_addr, int mr_access_flags,

				  struct ib_udata *udata);

drivers/infiniband/hw/bnxt_re/main.c

+0 −4
Original line number Diff line number Diff line
@@ -507,10 +507,6 @@ static int bnxt_re_register_ib(struct bnxt_re_dev *rdev) 
	ibdev->dereg_mr			= bnxt_re_dereg_mr;

	ibdev->alloc_mr			= bnxt_re_alloc_mr;

	ibdev->map_mr_sg		= bnxt_re_map_mr_sg;

	ibdev->alloc_fmr		= bnxt_re_alloc_fmr;

	ibdev->map_phys_fmr		= bnxt_re_map_phys_fmr;

	ibdev->unmap_fmr		= bnxt_re_unmap_fmr;

	ibdev->dealloc_fmr		= bnxt_re_dealloc_fmr;



	ibdev->reg_user_mr		= bnxt_re_reg_user_mr;

	ibdev->alloc_ucontext		= bnxt_re_alloc_ucontext;