dma-buf: align fd_flags and heap_flags with dma_heap_allocation_data
PATCH v2 1/1 dma-buf: align fd_flags and heap_flags with dma_heap_allocation_data
From: Barry Song <[email protected]>
dma_heap_allocation_data defines the UAPI as follows:
struct dma_heap_allocation_data {
__u64 len;
__u32 fd;
__u32 fd_flags;
__u64 heap_flags;
};
However, dma_heap_buffer_alloc() casts both fd_flags and heap_flags into unsigned int. We're inconsistent with types in the non UAPI arguments. This patch fixes it.
---
-v2:
collect ack of John, thanks!
refine commit message;
drivers/dma-buf/dma-heap.c | 4 ++-- include/uapi/linux/dma-heap.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/dma-buf/dma-heap.c +2 -2
@@ -50,8 +50,8 @@ static struct class *dma_heap_class;static DEFINE_XARRAY_ALLOC (dma_heap_minors);static int dma_heap_buffer_alloc (struct dma_heap *heap,size_t len, -unsigned int fd_flags, -unsigned int heap_flags) +u32 fd_flags, +u64 heap_flags) {struct dma_buf *dmabuf;int fd;
include/uapi/linux/dma-heap.h +1 -1
@@ -19,7 +19,7 @@#define DMA_HEAP_VALID_FD_FLAGS (O_CLOEXEC | O_ACCMODE)/* Currently no heap flags */ -#define DMA_HEAP_VALID_HEAP_FLAGS (0) +#define DMA_HEAP_VALID_HEAP_FLAGS (0ULL)/** * struct dma_heap_allocation_data - metadata passed from userspace for
Signature · 1 line
2.34.1
Sumit Semwal
maintainerHello Barry,
Quoted 10 lines · Barry Song
From: Barry Song <[email protected]>
dma_heap_allocation_datadefines the UAPI as follows:struct dma_heap_allocation_data { __u64 len; __u32 fd; __u32 fd_flags; __u64 heap_flags;
Quoted 5 lines
};
However,
dma_heap_buffer_alloc()casts bothfd_flagsandheap_flagsinto unsigned int. We're inconsistent with types in the non UAPI arguments. This patch fixes it.
Thank you for your patch; I've pushed it to drm-misc-next.
Best,
Sumit.
Quoted 43 lines
Signed-off-by Barry Song <[email protected]>Acked-by John Stultz <[email protected]>---
-v2:
collect ack of John, thanks!
refine commit message;drivers/dma-buf/dma-heap.c | 4 ++-- include/uapi/linux/dma-heap.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)drivers/dma-buf/dma-heap.c +2
-2@@ -50,8 +50,8 @@ static struct class *dma_heap_class;static DEFINE_XARRAY_ALLOC (dma_heap_minors);static int dma_heap_buffer_alloc (struct dma_heap *heap,size_t len, -unsigned int fd_flags, -unsigned int heap_flags) +u32 fd_flags, +u64 heap_flags) {struct dma_buf *dmabuf;int fd;include/uapi/linux/dma-heap.h +1
-2@@ -19,7 +19,7 @@#define DMA_HEAP_VALID_FD_FLAGS (O_CLOEXEC | O_ACCMODE)/* Currently no heap flags */ -#define DMA_HEAP_VALID_HEAP_FLAGS (0) +#define DMA_HEAP_VALID_HEAP_FLAGS (0ULL)/** * struct dma_heap_allocation_data - metadata passed from userspace for -- 2.34.1
Signature · 5 lines
Thanks and regards, Sumit Semwal (he / him) Tech Lead - LCG, Vertical Technologies Linaro.org │ Open source software for ARM SoCs