dma-buf: Flag vmap'ed memory as system or I/O memory
Subsystems (10)
Thomas Zimmermann
maintainercover dma-buf: Flag vmap'ed memory as system or I/O memory
Dma-buf provides vmap() and vunmap() for retrieving and releasing mappings of dma-buf memory in kernel address space. The functions operate with plain addresses and the assumption is that the memory can be accessed with load and store operations. This is not the case on some architectures (e.g., sparc64) where I/O memory can only be accessed with dedicated instructions.
This patchset introduces struct dma_buf_map, which contains the address of a buffer and a flag that tells whether system- or I/O-memory instructions are required.
Some background: updating the DRM framebuffer console on sparc64 makes the kernel panic. This is because the framebuffer memory cannot be accessed with system-memory instructions. We currently employ a workaround in DRM to address this specific problem. [1]
To resolve the problem, we'd like to address it at the most common point, which is the dma-buf framework. The dma-buf mapping ideally knows if I/O instructions are required and exports this information to it's users. The new structure struct dma_buf_map stores the buffer address and a flag that signals I/O memory. Affected users of the buffer (e.g., drivers, frameworks) can then access the memory accordingly.
This patchset only introduces struct dma_buf_map, and updates struct dma_buf and it's interfaces. Further patches can update dma-buf users. For example, there's a prototype patchset for DRM that fixes the framebuffer problem. [2]
Further work: TTM, one of DRM's memory managers, already exports an is_iomem flag of its own. It could later be switched over to exporting struct dma_buf_map, thus simplifying some code. Several DRM drivers expect their fbdev console to operate on I/O memory. These could possibly be switched over to the generic fbdev emulation, as soon as the generic code uses struct dma_buf_map.
[1] https://lore.kernel.org/dri-devel/[email protected]/
[2] https://lore.kernel.org/dri-devel/[email protected]/
Thomas Zimmermann (3):
dma-buf: Add struct dma-buf-map for storing struct dma_buf.vaddr_ptr
dma-buf: Use struct dma_buf_map in dma_buf_vmap() interfaces
dma-buf: Use struct dma_buf_map in dma_buf_vunmap() interfaces
Documentation/driver-api/dma-buf.rst | 3 + drivers/dma-buf/dma-buf.c | 40 +++--- drivers/gpu/drm/drm_gem_cma_helper.c | 16 ++- drivers/gpu/drm/drm_gem_shmem_helper.c | 17 ++- drivers/gpu/drm/drm_prime.c | 14 +- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 13 +- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 18 ++- drivers/gpu/drm/tegra/gem.c | 23 ++-- .../common/videobuf2/videobuf2-dma-contig.c | 17 ++- .../media/common/videobuf2/videobuf2-dma-sg.c | 19 ++- .../common/videobuf2/videobuf2-vmalloc.c | 21 ++- include/drm/drm_prime.h | 5 +- include/linux/dma-buf-map.h | 126 ++++++++++++++++++ include/linux/dma-buf.h | 11 +- 15 files changed, 274 insertions(+), 82 deletions(-) create mode 100644 include/linux/dma-buf-map.h
--
2.28.0
Thomas Zimmermann
maintainerPATCH 1/3 dma-buf: Add struct dma-buf-map for storing struct dma_buf.vaddr_ptr
The new type struct dma_buf_map represents a mapping of dma-buf memory into kernel space. It contains a flag, is_iomem, that signals users to access the mapped memory with I/O operations instead of regular loads and stores.
It was assumed that DMA buffer memory can be accessed with regular load and store operations. Some architectures, such as sparc64, require the use of I/O operations to access dma-map buffers that are located in I/O memory. Providing struct dma_buf_map allows drivers to implement this. This was specifically a problem when refreshing the grahpics framebuffer on such systems. [Link 1]
As the first step, struct dma_buf stores an instance of struct dma_buf_map internally. Afterwards, dma-buf's vmap and vunmap interfaces are be converted. Finally, affected drivers can be fixed.
--- Documentation/driver-api/dma-buf.rst | 3 + drivers/dma-buf/dma-buf.c | 14 ++--- include/linux/dma-buf-map.h | 87 ++++++++++++++++++++++++++++ include/linux/dma-buf.h | 3 +- 4 files changed, 99 insertions(+), 8 deletions(-) create mode 100644 include/linux/dma-buf-map.h
Documentation/driver-api/dma-buf.rst +3 -0
@@ -115,6 +115,9 @@ Kernel Functions and Structures Reference .. kernel-doc:: include/linux/dma-buf.h :internal: +.. kernel-doc:: include/linux/dma-buf-map.h + :internal: + Reservation Objects -------------------
drivers/dma-buf/dma-buf.c +7 -7
@@ -1207,12 +1207,12 @@ void *dma_buf_vmap(struct dma_buf *dmabuf)mutex_lock (&dmabuf->lock);if (dmabuf->vmapping_counter) { dmabuf->vmapping_counter++; -BUG_ON (!dmabuf->vmap_ptr); - ptr = dmabuf->vmap_ptr; +BUG_ON (dma_buf_map_is_null (&dmabuf->vmap_ptr)); + ptr = dmabuf->vmap_ptr.vaddr; goto out_unlock; } -BUG_ON (dmabuf->vmap_ptr); +BUG_ON (dma_buf_map_is_set (&dmabuf->vmap_ptr)); ptr = dmabuf->ops->vmap (dmabuf);if (WARN_ON_ONCE (IS_ERR (ptr)))
@@ -1220,7 +1220,7 @@ void *dma_buf_vmap(struct dma_buf *dmabuf)if (!ptr) goto out_unlock; - dmabuf->vmap_ptr = ptr; + dmabuf->vmap_ptr.vaddr = ptr; dmabuf->vmapping_counter =1 ; out_unlock:
@@ -1239,15 +1239,15 @@ void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr)if (WARN_ON (!dmabuf))return ; -BUG_ON (!dmabuf->vmap_ptr); +BUG_ON (dma_buf_map_is_null (&dmabuf->vmap_ptr));BUG_ON (dmabuf->vmapping_counter =0 ); -BUG_ON (dmabuf->vmap_ptr != vaddr); +BUG_ON (!dma_buf_map_is_vaddr (&dmabuf->vmap_ptr, vaddr));mutex_lock (&dmabuf->lock);if (--dmabuf->vmapping_counter =0 ) {if (dmabuf->ops->vunmap) dmabuf->ops->vunmap (dmabuf, vaddr); - dmabuf->vmap_ptr =NULL ; +dma_buf_map_clear (&dmabuf->vmap_ptr); }mutex_unlock (&dmabuf->lock); }
include/linux/dma-buf-map.h new file +87 -0
87 lines not on this page · raw message
include/linux/dma-buf.h +2 -1
@@ -13,6 +13,7 @@#ifndef __DMA_BUF_H__#define __DMA_BUF_H__ +#include <linux/dma-buf-map.h> #include <linux/file.h> #include <linux/err.h> #include <linux/scatterlist.h>
@@ -309,7 +310,7 @@ struct dma_buf {const struct dma_buf_ops *ops;struct mutex lock;unsigned vmapping_counter; -void *vmap_ptr; +struct dma_buf_map vmap_ptr;const char *exp_name;const char *name;spinlock_t name_lock;
Signature · 1 line
2.28.0
Thomas Zimmermann
maintainerPATCH 2/3 dma-buf: Use struct dma_buf_map in dma_buf_vmap() interfaces
In reply to Thomas ZimmermannThis patch updates dma_buf_vmap() and dma-buf's vmap callback to use struct dma_buf_map.
The interfaces used to return a buffer address. This address now gets stored in an instance of the structure that is given as an additional argument. The functions return an errno code on errors.
Users of the functions are updated accordingly. This is only an interface change. It is currently expected that dma-buf memory can be accessed with system memory load/store operations.
--- drivers/dma-buf/dma-buf.c | 26 ++++++++++--------- drivers/gpu/drm/drm_gem_cma_helper.c | 13 +++++----- drivers/gpu/drm/drm_gem_shmem_helper.c | 14 ++++++---- drivers/gpu/drm/drm_prime.c | 8 +++--- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 8 +++++- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 11 ++++++-- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 12 ++++++--- drivers/gpu/drm/tegra/gem.c | 18 ++++++++----- .../common/videobuf2/videobuf2-dma-contig.c | 14 +++++++--- .../media/common/videobuf2/videobuf2-dma-sg.c | 16 ++++++++---- .../common/videobuf2/videobuf2-vmalloc.c | 15 ++++++++--- include/drm/drm_prime.h | 3 ++- include/linux/dma-buf-map.h | 13 ++++++++++ include/linux/dma-buf.h | 6 ++--- 14 files changed, 122 insertions(+), 55 deletions(-)
drivers/dma-buf/dma-buf.c +14 -12
@@ -1186,46 +1186,48 @@ EXPORT_SYMBOL_GPL(dma_buf_mmap);* dma_buf_vmap - Create virtual mapping for the buffer object into kernel * address space. Same restrictions as for vmap and friends apply. * @dmabuf: [in] buffer to vmap +* @map: [out] returns the vmap pointer * * This call may fail due to lack of virtual mapping address space. * These calls are optional in drivers. The intended use for them * is for mapping objects linear in kernel space for high use objects. * Please attempt to use kmap/kunmap before thinking about these interfaces. * -* Returns NULL on error. +* Returns 0 on success, or a negative errno code otherwise. */ -void *dma_buf_vmap (struct dma_buf *dmabuf) +int dma_buf_vmap (struct dma_buf *dmabuf,struct dma_buf_map *map) { -void *ptr; +struct dma_buf_map ptr; +int ret =0 ;if (WARN_ON (!dmabuf)) -return NULL ; +return -EINVAL ;if (!dmabuf->ops->vmap) -return NULL ; +return -EINVAL ;mutex_lock (&dmabuf->lock);if (dmabuf->vmapping_counter) { dmabuf->vmapping_counter++;BUG_ON (dma_buf_map_is_null (&dmabuf->vmap_ptr)); - ptr = dmabuf->vmap_ptr.vaddr; + *map = dmabuf->vmap_ptr; goto out_unlock; }BUG_ON (dma_buf_map_is_set (&dmabuf->vmap_ptr)); - ptr = dmabuf->ops->vmap (dmabuf); -if (WARN_ON_ONCE (IS_ERR (ptr))) - ptr =NULL ; -if (!ptr) + ret = dmabuf->ops->vmap (dmabuf, &ptr); +if (WARN_ON_ONCE (ret)) goto out_unlock; - dmabuf->vmap_ptr.vaddr = ptr; + dmabuf->vmap_ptr = ptr; dmabuf->vmapping_counter =1 ; + *map = dmabuf->vmap_ptr; + out_unlock:mutex_unlock (&dmabuf->lock); -return ptr; +return ret; }EXPORT_SYMBOL_GPL (dma_buf_vmap);
drivers/gpu/drm/drm_gem_cma_helper.c +7 -6
@@ -634,22 +634,23 @@ drm_gem_cma_prime_import_sg_table_vmap(struct drm_device *dev, {struct drm_gem_cma_object *cma_obj;struct drm_gem_object *obj; -void *vaddr; +struct dma_buf_map map; +int ret; - vaddr =dma_buf_vmap (attach->dmabuf); -if (!vaddr) { + ret =dma_buf_vmap (attach->dmabuf, &map); +if (ret) {DRM_ERROR ("Failed to vmap PRIME buffer\n" ); -return ERR_PTR (-ENOMEM ); +return ERR_PTR (ret); } obj =drm_gem_cma_prime_import_sg_table (dev, attach, sgt);if (IS_ERR (obj)) { -dma_buf_vunmap (attach->dmabuf, vaddr); +dma_buf_vunmap (attach->dmabuf, map.vaddr);return obj; } cma_obj =to_drm_gem_cma_obj (obj); - cma_obj->vaddr = vaddr; + cma_obj->vaddr = map.vaddr;return obj; }
drivers/gpu/drm/drm_gem_shmem_helper.c +9 -5
@@ -261,13 +261,16 @@ EXPORT_SYMBOL(drm_gem_shmem_unpin);static void *drm_gem_shmem_vmap_locked (struct drm_gem_shmem_object *shmem) {struct drm_gem_object *obj = &shmem->base; -int ret; +struct dma_buf_map map; +int ret =0 ;if (shmem->vmap_use_count++ >0 )return shmem->vaddr;if (obj->import_attach) { - shmem->vaddr =dma_buf_vmap (obj->import_attach->dmabuf); + ret =dma_buf_vmap (obj->import_attach->dmabuf, &map); +if (!ret) + shmem->vaddr = map.vaddr; }else {pgprot_t prot =PAGE_KERNEL ;
@@ -279,11 +282,12 @@ static void *drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem) prot =pgprot_writecombine (prot); shmem->vaddr =vmap (shmem->pages, obj->size >>PAGE_SHIFT ,VM_MAP , prot); +if (!shmem->vaddr) + ret = -ENOMEM ; } -if (!shmem->vaddr) { -DRM_DEBUG_KMS ("Failed to vmap pages\n" ); - ret = -ENOMEM ; +if (ret) { +DRM_DEBUG_KMS ("Failed to vmap pages, error %d\n" , ret); goto err_put_pages; }
drivers/gpu/drm/drm_prime.c +5 -3
@@ -668,16 +668,18 @@ EXPORT_SYMBOL(drm_gem_unmap_dma_buf);* * Returns the kernel virtual address or NULL on failure. */ -void *drm_gem_dmabuf_vmap (struct dma_buf *dma_buf) +int drm_gem_dmabuf_vmap (struct dma_buf *dma_buf,struct dma_buf_map *map) {struct drm_gem_object *obj = dma_buf->priv;void *vaddr; vaddr =drm_gem_vmap (obj);if (IS_ERR (vaddr)) - vaddr =NULL ; +return PTR_ERR (vaddr); -return vaddr; +dma_buf_map_set_vaddr (map, vaddr); + +return 0 ; }EXPORT_SYMBOL (drm_gem_dmabuf_vmap);
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +7 -1
@@ -85,9 +85,15 @@ static void etnaviv_gem_prime_release(struct etnaviv_gem_object *etnaviv_obj)static void *etnaviv_gem_prime_vmap_impl (struct etnaviv_gem_object *etnaviv_obj) { +struct dma_buf_map map; +int ret; +lockdep_assert_held (&etnaviv_obj->lock); -return dma_buf_vmap (etnaviv_obj->base.import_attach->dmabuf); + ret =dma_buf_vmap (etnaviv_obj->base.import_attach->dmabuf, &map); +if (ret) +return NULL ; +return map.vaddr; } static int etnaviv_gem_prime_mmap_obj(struct etnaviv_gem_object *etnaviv_obj,
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +9 -2
@@ -82,11 +82,18 @@ static void i915_gem_unmap_dma_buf(struct dma_buf_attachment *attachment,i915_gem_object_unpin_pages (obj); } -static void *i915_gem_dmabuf_vmap (struct dma_buf *dma_buf) +static int i915_gem_dmabuf_vmap (struct dma_buf *dma_buf,struct dma_buf_map *map) {struct drm_i915_gem_object *obj =dma_buf_to_obj (dma_buf); +void *vaddr; -return i915_gem_object_pin_map (obj,I915_MAP_WB ); + vaddr =i915_gem_object_pin_map (obj,I915_MAP_WB ); +if (IS_ERR (vaddr)) +return PTR_ERR (vaddr); + +dma_buf_map_set_vaddr (map, vaddr); + +return 0 ; }static void i915_gem_dmabuf_vunmap (struct dma_buf *dma_buf,void *vaddr)
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +9 -3
@@ -82,6 +82,7 @@ static int igt_dmabuf_import(void *arg)struct drm_i915_gem_object *obj;struct dma_buf *dmabuf;void *obj_map, *dma_map; +struct dma_buf_map map;u32 pattern[] = {0 ,0xaa ,0xcc ,0x55 ,0xff };int err, i;
@@ -110,7 +111,8 @@ static int igt_dmabuf_import(void *arg) goto out_obj; } - dma_map =dma_buf_vmap (dmabuf); + err =dma_buf_vmap (dmabuf, &map); + dma_map = err ?NULL : map.vaddr;if (!dma_map) {pr_err ("dma_buf_vmap failed\n" ); err = -ENOMEM ;
@@ -163,6 +165,7 @@ static int igt_dmabuf_import_ownership(void *arg)struct drm_i915_private *i915 = arg;struct drm_i915_gem_object *obj;struct dma_buf *dmabuf; +struct dma_buf_map map;void *ptr;int err;
@@ -170,7 +173,8 @@ static int igt_dmabuf_import_ownership(void *arg)if (IS_ERR (dmabuf))return PTR_ERR (dmabuf); - ptr =dma_buf_vmap (dmabuf); + err =dma_buf_vmap (dmabuf, &map); + ptr = err ?NULL : map.vaddr;if (!ptr) {pr_err ("dma_buf_vmap failed\n" ); err = -ENOMEM ;
@@ -212,6 +216,7 @@ static int igt_dmabuf_export_vmap(void *arg)struct drm_i915_private *i915 = arg;struct drm_i915_gem_object *obj;struct dma_buf *dmabuf; +struct dma_buf_map map;void *ptr;int err;
@@ -228,7 +233,8 @@ static int igt_dmabuf_export_vmap(void *arg) }i915_gem_object_put (obj); - ptr =dma_buf_vmap (dmabuf); + err =dma_buf_vmap (dmabuf, &map); + ptr = err ?NULL : map.vaddr;if (!ptr) {pr_err ("dma_buf_vmap failed\n" ); err = -ENOMEM ;
drivers/gpu/drm/tegra/gem.c +12 -6
@@ -132,14 +132,18 @@ static void tegra_bo_unpin(struct device *dev, struct sg_table *sgt)static void *tegra_bo_mmap (struct host1x_bo *bo) {struct tegra_bo *obj =host1x_to_tegra_bo (bo); +struct dma_buf_map map; +int ret; -if (obj->vaddr) +if (obj->vaddr) {return obj->vaddr; -else if (obj->gem.import_attach) -return dma_buf_vmap (obj->gem.import_attach->dmabuf); -else + }else if (obj->gem.import_attach) { + ret =dma_buf_vmap (obj->gem.import_attach->dmabuf, &map); +return ret ?NULL : map.vaddr; + }else {return vmap (obj->pages, obj->num_pages,VM_MAP ,pgprot_writecombine (PAGE_KERNEL )); + } }static void tegra_bo_munmap (struct host1x_bo *bo,void *addr)
@@ -641,12 +645,14 @@ static int tegra_gem_prime_mmap(struct dma_buf *buf, struct vm_area_struct *vma)return __tegra_gem_mmap (gem, vma); } -static void *tegra_gem_prime_vmap (struct dma_buf *buf) +static int tegra_gem_prime_vmap (struct dma_buf *buf,struct dma_buf_map *map) {struct drm_gem_object *gem = buf->priv;struct tegra_bo *bo =to_tegra_bo (gem); -return bo->vaddr; +dma_buf_map_set_vaddr (map, bo->vaddr); + +return 0 ; }static void tegra_gem_prime_vunmap (struct dma_buf *buf,void *vaddr)
drivers/media/common/videobuf2/videobuf2-dma-contig.c +10 -4
@@ -81,9 +81,13 @@ static void *vb2_dc_cookie(void *buf_priv)static void *vb2_dc_vaddr (void *buf_priv) {struct vb2_dc_buf *buf = buf_priv; +struct dma_buf_map map; +int ret; -if (!buf->vaddr && buf->db_attach) - buf->vaddr =dma_buf_vmap (buf->db_attach->dmabuf); +if (!buf->vaddr && buf->db_attach) { + ret =dma_buf_vmap (buf->db_attach->dmabuf, &map); + buf->vaddr = ret ?NULL : map.vaddr; + }return buf->vaddr; }
@@ -365,11 +369,13 @@ vb2_dc_dmabuf_ops_end_cpu_access(struct dma_buf *dbuf,return 0 ; } -static void *vb2_dc_dmabuf_ops_vmap (struct dma_buf *dbuf) +static int vb2_dc_dmabuf_ops_vmap (struct dma_buf *dbuf,struct dma_buf_map *map) {struct vb2_dc_buf *buf = dbuf->priv; -return buf->vaddr; +dma_buf_map_set_vaddr (map, buf->vaddr); + +return 0 ; } static int vb2_dc_dmabuf_ops_mmap(struct dma_buf *dbuf,
drivers/media/common/videobuf2/videobuf2-dma-sg.c +11 -5
@@ -300,14 +300,18 @@ static void vb2_dma_sg_put_userptr(void *buf_priv)static void *vb2_dma_sg_vaddr (void *buf_priv) {struct vb2_dma_sg_buf *buf = buf_priv; +struct dma_buf_map map; +int ret;BUG_ON (!buf);if (!buf->vaddr) { -if (buf->db_attach) - buf->vaddr =dma_buf_vmap (buf->db_attach->dmabuf); -else +if (buf->db_attach) { + ret =dma_buf_vmap (buf->db_attach->dmabuf, &map); + buf->vaddr = ret ?NULL : map.vaddr; + }else { buf->vaddr =vm_map_ram (buf->pages, buf->num_pages,-1 ); + } }/* add offset in case userptr is not page-aligned */
@@ -489,11 +493,13 @@ vb2_dma_sg_dmabuf_ops_end_cpu_access(struct dma_buf *dbuf,return 0 ; } -static void *vb2_dma_sg_dmabuf_ops_vmap (struct dma_buf *dbuf) +static int vb2_dma_sg_dmabuf_ops_vmap (struct dma_buf *dbuf,struct dma_buf_map *map) {struct vb2_dma_sg_buf *buf = dbuf->priv; -return vb2_dma_sg_vaddr (buf); +dma_buf_map_set_vaddr (map, buf->vaddr); + +return 0 ; } static int vb2_dma_sg_dmabuf_ops_mmap(struct dma_buf *dbuf,
drivers/media/common/videobuf2/videobuf2-vmalloc.c +11 -4
@@ -318,11 +318,13 @@ static void vb2_vmalloc_dmabuf_ops_release(struct dma_buf *dbuf)vb2_vmalloc_put (dbuf->priv); } -static void *vb2_vmalloc_dmabuf_ops_vmap (struct dma_buf *dbuf) +static int vb2_vmalloc_dmabuf_ops_vmap (struct dma_buf *dbuf,struct dma_buf_map *map) {struct vb2_vmalloc_buf *buf = dbuf->priv; -return buf->vaddr; +dma_buf_map_set_vaddr (map, buf->vaddr); + +return 0 ; } static int vb2_vmalloc_dmabuf_ops_mmap(struct dma_buf *dbuf,
@@ -374,10 +376,15 @@ static struct dma_buf *vb2_vmalloc_get_dmabuf(void *buf_priv, unsigned long flagstatic int vb2_vmalloc_map_dmabuf (void *mem_priv) {struct vb2_vmalloc_buf *buf = mem_priv; +struct dma_buf_map map; +int ret; - buf->vaddr =dma_buf_vmap (buf->dbuf); + ret =dma_buf_vmap (buf->dbuf, &map); +if (ret) +return -EFAULT ; + buf->vaddr = map.vaddr; -return buf->vaddr ?0 : -EFAULT ; +return 0 ; }static void vb2_vmalloc_unmap_dmabuf (void *mem_priv)
include/drm/drm_prime.h +2 -1
@@ -54,6 +54,7 @@ struct device;struct dma_buf_export_info ;struct dma_buf ;struct dma_buf_attachment ; +struct dma_buf_map ;enum dma_data_direction ;
@@ -82,7 +83,7 @@ struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach,void drm_gem_unmap_dma_buf (struct dma_buf_attachment *attach,struct sg_table *sgt,enum dma_data_direction dir); -void *drm_gem_dmabuf_vmap (struct dma_buf *dma_buf); +int drm_gem_dmabuf_vmap (struct dma_buf *dma_buf,struct dma_buf_map *map);void drm_gem_dmabuf_vunmap (struct dma_buf *dma_buf,void *vaddr);int drm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma);
include/linux/dma-buf-map.h +13 -0
@@ -28,6 +28,19 @@ struct dma_buf_map {bool is_iomem; }; +/** +* dma_buf_map_set_vaddr - Sets a dma-buf mapping structure to an address in system memory +* @map: The dma-buf mapping structure +* @vaddr: A system-memory address +* +* Sets the address and clears the I/O-memory flag. +*/ +static inline void dma_buf_map_set_vaddr (struct dma_buf_map *map,void *vaddr) +{ + map->vaddr = vaddr; + map->is_iomem = false; +} +/* API transition helper */ static inline bool dma_buf_map_is_vaddr (const struct dma_buf_map *map,const void *vaddr) {
include/linux/dma-buf.h +3 -3
@@ -266,7 +266,7 @@ struct dma_buf_ops {*/ int (*mmap)(struct dma_buf *,struct vm_area_struct *vma); -void *(*vmap)(struct dma_buf *); +int (*vmap)(struct dma_buf *dmabuf,struct dma_buf_map *map);void (*vunmap)(struct dma_buf *,void *vaddr); };
@@ -503,6 +503,6 @@ int dma_buf_end_cpu_access(struct dma_buf *dma_buf,int dma_buf_mmap (struct dma_buf *,struct vm_area_struct *,unsigned long ); -void *dma_buf_vmap (struct dma_buf *); -void dma_buf_vunmap (struct dma_buf *,void *vaddr); +int dma_buf_vmap (struct dma_buf *dmabuf,struct dma_buf_map *map); +void dma_buf_vunmap (struct dma_buf *dmabuf,void *vaddr);#endif /* __DMA_BUF_H__ */
Signature · 1 line
2.28.0
kernel test robot
build botRe: [Intel-gfx] [PATCH 2/3] dma-buf: Use struct dma_buf_map in dma_buf_vmap() interfaces
I love your patch! Yet something to improve:
Hi Thomas,
I love your patch! Yet something to improve:
[auto build test ERROR on next-20200914]
[also build test ERROR on v5.9-rc5]
[cannot apply to linuxtv-media/master drm-intel/for-linux-next tegra/for-next linus/master v5.9-rc5 v5.9-rc4 v5.9-rc3] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/dma-buf-Flag-vmap-ed-memory-as-system-or-I-O-memory/20200914-192712 base: f965d3ec86fa89285db0fbb983da76ba9c398efa config: x86_64-randconfig-a004-20200913 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project b2c32c90bab09a6e2c1f370429db26017a182143)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/dma-buf/heaps/heap-helpers.c:269:10: error: incompatible function pointer types initializing 'int (*)(struct dma_buf *, struct dma_buf_map *)' with an expression of type 'void *(struct dma_buf *)' [-Werror,-Wincompatible-function-pointer-types]
.vmap = dma_heap_dma_buf_vmap,
^~~~~~~~~~~~~~~~~~~~~
1 error generated.
# https://github.com/0day-ci/linux/commit/b9513704e28f25636f00827154183df60a80d95c
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Zimmermann/dma-buf-Flag-vmap-ed-memory-as-system-or-I-O-memory/20200914-192712 git checkout b9513704e28f25636f00827154183df60a80d95c
vim +269 drivers/dma-buf/heaps/heap-helpers.c
5248eb12fea890a John Stultz 2019-12-03 259
5248eb12fea890a John Stultz 2019-12-03 260 const struct dma_buf_ops heap_helper_ops = {
5248eb12fea890a John Stultz 2019-12-03 261 .map_dma_buf = dma_heap_map_dma_buf,
5248eb12fea890a John Stultz 2019-12-03 262 .unmap_dma_buf = dma_heap_unmap_dma_buf,
5248eb12fea890a John Stultz 2019-12-03 263 .mmap = dma_heap_mmap,
5248eb12fea890a John Stultz 2019-12-03 264 .release = dma_heap_dma_buf_release,
5248eb12fea890a John Stultz 2019-12-03 265 .attach = dma_heap_attach,
5248eb12fea890a John Stultz 2019-12-03 266 .detach = dma_heap_detach,
5248eb12fea890a John Stultz 2019-12-03 267 .begin_cpu_access = dma_heap_dma_buf_begin_cpu_access,
5248eb12fea890a John Stultz 2019-12-03 268 .end_cpu_access = dma_heap_dma_buf_end_cpu_access,5248eb12fea890a John Stultz 2019-12-03 @269 .vmap = dma_heap_dma_buf_vmap,
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [Intel-gfx] [PATCH 2/3] dma-buf: Use struct dma_buf_map in dma_buf_vmap() interfaces
In reply to Thomas ZimmermannI love your patch! Yet something to improve:
Hi Thomas,
I love your patch! Yet something to improve:
[auto build test ERROR on next-20200914]
[also build test ERROR on v5.9-rc5]
[cannot apply to linuxtv-media/master drm-intel/for-linux-next tegra/for-next linus/master v5.9-rc5 v5.9-rc4 v5.9-rc3] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/dma-buf-Flag-vmap-ed-memory-as-system-or-I-O-memory/20200914-192712 base: f965d3ec86fa89285db0fbb983da76ba9c398efa config: mips-randconfig-r013-20200914 (attached as .config) compiler: mipsel-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=mips
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/dma-buf/heaps/heap-helpers.c:269:10: error: initialization of 'int (*)(struct dma_buf *, struct dma_buf_map *)' from incompatible pointer type 'void * (*)(struct dma_buf *)' [-Werror=incompatible-pointer-types]
269 | .vmap = dma_heap_dma_buf_vmap,
| ^~~~~~~~~~~~~~~~~~~~~ drivers/dma-buf/heaps/heap-helpers.c:269:10: note: (near initialization for 'heap_helper_ops.vmap')
cc1: some warnings being treated as errors
# https://github.com/0day-ci/linux/commit/b9513704e28f25636f00827154183df60a80d95c
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Zimmermann/dma-buf-Flag-vmap-ed-memory-as-system-or-I-O-memory/20200914-192712 git checkout b9513704e28f25636f00827154183df60a80d95c
vim +269 drivers/dma-buf/heaps/heap-helpers.c
5248eb12fea890 John Stultz 2019-12-03 259
5248eb12fea890 John Stultz 2019-12-03 260 const struct dma_buf_ops heap_helper_ops = {
5248eb12fea890 John Stultz 2019-12-03 261 .map_dma_buf = dma_heap_map_dma_buf,
5248eb12fea890 John Stultz 2019-12-03 262 .unmap_dma_buf = dma_heap_unmap_dma_buf,
5248eb12fea890 John Stultz 2019-12-03 263 .mmap = dma_heap_mmap,
5248eb12fea890 John Stultz 2019-12-03 264 .release = dma_heap_dma_buf_release,
5248eb12fea890 John Stultz 2019-12-03 265 .attach = dma_heap_attach,
5248eb12fea890 John Stultz 2019-12-03 266 .detach = dma_heap_detach,
5248eb12fea890 John Stultz 2019-12-03 267 .begin_cpu_access = dma_heap_dma_buf_begin_cpu_access,
5248eb12fea890 John Stultz 2019-12-03 268 .end_cpu_access = dma_heap_dma_buf_end_cpu_access,5248eb12fea890 John Stultz 2019-12-03 @269 .vmap = dma_heap_dma_buf_vmap,
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [Intel-gfx] [PATCH 2/3] dma-buf: Use struct dma_buf_map in dma_buf_vmap() interfaces
In reply to Thomas ZimmermannI love your patch! Yet something to improve:
Hi Thomas,
I love your patch! Yet something to improve:
[auto build test ERROR on next-20200914]
[also build test ERROR on v5.9-rc5]
[cannot apply to linuxtv-media/master drm-intel/for-linux-next tegra/for-next linus/master v5.9-rc5 v5.9-rc4 v5.9-rc3] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/dma-buf-Flag-vmap-ed-memory-as-system-or-I-O-memory/20200914-192712 base: f965d3ec86fa89285db0fbb983da76ba9c398efa config: i386-randconfig-r034-20200913 (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce (this is a W=1 build): # save the attached .config to linux build tree make W=1 ARCH=i386
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
In file included from drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c:291:
>> drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c:89:10: error: initialization of 'int (*)(struct dma_buf *, struct dma_buf_map *)' from incompatible pointer type 'void * (*)(struct dma_buf *)' [-Werror=incompatible-pointer-types]
89 | .vmap = mock_dmabuf_vmap,
| ^~~~~~~~~~~~~~~~ drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c:89:10: note: (near initialization for 'mock_dmabuf_ops.vmap')
cc1: some warnings being treated as errors
# https://github.com/0day-ci/linux/commit/b9513704e28f25636f00827154183df60a80d95c
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Zimmermann/dma-buf-Flag-vmap-ed-memory-as-system-or-I-O-memory/20200914-192712 git checkout b9513704e28f25636f00827154183df60a80d95c
vim +89 drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c
6cca22ede8a448 drivers/gpu/drm/i915/selftests/mock_dmabuf.c Chris Wilson 2017-02-13 83
6cca22ede8a448 drivers/gpu/drm/i915/selftests/mock_dmabuf.c Chris Wilson 2017-02-13 84 static const struct dma_buf_ops mock_dmabuf_ops = {
6cca22ede8a448 drivers/gpu/drm/i915/selftests/mock_dmabuf.c Chris Wilson 2017-02-13 85 .map_dma_buf = mock_map_dma_buf,
6cca22ede8a448 drivers/gpu/drm/i915/selftests/mock_dmabuf.c Chris Wilson 2017-02-13 86 .unmap_dma_buf = mock_unmap_dma_buf,
6cca22ede8a448 drivers/gpu/drm/i915/selftests/mock_dmabuf.c Chris Wilson 2017-02-13 87 .release = mock_dmabuf_release,
6cca22ede8a448 drivers/gpu/drm/i915/selftests/mock_dmabuf.c Chris Wilson 2017-02-13 88 .mmap = mock_dmabuf_mmap,
6cca22ede8a448 drivers/gpu/drm/i915/selftests/mock_dmabuf.c Chris Wilson 2017-02-13 @89 .vmap = mock_dmabuf_vmap,
6cca22ede8a448 drivers/gpu/drm/i915/selftests/mock_dmabuf.c Chris Wilson 2017-02-13 90 .vunmap = mock_dmabuf_vunmap,
6cca22ede8a448 drivers/gpu/drm/i915/selftests/mock_dmabuf.c Chris Wilson 2017-02-13 91 };6cca22ede8a448 drivers/gpu/drm/i915/selftests/mock_dmabuf.c Chris Wilson 2017-02-13 92
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH 2/3] dma-buf: Use struct dma_buf_map in dma_buf_vmap() interfaces
In reply to Thomas ZimmermannQuoted 42 lines · Thomas Zimmermann
This patch updates
dma_buf_vmap()and dma-buf's vmap callback to use structdma_buf_map.The interfaces used to return a buffer address. This address now gets stored in an instance of the structure that is given as an additional argument. The functions return an errno code on errors.
Users of the functions are updated accordingly. This is only an interface change. It is currently expected that dma-buf memory can be accessed with system memory load/store operations.
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/dma-buf/dma-buf.c | 26 ++++++++++--------- drivers/gpu/drm/drm_gem_cma_helper.c | 13 +++++----- drivers/gpu/drm/drm_gem_shmem_helper.c | 14 ++++++---- drivers/gpu/drm/drm_prime.c | 8 +++--- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 8 +++++- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 11 ++++++-- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 12 ++++++--- drivers/gpu/drm/tegra/gem.c | 18 ++++++++----- .../common/videobuf2/videobuf2-dma-contig.c | 14 +++++++--- .../media/common/videobuf2/videobuf2-dma-sg.c | 16 ++++++++---- .../common/videobuf2/videobuf2-vmalloc.c | 15 ++++++++--- include/drm/drm_prime.h | 3 ++- include/linux/dma-buf-map.h | 13 ++++++++++ include/linux/dma-buf.h | 6 ++--- 14 files changed, 122 insertions(+), 55 deletions(-)drivers/dma-buf/dma-buf.c +1
-0@@ -1186,46 +1186,48 @@ EXPORT_SYMBOL_GPL(dma_buf_mmap);* dma_buf_vmap - Create virtual mapping for the buffer object into kernel * address space. Same restrictions as for vmap and friends apply. * @dmabuf: [in] buffer to vmap +* @map: [out] returns the vmap pointer * * This call may fail due to lack of virtual mapping address space. * These calls are optional in drivers. The intended use for them * is for mapping objects linear in kernel space for high use objects.
drivers/dma-buf/dma-buf.c EXPORT_SYMBOL_GPL(dma_buf_mmap); · line 1200
Quoted 10 lines
drivers/dma-buf/dma-buf.c +3
-3* Please attempt to use kmap/kunmap before thinking about these interfaces. * -* Returns NULL on error. +* Returns 0 on success, or a negative errno code otherwise. */ -void *dma_buf_vmap (struct dma_buf *dmabuf) +int dma_buf_vmap (struct dma_buf *dmabuf,struct dma_buf_map *map) { -void *ptr; +struct dma_buf_map ptr;
Hm I think for safety we should unconditionally clear map, even when it fails. Otherwise callers of this who fail to handle errors might trip up on stack garbage, instead of tripping over a NULL pointer. That's a step back from the old version of
vaddr = dma_buf_vmap()
where you where guaranteed to trip over a NULL pointer if you didn't check for errors. So also no need for the local variable.
Otherwise I think this interface looks clean.
-Daniel
Quoted 475 lines
drivers/dma-buf/dma-buf.c +10
-9+int ret =0 ;if (WARN_ON (!dmabuf)) -return NULL ; +return -EINVAL ;if (!dmabuf->ops->vmap) -return NULL ; +return -EINVAL ;mutex_lock (&dmabuf->lock);if (dmabuf->vmapping_counter) { dmabuf->vmapping_counter++;BUG_ON (dma_buf_map_is_null (&dmabuf->vmap_ptr)); - ptr = dmabuf->vmap_ptr.vaddr; + *map = dmabuf->vmap_ptr; goto out_unlock; }BUG_ON (dma_buf_map_is_set (&dmabuf->vmap_ptr)); - ptr = dmabuf->ops->vmap (dmabuf); -if (WARN_ON_ONCE (IS_ERR (ptr))) - ptr =NULL ; -if (!ptr) + ret = dmabuf->ops->vmap (dmabuf, &ptr); +if (WARN_ON_ONCE (ret)) goto out_unlock; - dmabuf->vmap_ptr.vaddr = ptr; + dmabuf->vmap_ptr = ptr; dmabuf->vmapping_counter =1 ; + *map = dmabuf->vmap_ptr; + out_unlock:mutex_unlock (&dmabuf->lock); -return ptr; +return ret; }EXPORT_SYMBOL_GPL (dma_buf_vmap);drivers/gpu/drm/drm_gem_cma_helper.c +7
-6@@ -634,22 +634,23 @@ drm_gem_cma_prime_import_sg_table_vmap(struct drm_device *dev, {struct drm_gem_cma_object *cma_obj;struct drm_gem_object *obj; -void *vaddr; +struct dma_buf_map map; +int ret; - vaddr =dma_buf_vmap (attach->dmabuf); -if (!vaddr) { + ret =dma_buf_vmap (attach->dmabuf, &map); +if (ret) {DRM_ERROR ("Failed to vmap PRIME buffer\n" ); -return ERR_PTR (-ENOMEM ); +return ERR_PTR (ret); } obj =drm_gem_cma_prime_import_sg_table (dev, attach, sgt);if (IS_ERR (obj)) { -dma_buf_vunmap (attach->dmabuf, vaddr); +dma_buf_vunmap (attach->dmabuf, map.vaddr);return obj; } cma_obj =to_drm_gem_cma_obj (obj); - cma_obj->vaddr = vaddr; + cma_obj->vaddr = map.vaddr;return obj; }drivers/gpu/drm/drm_gem_shmem_helper.c +9
-5@@ -261,13 +261,16 @@ EXPORT_SYMBOL(drm_gem_shmem_unpin);static void *drm_gem_shmem_vmap_locked (struct drm_gem_shmem_object *shmem) {struct drm_gem_object *obj = &shmem->base; -int ret; +struct dma_buf_map map; +int ret =0 ;if (shmem->vmap_use_count++ >0 )return shmem->vaddr;if (obj->import_attach) { - shmem->vaddr =dma_buf_vmap (obj->import_attach->dmabuf); + ret =dma_buf_vmap (obj->import_attach->dmabuf, &map); +if (!ret) + shmem->vaddr = map.vaddr; }else {pgprot_t prot =PAGE_KERNEL ;@@ -279,11 +282,12 @@ static void *drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem) prot =pgprot_writecombine (prot); shmem->vaddr =vmap (shmem->pages, obj->size >>PAGE_SHIFT ,VM_MAP , prot); +if (!shmem->vaddr) + ret = -ENOMEM ; } -if (!shmem->vaddr) { -DRM_DEBUG_KMS ("Failed to vmap pages\n" ); - ret = -ENOMEM ; +if (ret) { +DRM_DEBUG_KMS ("Failed to vmap pages, error %d\n" , ret); goto err_put_pages; }drivers/gpu/drm/drm_prime.c +5
-3@@ -668,16 +668,18 @@ EXPORT_SYMBOL(drm_gem_unmap_dma_buf);* * Returns the kernel virtual address or NULL on failure. */ -void *drm_gem_dmabuf_vmap (struct dma_buf *dma_buf) +int drm_gem_dmabuf_vmap (struct dma_buf *dma_buf,struct dma_buf_map *map) {struct drm_gem_object *obj = dma_buf->priv;void *vaddr; vaddr =drm_gem_vmap (obj);if (IS_ERR (vaddr)) - vaddr =NULL ; +return PTR_ERR (vaddr); -return vaddr; +dma_buf_map_set_vaddr (map, vaddr); + +return 0 ; }EXPORT_SYMBOL (drm_gem_dmabuf_vmap);drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +7
-1@@ -85,9 +85,15 @@ static void etnaviv_gem_prime_release(struct etnaviv_gem_object *etnaviv_obj)static void *etnaviv_gem_prime_vmap_impl (struct etnaviv_gem_object *etnaviv_obj) { +struct dma_buf_map map; +int ret; +lockdep_assert_held (&etnaviv_obj->lock); -return dma_buf_vmap (etnaviv_obj->base.import_attach->dmabuf); + ret =dma_buf_vmap (etnaviv_obj->base.import_attach->dmabuf, &map); +if (ret) +return NULL ; +return map.vaddr; } static int etnaviv_gem_prime_mmap_obj(struct etnaviv_gem_object *etnaviv_obj,drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +9
-2@@ -82,11 +82,18 @@ static void i915_gem_unmap_dma_buf(struct dma_buf_attachment *attachment,i915_gem_object_unpin_pages (obj); } -static void *i915_gem_dmabuf_vmap (struct dma_buf *dma_buf) +static int i915_gem_dmabuf_vmap (struct dma_buf *dma_buf,struct dma_buf_map *map) {struct drm_i915_gem_object *obj =dma_buf_to_obj (dma_buf); +void *vaddr; -return i915_gem_object_pin_map (obj,I915_MAP_WB ); + vaddr =i915_gem_object_pin_map (obj,I915_MAP_WB ); +if (IS_ERR (vaddr)) +return PTR_ERR (vaddr); + +dma_buf_map_set_vaddr (map, vaddr); + +return 0 ; }static void i915_gem_dmabuf_vunmap (struct dma_buf *dma_buf,void *vaddr)drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +9
-3@@ -82,6 +82,7 @@ static int igt_dmabuf_import(void *arg)struct drm_i915_gem_object *obj;struct dma_buf *dmabuf;void *obj_map, *dma_map; +struct dma_buf_map map;u32 pattern[] = {0 ,0xaa ,0xcc ,0x55 ,0xff };int err, i;@@ -110,7 +111,8 @@ static int igt_dmabuf_import(void *arg) goto out_obj; } - dma_map =dma_buf_vmap (dmabuf); + err =dma_buf_vmap (dmabuf, &map); + dma_map = err ?NULL : map.vaddr;if (!dma_map) {pr_err ("dma_buf_vmap failed\n" ); err = -ENOMEM ;@@ -163,6 +165,7 @@ static int igt_dmabuf_import_ownership(void *arg)struct drm_i915_private *i915 = arg;struct drm_i915_gem_object *obj;struct dma_buf *dmabuf; +struct dma_buf_map map;void *ptr;int err;@@ -170,7 +173,8 @@ static int igt_dmabuf_import_ownership(void *arg)if (IS_ERR (dmabuf))return PTR_ERR (dmabuf); - ptr =dma_buf_vmap (dmabuf); + err =dma_buf_vmap (dmabuf, &map); + ptr = err ?NULL : map.vaddr;if (!ptr) {pr_err ("dma_buf_vmap failed\n" ); err = -ENOMEM ;@@ -212,6 +216,7 @@ static int igt_dmabuf_export_vmap(void *arg)struct drm_i915_private *i915 = arg;struct drm_i915_gem_object *obj;struct dma_buf *dmabuf; +struct dma_buf_map map;void *ptr;int err;@@ -228,7 +233,8 @@ static int igt_dmabuf_export_vmap(void *arg) }i915_gem_object_put (obj); - ptr =dma_buf_vmap (dmabuf); + err =dma_buf_vmap (dmabuf, &map); + ptr = err ?NULL : map.vaddr;if (!ptr) {pr_err ("dma_buf_vmap failed\n" ); err = -ENOMEM ;drivers/gpu/drm/tegra/gem.c +12
-6@@ -132,14 +132,18 @@ static void tegra_bo_unpin(struct device *dev, struct sg_table *sgt)static void *tegra_bo_mmap (struct host1x_bo *bo) {struct tegra_bo *obj =host1x_to_tegra_bo (bo); +struct dma_buf_map map; +int ret; -if (obj->vaddr) +if (obj->vaddr) {return obj->vaddr; -else if (obj->gem.import_attach) -return dma_buf_vmap (obj->gem.import_attach->dmabuf); -else + }else if (obj->gem.import_attach) { + ret =dma_buf_vmap (obj->gem.import_attach->dmabuf, &map); +return ret ?NULL : map.vaddr; + }else {return vmap (obj->pages, obj->num_pages,VM_MAP ,pgprot_writecombine (PAGE_KERNEL )); + } }static void tegra_bo_munmap (struct host1x_bo *bo,void *addr)@@ -641,12 +645,14 @@ static int tegra_gem_prime_mmap(struct dma_buf *buf, struct vm_area_struct *vma)return __tegra_gem_mmap (gem, vma); } -static void *tegra_gem_prime_vmap (struct dma_buf *buf) +static int tegra_gem_prime_vmap (struct dma_buf *buf,struct dma_buf_map *map) {struct drm_gem_object *gem = buf->priv;struct tegra_bo *bo =to_tegra_bo (gem); -return bo->vaddr; +dma_buf_map_set_vaddr (map, bo->vaddr); + +return 0 ; }static void tegra_gem_prime_vunmap (struct dma_buf *buf,void *vaddr)drivers/media/common/videobuf2/videobuf2-dma-contig.c +10
-4@@ -81,9 +81,13 @@ static void *vb2_dc_cookie(void *buf_priv)static void *vb2_dc_vaddr (void *buf_priv) {struct vb2_dc_buf *buf = buf_priv; +struct dma_buf_map map; +int ret; -if (!buf->vaddr && buf->db_attach) - buf->vaddr =dma_buf_vmap (buf->db_attach->dmabuf); +if (!buf->vaddr && buf->db_attach) { + ret =dma_buf_vmap (buf->db_attach->dmabuf, &map); + buf->vaddr = ret ?NULL : map.vaddr; + }return buf->vaddr; }@@ -365,11 +369,13 @@ vb2_dc_dmabuf_ops_end_cpu_access(struct dma_buf *dbuf,return 0 ; } -static void *vb2_dc_dmabuf_ops_vmap (struct dma_buf *dbuf) +static int vb2_dc_dmabuf_ops_vmap (struct dma_buf *dbuf,struct dma_buf_map *map) {struct vb2_dc_buf *buf = dbuf->priv; -return buf->vaddr; +dma_buf_map_set_vaddr (map, buf->vaddr); + +return 0 ; } static int vb2_dc_dmabuf_ops_mmap(struct dma_buf *dbuf,drivers/media/common/videobuf2/videobuf2-dma-sg.c +11
-5@@ -300,14 +300,18 @@ static void vb2_dma_sg_put_userptr(void *buf_priv)static void *vb2_dma_sg_vaddr (void *buf_priv) {struct vb2_dma_sg_buf *buf = buf_priv; +struct dma_buf_map map; +int ret;BUG_ON (!buf);if (!buf->vaddr) { -if (buf->db_attach) - buf->vaddr =dma_buf_vmap (buf->db_attach->dmabuf); -else +if (buf->db_attach) { + ret =dma_buf_vmap (buf->db_attach->dmabuf, &map); + buf->vaddr = ret ?NULL : map.vaddr; + }else { buf->vaddr =vm_map_ram (buf->pages, buf->num_pages,-1 ); + } }/* add offset in case userptr is not page-aligned */ @@ -489,11 +493,13 @@ vb2_dma_sg_dmabuf_ops_end_cpu_access(struct dma_buf *dbuf,return 0 ; } -static void *vb2_dma_sg_dmabuf_ops_vmap (struct dma_buf *dbuf) +static int vb2_dma_sg_dmabuf_ops_vmap (struct dma_buf *dbuf,struct dma_buf_map *map) {struct vb2_dma_sg_buf *buf = dbuf->priv; -return vb2_dma_sg_vaddr (buf); +dma_buf_map_set_vaddr (map, buf->vaddr); + +return 0 ; } static int vb2_dma_sg_dmabuf_ops_mmap(struct dma_buf *dbuf,drivers/media/common/videobuf2/videobuf2-vmalloc.c +11
-4@@ -318,11 +318,13 @@ static void vb2_vmalloc_dmabuf_ops_release(struct dma_buf *dbuf)vb2_vmalloc_put (dbuf->priv); } -static void *vb2_vmalloc_dmabuf_ops_vmap (struct dma_buf *dbuf) +static int vb2_vmalloc_dmabuf_ops_vmap (struct dma_buf *dbuf,struct dma_buf_map *map) {struct vb2_vmalloc_buf *buf = dbuf->priv; -return buf->vaddr; +dma_buf_map_set_vaddr (map, buf->vaddr); + +return 0 ; } static int vb2_vmalloc_dmabuf_ops_mmap(struct dma_buf *dbuf,@@ -374,10 +376,15 @@ static struct dma_buf *vb2_vmalloc_get_dmabuf(void *buf_priv, unsigned long flagstatic int vb2_vmalloc_map_dmabuf (void *mem_priv) {struct vb2_vmalloc_buf *buf = mem_priv; +struct dma_buf_map map; +int ret; - buf->vaddr =dma_buf_vmap (buf->dbuf); + ret =dma_buf_vmap (buf->dbuf, &map); +if (ret) +return -EFAULT ; + buf->vaddr = map.vaddr; -return buf->vaddr ?0 : -EFAULT ; +return 0 ; }static void vb2_vmalloc_unmap_dmabuf (void *mem_priv)include/drm/drm_prime.h +2
-1@@ -54,6 +54,7 @@ struct device;struct dma_buf_export_info ;struct dma_buf ;struct dma_buf_attachment ; +struct dma_buf_map ;enum dma_data_direction ;@@ -82,7 +83,7 @@ struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach,void drm_gem_unmap_dma_buf (struct dma_buf_attachment *attach,struct sg_table *sgt,enum dma_data_direction dir); -void *drm_gem_dmabuf_vmap (struct dma_buf *dma_buf); +int drm_gem_dmabuf_vmap (struct dma_buf *dma_buf,struct dma_buf_map *map);void drm_gem_dmabuf_vunmap (struct dma_buf *dma_buf,void *vaddr);int drm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma);include/linux/dma-buf-map.h +13
-0@@ -28,6 +28,19 @@ struct dma_buf_map {bool is_iomem; }; +/** +* dma_buf_map_set_vaddr - Sets a dma-buf mapping structure to an address in system memory +* @map: The dma-buf mapping structure +* @vaddr: A system-memory address +* +* Sets the address and clears the I/O-memory flag. +*/ +static inline void dma_buf_map_set_vaddr (struct dma_buf_map *map,void *vaddr) +{ + map->vaddr = vaddr; + map->is_iomem = false; +} +/* API transition helper */ static inline bool dma_buf_map_is_vaddr (const struct dma_buf_map *map,const void *vaddr) {include/linux/dma-buf.h +3
-3@@ -266,7 +266,7 @@ struct dma_buf_ops {*/ int (*mmap)(struct dma_buf *,struct vm_area_struct *vma); -void *(*vmap)(struct dma_buf *); +int (*vmap)(struct dma_buf *dmabuf,struct dma_buf_map *map);void (*vunmap)(struct dma_buf *,void *vaddr); };@@ -503,6 +503,6 @@ int dma_buf_end_cpu_access(struct dma_buf *dma_buf,int dma_buf_mmap (struct dma_buf *,struct vm_area_struct *,unsigned long ); -void *dma_buf_vmap (struct dma_buf *); -void dma_buf_vunmap (struct dma_buf *,void *vaddr); +int dma_buf_vmap (struct dma_buf *dmabuf,struct dma_buf_map *map); +void dma_buf_vunmap (struct dma_buf *dmabuf,void *vaddr);#endif /* __DMA_BUF_H__ */ Signature · 1 line
2.28.0
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Thomas Zimmermann
maintainerPATCH 3/3 dma-buf: Use struct dma_buf_map in dma_buf_vunmap() interfaces
In reply to Thomas ZimmermannThis patch updates dma_buf_vunmap() and dma-buf's vunmap callback to use struct dma_buf_map. The interfaces used to receive a buffer address. This address is now given in an instance of the structure.
Users of the functions are updated accordingly. This is only an interface change. It is currently expected that dma-buf memory can be accessed with system memory load/store operations.
--- drivers/dma-buf/dma-buf.c | 8 ++--- drivers/gpu/drm/drm_gem_cma_helper.c | 5 +-- drivers/gpu/drm/drm_gem_shmem_helper.c | 3 +- drivers/gpu/drm/drm_prime.c | 6 ++-- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 5 +-- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 +- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 6 ++-- drivers/gpu/drm/tegra/gem.c | 5 +-- .../common/videobuf2/videobuf2-dma-contig.c | 3 +- .../media/common/videobuf2/videobuf2-dma-sg.c | 3 +- .../common/videobuf2/videobuf2-vmalloc.c | 6 ++-- include/drm/drm_prime.h | 2 +- include/linux/dma-buf-map.h | 32 +++++++++++++++++-- include/linux/dma-buf.h | 4 +-- 14 files changed, 62 insertions(+), 28 deletions(-)
drivers/dma-buf/dma-buf.c +4 -4
@@ -1234,21 +1234,21 @@ EXPORT_SYMBOL_GPL(dma_buf_vmap);/** * dma_buf_vunmap - Unmap a vmap obtained by dma_buf_vmap. * @dmabuf: [in] buffer to vunmap -* @vaddr: [in] vmap to vunmap +* @map: [in] vmap pointer to vunmap */ -void dma_buf_vunmap (struct dma_buf *dmabuf,void *vaddr) +void dma_buf_vunmap (struct dma_buf *dmabuf,struct dma_buf_map *map) {if (WARN_ON (!dmabuf))return ;BUG_ON (dma_buf_map_is_null (&dmabuf->vmap_ptr));BUG_ON (dmabuf->vmapping_counter =0 ); -BUG_ON (!dma_buf_map_is_vaddr (&dmabuf->vmap_ptr, vaddr)); +BUG_ON (!dma_buf_map_is_equal (&dmabuf->vmap_ptr, map));mutex_lock (&dmabuf->lock);if (--dmabuf->vmapping_counter =0 ) {if (dmabuf->ops->vunmap) - dmabuf->ops->vunmap (dmabuf, vaddr); + dmabuf->ops->vunmap (dmabuf, map);dma_buf_map_clear (&dmabuf->vmap_ptr); }mutex_unlock (&dmabuf->lock);
drivers/gpu/drm/drm_gem_cma_helper.c +3 -2
@@ -176,12 +176,13 @@ drm_gem_cma_create_with_handle(struct drm_file *file_priv,void drm_gem_cma_free_object (struct drm_gem_object *gem_obj) {struct drm_gem_cma_object *cma_obj; +struct dma_buf_map map =DMA_BUF_MAP_INIT_VADDR (cma_obj->vaddr); cma_obj =to_drm_gem_cma_obj (gem_obj);if (gem_obj->import_attach) {if (cma_obj->vaddr) -dma_buf_vunmap (gem_obj->import_attach->dmabuf, cma_obj->vaddr); +dma_buf_vunmap (gem_obj->import_attach->dmabuf, &map);drm_prime_gem_destroy (gem_obj, cma_obj->sgt); }else if (cma_obj->vaddr) { dma_free_wc(gem_obj->dev->dev, cma_obj->base.size,
@@ -645,7 +646,7 @@ drm_gem_cma_prime_import_sg_table_vmap(struct drm_device *dev, obj =drm_gem_cma_prime_import_sg_table (dev, attach, sgt);if (IS_ERR (obj)) { -dma_buf_vunmap (attach->dmabuf, map.vaddr); +dma_buf_vunmap (attach->dmabuf, &map);return obj; }
drivers/gpu/drm/drm_gem_shmem_helper.c +2 -1
@@ -337,6 +337,7 @@ EXPORT_SYMBOL(drm_gem_shmem_vmap);static void drm_gem_shmem_vunmap_locked (struct drm_gem_shmem_object *shmem) {struct drm_gem_object *obj = &shmem->base; +struct dma_buf_map map =DMA_BUF_MAP_INIT_VADDR (shmem->vaddr);if (WARN_ON_ONCE (!shmem->vmap_use_count))return ;
@@ -345,7 +346,7 @@ static void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem)return ;if (obj->import_attach) -dma_buf_vunmap (obj->import_attach->dmabuf, shmem->vaddr); +dma_buf_vunmap (obj->import_attach->dmabuf, &map);else vunmap (shmem->vaddr);
drivers/gpu/drm/drm_prime.c +3 -3
@@ -686,16 +686,16 @@ EXPORT_SYMBOL(drm_gem_dmabuf_vmap);/** * drm_gem_dmabuf_vunmap - dma_buf vunmap implementation for GEM * @dma_buf: buffer to be unmapped -* @vaddr: the virtual address of the buffer +* @map: the virtual address of the buffer * * Releases a kernel virtual mapping. This can be used as the * &dma_buf_ops.vunmap callback. Calls into &drm_gem_object_funcs.vunmap for device specific handling. */ -void drm_gem_dmabuf_vunmap (struct dma_buf *dma_buf,void *vaddr) +void drm_gem_dmabuf_vunmap (struct dma_buf *dma_buf,struct dma_buf_map *map) {struct drm_gem_object *obj = dma_buf->priv; -drm_gem_vunmap (obj, vaddr); +drm_gem_vunmap (obj, map->vaddr); }EXPORT_SYMBOL (drm_gem_dmabuf_vunmap);
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +3 -2
@@ -70,9 +70,10 @@ void etnaviv_gem_prime_unpin(struct drm_gem_object *obj)static void etnaviv_gem_prime_release (struct etnaviv_gem_object *etnaviv_obj) { +struct dma_buf_map map =DMA_BUF_MAP_INIT_VADDR (etnaviv_obj->vaddr); +if (etnaviv_obj->vaddr) -dma_buf_vunmap (etnaviv_obj->base.import_attach->dmabuf, - etnaviv_obj->vaddr); +dma_buf_vunmap (etnaviv_obj->base.import_attach->dmabuf, &map);/* Don't drop the pages for imported dmabuf, as they are not * ours, just free the array we allocated:
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +1 -1
@@ -96,7 +96,7 @@ static int i915_gem_dmabuf_vmap(struct dma_buf *dma_buf, struct dma_buf_map *mapreturn 0 ; } -static void i915_gem_dmabuf_vunmap (struct dma_buf *dma_buf,void *vaddr) +static void i915_gem_dmabuf_vunmap (struct dma_buf *dma_buf,struct dma_buf_map *map) {struct drm_i915_gem_object *obj =dma_buf_to_obj (dma_buf);
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +3 -3
@@ -152,7 +152,7 @@ static int igt_dmabuf_import(void *arg) err =0 ; out_dma_map: -dma_buf_vunmap (dmabuf, dma_map); +dma_buf_vunmap (dmabuf, &map); out_obj:i915_gem_object_put (obj); out_dmabuf:
@@ -182,7 +182,7 @@ static int igt_dmabuf_import_ownership(void *arg) }memset (ptr,0xc5 ,PAGE_SIZE ); -dma_buf_vunmap (dmabuf, ptr); +dma_buf_vunmap (dmabuf, &map); obj =to_intel_bo (i915_gem_prime_import (&i915->drm, dmabuf));if (IS_ERR (obj)) {
@@ -250,7 +250,7 @@ static int igt_dmabuf_export_vmap(void *arg)memset (ptr,0xc5 , dmabuf->size); err =0 ; -dma_buf_vunmap (dmabuf, ptr); +dma_buf_vunmap (dmabuf, &map); out:dma_buf_put (dmabuf);return err;
drivers/gpu/drm/tegra/gem.c +3 -2
@@ -149,11 +149,12 @@ static void *tegra_bo_mmap(struct host1x_bo *bo)static void tegra_bo_munmap (struct host1x_bo *bo,void *addr) {struct tegra_bo *obj =host1x_to_tegra_bo (bo); +struct dma_buf_map map =DMA_BUF_MAP_INIT_VADDR (addr);if (obj->vaddr)return ;else if (obj->gem.import_attach) -dma_buf_vunmap (obj->gem.import_attach->dmabuf, addr); +dma_buf_vunmap (obj->gem.import_attach->dmabuf, &map);else vunmap (addr); }
@@ -655,7 +656,7 @@ static int tegra_gem_prime_vmap(struct dma_buf *buf, struct dma_buf_map *map)return 0 ; } -static void tegra_gem_prime_vunmap (struct dma_buf *buf,void *vaddr) +static void tegra_gem_prime_vunmap (struct dma_buf *buf,struct dma_buf_map *map) { }
drivers/media/common/videobuf2/videobuf2-dma-contig.c +2 -1
@@ -648,6 +648,7 @@ static void vb2_dc_unmap_dmabuf(void *mem_priv) {struct vb2_dc_buf *buf = mem_priv;struct sg_table *sgt = buf->dma_sgt; +struct dma_buf_map map =DMA_BUF_MAP_INIT_VADDR (buf->vaddr);if (WARN_ON (!buf->db_attach)) {pr_err ("trying to unpin a not attached buffer\n" );
@@ -660,7 +661,7 @@ static void vb2_dc_unmap_dmabuf(void *mem_priv) }if (buf->vaddr) { -dma_buf_vunmap (buf->db_attach->dmabuf, buf->vaddr); +dma_buf_vunmap (buf->db_attach->dmabuf, &map); buf->vaddr =NULL ; }dma_buf_unmap_attachment (buf->db_attach, sgt, buf->dma_dir);
drivers/media/common/videobuf2/videobuf2-dma-sg.c +2 -1
@@ -580,6 +580,7 @@ static void vb2_dma_sg_unmap_dmabuf(void *mem_priv) {struct vb2_dma_sg_buf *buf = mem_priv;struct sg_table *sgt = buf->dma_sgt; +struct dma_buf_map map =DMA_BUF_MAP_INIT_VADDR (buf->vaddr);if (WARN_ON (!buf->db_attach)) {pr_err ("trying to unpin a not attached buffer\n" );
@@ -592,7 +593,7 @@ static void vb2_dma_sg_unmap_dmabuf(void *mem_priv) }if (buf->vaddr) { -dma_buf_vunmap (buf->db_attach->dmabuf, buf->vaddr); +dma_buf_vunmap (buf->db_attach->dmabuf, &map); buf->vaddr =NULL ; }dma_buf_unmap_attachment (buf->db_attach, sgt, buf->dma_dir);
drivers/media/common/videobuf2/videobuf2-vmalloc.c +4 -2
@@ -390,17 +390,19 @@ static int vb2_vmalloc_map_dmabuf(void *mem_priv)static void vb2_vmalloc_unmap_dmabuf (void *mem_priv) {struct vb2_vmalloc_buf *buf = mem_priv; +struct dma_buf_map map =DMA_BUF_MAP_INIT_VADDR (buf->vaddr); -dma_buf_vunmap (buf->dbuf, buf->vaddr); +dma_buf_vunmap (buf->dbuf, &map); buf->vaddr =NULL ; }static void vb2_vmalloc_detach_dmabuf (void *mem_priv) {struct vb2_vmalloc_buf *buf = mem_priv; +struct dma_buf_map map =DMA_BUF_MAP_INIT_VADDR (buf->vaddr);if (buf->vaddr) -dma_buf_vunmap (buf->dbuf, buf->vaddr); +dma_buf_vunmap (buf->dbuf, &map);kfree (buf); }
include/drm/drm_prime.h +1 -1
@@ -84,7 +84,7 @@ void drm_gem_unmap_dma_buf(struct dma_buf_attachment *attach,struct sg_table *sgt, enum dma_data_direction dir);int drm_gem_dmabuf_vmap (struct dma_buf *dma_buf,struct dma_buf_map *map); -void drm_gem_dmabuf_vunmap (struct dma_buf *dma_buf,void *vaddr); +void drm_gem_dmabuf_vunmap (struct dma_buf *dma_buf,struct dma_buf_map *map);int drm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma);int drm_gem_dmabuf_mmap (struct dma_buf *dma_buf,struct vm_area_struct *vma);
include/linux/dma-buf-map.h +29 -3
@@ -28,6 +28,16 @@ struct dma_buf_map {bool is_iomem; }; +/** +* DMA_BUF_MAP_INIT_VADDR - Initializes struct dma_buf_map to an address in system memory +* @vaddr: A system-memory address +*/ +#define DMA_BUF_MAP_INIT_VADDR (vaddr_) \ + { \ + .vaddr = (vaddr_), \ + .is_iomem = false, \ + } +/** * dma_buf_map_set_vaddr - Sets a dma-buf mapping structure to an address in system memory * @map: The dma-buf mapping structure
@@ -41,10 +51,26 @@ static inline void dma_buf_map_set_vaddr(struct dma_buf_map *map, void *vaddr) map->is_iomem = false; } -/* API transition helper */ -static inline bool dma_buf_map_is_vaddr (const struct dma_buf_map *map,const void *vaddr) +/** +* dma_buf_map_is_equal - Compares two dma-buf mapping structures for equality +* @lhs: The dma-buf mapping structure +* @rhs: A dma-buf mapping structure to compare with +* +* Two dma-buf mapping structures are equal if they both refer to the same type of memory +* and to the same address within that memory. +* +* Returns: +* True is both structures are equal, or false otherwise. +*/ +static inline bool dma_buf_map_is_equal (const struct dma_buf_map *lhs, +const struct dma_buf_map *rhs) { -return !map->is_iomem && (map->vaddr = vaddr); +if (lhs->is_iomem != rhs->is_iomem) +return false; +else if (lhs->is_iomem) +return lhs->vaddr_iomem = rhs->vaddr_iomem; +else +return lhs->vaddr = rhs->vaddr; }/**
include/linux/dma-buf.h +2 -2
@@ -267,7 +267,7 @@ struct dma_buf_ops {int (*mmap)(struct dma_buf *,struct vm_area_struct *vma);int (*vmap)(struct dma_buf *dmabuf,struct dma_buf_map *map); -void (*vunmap)(struct dma_buf *,void *vaddr); +void (*vunmap)(struct dma_buf *dmabuf,struct dma_buf_map *map); };/**
@@ -504,5 +504,5 @@ int dma_buf_end_cpu_access(struct dma_buf *dma_buf,int dma_buf_mmap (struct dma_buf *,struct vm_area_struct *,unsigned long );int dma_buf_vmap (struct dma_buf *dmabuf,struct dma_buf_map *map); -void dma_buf_vunmap (struct dma_buf *dmabuf,void *vaddr); +void dma_buf_vunmap (struct dma_buf *dmabuf,struct dma_buf_map *map);#endif /* __DMA_BUF_H__ */
Signature · 1 line
2.28.0
kernel test robot
build botRe: [Intel-gfx] [PATCH 3/3] dma-buf: Use struct dma_buf_map in dma_buf_vunmap() interfaces
I love your patch! Perhaps something to improve:
Hi Thomas,
I love your patch! Perhaps something to improve:
[auto build test WARNING on next-20200914]
[also build test WARNING on v5.9-rc5]
[cannot apply to linuxtv-media/master drm-intel/for-linux-next tegra/for-next linus/master v5.9-rc5 v5.9-rc4 v5.9-rc3] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/dma-buf-Flag-vmap-ed-memory-as-system-or-I-O-memory/20200914-192712 base: f965d3ec86fa89285db0fbb983da76ba9c398efa config: arm-randconfig-r002-20200914 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project b2c32c90bab09a6e2c1f370429db26017a182143)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm cross compiling tool for clang build
# apt-get install binutils-arm-linux-gnueabi
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/gpu/drm/drm_gem_cma_helper.c:179:50: warning: variable 'cma_obj' is uninitialized when used here [-Wuninitialized]
struct dma_buf_map map = DMA_BUF_MAP_INIT_VADDR(cma_obj->vaddr);
^~~~~~~
include/linux/dma-buf-map.h:37:13: note: expanded from macro 'DMA_BUF_MAP_INIT_VADDR'
.vaddr = (vaddr_), \
^~~~~~
drivers/gpu/drm/drm_gem_cma_helper.c:178:36: note: initialize the variable 'cma_obj' to silence this warning
struct drm_gem_cma_object *cma_obj;
^
= NULL1 warning generated.
# https://github.com/0day-ci/linux/commit/7fd403952126005980734501c5d0de5e13b3673b
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Zimmermann/dma-buf-Flag-vmap-ed-memory-as-system-or-I-O-memory/20200914-192712 git checkout 7fd403952126005980734501c5d0de5e13b3673b
vim +/cma_obj +179 drivers/gpu/drm/drm_gem_cma_helper.c
165
166 /**
167 * drm_gem_cma_free_object - free resources associated with a CMA GEM object
168 * @gem_obj: GEM object to free
169 *
170 * This function frees the backing memory of the CMA GEM object, cleans up the
171 * GEM object state and frees the memory used to store the object itself.
172 * If the buffer is imported and the virtual address is set, it is released.
173 * Drivers using the CMA helpers should set this as their
174 * &drm_driver.gem_free_object_unlocked callback.
175 */
176 void drm_gem_cma_free_object(struct drm_gem_object *gem_obj)
177 {
178 struct drm_gem_cma_object *cma_obj;
> 179 struct dma_buf_map map = DMA_BUF_MAP_INIT_VADDR(cma_obj->vaddr);
180
181 cma_obj = to_drm_gem_cma_obj(gem_obj);
182
183 if (gem_obj->import_attach) {
184 if (cma_obj->vaddr)
185 dma_buf_vunmap(gem_obj->import_attach->dmabuf, &map);
186 drm_prime_gem_destroy(gem_obj, cma_obj->sgt);
187 } else if (cma_obj->vaddr) {
188 dma_free_wc(gem_obj->dev->dev, cma_obj->base.size,
189 cma_obj->vaddr, cma_obj->paddr);
190 }
191
192 drm_gem_object_release(gem_obj);
193
194 kfree(cma_obj);
195 }
196 EXPORT_SYMBOL_GPL(drm_gem_cma_free_object);
197
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [Intel-gfx] [PATCH 3/3] dma-buf: Use struct dma_buf_map in dma_buf_vunmap() interfaces
In reply to Thomas ZimmermannI love your patch! Yet something to improve:
Hi Thomas,
I love your patch! Yet something to improve:
[auto build test ERROR on next-20200914]
[also build test ERROR on v5.9-rc5]
[cannot apply to linuxtv-media/master drm-intel/for-linux-next tegra/for-next linus/master v5.9-rc5 v5.9-rc4 v5.9-rc3] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/dma-buf-Flag-vmap-ed-memory-as-system-or-I-O-memory/20200914-192712 base: f965d3ec86fa89285db0fbb983da76ba9c398efa config: x86_64-randconfig-a004-20200913 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project b2c32c90bab09a6e2c1f370429db26017a182143)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
drivers/dma-buf/heaps/heap-helpers.c:269:10: error: incompatible function pointer types initializing 'int (*)(struct dma_buf *, struct dma_buf_map *)' with an expression of type 'void *(struct dma_buf *)' [-Werror,-Wincompatible-function-pointer-types]
.vmap = dma_heap_dma_buf_vmap,
^~~~~~~~~~~~~~~~~~~~~
>> drivers/dma-buf/heaps/heap-helpers.c:270:12: error: incompatible function pointer types initializing 'void (*)(struct dma_buf *, struct dma_buf_map *)' with an expression of type 'void (struct dma_buf *, void *)' [-Werror,-Wincompatible-function-pointer-types]
.vunmap = dma_heap_dma_buf_vunmap,
^~~~~~~~~~~~~~~~~~~~~~~
2 errors generated.
# https://github.com/0day-ci/linux/commit/7fd403952126005980734501c5d0de5e13b3673b
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Zimmermann/dma-buf-Flag-vmap-ed-memory-as-system-or-I-O-memory/20200914-192712 git checkout 7fd403952126005980734501c5d0de5e13b3673b
vim +270 drivers/dma-buf/heaps/heap-helpers.c
5248eb12fea890a John Stultz 2019-12-03 259
5248eb12fea890a John Stultz 2019-12-03 260 const struct dma_buf_ops heap_helper_ops = {
5248eb12fea890a John Stultz 2019-12-03 261 .map_dma_buf = dma_heap_map_dma_buf,
5248eb12fea890a John Stultz 2019-12-03 262 .unmap_dma_buf = dma_heap_unmap_dma_buf,
5248eb12fea890a John Stultz 2019-12-03 263 .mmap = dma_heap_mmap,
5248eb12fea890a John Stultz 2019-12-03 264 .release = dma_heap_dma_buf_release,
5248eb12fea890a John Stultz 2019-12-03 265 .attach = dma_heap_attach,
5248eb12fea890a John Stultz 2019-12-03 266 .detach = dma_heap_detach,
5248eb12fea890a John Stultz 2019-12-03 267 .begin_cpu_access = dma_heap_dma_buf_begin_cpu_access,
5248eb12fea890a John Stultz 2019-12-03 268 .end_cpu_access = dma_heap_dma_buf_end_cpu_access,5248eb12fea890a John Stultz 2019-12-03 @269 .vmap = dma_heap_dma_buf_vmap,5248eb12fea890a John Stultz 2019-12-03 @270 .vunmap = dma_heap_dma_buf_vunmap,
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for dma-buf: Flag vmap'ed memory as system or I/O memory
In reply to Thomas Zimmermann== Series Details ==
== Series Details ==
Series: dma-buf: Flag vmap'ed memory as system or I/O memory
URL : https://patchwork.freedesktop.org/series/81647/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
CC [M] drivers/gpu/drm/i915/gem/i915_gem_dmabuf.o
In file included from drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c:291:0:drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c:89:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.vmap = mock_dmabuf_vmap,
^~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c:89:10: note: (near initialization for ‘mock_dmabuf_ops.vmap’)
drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c:90:12: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.vunmap = mock_dmabuf_vunmap,
^~~~~~~~~~~~~~~~~~drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c:90:12: note: (near initialization for ‘mock_dmabuf_ops.vunmap’)
cc1: all warnings being treated as errorsscripts/Makefile.build:283: recipe for target 'drivers/gpu/drm/i915/gem/i915_gem_dmabuf.o' failed make[4]: *** [drivers/gpu/drm/i915/gem/i915_gem_dmabuf.o] Error 1scripts/Makefile.build:500: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:500: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:500: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1784: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 33 lines · Thomas Zimmermann
Dma-buf provides
vmap()andvunmap()for retrieving and releasing mappings of dma-buf memory in kernel address space. The functions operate with plain addresses and the assumption is that the memory can be accessed with load and store operations. This is not the case on some architectures (e.g., sparc64) where I/O memory can only be accessed with dedicated instructions.This patchset introduces struct
dma_buf_map, which contains the address of a buffer and a flag that tells whether system- or I/O-memory instructions are required.Some background: updating the DRM framebuffer console on sparc64 makes the kernel panic. This is because the framebuffer memory cannot be accessed with system-memory instructions. We currently employ a workaround in DRM to address this specific problem. [1]
To resolve the problem, we'd like to address it at the most common point, which is the dma-buf framework. The dma-buf mapping ideally knows if I/O instructions are required and exports this information to it's users. The new structure struct
dma_buf_mapstores the buffer address and a flag that signals I/O memory. Affected users of the buffer (e.g., drivers, frameworks) can then access the memory accordingly.This patchset only introduces struct
dma_buf_map, and updates structdma_bufand it's interfaces. Further patches can update dma-buf users. For example, there's a prototype patchset for DRM that fixes the framebuffer problem. [2]Further work: TTM, one of DRM's memory managers, already exports an
is_iomemflag of its own. It could later be switched over to exporting structdma_buf_map, thus simplifying some code. Several DRM drivers expect their fbdev console to operate on I/O memory. These could possibly be switched over to the generic fbdev emulation, as soon as the generic code uses structdma_buf_map.
Quoted 2 lines
[1] https://lore.kernel.org/dri-devel/[email protected]/
[2] https://lore.kernel.org/dri-devel/[email protected]/
lgtm, imo ready to convert the follow-up patches over to this. But I think would be good to get at least some ack from the ttm side for the overall plan.
Also, I think we should put all the various helpers (writel/readl, memset, memcpy, whatever else) into the dma-buf-map.h helper, so that most code using this can just treat it as an abstract pointer type and never look underneath it.
-Daniel
Quoted 27 lines
Thomas Zimmermann (3):
dma-buf: Add struct dma-buf-map for storing struct dma_buf.vaddr_ptr
dma-buf: Use structdma_buf_mapindma_buf_vmap()interfaces
dma-buf: Use structdma_buf_mapindma_buf_vunmap()interfacesDocumentation/driver-api/dma-buf.rst | 3 + drivers/dma-buf/dma-buf.c | 40 +++--- drivers/gpu/drm/drm_gem_cma_helper.c | 16 ++- drivers/gpu/drm/drm_gem_shmem_helper.c | 17 ++- drivers/gpu/drm/drm_prime.c | 14 +- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 13 +- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 18 ++- drivers/gpu/drm/tegra/gem.c | 23 ++-- .../common/videobuf2/videobuf2-dma-contig.c | 17 ++- .../media/common/videobuf2/videobuf2-dma-sg.c | 19 ++- .../common/videobuf2/videobuf2-vmalloc.c | 21 ++- include/drm/drm_prime.h | 5 +- include/linux/dma-buf-map.h | 126 ++++++++++++++++++ include/linux/dma-buf.h | 11 +- 15 files changed, 274 insertions(+), 82 deletions(-) create mode 100644 include/linux/dma-buf-map.h--
2.28.0
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Thomas Zimmermann
maintainerHi
Am 16.09.20 um 11:37 schrieb Daniel Vetter:
Quoted 34 lines · Thomas Zimmermann
Quoted 33 lines
Dma-buf provides
vmap()andvunmap()for retrieving and releasing mappings of dma-buf memory in kernel address space. The functions operate with plain addresses and the assumption is that the memory can be accessed with load and store operations. This is not the case on some architectures (e.g., sparc64) where I/O memory can only be accessed with dedicated instructions.This patchset introduces struct
dma_buf_map, which contains the address of a buffer and a flag that tells whether system- or I/O-memory instructions are required.Some background: updating the DRM framebuffer console on sparc64 makes the kernel panic. This is because the framebuffer memory cannot be accessed with system-memory instructions. We currently employ a workaround in DRM to address this specific problem. [1]
To resolve the problem, we'd like to address it at the most common point, which is the dma-buf framework. The dma-buf mapping ideally knows if I/O instructions are required and exports this information to it's users. The new structure struct
dma_buf_mapstores the buffer address and a flag that signals I/O memory. Affected users of the buffer (e.g., drivers, frameworks) can then access the memory accordingly.This patchset only introduces struct
dma_buf_map, and updates structdma_bufand it's interfaces. Further patches can update dma-buf users. For example, there's a prototype patchset for DRM that fixes the framebuffer problem. [2]Further work: TTM, one of DRM's memory managers, already exports an
is_iomemflag of its own. It could later be switched over to exporting structdma_buf_map, thus simplifying some code. Several DRM drivers expect their fbdev console to operate on I/O memory. These could possibly be switched over to the generic fbdev emulation, as soon as the generic code uses structdma_buf_map.
Quoted 6 lines
Quoted 2 lines
[1] https://lore.kernel.org/dri-devel/[email protected]/
[2] https://lore.kernel.org/dri-devel/[email protected]/lgtm, imo ready to convert the follow-up patches over to this. But I think would be good to get at least some ack from the ttm side for the overall plan.
Yup, it would be nice if TTM could had out these types automatically. Then all TTM-based drivers would automatically support it.
Quoted 5 lines
Also, I think we should put all the various helpers (writel/readl, memset, memcpy, whatever else) into the
dma-buf-map.hhelper, so that most code using this can just treat it as an abstract pointer type and never look underneath it.
We have some framebuffer helpers that rely on pointer arithmetic, so we'd need that too. No big deal wrt code, but I was worried about the overhead. If a loop goes over framebuffer memory, there's an if/else branch for each access to the memory buffer.
Best regards
Thomas
Quoted 30 lines
-Daniel
Quoted 27 lines
Thomas Zimmermann (3):
dma-buf: Add struct dma-buf-map for storing struct dma_buf.vaddr_ptr
dma-buf: Use structdma_buf_mapindma_buf_vmap()interfaces
dma-buf: Use structdma_buf_mapindma_buf_vunmap()interfacesDocumentation/driver-api/dma-buf.rst | 3 + drivers/dma-buf/dma-buf.c | 40 +++--- drivers/gpu/drm/drm_gem_cma_helper.c | 16 ++- drivers/gpu/drm/drm_gem_shmem_helper.c | 17 ++- drivers/gpu/drm/drm_prime.c | 14 +- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 13 +- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 18 ++- drivers/gpu/drm/tegra/gem.c | 23 ++-- .../common/videobuf2/videobuf2-dma-contig.c | 17 ++- .../media/common/videobuf2/videobuf2-dma-sg.c | 19 ++- .../common/videobuf2/videobuf2-vmalloc.c | 21 ++- include/drm/drm_prime.h | 5 +- include/linux/dma-buf-map.h | 126 ++++++++++++++++++ include/linux/dma-buf.h | 11 +- 15 files changed, 274 insertions(+), 82 deletions(-) create mode 100644 include/linux/dma-buf-map.h--
2.28.0
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
Quoted 53 lines · Thomas Zimmermann
Hi
Am 16.09.20 um 11:37 schrieb Daniel Vetter:
Quoted 34 lines · Thomas Zimmermann
Quoted 33 lines
Dma-buf provides
vmap()andvunmap()for retrieving and releasing mappings of dma-buf memory in kernel address space. The functions operate with plain addresses and the assumption is that the memory can be accessed with load and store operations. This is not the case on some architectures (e.g., sparc64) where I/O memory can only be accessed with dedicated instructions.This patchset introduces struct
dma_buf_map, which contains the address of a buffer and a flag that tells whether system- or I/O-memory instructions are required.Some background: updating the DRM framebuffer console on sparc64 makes the kernel panic. This is because the framebuffer memory cannot be accessed with system-memory instructions. We currently employ a workaround in DRM to address this specific problem. [1]
To resolve the problem, we'd like to address it at the most common point, which is the dma-buf framework. The dma-buf mapping ideally knows if I/O instructions are required and exports this information to it's users. The new structure struct
dma_buf_mapstores the buffer address and a flag that signals I/O memory. Affected users of the buffer (e.g., drivers, frameworks) can then access the memory accordingly.This patchset only introduces struct
dma_buf_map, and updates structdma_bufand it's interfaces. Further patches can update dma-buf users. For example, there's a prototype patchset for DRM that fixes the framebuffer problem. [2]Further work: TTM, one of DRM's memory managers, already exports an
is_iomemflag of its own. It could later be switched over to exporting structdma_buf_map, thus simplifying some code. Several DRM drivers expect their fbdev console to operate on I/O memory. These could possibly be switched over to the generic fbdev emulation, as soon as the generic code uses structdma_buf_map.Quoted 6 lines
Quoted 2 lines
[1] https://lore.kernel.org/dri-devel/[email protected]/
[2] https://lore.kernel.org/dri-devel/[email protected]/lgtm, imo ready to convert the follow-up patches over to this. But I think would be good to get at least some ack from the ttm side for the overall plan.
Yup, it would be nice if TTM could had out these types automatically. Then all TTM-based drivers would automatically support it.
Quoted 5 lines
Also, I think we should put all the various helpers (writel/readl, memset, memcpy, whatever else) into the
dma-buf-map.hhelper, so that most code using this can just treat it as an abstract pointer type and never look underneath it.
Quoted 4 lines
We have some framebuffer helpers that rely on pointer arithmetic, so we'd need that too. No big deal wrt code, but I was worried about the overhead. If a loop goes over framebuffer memory, there's an if/else branch for each access to the memory buffer.
If we make all the helpers static inline, then the compiler should be able to see that dma_buf_map.is_iomem is always the same, and produced really optimized code for it by pulling that check out from all the loops.
So should only result in somewhat verbose code of having to call dma_buf_map pointer arthimetic helpers, but not in bad generated code. Still worth double-checking I think, since e.g. on x86 the generated code should be the same for both cases (but maybe the compiler doesn't see through the inline asm to realize that, so we might end up with 2 copies). -Daniel
Quoted 43 lines
Best regards
ThomasQuoted 30 lines
-Daniel
Quoted 27 lines
Thomas Zimmermann (3):
dma-buf: Add struct dma-buf-map for storing struct dma_buf.vaddr_ptr
dma-buf: Use structdma_buf_mapindma_buf_vmap()interfaces
dma-buf: Use structdma_buf_mapindma_buf_vunmap()interfacesDocumentation/driver-api/dma-buf.rst | 3 + drivers/dma-buf/dma-buf.c | 40 +++--- drivers/gpu/drm/drm_gem_cma_helper.c | 16 ++- drivers/gpu/drm/drm_gem_shmem_helper.c | 17 ++- drivers/gpu/drm/drm_prime.c | 14 +- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 13 +- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 18 ++- drivers/gpu/drm/tegra/gem.c | 23 ++-- .../common/videobuf2/videobuf2-dma-contig.c | 17 ++- .../media/common/videobuf2/videobuf2-dma-sg.c | 19 ++- .../common/videobuf2/videobuf2-vmalloc.c | 21 ++- include/drm/drm_prime.h | 5 +- include/linux/dma-buf-map.h | 126 ++++++++++++++++++ include/linux/dma-buf.h | 11 +- 15 files changed, 274 insertions(+), 82 deletions(-) create mode 100644 include/linux/dma-buf-map.h--
2.28.0Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Christian König
maintainerAm 16.09.20 um 14:24 schrieb Daniel Vetter:
Quoted 58 lines · Thomas Zimmermann
Quoted 45 lines
Hi
Am 16.09.20 um 11:37 schrieb Daniel Vetter:
Quoted 34 lines · Thomas Zimmermann
Quoted 33 lines
Dma-buf provides
vmap()andvunmap()for retrieving and releasing mappings of dma-buf memory in kernel address space. The functions operate with plain addresses and the assumption is that the memory can be accessed with load and store operations. This is not the case on some architectures (e.g., sparc64) where I/O memory can only be accessed with dedicated instructions.This patchset introduces struct
dma_buf_map, which contains the address of a buffer and a flag that tells whether system- or I/O-memory instructions are required.Some background: updating the DRM framebuffer console on sparc64 makes the kernel panic. This is because the framebuffer memory cannot be accessed with system-memory instructions. We currently employ a workaround in DRM to address this specific problem. [1]
To resolve the problem, we'd like to address it at the most common point, which is the dma-buf framework. The dma-buf mapping ideally knows if I/O instructions are required and exports this information to it's users. The new structure struct
dma_buf_mapstores the buffer address and a flag that signals I/O memory. Affected users of the buffer (e.g., drivers, frameworks) can then access the memory accordingly.This patchset only introduces struct
dma_buf_map, and updates structdma_bufand it's interfaces. Further patches can update dma-buf users. For example, there's a prototype patchset for DRM that fixes the framebuffer problem. [2]Further work: TTM, one of DRM's memory managers, already exports an
is_iomemflag of its own. It could later be switched over to exporting structdma_buf_map, thus simplifying some code. Several DRM drivers expect their fbdev console to operate on I/O memory. These could possibly be switched over to the generic fbdev emulation, as soon as the generic code uses structdma_buf_map.Quoted 5 lines
Quoted 2 lines
[1] https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Fdri-devel%2F20200725191012.GA434957%40ravnborg.org%2F&data%7C01%7Cchristian.koenig%40amd.com%7C04e3cc3e03ae40f1fa0f08d85a3b6a68%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637358558524732385&sdata=wTmFuB95GhKUU%2F2Q91V0%2BtzAu4%2BEe3VBUcriBy3jx2g%3D&reserved=0
[2] https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Fdri-devel%2F20200806085239.4606-1-tzimmermann%40suse.de%2F&data%7C01%7Cchristian.koenig%40amd.com%7C04e3cc3e03ae40f1fa0f08d85a3b6a68%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637358558524732385&sdata=L4rBHmegO63b%2FiTQdTyH158KNxAZwSuJCQOaFszo5L0%3D&reserved=0lgtm, imo ready to convert the follow-up patches over to this. But I think would be good to get at least some ack from the ttm side for the overall plan.
Yup, it would be nice if TTM could had out these types automatically. Then all TTM-based drivers would automatically support it.
Quoted 8 lines
Quoted 4 lines
Also, I think we should put all the various helpers (writel/readl, memset, memcpy, whatever else) into the
dma-buf-map.hhelper, so that most code using this can just treat it as an abstract pointer type and never look underneath it.We have some framebuffer helpers that rely on pointer arithmetic, so we'd need that too. No big deal wrt code, but I was worried about the overhead. If a loop goes over framebuffer memory, there's an if/else branch for each access to the memory buffer.
If we make all the helpers static inline, then the compiler should be able to see that dma_buf_map.is_iomem is always the same, and produced really optimized code for it by pulling that check out from all the loops.
Quoted 5 lines
So should only result in somewhat verbose code of having to call
dma_buf_mappointer arthimetic helpers, but not in bad generated code. Still worth double-checking I think, since e.g. on x86 the generated code should be the same for both cases (but maybe the compiler doesn't see through the inline asm to realize that, so we might end up with 2 copies).
Can we have that even independent of DMA-buf? We have essentially the same problem in TTM and the code around that is a complete mess if you ask me.
Christian.
Quoted 45 lines
-Daniel
Quoted 39 lines
Best regards
ThomasQuoted 28 lines
-Daniel
Quoted 26 lines
Thomas Zimmermann (3):
dma-buf: Add struct dma-buf-map for storing struct dma_buf.vaddr_ptr
dma-buf: Use structdma_buf_mapindma_buf_vmap()interfaces
dma-buf: Use structdma_buf_mapindma_buf_vunmap()interfacesDocumentation/driver-api/dma-buf.rst | 3 + drivers/dma-buf/dma-buf.c | 40 +++--- drivers/gpu/drm/drm_gem_cma_helper.c | 16 ++- drivers/gpu/drm/drm_gem_shmem_helper.c | 17 ++- drivers/gpu/drm/drm_prime.c | 14 +- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 13 +- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 18 ++- drivers/gpu/drm/tegra/gem.c | 23 ++-- .../common/videobuf2/videobuf2-dma-contig.c | 17 ++- .../media/common/videobuf2/videobuf2-dma-sg.c | 19 ++- .../common/videobuf2/videobuf2-vmalloc.c | 21 ++- include/drm/drm_prime.h | 5 +- include/linux/dma-buf-map.h | 126 ++++++++++++++++++ include/linux/dma-buf.h | 11 +- 15 files changed, 274 insertions(+), 82 deletions(-)create mode 100644
include/linux/dma-buf-map.h--
2.28.0Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
Thomas Zimmermann
maintainerHi
Am 16.09.20 um 14:59 schrieb Christian König:
Quoted 95 lines
Am 16.09.20 um 14:24 schrieb Daniel Vetter:
Quoted 87 lines · Thomas Zimmermann
Quoted 77 lines
Hi
Am 16.09.20 um 11:37 schrieb Daniel Vetter:
Quoted 58 lines · Thomas Zimmermann
Quoted 57 lines
Dma-buf provides
vmap()andvunmap()for retrieving and releasing mappings
of dma-buf memory in kernel address space. The functions operate with plain
addresses and the assumption is that the memory can be accessed with load
and store operations. This is not the case on some architectures (e.g.,
sparc64) where I/O memory can only be accessed with dedicated instructions.This patchset introduces struct
dma_buf_map, which contains the address of
a buffer and a flag that tells whether system- or I/O-memory instructions
are required.Some background: updating the DRM framebuffer console on sparc64 makes the
kernel panic. This is because the framebuffer memory cannot be accessed with
system-memory instructions. We currently employ a workaround in DRM to address this specific problem. [1]To resolve the problem, we'd like to address it at the most common point,
which is the dma-buf framework. The dma-buf mapping ideally knows if I/O
instructions are required and exports this information to it's users. The
new structure structdma_buf_mapstores the buffer address and a flag that
signals I/O memory. Affected users of the buffer (e.g., drivers, frameworks)
can then access the memory accordingly.This patchset only introduces struct
dma_buf_map, and updates structdma_buf
and it's interfaces. Further patches can update dma-buf users. For example,
there's a prototype patchset for DRM that fixes the framebuffer problem. [2]Further work: TTM, one of DRM's memory managers, already exports an
is_iomemflag of its own. It could later be switched over to exporting structdma_buf_map, thus simplifying some code. Several DRM drivers expect their
fbdev console to operate on I/O memory. These could possibly be switched over
to the generic fbdev emulation, as soon as the generic code uses structdma_buf_map.Quoted 8 lines
lgtm, imo ready to convert the follow-up patches over to this. But I think
would be good to get at least some ack from the ttm side for the overall
plan.Yup, it would be nice if TTM could had out these types automatically. Then all TTM-based drivers would automatically support it.
Quoted 5 lines
Also, I think we should put all the various helpers (writel/readl, memset,
memcpy, whatever else) into thedma-buf-map.hhelper, so that most code using this can just treat it as an abstract pointer type and never look underneath it.Quoted 4 lines
We have some framebuffer helpers that rely on pointer arithmetic, so we'd need that too. No big deal wrt code, but I was worried about the overhead. If a loop goes over framebuffer memory, there's an if/else branch for each access to the memory buffer.
If we make all the helpers static inline, then the compiler should be able
to see that dma_buf_map.is_iomem is always the same, and produced really optimized code for it by pulling that check out from all the loops.Quoted 6 lines
So should only result in somewhat verbose code of having to call
dma_buf_mappointer arthimetic helpers, but not in bad generated code. Still worth double-checking I think, since e.g. on x86 the generated code should be the same for both cases (but maybe the compiler doesn't see through the inline asm to realize that, so we might end up with 2 copies).
Quoted 3 lines
Can we have that even independent of DMA-buf? We have essentially the same problem in TTM and the code around that is a complete mess if you ask me.
I already put this into dma-buf because it's at the intersection of all the affected modules. For non-dma-buf pointers (say in framebuffer damage handling), the idea is to initialize struct dma_buf_map by hand and use this.
Where would you want to put it?
Best regards
Thomas
Quoted 55 lines
Christian.
Quoted 47 lines
-Daniel
Quoted 41 lines
Best regards
ThomasQuoted 30 lines
-Daniel
Quoted 28 lines
Thomas Zimmermann (3):
dma-buf: Add struct dma-buf-map for storing struct dma_buf.vaddr_ptr
dma-buf: Use structdma_buf_mapindma_buf_vmap()interfaces
dma-buf: Use structdma_buf_mapindma_buf_vunmap()interfacesDocumentation/driver-api/dma-buf.rst | 3 + drivers/dma-buf/dma-buf.c | 40 +++--- drivers/gpu/drm/drm_gem_cma_helper.c | 16 ++- drivers/gpu/drm/drm_gem_shmem_helper.c | 17 ++- drivers/gpu/drm/drm_prime.c | 14 +- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 13 +- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 18 ++- drivers/gpu/drm/tegra/gem.c | 23 ++-- .../common/videobuf2/videobuf2-dma-contig.c | 17 ++-
.../media/common/videobuf2/videobuf2-dma-sg.c| 19 ++- .../common/videobuf2/videobuf2-vmalloc.c | 21 ++- include/drm/drm_prime.h | 5 +- include/linux/dma-buf-map.h | 126
++++++++++++++++++
include/linux/dma-buf.h | 11 +-15 files changed, 274 insertions(+), 82 deletions(-)create mode 100644
include/linux/dma-buf-map.hSignature · 1 line
2.28.0--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
Quoted 65 lines · Christian König
Am 16.09.20 um 14:24 schrieb Daniel Vetter:
Quoted 58 lines · Thomas Zimmermann
Quoted 45 lines
Hi
Am 16.09.20 um 11:37 schrieb Daniel Vetter:
Quoted 34 lines · Thomas Zimmermann
Quoted 33 lines
Dma-buf provides
vmap()andvunmap()for retrieving and releasing mappings of dma-buf memory in kernel address space. The functions operate with plain addresses and the assumption is that the memory can be accessed with load and store operations. This is not the case on some architectures (e.g., sparc64) where I/O memory can only be accessed with dedicated instructions.This patchset introduces struct
dma_buf_map, which contains the address of a buffer and a flag that tells whether system- or I/O-memory instructions are required.Some background: updating the DRM framebuffer console on sparc64 makes the kernel panic. This is because the framebuffer memory cannot be accessed with system-memory instructions. We currently employ a workaround in DRM to address this specific problem. [1]
To resolve the problem, we'd like to address it at the most common point, which is the dma-buf framework. The dma-buf mapping ideally knows if I/O instructions are required and exports this information to it's users. The new structure struct
dma_buf_mapstores the buffer address and a flag that signals I/O memory. Affected users of the buffer (e.g., drivers, frameworks) can then access the memory accordingly.This patchset only introduces struct
dma_buf_map, and updates structdma_bufand it's interfaces. Further patches can update dma-buf users. For example, there's a prototype patchset for DRM that fixes the framebuffer problem. [2]Further work: TTM, one of DRM's memory managers, already exports an
is_iomemflag of its own. It could later be switched over to exporting structdma_buf_map, thus simplifying some code. Several DRM drivers expect their fbdev console to operate on I/O memory. These could possibly be switched over to the generic fbdev emulation, as soon as the generic code uses structdma_buf_map.Quoted 5 lines
Quoted 2 lines
[1] https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Fdri-devel%2F20200725191012.GA434957%40ravnborg.org%2F&data=02%7C01%7Cchristian.koenig%40amd.com%7C04e3cc3e03ae40f1fa0f08d85a3b6a68%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637358558524732385&sdata=wTmFuB95GhKUU%2F2Q91V0%2BtzAu4%2BEe3VBUcriBy3jx2g%3D&reserved=0
[2] https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Fdri-devel%2F20200806085239.4606-1-tzimmermann%40suse.de%2F&data=02%7C01%7Cchristian.koenig%40amd.com%7C04e3cc3e03ae40f1fa0f08d85a3b6a68%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637358558524732385&sdata=L4rBHmegO63b%2FiTQdTyH158KNxAZwSuJCQOaFszo5L0%3D&reserved=0lgtm, imo ready to convert the follow-up patches over to this. But I think would be good to get at least some ack from the ttm side for the overall plan.
Yup, it would be nice if TTM could had out these types automatically. Then all TTM-based drivers would automatically support it.
Quoted 8 lines
Quoted 4 lines
Also, I think we should put all the various helpers (writel/readl, memset, memcpy, whatever else) into the
dma-buf-map.hhelper, so that most code using this can just treat it as an abstract pointer type and never look underneath it.We have some framebuffer helpers that rely on pointer arithmetic, so we'd need that too. No big deal wrt code, but I was worried about the overhead. If a loop goes over framebuffer memory, there's an if/else branch for each access to the memory buffer.
If we make all the helpers static inline, then the compiler should be able to see that dma_buf_map.is_iomem is always the same, and produced really optimized code for it by pulling that check out from all the loops.
Quoted 5 lines
So should only result in somewhat verbose code of having to call
dma_buf_mappointer arthimetic helpers, but not in bad generated code. Still worth double-checking I think, since e.g. on x86 the generated code should be the same for both cases (but maybe the compiler doesn't see through the inline asm to realize that, so we might end up with 2 copies).
Quoted 4 lines
Can we have that even independent of DMA-buf? We have essentially the same problem in TTM and the code around that is a complete mess if you ask me.
Christian.
I think this patchset looks good. Changing ttm_bo_kmap() over to returning a struct dma-buf-map would probably work just fine. If we then can have a set of helpers to operate on it, that's great.
/Thomas
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerHi Christian and Thomas
Am 16.09.20 um 15:37 schrieb Thomas Hellström (Intel):
Quoted 105 lines · Christian König
Quoted 103 lines
Am 16.09.20 um 14:24 schrieb Daniel Vetter:
Quoted 90 lines · Thomas Zimmermann
Quoted 80 lines
Hi
Am 16.09.20 um 11:37 schrieb Daniel Vetter:
Quoted 59 lines · Thomas Zimmermann
Quoted 58 lines
Dma-buf provides
vmap()andvunmap()for retrieving and releasing mappings
of dma-buf memory in kernel address space. The functions operate with plain
addresses and the assumption is that the memory can be accessed with load
and store operations. This is not the case on some architectures (e.g.,
sparc64) where I/O memory can only be accessed with dedicated instructions.This patchset introduces struct
dma_buf_map, which contains the address of
a buffer and a flag that tells whether system- or I/O-memory instructions
are required.Some background: updating the DRM framebuffer console on sparc64 makes the
kernel panic. This is because the framebuffer memory cannot be accessed with
system-memory instructions. We currently employ a workaround in DRM to
address this specific problem. [1]To resolve the problem, we'd like to address it at the most common point,
which is the dma-buf framework. The dma-buf mapping ideally knows if I/O
instructions are required and exports this information to it's users. The
new structure structdma_buf_mapstores the buffer address and a flag that
signals I/O memory. Affected users of the buffer (e.g., drivers, frameworks)
can then access the memory accordingly.This patchset only introduces struct
dma_buf_map, and updates structdma_buf
and it's interfaces. Further patches can update dma-buf users. For example,
there's a prototype patchset for DRM that fixes the framebuffer problem. [2]Further work: TTM, one of DRM's memory managers, already exports an
is_iomemflag of its own. It could later be switched over to exporting structdma_buf_map, thus simplifying some code. Several DRM drivers expect their
fbdev console to operate on I/O memory. These could possibly be switched over
to the generic fbdev emulation, as soon as the generic code uses structdma_buf_map.Quoted 8 lines
lgtm, imo ready to convert the follow-up patches over to this. But I think
would be good to get at least some ack from the ttm side for the overall
plan.Yup, it would be nice if TTM could had out these types automatically. Then all TTM-based drivers would automatically support it.
Quoted 7 lines
Also, I think we should put all the various helpers (writel/readl, memset,
memcpy, whatever else) into thedma-buf-map.hhelper, so that most code
using this can just treat it as an abstract pointer type and never look
underneath it.Quoted 4 lines
We have some framebuffer helpers that rely on pointer arithmetic, so we'd need that too. No big deal wrt code, but I was worried about the overhead. If a loop goes over framebuffer memory, there's an if/else branch for each access to the memory buffer.
If we make all the helpers static inline, then the compiler should be able
to see that dma_buf_map.is_iomem is always the same, and produced really optimized code for it by pulling that check out from all the loops.Quoted 7 lines
So should only result in somewhat verbose code of having to call
dma_buf_mappointer arthimetic helpers, but not in bad generated code. Still worth double-checking I think, since e.g. on x86 the generated code
should be the same for both cases (but maybe the compiler doesn't see through the inline asm to realize that, so we might end up with 2 copies).Can we have that even independent of DMA-buf? We have essentially the same problem in TTM and the code around that is a complete mess if you ask me.
Quoted 7 lines
Quoted 2 lines
Christian.
I think this patchset looks good. Changing
ttm_bo_kmap()over to returning a struct dma-buf-map would probably work just fine. If we then can have a set of helpers to operate on it, that's great./Thomas
Can I count this as an A-b by one of you?
Best regards
Thomas
Quoted 6 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Christian König
maintainerAm 17.09.20 um 09:16 schrieb Thomas Zimmermann:
Quoted 106 lines
Hi Christian and Thomas
Am 16.09.20 um 15:37 schrieb Thomas Hellström (Intel):
Quoted 103 lines · Christian König
Quoted 102 lines
Am 16.09.20 um 14:24 schrieb Daniel Vetter:
Quoted 90 lines · Thomas Zimmermann
Quoted 80 lines
Hi
Am 16.09.20 um 11:37 schrieb Daniel Vetter:
Quoted 59 lines · Thomas Zimmermann
Quoted 58 lines
Dma-buf provides
vmap()andvunmap()for retrieving and releasing mappings
of dma-buf memory in kernel address space. The functions operate with plain
addresses and the assumption is that the memory can be accessed with load
and store operations. This is not the case on some architectures (e.g.,
sparc64) where I/O memory can only be accessed with dedicated instructions.This patchset introduces struct
dma_buf_map, which contains the address of
a buffer and a flag that tells whether system- or I/O-memory instructions
are required.Some background: updating the DRM framebuffer console on sparc64 makes the
kernel panic. This is because the framebuffer memory cannot be accessed with
system-memory instructions. We currently employ a workaround in DRM to
address this specific problem. [1]To resolve the problem, we'd like to address it at the most common point,
which is the dma-buf framework. The dma-buf mapping ideally knows if I/O
instructions are required and exports this information to it's users. The
new structure structdma_buf_mapstores the buffer address and a flag that
signals I/O memory. Affected users of the buffer (e.g., drivers, frameworks)
can then access the memory accordingly.This patchset only introduces struct
dma_buf_map, and updates structdma_buf
and it's interfaces. Further patches can update dma-buf users. For example,
there's a prototype patchset for DRM that fixes the framebuffer problem. [2]Further work: TTM, one of DRM's memory managers, already exports an
is_iomemflag of its own. It could later be switched over to exporting structdma_buf_map, thus simplifying some code. Several DRM drivers expect their
fbdev console to operate on I/O memory. These could possibly be switched over
to the generic fbdev emulation, as soon as the generic code uses structdma_buf_map.Quoted 8 lines
lgtm, imo ready to convert the follow-up patches over to this. But I think
would be good to get at least some ack from the ttm side for the overall
plan.Yup, it would be nice if TTM could had out these types automatically. Then all TTM-based drivers would automatically support it.
Quoted 7 lines
Also, I think we should put all the various helpers (writel/readl, memset,
memcpy, whatever else) into thedma-buf-map.hhelper, so that most code
using this can just treat it as an abstract pointer type and never look
underneath it.Quoted 4 lines
We have some framebuffer helpers that rely on pointer arithmetic, so we'd need that too. No big deal wrt code, but I was worried about the overhead. If a loop goes over framebuffer memory, there's an if/else branch for each access to the memory buffer.
If we make all the helpers static inline, then the compiler should be able
to see that dma_buf_map.is_iomem is always the same, and produced really optimized code for it by pulling that check out from all the loops.Quoted 7 lines
So should only result in somewhat verbose code of having to call
dma_buf_mappointer arthimetic helpers, but not in bad generated code. Still worth double-checking I think, since e.g. on x86 the generated code
should be the same for both cases (but maybe the compiler doesn't see through the inline asm to realize that, so we might end up with 2 copies).Can we have that even independent of DMA-buf? We have essentially the same problem in TTM and the code around that is a complete mess if you ask me.
Quoted 8 lines
Quoted 7 lines
Quoted 2 lines
Christian.
I think this patchset looks good. Changing
ttm_bo_kmap()over to returning a struct dma-buf-map would probably work just fine. If we then can have a set of helpers to operate on it, that's great./Thomas
Can I count this as an A-b by one of you?
For the the general approach, certainly yes.
Regards,
Christian.
Quoted 9 lines
Best regards
ThomasQuoted 5 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hello Thomas,
Quoted 10 lines · Thomas Zimmermann
Dma-buf provides
vmap()andvunmap()for retrieving and releasing mappings of dma-buf memory in kernel address space. The functions operate with plain addresses and the assumption is that the memory can be accessed with load and store operations. This is not the case on some architectures (e.g., sparc64) where I/O memory can only be accessed with dedicated instructions.This patchset introduces struct
dma_buf_map, which contains the address of a buffer and a flag that tells whether system- or I/O-memory instructions are required.
Thank you for the patchset - it is a really nice, clean bit to add!
Quoted 24 lines
Some background: updating the DRM framebuffer console on sparc64 makes the kernel panic. This is because the framebuffer memory cannot be accessed with system-memory instructions. We currently employ a workaround in DRM to address this specific problem. [1]
To resolve the problem, we'd like to address it at the most common point, which is the dma-buf framework. The dma-buf mapping ideally knows if I/O instructions are required and exports this information to it's users. The new structure struct
dma_buf_mapstores the buffer address and a flag that signals I/O memory. Affected users of the buffer (e.g., drivers, frameworks) can then access the memory accordingly.This patchset only introduces struct
dma_buf_map, and updates structdma_bufand it's interfaces. Further patches can update dma-buf users. For example, there's a prototype patchset for DRM that fixes the framebuffer problem. [2]Further work: TTM, one of DRM's memory managers, already exports an
is_iomemflag of its own. It could later be switched over to exporting structdma_buf_map, thus simplifying some code. Several DRM drivers expect their fbdev console to operate on I/O memory. These could possibly be switched over to the generic fbdev emulation, as soon as the generic code uses structdma_buf_map.
Quoted 7 lines
[1] https://lore.kernel.org/dri-devel/[email protected]/
[2] https://lore.kernel.org/dri-devel/[email protected]/Thomas Zimmermann (3):
dma-buf: Add struct dma-buf-map for storing struct dma_buf.vaddr_ptr
dma-buf: Use structdma_buf_mapindma_buf_vmap()interfaces
dma-buf: Use structdma_buf_mapindma_buf_vunmap()interfaces
FWIW, for the series, please feel free to add my
Quoted 19 lines
Documentation/driver-api/dma-buf.rst | 3 + drivers/dma-buf/dma-buf.c | 40 +++--- drivers/gpu/drm/drm_gem_cma_helper.c | 16 ++- drivers/gpu/drm/drm_gem_shmem_helper.c | 17 ++- drivers/gpu/drm/drm_prime.c | 14 +- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 13 +- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 18 ++- drivers/gpu/drm/tegra/gem.c | 23 ++-- .../common/videobuf2/videobuf2-dma-contig.c | 17 ++- .../media/common/videobuf2/videobuf2-dma-sg.c | 19 ++- .../common/videobuf2/videobuf2-vmalloc.c | 21 ++- include/drm/drm_prime.h | 5 +- include/linux/dma-buf-map.h | 126 ++++++++++++++++++ include/linux/dma-buf.h | 11 +- 15 files changed, 274 insertions(+), 82 deletions(-) create mode 100644 include/linux/dma-buf-map.h
Quoted 3 lines
--
2.28.0
Best,
Sumit.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Sumit Semwal
maintainerHi Thomas,
Quoted 43 lines · Sumit Semwal
Hello Thomas,
Quoted 10 lines · Thomas Zimmermann
Dma-buf provides
vmap()andvunmap()for retrieving and releasing mappings of dma-buf memory in kernel address space. The functions operate with plain addresses and the assumption is that the memory can be accessed with load and store operations. This is not the case on some architectures (e.g., sparc64) where I/O memory can only be accessed with dedicated instructions.This patchset introduces struct
dma_buf_map, which contains the address of a buffer and a flag that tells whether system- or I/O-memory instructions are required.Thank you for the patchset - it is a really nice, clean bit to add!
Quoted 27 lines
Some background: updating the DRM framebuffer console on sparc64 makes the kernel panic. This is because the framebuffer memory cannot be accessed with system-memory instructions. We currently employ a workaround in DRM to address this specific problem. [1]
To resolve the problem, we'd like to address it at the most common point, which is the dma-buf framework. The dma-buf mapping ideally knows if I/O instructions are required and exports this information to it's users. The new structure struct
dma_buf_mapstores the buffer address and a flag that signals I/O memory. Affected users of the buffer (e.g., drivers, frameworks) can then access the memory accordingly.This patchset only introduces struct
dma_buf_map, and updates structdma_bufand it's interfaces. Further patches can update dma-buf users. For example, there's a prototype patchset for DRM that fixes the framebuffer problem. [2]Further work: TTM, one of DRM's memory managers, already exports an
is_iomemflag of its own. It could later be switched over to exporting structdma_buf_map, thus simplifying some code. Several DRM drivers expect their fbdev console to operate on I/O memory. These could possibly be switched over to the generic fbdev emulation, as soon as the generic code uses structdma_buf_map.[1] https://lore.kernel.org/dri-devel/[email protected]/
[2] https://lore.kernel.org/dri-devel/[email protected]/
Quoted 7 lines
Quoted 4 lines
Thomas Zimmermann (3):
dma-buf: Add struct dma-buf-map for storing struct dma_buf.vaddr_ptr
dma-buf: Use structdma_buf_mapindma_buf_vmap()interfaces
dma-buf: Use structdma_buf_mapindma_buf_vunmap()interfacesFWIW, for the series, please feel free to add my
Acked-by Sumit Semwal <[email protected]>
Of course, once the errors found by kernel test robot are fixed :).
Quoted 20 lines
Quoted 20 lines
Documentation/driver-api/dma-buf.rst | 3 + drivers/dma-buf/dma-buf.c | 40 +++--- drivers/gpu/drm/drm_gem_cma_helper.c | 16 ++- drivers/gpu/drm/drm_gem_shmem_helper.c | 17 ++- drivers/gpu/drm/drm_prime.c | 14 +- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 13 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 13 +- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 18 ++- drivers/gpu/drm/tegra/gem.c | 23 ++-- .../common/videobuf2/videobuf2-dma-contig.c | 17 ++- .../media/common/videobuf2/videobuf2-dma-sg.c | 19 ++- .../common/videobuf2/videobuf2-vmalloc.c | 21 ++- include/drm/drm_prime.h | 5 +- include/linux/dma-buf-map.h | 126 ++++++++++++++++++ include/linux/dma-buf.h | 11 +- 15 files changed, 274 insertions(+), 82 deletions(-) create mode 100644 include/linux/dma-buf-map.h
Quoted 6 lines
Quoted 3 lines
--
2.28.0Best,
Sumit.
Best,
Sumit.