linux-kernel - Re: [PATCH v2] drm: import DMA

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <2312b5c3-ffc9-b54e-a08b-2548e3837d83@suse.de>
Date:   Fri, 29 Oct 2021 20:51:52 +0200
From:   Thomas Zimmermann <tzimmermann@...e.de>
To:     Marcel Ziswiler <marcel@...wiler.com>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        dri-devel@...ts.freedesktop.org,
        open list <linux-kernel@...r.kernel.org>,
        Linux ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     Maxime Ripard <mripard@...nel.org>, Arnd Bergmann <arnd@...db.de>,
        Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Andrey Konovalov <andreyknvl@...il.com>,
        Alexandre Belloni <alexandre.belloni@...tlin.com>,
        Linus Walleij <linus.walleij@...aro.org>,
        Daniel Vetter <daniel@...ll.ch>,
        David Airlie <airlied@...ux.ie>,
        Marcel Ziswiler <marcel.ziswiler@...adex.com>,
        Linux Kernel Functional Testing <lkft@...aro.org>
Subject: Re: [PATCH v2] drm: import DMA_BUF module namespace

Hi

Am 27.10.21 um 23:25 schrieb Marcel Ziswiler:
> From: Marcel Ziswiler <marcel.ziswiler@...adex.com>
> 
> Today's -next fails building arm64 defconfig as follows:
> 
> ERROR: modpost: module drm_cma_helper uses symbol dma_buf_vunmap from
>   namespace DMA_BUF, but does not import it.
> ERROR: modpost: module drm_cma_helper uses symbol dma_buf_vmap from
>   namespace DMA_BUF, but does not import it.
> 
> Reported-by: Linux Kernel Functional Testing <lkft@...aro.org>
> Fixes: commit 4b2b5e142ff4 ("drm: Move GEM memory managers into modules")
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@...adex.com>

I added this fix into drm-misc-next. Thanks!

However, I had to import linux-next while doing so. 'Git am' did a 3-way 
merge, which may result in a conflict when the fix reaches linux-next 
again. I also updated the commit description.

Best regards
Thomas

> 
> ---
> 
> Changes in v2:
> - After consulting the documentation move it to the bottom of the file
>    where the other MODULE statements are as suggested by Thomas.
> - Also move it down there for the drm_gem_shmem_helper.c file.
> 
>   drivers/gpu/drm/drm_gem_cma_helper.c   | 1 +
>   drivers/gpu/drm/drm_gem_shmem_helper.c | 3 +--
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
> index 6f7b3f8ec04d3..2a34241fee025 100644
> --- a/drivers/gpu/drm/drm_gem_cma_helper.c
> +++ b/drivers/gpu/drm/drm_gem_cma_helper.c
> @@ -581,4 +581,5 @@ drm_gem_cma_prime_import_sg_table_vmap(struct drm_device *dev,
>   EXPORT_SYMBOL(drm_gem_cma_prime_import_sg_table_vmap);
>   
>   MODULE_DESCRIPTION("DRM CMA memory-management helpers");
> +MODULE_IMPORT_NS(DMA_BUF);
>   MODULE_LICENSE("GPL");
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index f7324582afe71..a5b743a83ce99 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -22,8 +22,6 @@
>   #include <drm/drm_prime.h>
>   #include <drm/drm_print.h>
>   
> -MODULE_IMPORT_NS(DMA_BUF);
> -
>   /**
>    * DOC: overview
>    *
> @@ -779,4 +777,5 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *dev,
>   EXPORT_SYMBOL_GPL(drm_gem_shmem_prime_import_sg_table);
>   
>   MODULE_DESCRIPTION("DRM SHMEM memory-management helpers");
> +MODULE_IMPORT_NS(DMA_BUF);
>   MODULE_LICENSE("GPL v2");
> 

-- 
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

Download attachment "OpenPGP_signature" of type "application/pgp-signature" (841 bytes)