Re: [PATCH v6.1] infiniband: dma-mapping: Use unsigned long for dma_attrs

[Krzysztof Kozlowski]

On 07/13/2016 01:14 PM, Krzysztof Kozlowski wrote:
> Split out subsystem specific changes for easier reviews. This will be
> squashed with main commit.
> 
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
> 
> ---
> 
> Update only to this patch from the set.
> 
> Changes since v6:
> 1. Rename attrs->dma_attrs arguments in map/unmap functions (suggested
>    by Bart Van Assche).
> ---
>  drivers/infiniband/core/umem.c |  7 +++----
>  include/rdma/ib_verbs.h        | 13 +++++++------
>  2 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
> index fe4d2e1a8b58..c68746ce6624 100644
> --- a/drivers/infiniband/core/umem.c
> +++ b/drivers/infiniband/core/umem.c
> @@ -37,7 +37,6 @@
>  #include <linux/sched.h>
>  #include <linux/export.h>
>  #include <linux/hugetlb.h>
> -#include <linux/dma-attrs.h>
>  #include <linux/slab.h>
>  #include <rdma/ib_umem_odp.h>
>  
> @@ -92,12 +91,12 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
>  	unsigned long npages;
>  	int ret;
>  	int i;
> -	DEFINE_DMA_ATTRS(attrs);
> +	unsigned long dma_attrs = 0;
>  	struct scatterlist *sg, *sg_list_start;
>  	int need_release = 0;
>  
>  	if (dmasync)
> -		dma_set_attr(DMA_ATTR_WRITE_BARRIER, &attrs);
> +		dma_attrs |= DMA_ATTR_WRITE_BARRIER;
>  
>  	if (!size)
>  		return ERR_PTR(-EINVAL);
> @@ -215,7 +214,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
>  				  umem->sg_head.sgl,
>  				  umem->npages,
>  				  DMA_BIDIRECTIONAL,
> -				  &attrs);
> +				  dma_attrs);
>  
>  	if (umem->nmap <= 0) {
>  		ret = -ENOMEM;
> diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
> index 156673a80704..ae9cfcac20f4 100644
> --- a/include/rdma/ib_verbs.h
> +++ b/include/rdma/ib_verbs.h
> @@ -2910,7 +2910,7 @@ static inline void ib_dma_unmap_single(struct ib_device *dev,
>  static inline u64 ib_dma_map_single_attrs(struct ib_device *dev,
>  					  void *cpu_addr, size_t size,
>  					  enum dma_data_direction direction,
> -					  struct dma_attrs *attrs)
> +					  unsigned long attrs)
>  {
>  	return dma_map_single_attrs(dev->dma_device, cpu_addr, size,
>  				    direction, attrs);
> @@ -2919,7 +2919,7 @@ static inline u64 ib_dma_map_single_attrs(struct ib_device *dev,
>  static inline void ib_dma_unmap_single_attrs(struct ib_device *dev,
>  					     u64 addr, size_t size,
>  					     enum dma_data_direction direction,
> -					     struct dma_attrs *attrs)
> +					     unsigned long attrs)

Oh crap, I didn't rename it everywhere. Let me do a respin...

BR,
Krzysztof