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

Pull more rdma updates from Doug Ledford:
 "Minor updates for rxe driver"

[ Starting to do merge window pulls again - the current -git tree does
  appear to have some netfilter use-after-free issues, but I've sent
  off the report to the proper channels, and I don't want to delay merge
  window activity any more ]

* tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  IB/rxe: improved debug prints & code cleanup
  rdma_rxe: Ensure rdma_rxe init occurs at correct time
  IB/rxe: Properly honor max IRD value for rd/atomic.
  IB/{rxe,core,rdmavt}: Fix kernel crash for reg MR
  IB/rxe: Fix sending out loopback packet on netdev interface.
  IB/rxe: Avoid scheduling tasklet for userspace QP

1 files changed, 20 insertions, 3 deletions

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index e1f96737c2a1..9e935655fccb 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1739,6 +1739,14 @@ struct ib_dma_mapping_ops {
         void            (*unmap_sg)(struct ib_device *dev,
                                     struct scatterlist *sg, int nents,
                                     enum dma_data_direction direction);
+        int             (*map_sg_attrs)(struct ib_device *dev,
+                                        struct scatterlist *sg, int nents,
+                                        enum dma_data_direction direction,
+                                        unsigned long attrs);
+        void            (*unmap_sg_attrs)(struct ib_device *dev,
+                                          struct scatterlist *sg, int nents,
+                                          enum dma_data_direction direction,
+                                          unsigned long attrs);
         void            (*sync_single_for_cpu)(struct ib_device *dev,
                                                u64 dma_handle,
                                                size_t size,
@@ -3000,8 +3008,12 @@ static inline int ib_dma_map_sg_attrs(struct ib_device *dev,
                                       enum dma_data_direction direction,
                                       unsigned long dma_attrs)
 {
-        return dma_map_sg_attrs(dev->dma_device, sg, nents, direction,
-                                dma_attrs);
+        if (dev->dma_ops)
+                return dev->dma_ops->map_sg_attrs(dev, sg, nents, direction,
+                                                  dma_attrs);
+        else
+                return dma_map_sg_attrs(dev->dma_device, sg, nents, direction,
+                                        dma_attrs);
 }
 
 static inline void ib_dma_unmap_sg_attrs(struct ib_device *dev,
@@ -3009,7 +3021,12 @@ static inline void ib_dma_unmap_sg_attrs(struct ib_device *dev,
                                          enum dma_data_direction direction,
                                          unsigned long dma_attrs)
 {
-        dma_unmap_sg_attrs(dev->dma_device, sg, nents, direction, dma_attrs);
+        if (dev->dma_ops)
+                return dev->dma_ops->unmap_sg_attrs(dev, sg, nents, direction,
+                                                  dma_attrs);
+        else
+                dma_unmap_sg_attrs(dev->dma_device, sg, nents, direction,
+                                   dma_attrs);
 }
 /**
  * ib_sg_dma_address - Return the DMA address from a scatter/gather entry