* [PATCH] dma-heap: Let dma heap use dma_map_attrs to map & unmap iova @ 2021-07-08 10:14 guangming.cao 2021-07-15 6:24 ` guangming.cao 0 siblings, 1 reply; 8+ messages in thread From: guangming.cao @ 2021-07-08 10:14 UTC (permalink / raw) To: Sumit Semwal, Christian König, Matthias Brugger Cc: Benjamin Gaignard, Liam Mark, Laura Abbott, Brian Starkey, John Stultz, linux-media, dri-devel, linaro-mm-sig, linux-kernel, linux-arm-kernel, linux-mediatek, Guangming Cao From: Guangming Cao <Guangming.Cao@mediatek.com> For dma-heap users, they can't bypass cache sync when map/unmap iova with dma heap. But they can do it by adding DMA_ATTR_SKIP_CPU_SYNC into dma_alloc_attrs. To keep alignment, at dma_heap side, also use dma_buf_attachment.dma_map_attrs to do iova map & unmap. Signed-off-by: Guangming Cao <Guangming.Cao@mediatek.com> --- drivers/dma-buf/heaps/cma_heap.c | 6 ++++-- drivers/dma-buf/heaps/system_heap.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c index 0c05b79870f9..2c9feb3bfc3e 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -99,9 +99,10 @@ static struct sg_table *cma_heap_map_dma_buf(struct dma_buf_attachment *attachme { struct dma_heap_attachment *a = attachment->priv; struct sg_table *table = &a->table; + int attrs = attachment->dma_map_attrs; int ret; - ret = dma_map_sgtable(attachment->dev, table, direction, 0); + ret = dma_map_sgtable(attachment->dev, table, direction, attrs); if (ret) return ERR_PTR(-ENOMEM); a->mapped = true; @@ -113,9 +114,10 @@ static void cma_heap_unmap_dma_buf(struct dma_buf_attachment *attachment, enum dma_data_direction direction) { struct dma_heap_attachment *a = attachment->priv; + int attrs = attachment->dma_map_attrs; a->mapped = false; - dma_unmap_sgtable(attachment->dev, table, direction, 0); + dma_unmap_sgtable(attachment->dev, table, direction, attrs); } static int cma_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c index 23a7e74ef966..fc7b1e02988e 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c @@ -130,9 +130,10 @@ static struct sg_table *system_heap_map_dma_buf(struct dma_buf_attachment *attac { struct dma_heap_attachment *a = attachment->priv; struct sg_table *table = a->table; + int attrs = attachment->dma_map_attrs; int ret; - ret = dma_map_sgtable(attachment->dev, table, direction, 0); + ret = dma_map_sgtable(attachment->dev, table, direction, attrs); if (ret) return ERR_PTR(ret); @@ -145,9 +146,10 @@ static void system_heap_unmap_dma_buf(struct dma_buf_attachment *attachment, enum dma_data_direction direction) { struct dma_heap_attachment *a = attachment->priv; + int attrs = attachment->dma_map_attrs; a->mapped = false; - dma_unmap_sgtable(attachment->dev, table, direction, 0); + dma_unmap_sgtable(attachment->dev, table, direction, attrs); } static int system_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, -- 2.17.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH] dma-heap: Let dma heap use dma_map_attrs to map & unmap iova 2021-07-08 10:14 [PATCH] dma-heap: Let dma heap use dma_map_attrs to map & unmap iova guangming.cao @ 2021-07-15 6:24 ` guangming.cao 2021-07-21 9:43 ` guangming.cao 0 siblings, 1 reply; 8+ messages in thread From: guangming.cao @ 2021-07-15 6:24 UTC (permalink / raw) To: guangming.cao Cc: Brian.Starkey, benjamin.gaignard, christian.koenig, dri-devel, john.stultz, labbott, linaro-mm-sig, linux-arm-kernel, linux-kernel, linux-media, linux-mediatek, lmark, matthias.bgg, sumit.semwal, Guangming Cao From: Guangming Cao <Guangming.Cao@mediatek.com> On Thu, 2021-07-08 at 18:14 +0800, guangming.cao@mediatek.com wrote: Hi Sumit, Christian, Matthias, gentle ping for this patch :) BRs! Guangming > From: Guangming Cao <Guangming.Cao@mediatek.com> > > For dma-heap users, they can't bypass cache sync when map/unmap iova > with dma heap. But they can do it by adding DMA_ATTR_SKIP_CPU_SYNC > into dma_alloc_attrs. > > To keep alignment, at dma_heap side, also use > dma_buf_attachment.dma_map_attrs to do iova map & unmap. > > Signed-off-by: Guangming Cao <Guangming.Cao@mediatek.com> > --- > drivers/dma-buf/heaps/cma_heap.c | 6 ++++-- > drivers/dma-buf/heaps/system_heap.c | 6 ++++-- > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma- > buf/heaps/cma_heap.c > index 0c05b79870f9..2c9feb3bfc3e 100644 > --- a/drivers/dma-buf/heaps/cma_heap.c > +++ b/drivers/dma-buf/heaps/cma_heap.c > @@ -99,9 +99,10 @@ static struct sg_table > *cma_heap_map_dma_buf(struct dma_buf_attachment *attachme > { > struct dma_heap_attachment *a = attachment->priv; > struct sg_table *table = &a->table; > + int attrs = attachment->dma_map_attrs; > int ret; > > - ret = dma_map_sgtable(attachment->dev, table, direction, 0); > + ret = dma_map_sgtable(attachment->dev, table, direction, > attrs); > if (ret) > return ERR_PTR(-ENOMEM); > a->mapped = true; > @@ -113,9 +114,10 @@ static void cma_heap_unmap_dma_buf(struct > dma_buf_attachment *attachment, > enum dma_data_direction direction) > { > struct dma_heap_attachment *a = attachment->priv; > + int attrs = attachment->dma_map_attrs; > > a->mapped = false; > - dma_unmap_sgtable(attachment->dev, table, direction, 0); > + dma_unmap_sgtable(attachment->dev, table, direction, attrs); > } > > static int cma_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, > diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma- > buf/heaps/system_heap.c > index 23a7e74ef966..fc7b1e02988e 100644 > --- a/drivers/dma-buf/heaps/system_heap.c > +++ b/drivers/dma-buf/heaps/system_heap.c > @@ -130,9 +130,10 @@ static struct sg_table > *system_heap_map_dma_buf(struct dma_buf_attachment *attac > { > struct dma_heap_attachment *a = attachment->priv; > struct sg_table *table = a->table; > + int attrs = attachment->dma_map_attrs; > int ret; > > - ret = dma_map_sgtable(attachment->dev, table, direction, 0); > + ret = dma_map_sgtable(attachment->dev, table, direction, > attrs); > if (ret) > return ERR_PTR(ret); > > @@ -145,9 +146,10 @@ static void system_heap_unmap_dma_buf(struct > dma_buf_attachment *attachment, > enum dma_data_direction > direction) > { > struct dma_heap_attachment *a = attachment->priv; > + int attrs = attachment->dma_map_attrs; > > a->mapped = false; > - dma_unmap_sgtable(attachment->dev, table, direction, 0); > + dma_unmap_sgtable(attachment->dev, table, direction, attrs); > } > > static int system_heap_dma_buf_begin_cpu_access(struct dma_buf > *dmabuf, > -- > 2.17.1 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] dma-heap: Let dma heap use dma_map_attrs to map & unmap iova 2021-07-15 6:24 ` guangming.cao @ 2021-07-21 9:43 ` guangming.cao 2021-08-10 2:02 ` [PATCH] dma_heap: enable map_attrs when (un)map_attachment guangming.cao 0 siblings, 1 reply; 8+ messages in thread From: guangming.cao @ 2021-07-21 9:43 UTC (permalink / raw) To: Brian.Starkey, benjamin.gaignard, christian.koenig, dri-devel, john.stultz, labbott, linaro-mm-sig, linux-arm-kernel, linux-kernel, linux-media, linux-mediatek, lmark, matthias.bgg, sumit.semwal Cc: wsd_upstream, Guangming Cao From: Guangming Cao <Guangming.Cao@mediatek.com> On Thu, 2021-07-15 at 14:24 +0800, guangming.cao@mediatek.com wrote: > From: Guangming Cao <Guangming.Cao@mediatek.com> > > On Thu, 2021-07-08 at 18:14 +0800, guangming.cao@mediatek.com wrote: > > Hi Sumit, Christian, Matthias, > > gentle ping for this patch :) move receviers to '--to' list. gentle ping for this patch :) > > BRs! > Guangming > > > From: Guangming Cao <Guangming.Cao@mediatek.com> > > > > For dma-heap users, they can't bypass cache sync when map/unmap > > iova > > with dma heap. But they can do it by adding DMA_ATTR_SKIP_CPU_SYNC > > into dma_alloc_attrs. > > > > To keep alignment, at dma_heap side, also use > > dma_buf_attachment.dma_map_attrs to do iova map & unmap. > > > > Signed-off-by: Guangming Cao <Guangming.Cao@mediatek.com> > > --- > > drivers/dma-buf/heaps/cma_heap.c | 6 ++++-- > > drivers/dma-buf/heaps/system_heap.c | 6 ++++-- > > 2 files changed, 8 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma- > > buf/heaps/cma_heap.c > > index 0c05b79870f9..2c9feb3bfc3e 100644 > > --- a/drivers/dma-buf/heaps/cma_heap.c > > +++ b/drivers/dma-buf/heaps/cma_heap.c > > @@ -99,9 +99,10 @@ static struct sg_table > > *cma_heap_map_dma_buf(struct dma_buf_attachment *attachme > > { > > struct dma_heap_attachment *a = attachment->priv; > > struct sg_table *table = &a->table; > > + int attrs = attachment->dma_map_attrs; > > int ret; > > > > - ret = dma_map_sgtable(attachment->dev, table, direction, 0); > > + ret = dma_map_sgtable(attachment->dev, table, direction, > > attrs); > > if (ret) > > return ERR_PTR(-ENOMEM); > > a->mapped = true; > > @@ -113,9 +114,10 @@ static void cma_heap_unmap_dma_buf(struct > > dma_buf_attachment *attachment, > > enum dma_data_direction direction) > > { > > struct dma_heap_attachment *a = attachment->priv; > > + int attrs = attachment->dma_map_attrs; > > > > a->mapped = false; > > - dma_unmap_sgtable(attachment->dev, table, direction, 0); > > + dma_unmap_sgtable(attachment->dev, table, direction, attrs); > > } > > > > static int cma_heap_dma_buf_begin_cpu_access(struct dma_buf > > *dmabuf, > > diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma- > > buf/heaps/system_heap.c > > index 23a7e74ef966..fc7b1e02988e 100644 > > --- a/drivers/dma-buf/heaps/system_heap.c > > +++ b/drivers/dma-buf/heaps/system_heap.c > > @@ -130,9 +130,10 @@ static struct sg_table > > *system_heap_map_dma_buf(struct dma_buf_attachment *attac > > { > > struct dma_heap_attachment *a = attachment->priv; > > struct sg_table *table = a->table; > > + int attrs = attachment->dma_map_attrs; > > int ret; > > > > - ret = dma_map_sgtable(attachment->dev, table, direction, 0); > > + ret = dma_map_sgtable(attachment->dev, table, direction, > > attrs); > > if (ret) > > return ERR_PTR(ret); > > > > @@ -145,9 +146,10 @@ static void system_heap_unmap_dma_buf(struct > > dma_buf_attachment *attachment, > > enum dma_data_direction > > direction) > > { > > struct dma_heap_attachment *a = attachment->priv; > > + int attrs = attachment->dma_map_attrs; > > > > a->mapped = false; > > - dma_unmap_sgtable(attachment->dev, table, direction, 0); > > + dma_unmap_sgtable(attachment->dev, table, direction, attrs); > > } > > > > static int system_heap_dma_buf_begin_cpu_access(struct dma_buf > > *dmabuf, > > -- > > 2.17.1 > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] dma_heap: enable map_attrs when (un)map_attachment 2021-07-21 9:43 ` guangming.cao @ 2021-08-10 2:02 ` guangming.cao 2021-08-10 9:26 ` kernel test robot ` (3 more replies) 0 siblings, 4 replies; 8+ messages in thread From: guangming.cao @ 2021-08-10 2:02 UTC (permalink / raw) To: Sumit Semwal, Benjamin Gaignard, Liam Mark, Laura Abbott, Brian Starkey, John Stultz, Christian König, Matthias Brugger, open list:DMA-BUF HEAPS FRAMEWORK, open list:DMA-BUF HEAPS FRAMEWORK, moderated list:DMA-BUF HEAPS FRAMEWORK, open list, moderated list:ARM/Mediatek SoC support, moderated list:ARM/Mediatek SoC support Cc: wsd_upstream, Guangming Cao From: Guangming Cao <Guangming.Cao@mediatek.com> For dma-heap users, they can't bypass cache sync when (un)map iova with dma heap. But they can do it by adding DMA_ATTR_SKIP_CPU_SYNC into dma_alloc_attrs. To Keep alignment, add map_attrs support for dma_heap when (un)map_attachment. Signed-off-by: Guangming Cao <Guangming.Cao@mediatek.com> --- drivers/dma-buf/heaps/cma_heap.c | 6 ++++-- drivers/dma-buf/heaps/system_heap.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c index 0c05b79870f9..2c9feb3bfc3e 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -99,9 +99,10 @@ static struct sg_table *cma_heap_map_dma_buf(struct dma_buf_attachment *attachme { struct dma_heap_attachment *a = attachment->priv; struct sg_table *table = &a->table; + int attrs = attachment->dma_map_attrs; int ret; - ret = dma_map_sgtable(attachment->dev, table, direction, 0); + ret = dma_map_sgtable(attachment->dev, table, direction, attrs); if (ret) return ERR_PTR(-ENOMEM); a->mapped = true; @@ -113,9 +114,10 @@ static void cma_heap_unmap_dma_buf(struct dma_buf_attachment *attachment, enum dma_data_direction direction) { struct dma_heap_attachment *a = attachment->priv; + int attrs = attachment->dma_map_attrs; a->mapped = false; - dma_unmap_sgtable(attachment->dev, table, direction, 0); + dma_unmap_sgtable(attachment->dev, table, direction, attrs); } static int cma_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c index 23a7e74ef966..fc7b1e02988e 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c @@ -130,9 +130,10 @@ static struct sg_table *system_heap_map_dma_buf(struct dma_buf_attachment *attac { struct dma_heap_attachment *a = attachment->priv; struct sg_table *table = a->table; + int attrs = attachment->dma_map_attrs; int ret; - ret = dma_map_sgtable(attachment->dev, table, direction, 0); + ret = dma_map_sgtable(attachment->dev, table, direction, attrs); if (ret) return ERR_PTR(ret); @@ -145,9 +146,10 @@ static void system_heap_unmap_dma_buf(struct dma_buf_attachment *attachment, enum dma_data_direction direction) { struct dma_heap_attachment *a = attachment->priv; + int attrs = attachment->dma_map_attrs; a->mapped = false; - dma_unmap_sgtable(attachment->dev, table, direction, 0); + dma_unmap_sgtable(attachment->dev, table, direction, attrs); } static int system_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, -- 2.17.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] dma_heap: enable map_attrs when (un)map_attachment 2021-08-10 2:02 ` [PATCH] dma_heap: enable map_attrs when (un)map_attachment guangming.cao @ 2021-08-10 9:26 ` kernel test robot 2021-08-10 9:56 ` kernel test robot ` (2 subsequent siblings) 3 siblings, 0 replies; 8+ messages in thread From: kernel test robot @ 2021-08-10 9:26 UTC (permalink / raw) To: guangming.cao, Sumit Semwal, Benjamin Gaignard, Liam Mark, Laura Abbott, Brian Starkey, John Stultz, Christian König, Matthias Brugger, open list:DMA-BUF HEAPS FRAMEWORK, moderated list:DMA-BUF HEAPS FRAMEWORK Cc: kbuild-all [-- Attachment #1: Type: text/plain, Size: 2830 bytes --] Hi, Thank you for the patch! Yet something to improve: [auto build test ERROR on linus/master] [also build test ERROR on v5.14-rc5 next-20210809] [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/guangming-cao-mediatek-com/dma_heap-enable-map_attrs-when-un-map_attachment/20210810-100452 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 9a73fa375d58fee5262dd16473c8e7522bdf44de config: alpha-buildonly-randconfig-r003-20210809 (attached as .config) compiler: alpha-linux-gcc (GCC) 10.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 # https://github.com/0day-ci/linux/commit/b1a5626566cf9a73b35a742151246017ac87556b git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review guangming-cao-mediatek-com/dma_heap-enable-map_attrs-when-un-map_attachment/20210810-100452 git checkout b1a5626566cf9a73b35a742151246017ac87556b # save the attached .config to linux build tree mkdir build_dir COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-10.3.0 make.cross O=build_dir ARCH=alpha SHELL=/bin/bash If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> All errors (new ones prefixed by >>): drivers/dma-buf/heaps/system_heap.c: In function 'system_heap_map_dma_buf': >> drivers/dma-buf/heaps/system_heap.c:133:24: error: 'struct dma_buf_attachment' has no member named 'dma_map_attrs' 133 | int attrs = attachment->dma_map_attrs; | ^~ drivers/dma-buf/heaps/system_heap.c: In function 'system_heap_unmap_dma_buf': drivers/dma-buf/heaps/system_heap.c:149:24: error: 'struct dma_buf_attachment' has no member named 'dma_map_attrs' 149 | int attrs = attachment->dma_map_attrs; | ^~ vim +133 drivers/dma-buf/heaps/system_heap.c 127 128 static struct sg_table *system_heap_map_dma_buf(struct dma_buf_attachment *attachment, 129 enum dma_data_direction direction) 130 { 131 struct dma_heap_attachment *a = attachment->priv; 132 struct sg_table *table = a->table; > 133 int attrs = attachment->dma_map_attrs; 134 int ret; 135 136 ret = dma_map_sgtable(attachment->dev, table, direction, attrs); 137 if (ret) 138 return ERR_PTR(ret); 139 140 a->mapped = true; 141 return table; 142 } 143 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 36129 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] dma_heap: enable map_attrs when (un)map_attachment 2021-08-10 2:02 ` [PATCH] dma_heap: enable map_attrs when (un)map_attachment guangming.cao 2021-08-10 9:26 ` kernel test robot @ 2021-08-10 9:56 ` kernel test robot 2021-08-10 9:56 ` kernel test robot 2021-08-26 6:42 ` [PATCH] dma-buf: Add support for mapping buffers with DMA attributes guangming.cao 3 siblings, 0 replies; 8+ messages in thread From: kernel test robot @ 2021-08-10 9:56 UTC (permalink / raw) To: guangming.cao, Sumit Semwal, Benjamin Gaignard, Liam Mark, Laura Abbott, Brian Starkey, John Stultz, Christian König, Matthias Brugger, open list:DMA-BUF HEAPS FRAMEWORK, moderated list:DMA-BUF HEAPS FRAMEWORK Cc: clang-built-linux, kbuild-all [-- Attachment #1: Type: text/plain, Size: 2737 bytes --] Hi, Thank you for the patch! Yet something to improve: [auto build test ERROR on linus/master] [also build test ERROR on v5.14-rc5 next-20210809] [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/guangming-cao-mediatek-com/dma_heap-enable-map_attrs-when-un-map_attachment/20210810-100452 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 9a73fa375d58fee5262dd16473c8e7522bdf44de config: x86_64-randconfig-a016-20210810 (attached as .config) compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project 614c7d03877fd99c2de47429b15be3f00306a3bd) 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 # https://github.com/0day-ci/linux/commit/b1a5626566cf9a73b35a742151246017ac87556b git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review guangming-cao-mediatek-com/dma_heap-enable-map_attrs-when-un-map_attachment/20210810-100452 git checkout b1a5626566cf9a73b35a742151246017ac87556b # save the attached .config to linux build tree mkdir build_dir COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross O=build_dir ARCH=x86_64 SHELL=/bin/bash If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> All errors (new ones prefixed by >>): >> drivers/dma-buf/heaps/cma_heap.c:102:26: error: no member named 'dma_map_attrs' in 'struct dma_buf_attachment' int attrs = attachment->dma_map_attrs; ~~~~~~~~~~ ^ drivers/dma-buf/heaps/cma_heap.c:117:26: error: no member named 'dma_map_attrs' in 'struct dma_buf_attachment' int attrs = attachment->dma_map_attrs; ~~~~~~~~~~ ^ 2 errors generated. vim +102 drivers/dma-buf/heaps/cma_heap.c 96 97 static struct sg_table *cma_heap_map_dma_buf(struct dma_buf_attachment *attachment, 98 enum dma_data_direction direction) 99 { 100 struct dma_heap_attachment *a = attachment->priv; 101 struct sg_table *table = &a->table; > 102 int attrs = attachment->dma_map_attrs; 103 int ret; 104 105 ret = dma_map_sgtable(attachment->dev, table, direction, attrs); 106 if (ret) 107 return ERR_PTR(-ENOMEM); 108 a->mapped = true; 109 return table; 110 } 111 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 37747 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] dma_heap: enable map_attrs when (un)map_attachment 2021-08-10 2:02 ` [PATCH] dma_heap: enable map_attrs when (un)map_attachment guangming.cao 2021-08-10 9:26 ` kernel test robot 2021-08-10 9:56 ` kernel test robot @ 2021-08-10 9:56 ` kernel test robot 2021-08-26 6:42 ` [PATCH] dma-buf: Add support for mapping buffers with DMA attributes guangming.cao 3 siblings, 0 replies; 8+ messages in thread From: kernel test robot @ 2021-08-10 9:56 UTC (permalink / raw) To: guangming.cao, Sumit Semwal, Benjamin Gaignard, Liam Mark, Laura Abbott, Brian Starkey, John Stultz, Christian König, Matthias Brugger, open list:DMA-BUF HEAPS FRAMEWORK, moderated list:DMA-BUF HEAPS FRAMEWORK Cc: clang-built-linux, kbuild-all [-- Attachment #1: Type: text/plain, Size: 2680 bytes --] Hi, Thank you for the patch! Yet something to improve: [auto build test ERROR on linus/master] [also build test ERROR on v5.14-rc5 next-20210809] [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/guangming-cao-mediatek-com/dma_heap-enable-map_attrs-when-un-map_attachment/20210810-100452 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 9a73fa375d58fee5262dd16473c8e7522bdf44de config: hexagon-buildonly-randconfig-r002-20210809 (attached as .config) compiler: clang version 12.0.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 # https://github.com/0day-ci/linux/commit/b1a5626566cf9a73b35a742151246017ac87556b git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review guangming-cao-mediatek-com/dma_heap-enable-map_attrs-when-un-map_attachment/20210810-100452 git checkout b1a5626566cf9a73b35a742151246017ac87556b # save the attached .config to linux build tree mkdir build_dir COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross O=build_dir ARCH=hexagon SHELL=/bin/bash If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> All errors (new ones prefixed by >>): >> drivers/dma-buf/heaps/system_heap.c:133:26: error: no member named 'dma_map_attrs' in 'struct dma_buf_attachment' int attrs = attachment->dma_map_attrs; ~~~~~~~~~~ ^ drivers/dma-buf/heaps/system_heap.c:149:26: error: no member named 'dma_map_attrs' in 'struct dma_buf_attachment' int attrs = attachment->dma_map_attrs; ~~~~~~~~~~ ^ 2 errors generated. vim +133 drivers/dma-buf/heaps/system_heap.c 127 128 static struct sg_table *system_heap_map_dma_buf(struct dma_buf_attachment *attachment, 129 enum dma_data_direction direction) 130 { 131 struct dma_heap_attachment *a = attachment->priv; 132 struct sg_table *table = a->table; > 133 int attrs = attachment->dma_map_attrs; 134 int ret; 135 136 ret = dma_map_sgtable(attachment->dev, table, direction, attrs); 137 if (ret) 138 return ERR_PTR(ret); 139 140 a->mapped = true; 141 return table; 142 } 143 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org [-- Attachment #2: .config.gz --] [-- Type: application/gzip, Size: 31141 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] dma-buf: Add support for mapping buffers with DMA attributes 2021-08-10 2:02 ` [PATCH] dma_heap: enable map_attrs when (un)map_attachment guangming.cao ` (2 preceding siblings ...) 2021-08-10 9:56 ` kernel test robot @ 2021-08-26 6:42 ` guangming.cao 3 siblings, 0 replies; 8+ messages in thread From: guangming.cao @ 2021-08-26 6:42 UTC (permalink / raw) To: Sumit Semwal, Benjamin Gaignard, Liam Mark, Laura Abbott, Brian Starkey, John Stultz, Christian König, Matthias Brugger, open list:DMA-BUF HEAPS FRAMEWORK, open list:DMA-BUF HEAPS FRAMEWORK, moderated list:DMA-BUF HEAPS FRAMEWORK, open list, moderated list:ARM/Mediatek SoC support, moderated list:ARM/Mediatek SoC support Cc: wsd_upstream, isaacm, sspatil, hridya, Guangming Cao From: Guangming Cao <Guangming.Cao@mediatek.com> When mapping the memory represented by a dma-buf into a device's address space, it might be desireable to map the memory with certain DMA attributes. Thus, introduce the dma_mapping_attrs field in the dma_buf_attachment structure so that when the memory is mapped with dma_buf_map_attachment, it is mapped with the desired DMA attributes. Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org> Signed-off-by: Sandeep Patil <sspatil@google.com> Signed-off-by: Guangming Cao <Guangming.Cao@mediatek.com> --- drivers/dma-buf/heaps/cma_heap.c | 6 ++++-- drivers/dma-buf/heaps/system_heap.c | 6 ++++-- include/linux/dma-buf.h | 3 +++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c index 0c05b79870f9..2c9feb3bfc3e 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -99,9 +99,10 @@ static struct sg_table *cma_heap_map_dma_buf(struct dma_buf_attachment *attachme { struct dma_heap_attachment *a = attachment->priv; struct sg_table *table = &a->table; + int attrs = attachment->dma_map_attrs; int ret; - ret = dma_map_sgtable(attachment->dev, table, direction, 0); + ret = dma_map_sgtable(attachment->dev, table, direction, attrs); if (ret) return ERR_PTR(-ENOMEM); a->mapped = true; @@ -113,9 +114,10 @@ static void cma_heap_unmap_dma_buf(struct dma_buf_attachment *attachment, enum dma_data_direction direction) { struct dma_heap_attachment *a = attachment->priv; + int attrs = attachment->dma_map_attrs; a->mapped = false; - dma_unmap_sgtable(attachment->dev, table, direction, 0); + dma_unmap_sgtable(attachment->dev, table, direction, attrs); } static int cma_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c index 23a7e74ef966..fc7b1e02988e 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c @@ -130,9 +130,10 @@ static struct sg_table *system_heap_map_dma_buf(struct dma_buf_attachment *attac { struct dma_heap_attachment *a = attachment->priv; struct sg_table *table = a->table; + int attrs = attachment->dma_map_attrs; int ret; - ret = dma_map_sgtable(attachment->dev, table, direction, 0); + ret = dma_map_sgtable(attachment->dev, table, direction, attrs); if (ret) return ERR_PTR(ret); @@ -145,9 +146,10 @@ static void system_heap_unmap_dma_buf(struct dma_buf_attachment *attachment, enum dma_data_direction direction) { struct dma_heap_attachment *a = attachment->priv; + int attrs = attachment->dma_map_attrs; a->mapped = false; - dma_unmap_sgtable(attachment->dev, table, direction, 0); + dma_unmap_sgtable(attachment->dev, table, direction, attrs); } static int system_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index efdc56b9d95f..4d650731766e 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -379,6 +379,8 @@ struct dma_buf_attach_ops { * @importer_ops: importer operations for this attachment, if provided * dma_buf_map/unmap_attachment() must be called with the dma_resv lock held. * @importer_priv: importer specific attachment data. + * @dma_map_attrs: DMA attributes to be used when the exporter maps the buffer + * through dma_buf_map_attachment. * * This structure holds the attachment information between the dma_buf buffer * and its user device(s). The list contains one attachment struct per device @@ -399,6 +401,7 @@ struct dma_buf_attachment { const struct dma_buf_attach_ops *importer_ops; void *importer_priv; void *priv; + unsigned long dma_map_attrs; }; /** -- 2.17.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-08-26 6:42 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-07-08 10:14 [PATCH] dma-heap: Let dma heap use dma_map_attrs to map & unmap iova guangming.cao 2021-07-15 6:24 ` guangming.cao 2021-07-21 9:43 ` guangming.cao 2021-08-10 2:02 ` [PATCH] dma_heap: enable map_attrs when (un)map_attachment guangming.cao 2021-08-10 9:26 ` kernel test robot 2021-08-10 9:56 ` kernel test robot 2021-08-10 9:56 ` kernel test robot 2021-08-26 6:42 ` [PATCH] dma-buf: Add support for mapping buffers with DMA attributes guangming.cao
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).