Skip to contentSkip to conversation

dma-buf: fix build due to missing export

PATCH In review Lucas De Marchi 4 participants 5 messages Jun 5, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dma-buf: fix build due to missing export

Commit 0c6b522abc2a ("dma-buf: cleanup dma-resv shared fence debugging a bit v2") turned dma_resv_reset_shared_max() into a function when CONFIG_DEBUG_MUTEXES is set, but forgot to export it. That resulted in a broken build:

ERROR: modpost: "dma_resv_reset_shared_max" [drivers/gpu/drm/vgem/vgem.ko] undefined!
ERROR: modpost: "dma_resv_reset_shared_max" [drivers/gpu/drm/i915/i915.ko] undefined!
ERROR: modpost: "dma_resv_reset_shared_max" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: modpost: "dma_resv_reset_shared_max" [drivers/gpu/drm/ttm/ttm.ko] undefined!
ERROR: modpost: "dma_resv_reset_shared_max" [drivers/gpu/drm/drm.ko] undefined!
ERROR: modpost: "dma_resv_reset_shared_max" [drivers/gpu/drm/drm_vram_helper.ko] undefined! make[1]: *** [scripts/Makefile.modpost:150: modules-only.symvers] Error 1

Fixes 0c6b522abc2a ("dma-buf: cleanup dma-resv shared fence debugging a bit v2")
Cc Christian König <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc "Christian König" <[email protected]>
---
 drivers/dma-buf/dma-resv.c | 1 +
 1 file changed, 1 insertion(+)
drivers/dma-buf/dma-resv.c +1 -0
index 3964df438505..6132ba631991 100644
@@ -226,6 +226,7 @@ void dma_resv_reset_shared_max(struct dma_resv *obj)
 		fence->shared_max = fence->shared_count;
 	}
 }
+EXPORT_SYMBOL(dma_resv_reset_shared_max);
 #endif
 
 /**
Signature · 1 line
2.31.1
#1 lore raw

[Intel-gfx] ✗ Fi.CI.BUILD: failure for dma-buf: fix build due to missing export

== Series Details ==

== Series Details ==

Series: dma-buf: fix build due to missing export
URL : https://patchwork.freedesktop.org/series/91045/
State : failure

== Summary ==

Applying: dma-buf: fix build due to missing export
Using index info to reconstruct a base tree...
M drivers/dma-buf/dma-resv.c
Falling back to patching base and 3-way merge... Auto-merging drivers/dma-buf/dma-resv.c
CONFLICT (content): Merge conflict in drivers/dma-buf/dma-resv.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 dma-buf: fix build due to missing export When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for dma-buf: fix build due to missing export

This patch is intended for drm-misc, where the issue comes from.

Lucas De Marchi

Quoted 8 lines · Patchwork

== Series Details ==

Series: dma-buf: fix build due to missing export
URL : https://patchwork.freedesktop.org/series/91045/
State : failure

== Summary ==

Quoted 14 lines

Applying: dma-buf: fix build due to missing export
Using index info to reconstruct a base tree...
M drivers/dma-buf/dma-resv.c
Falling back to patching base and 3-way merge... Auto-merging drivers/dma-buf/dma-resv.c
CONFLICT (content): Merge conflict in drivers/dma-buf/dma-resv.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 dma-buf: fix build due to missing export When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
In reply to Lucas De Marchi
Thank you for the patch! Yet something to improve:

Hi Lucas,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on drm-drm-misc/for-linux-next]
[cannot apply to tegra-drm/drm/tegra/for-next linus/master v5.13-rc4 next-20210604] [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/Lucas-De-Marchi/dma-buf-fix-build-due-to-missing-export/20210605-082109
base:   git://anongit.freedesktop.org/drm/drm-misc for-linux-next
config: arm-allmodconfig (attached as .config)
compiler: arm-linux-gnueabi-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
# https://github.com/0day-ci/linux/commit/c3c64fb8ca0e44b7fee87ed5cc623f2b2a8fa2c6
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Lucas-De-Marchi/dma-buf-fix-build-due-to-missing-export/20210605-082109 git checkout c3c64fb8ca0e44b7fee87ed5cc623f2b2a8fa2c6
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>, old ones prefixed by <<):

>> ERROR: modpost: "__aeabi_ldivmod" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
>> ERROR: modpost: "__aeabi_uldivmod" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

maintainer
#4 lore raw
In reply to Lucas De Marchi

That was an already known issue and I've just pushed a patch to fix it.

Christian.

Am 05.06.21 um 02:20 schrieb Lucas De Marchi:

Quoted 38 lines

Commit 0c6b522abc2a ("dma-buf: cleanup dma-resv shared fence debugging a bit v2") turned dma_resv_reset_shared_max() into a function when CONFIG_DEBUG_MUTEXES is set, but forgot to export it. That resulted in a broken build:

ERROR: modpost: "dma_resv_reset_shared_max" [drivers/gpu/drm/vgem/vgem.ko] undefined!
ERROR: modpost: "dma_resv_reset_shared_max" [drivers/gpu/drm/i915/i915.ko] undefined!
ERROR: modpost: "dma_resv_reset_shared_max" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: modpost: "dma_resv_reset_shared_max" [drivers/gpu/drm/ttm/ttm.ko] undefined!
ERROR: modpost: "dma_resv_reset_shared_max" [drivers/gpu/drm/drm.ko] undefined!
ERROR: modpost: "dma_resv_reset_shared_max" [drivers/gpu/drm/drm_vram_helper.ko] undefined! make[1]: *** [scripts/Makefile.modpost:150: modules-only.symvers] Error 1

Fixes 0c6b522abc2a ("dma-buf: cleanup dma-resv shared fence debugging a bit v2")
Cc Christian König <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Sumit Semwal <[email protected]>
Cc "Christian König" <[email protected]>
---
  drivers/dma-buf/dma-resv.c | 1 +
  1 file changed, 1 insertion(+)
drivers/dma-buf/dma-resv.c +1 -0
index 3964df438505..6132ba631991 100644
@@ -226,6 +226,7 @@ void dma_resv_reset_shared_max(struct dma_resv *obj)
  		fence->shared_max = fence->shared_count;
  	}
  }
+EXPORT_SYMBOL(dma_resv_reset_shared_max);
  #endif
 
  /**