Commit 9603e221 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 Doug Ledford:
 "A small collection of -rc fixes. Mostly. One API addition, but that's
  because we wanted to use it in a fix. There's also a bug fix that is
  going to render the 5.5 kernel's soft-RoCE driver incompatible with
  all soft-RoCE versions prior, but it's required to actually implement
  the protocol according to the RoCE spec and required in order for the
  soft-RoCE driver to be able to successfully work with actual RoCE
  hardware.

  Summary:

   - Update Steve Wise info

   - Fix for soft-RoCE crc calculations (will break back compatibility,
     but only with the soft-RoCE driver, which has had this bug since it
     was introduced and it is an on-the-wire bug, but will make
     soft-RoCE fully compatible with real RoCE hardware)

   - cma init fixup

   - counters oops fix

   - fix for mlx4 init/teardown sequence

   - fix for mkx5 steering rules

   - introduce a cleanup API, which isn't a fix, but we want to use it
     in the next fix

   - fix for mlx5 memory management that uses API in previous patch"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  IB/mlx5: Fix device memory flows
  IB/core: Introduce rdma_user_mmap_entry_insert_range() API
  IB/mlx5: Fix steering rule of drop and count
  IB/mlx4: Follow mirror sequence of device add during device removal
  RDMA/counter: Prevent auto-binding a QP which are not tracked with res
  rxe: correctly calculate iCRC for unaligned payloads
  Update mailmap info for Steve Wise
  RDMA/cma: add missed unregister_pernet_subsys in init failure
parents 1522d9da dc2316eb

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -276,3 +276,5 @@ Gustavo Padovan <gustavo@las.ic.unicamp.br> 
Gustavo Padovan <padovan@profusion.mobi>

Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>

Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>

Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>

Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>

drivers/infiniband/core/cma.c

+1 −0
Original line number Diff line number Diff line
@@ -4763,6 +4763,7 @@ err_ib: 
err:

	unregister_netdevice_notifier(&cma_nb);

	ib_sa_unregister_client(&sa_client);

	unregister_pernet_subsys(&cma_pernet_operations);

err_wq:

	destroy_workqueue(cma_wq);

	return ret;

drivers/infiniband/core/counters.c

+3 −0
Original line number Diff line number Diff line
@@ -286,6 +286,9 @@ int rdma_counter_bind_qp_auto(struct ib_qp *qp, u8 port) 
	struct rdma_counter *counter;

	int ret;



	if (!qp->res.valid)

		return 0;



	if (!rdma_is_port_valid(dev, port))

		return -EINVAL;

drivers/infiniband/core/ib_core_uverbs.c

+39 −9
Original line number Diff line number Diff line
@@ -238,28 +238,32 @@ void rdma_user_mmap_entry_remove(struct rdma_user_mmap_entry *entry) 
EXPORT_SYMBOL(rdma_user_mmap_entry_remove);



/**

 * rdma_user_mmap_entry_insert() - Insert an entry to the mmap_xa

 * rdma_user_mmap_entry_insert_range() - Insert an entry to the mmap_xa

 *					 in a given range.

 *

 * @ucontext: associated user context.

 * @entry: the entry to insert into the mmap_xa

 * @length: length of the address that will be mmapped

 * @min_pgoff: minimum pgoff to be returned

 * @max_pgoff: maximum pgoff to be returned

 *

 * This function should be called by drivers that use the rdma_user_mmap

 * interface for implementing their mmap syscall A database of mmap offsets is

 * handled in the core and helper functions are provided to insert entries

 * into the database and extract entries when the user calls mmap with the

 * given offset.  The function allocates a unique page offset that should be

 * provided to user, the user will use the offset to retrieve information such

 * as address to be mapped and how.

 * given offset. The function allocates a unique page offset in a given range

 * that should be provided to user, the user will use the offset to retrieve

 * information such as address to be mapped and how.

 *

 * Return: 0 on success and -ENOMEM on failure

 */

int rdma_user_mmap_entry_insert(struct ib_ucontext *ucontext,

int rdma_user_mmap_entry_insert_range(struct ib_ucontext *ucontext,

				      struct rdma_user_mmap_entry *entry,

				size_t length)

				      size_t length, u32 min_pgoff,

				      u32 max_pgoff)

{

	struct ib_uverbs_file *ufile = ucontext->ufile;

	XA_STATE(xas, &ucontext->mmap_xa, 0);

	XA_STATE(xas, &ucontext->mmap_xa, min_pgoff);

	u32 xa_first, xa_last, npages;

	int err;

	u32 i;
@@ -285,7 +289,7 @@ int rdma_user_mmap_entry_insert(struct ib_ucontext *ucontext, 
	entry->npages = npages;

	while (true) {

		/* First find an empty index */

		xas_find_marked(&xas, U32_MAX, XA_FREE_MARK);

		xas_find_marked(&xas, max_pgoff, XA_FREE_MARK);

		if (xas.xa_node == XAS_RESTART)

			goto err_unlock;
@@ -332,4 +336,30 @@ err_unlock: 
	mutex_unlock(&ufile->umap_lock);

	return -ENOMEM;

}

EXPORT_SYMBOL(rdma_user_mmap_entry_insert_range);



/**

 * rdma_user_mmap_entry_insert() - Insert an entry to the mmap_xa.

 *

 * @ucontext: associated user context.

 * @entry: the entry to insert into the mmap_xa

 * @length: length of the address that will be mmapped

 *

 * This function should be called by drivers that use the rdma_user_mmap

 * interface for handling user mmapped addresses. The database is handled in

 * the core and helper functions are provided to insert entries into the

 * database and extract entries when the user calls mmap with the given offset.

 * The function allocates a unique page offset that should be provided to user,

 * the user will use the offset to retrieve information such as address to

 * be mapped and how.

 *

 * Return: 0 on success and -ENOMEM on failure

 */

int rdma_user_mmap_entry_insert(struct ib_ucontext *ucontext,

				struct rdma_user_mmap_entry *entry,

				size_t length)

{

	return rdma_user_mmap_entry_insert_range(ucontext, entry, length, 0,

						 U32_MAX);

}

EXPORT_SYMBOL(rdma_user_mmap_entry_insert);

drivers/infiniband/hw/mlx4/main.c

+5 −4
Original line number Diff line number Diff line
@@ -3018,16 +3018,17 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr) 
	ibdev->ib_active = false;

	flush_workqueue(wq);



	mlx4_ib_close_sriov(ibdev);

	mlx4_ib_mad_cleanup(ibdev);

	ib_unregister_device(&ibdev->ib_dev);

	mlx4_ib_diag_cleanup(ibdev);

	if (ibdev->iboe.nb.notifier_call) {

		if (unregister_netdevice_notifier(&ibdev->iboe.nb))

			pr_warn("failure unregistering notifier\n");

		ibdev->iboe.nb.notifier_call = NULL;

	}



	mlx4_ib_close_sriov(ibdev);

	mlx4_ib_mad_cleanup(ibdev);

	ib_unregister_device(&ibdev->ib_dev);

	mlx4_ib_diag_cleanup(ibdev);



	mlx4_qp_release_range(dev, ibdev->steer_qpn_base,

			      ibdev->steer_qpn_count);

	kfree(ibdev->ib_uc_qpns_bitmap);

CRA Git | Maintained and supported by SUSTech CRA and CCSE