From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Dec 2018 22:57:10 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
X-Git-Tag: v5.0-rc1~111
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5d24ae67a961c51beb255a28c9c417d9710247c2;p=linux.git

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

Pull rdma updates from Jason Gunthorpe:
 "This has been a fairly typical cycle, with the usual sorts of driver
  updates. Several series continue to come through which improve and
  modernize various parts of the core code, and we finally are starting
  to get the uAPI command interface cleaned up.

   - Various driver fixes for bnxt_re, cxgb3/4, hfi1, hns, i40iw, mlx4,
     mlx5, qib, rxe, usnic

   - Rework the entire syscall flow for uverbs to be able to run over
     ioctl(). Finally getting past the historic bad choice to use
     write() for command execution

   - More functional coverage with the mlx5 'devx' user API

   - Start of the HFI1 series for 'TID RDMA'

   - SRQ support in the hns driver

   - Support for new IBTA defined 2x lane widths

   - A big series to consolidate all the driver function pointers into a
     big struct and have drivers provide a 'static const' version of the
     struct instead of open coding initialization

   - New 'advise_mr' uAPI to control device caching/loading of page
     tables

   - Support for inline data in SRPT

   - Modernize how umad uses the driver core and creates cdev's and
     sysfs files

   - First steps toward removing 'uobject' from the view of the drivers"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (193 commits)
  RDMA/srpt: Use kmem_cache_free() instead of kfree()
  RDMA/mlx5: Signedness bug in UVERBS_HANDLER()
  IB/uverbs: Signedness bug in UVERBS_HANDLER()
  IB/mlx5: Allocate the per-port Q counter shared when DEVX is supported
  IB/umad: Start using dev_groups of class
  IB/umad: Use class_groups and let core create class file
  IB/umad: Refactor code to use cdev_device_add()
  IB/umad: Avoid destroying device while it is accessed
  IB/umad: Simplify and avoid dynamic allocation of class
  IB/mlx5: Fix wrong error unwind
  IB/mlx4: Remove set but not used variable 'pd'
  RDMA/iwcm: Don't copy past the end of dev_name() string
  IB/mlx5: Fix long EEH recover time with NVMe offloads
  IB/mlx5: Simplify netdev unbinding
  IB/core: Move query port to ioctl
  RDMA/nldev: Expose port_cap_flags2
  IB/core: uverbs copy to struct or zero helper
  IB/rxe: Reuse code which sets port state
  IB/rxe: Make counters thread safe
  IB/mlx5: Use the correct commands for UMEM and UCTX allocation
  ...
---

5d24ae67a961c51beb255a28c9c417d9710247c2
diff --cc drivers/infiniband/hw/mlx5/odp.c
index 7309fb6bf0d2,80fa2438db8f..01e0f6200631
--- a/drivers/infiniband/hw/mlx5/odp.c
+++ b/drivers/infiniband/hw/mlx5/odp.c
@@@ -549,16 -549,22 +549,21 @@@ void mlx5_ib_free_implicit_mr(struct ml
  	wait_event(imr->q_leaf_free, !atomic_read(&imr->num_leaf_free));
  }
  
+ #define MLX5_PF_FLAGS_PREFETCH  BIT(0)
+ #define MLX5_PF_FLAGS_DOWNGRADE BIT(1)
  static int pagefault_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr,
- 			u64 io_virt, size_t bcnt, u32 *bytes_mapped)
+ 			u64 io_virt, size_t bcnt, u32 *bytes_mapped,
+ 			u32 flags)
  {
 +	int npages = 0, current_seq, page_shift, ret, np;
 +	bool implicit = false;
  	struct ib_umem_odp *odp_mr = to_ib_umem_odp(mr->umem);
+ 	bool downgrade = flags & MLX5_PF_FLAGS_DOWNGRADE;
+ 	bool prefetch = flags & MLX5_PF_FLAGS_PREFETCH;
  	u64 access_mask = ODP_READ_ALLOWED_BIT;
 -	int npages = 0, page_shift, np;
  	u64 start_idx, page_mask;
  	struct ib_umem_odp *odp;
 -	int current_seq;
  	size_t size;
 -	int ret;
  
  	if (!odp_mr->page_list) {
  		odp = implicit_mr_get_data(mr, io_virt, bcnt);