Hi all,
After merging the hmm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
mm/hmm.c: In function 'hmm_get_or_create':
mm/hmm.c:50:2: error: implicit declaration of function 'lockdep_assert_held_exclusive'; did you mean 'lockdep_assert_held_once'? [-Werror=implicit-function-declaration]
lockdep_assert_held_exclusive(&mm->mmap_sem);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lockdep_assert_held_once
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_ttm_tt_get_user_pages':
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:778:28: error: passing argument 2 of 'hmm_range_register' from incompatible pointer type [-Werror=incompatible-pointer-types]
hmm_range_register(range, mm, start,
^~
In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:35:
include/linux/hmm.h:464:29: note: expected 'struct hmm_mirror *' but argument is of type 'struct mm_struct *'
struct hmm_mirror *mirror,
~~~~~~~~~~~~~~~~~~~^~~~~~
Caused by commit
e36acfe6c86d ("mm/hmm: Use hmm_mirror not mm as an argument for hmm_range_register")
interacting with commit
66c45500bfdc ("drm/amdgpu: use new HMM APIs and helpers")
from the drm tree.
All I could do for now was to mark the AMDGPU driver broken. Please
submit a merge for for me (and later Linus) to use.
--
Cheers,
Stephen Rothwell
On Mon, Jul 01, 2019 at 09:33:04PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the hmm tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> mm/hmm.c: In function 'hmm_get_or_create':
> mm/hmm.c:50:2: error: implicit declaration of function 'lockdep_assert_held_exclusive'; did you mean 'lockdep_assert_held_once'? [-Werror=implicit-function-declaration]
> lockdep_assert_held_exclusive(&mm->mmap_sem);
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> lockdep_assert_held_once
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_ttm_tt_get_user_pages':
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:778:28: error: passing argument 2 of 'hmm_range_register' from incompatible pointer type [-Werror=incompatible-pointer-types]
> hmm_range_register(range, mm, start,
> ^~
> In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:35:
> include/linux/hmm.h:464:29: note: expected 'struct hmm_mirror *' but argument is of type 'struct mm_struct *'
> struct hmm_mirror *mirror,
> ~~~~~~~~~~~~~~~~~~~^~~~~~
>
> Caused by commit
>
> e36acfe6c86d ("mm/hmm: Use hmm_mirror not mm as an argument for hmm_range_register")
>
> interacting with commit
>
> 66c45500bfdc ("drm/amdgpu: use new HMM APIs and helpers")
>
> from the drm tree.
>
> All I could do for now was to mark the AMDGPU driver broken. Please
> submit a merge for for me (and later Linus) to use.
This is expected, the AMD guys have the resolution for this from when
they tested hmm.git..
I think we are going to have to merge hmm.git into the amdgpu tree and
push the resolution forward, as it looks kind of complicated to shift
onto Linus or DRM.
Probably amdgpu needs to gain a few patches making the hmm_mirror
visible to amdgpu_ttm.c and then the merge resolution will be simple?
AMD/DRM we have a few days left to decide on how best to handle the
conflict, thanks.
Regards,
Jason
On Tue, Jul 2, 2019 at 3:24 AM Jason Gunthorpe <[email protected]> wrote:
>
> On Mon, Jul 01, 2019 at 09:33:04PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the hmm tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> >
> > mm/hmm.c: In function 'hmm_get_or_create':
> > mm/hmm.c:50:2: error: implicit declaration of function 'lockdep_assert_held_exclusive'; did you mean 'lockdep_assert_held_once'? [-Werror=implicit-function-declaration]
> > lockdep_assert_held_exclusive(&mm->mmap_sem);
> > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > lockdep_assert_held_once
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_ttm_tt_get_user_pages':
> > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:778:28: error: passing argument 2 of 'hmm_range_register' from incompatible pointer type [-Werror=incompatible-pointer-types]
> > hmm_range_register(range, mm, start,
> > ^~
> > In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:35:
> > include/linux/hmm.h:464:29: note: expected 'struct hmm_mirror *' but argument is of type 'struct mm_struct *'
> > struct hmm_mirror *mirror,
> > ~~~~~~~~~~~~~~~~~~~^~~~~~
> >
> > Caused by commit
> >
> > e36acfe6c86d ("mm/hmm: Use hmm_mirror not mm as an argument for hmm_range_register")
> >
> > interacting with commit
> >
> > 66c45500bfdc ("drm/amdgpu: use new HMM APIs and helpers")
> >
> > from the drm tree.
> >
> > All I could do for now was to mark the AMDGPU driver broken. Please
> > submit a merge for for me (and later Linus) to use.
>
> This is expected, the AMD guys have the resolution for this from when
> they tested hmm.git..
>
> I think we are going to have to merge hmm.git into the amdgpu tree and
> push the resolution forward, as it looks kind of complicated to shift
> onto Linus or DRM.
>
> Probably amdgpu needs to gain a few patches making the hmm_mirror
> visible to amdgpu_ttm.c and then the merge resolution will be simple?
>
> AMD/DRM we have a few days left to decide on how best to handle the
> conflict, thanks.
Philip and Felix have been working on a branch with hmm merged into
drm-next with all the conflicts fixes up. I'll post it out tomorrow
once I get Felix's latest revisions.
Alex
>
> Regards,
> Jason
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Mon, Sep 02, 2019 at 08:50:17PM +1000, Stephen Rothwell wrote:
> Hi all,
> ERROR: "nd_region_provider_data" [drivers/acpi/nfit/nfit.ko] undefined!
> ERROR: "to_nd_blk_region" [drivers/acpi/nfit/nfit.ko] undefined!
> ERROR: "nvdimm_region_notify" [drivers/acpi/nfit/nfit.ko] undefined!
> ERROR: "nvdimm_blk_region_create" [drivers/acpi/nfit/nfit.ko] undefined!
>
> Caused by commit
>
> 126470c8a58b ("libnvdimm: Enable unit test infrastructure compile checks")
>
> I have reverted that commit for today.
>
Looks like more kconfig trouble, can you send Dan your kconfig? I'll
drop this patch again
Thanks,
Jason
Hi Jason,
On Mon, 2 Sep 2019 10:51:41 +0000 Jason Gunthorpe <[email protected]> wrote:
>
> On Mon, Sep 02, 2019 at 08:50:17PM +1000, Stephen Rothwell wrote:
> > Hi all,
>
> > ERROR: "nd_region_provider_data" [drivers/acpi/nfit/nfit.ko] undefined!
> > ERROR: "to_nd_blk_region" [drivers/acpi/nfit/nfit.ko] undefined!
> > ERROR: "nvdimm_region_notify" [drivers/acpi/nfit/nfit.ko] undefined!
> > ERROR: "nvdimm_blk_region_create" [drivers/acpi/nfit/nfit.ko] undefined!
> >
> > Caused by commit
> >
> > 126470c8a58b ("libnvdimm: Enable unit test infrastructure compile checks")
> >
> > I have reverted that commit for today.
>
> Looks like more kconfig trouble, can you send Dan your kconfig? I'll
> drop this patch again
>
Thanks. It was just an x86_64 allmodconfig build. I don't actually
have the .config file (it gets cleaned up, sorry).
--
Cheers,
Stephen Rothwell
On Mon, Sep 2, 2019 at 4:45 PM Stephen Rothwell <[email protected]> wrote:
>
> Hi Jason,
>
> On Mon, 2 Sep 2019 10:51:41 +0000 Jason Gunthorpe <[email protected]> wrote:
> >
> > On Mon, Sep 02, 2019 at 08:50:17PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> >
> > > ERROR: "nd_region_provider_data" [drivers/acpi/nfit/nfit.ko] undefined!
> > > ERROR: "to_nd_blk_region" [drivers/acpi/nfit/nfit.ko] undefined!
> > > ERROR: "nvdimm_region_notify" [drivers/acpi/nfit/nfit.ko] undefined!
> > > ERROR: "nvdimm_blk_region_create" [drivers/acpi/nfit/nfit.ko] undefined!
> > >
> > > Caused by commit
> > >
> > > 126470c8a58b ("libnvdimm: Enable unit test infrastructure compile checks")
> > >
> > > I have reverted that commit for today.
> >
> > Looks like more kconfig trouble, can you send Dan your kconfig? I'll
> > drop this patch again
> >
>
> Thanks. It was just an x86_64 allmodconfig build. I don't actually
> have the .config file (it gets cleaned up, sorry).
Strange. x86_64 allmodconfig is certainly a 0day build target. Could
this be toolchain dependent?
Hi Dan,
On Mon, 2 Sep 2019 22:31:00 -0700 Dan Williams <[email protected]> wrote:
>
> On Mon, Sep 2, 2019 at 4:45 PM Stephen Rothwell <[email protected]> wrote:
> >
> > Hi Jason,
> >
> > On Mon, 2 Sep 2019 10:51:41 +0000 Jason Gunthorpe <[email protected]> wrote:
> > >
> > > On Mon, Sep 02, 2019 at 08:50:17PM +1000, Stephen Rothwell wrote:
> > >
> > > > ERROR: "nd_region_provider_data" [drivers/acpi/nfit/nfit.ko] undefined!
> > > > ERROR: "to_nd_blk_region" [drivers/acpi/nfit/nfit.ko] undefined!
> > > > ERROR: "nvdimm_region_notify" [drivers/acpi/nfit/nfit.ko] undefined!
> > > > ERROR: "nvdimm_blk_region_create" [drivers/acpi/nfit/nfit.ko] undefined!
> > > >
> > > > Caused by commit
> > > >
> > > > 126470c8a58b ("libnvdimm: Enable unit test infrastructure compile checks")
> > > >
> > > > I have reverted that commit for today.
> > >
> > > Looks like more kconfig trouble, can you send Dan your kconfig? I'll
> > > drop this patch again
> > >
> >
> > Thanks. It was just an x86_64 allmodconfig build. I don't actually
> > have the .config file (it gets cleaned up, sorry).
>
> Strange. x86_64 allmodconfig is certainly a 0day build target. Could
> this be toolchain dependent?
Possible, I guess. I am cross compiling on a PowerPC LE host
$ x86_64-linux-gnu-gcc --version
x86_64-linux-gnu-gcc (Debian 9.2.1-4) 9.2.1 20190821
$ x86_64-linux-gnu-ld --version
GNU ld (GNU Binutils for Debian) 2.32.51.20190821
It could also be an interaction with something else in linux-next.
--
Cheers,
Stephen Rothwell
On Mon, Sep 2, 2019 at 10:42 PM Stephen Rothwell <[email protected]> wrote:
>
> Hi Dan,
>
> On Mon, 2 Sep 2019 22:31:00 -0700 Dan Williams <[email protected]> wrote:
> >
> > On Mon, Sep 2, 2019 at 4:45 PM Stephen Rothwell <[email protected]> wrote:
> > >
> > > Hi Jason,
> > >
> > > On Mon, 2 Sep 2019 10:51:41 +0000 Jason Gunthorpe <[email protected]> wrote:
> > > >
> > > > On Mon, Sep 02, 2019 at 08:50:17PM +1000, Stephen Rothwell wrote:
> > > >
> > > > > ERROR: "nd_region_provider_data" [drivers/acpi/nfit/nfit.ko] undefined!
> > > > > ERROR: "to_nd_blk_region" [drivers/acpi/nfit/nfit.ko] undefined!
> > > > > ERROR: "nvdimm_region_notify" [drivers/acpi/nfit/nfit.ko] undefined!
> > > > > ERROR: "nvdimm_blk_region_create" [drivers/acpi/nfit/nfit.ko] undefined!
> > > > >
> > > > > Caused by commit
> > > > >
> > > > > 126470c8a58b ("libnvdimm: Enable unit test infrastructure compile checks")
> > > > >
> > > > > I have reverted that commit for today.
> > > >
> > > > Looks like more kconfig trouble, can you send Dan your kconfig? I'll
> > > > drop this patch again
> > > >
> > >
> > > Thanks. It was just an x86_64 allmodconfig build. I don't actually
> > > have the .config file (it gets cleaned up, sorry).
> >
> > Strange. x86_64 allmodconfig is certainly a 0day build target. Could
> > this be toolchain dependent?
>
> Possible, I guess. I am cross compiling on a PowerPC LE host
>
> $ x86_64-linux-gnu-gcc --version
> x86_64-linux-gnu-gcc (Debian 9.2.1-4) 9.2.1 20190821
>
> $ x86_64-linux-gnu-ld --version
> GNU ld (GNU Binutils for Debian) 2.32.51.20190821
>
> It could also be an interaction with something else in linux-next.
I was able to reproduce and it seems to be fixed with this change:
diff --git a/drivers/nvdimm/Makefile b/drivers/nvdimm/Makefile
index 6557e126892f..29203f3d3069 100644
--- a/drivers/nvdimm/Makefile
+++ b/drivers/nvdimm/Makefile
@@ -32,4 +32,4 @@ libnvdimm-$(CONFIG_NVDIMM_KEYS) += security.o
TOOLS := ../../tools
TEST_SRC := $(TOOLS)/testing/nvdimm/test
-obj-$(CONFIG_NVDIMM_TEST_BUILD) := $(TEST_SRC)/iomap.o
+obj-$(CONFIG_NVDIMM_TEST_BUILD) += $(TEST_SRC)/iomap.o
I'll send it through one more 0day run before asking Jason to try again.