linux-next: build failure after merge of Linus' tree

linux-next: build failure after merge of Linus' tree

[Stephen Rothwell]

Hi all,

With Linus' tree, today's linux-next build (powerpc allyesconfig) failed
like this:

drivers/infiniband/sw/built-in.o:(.opd+0x1698): multiple definition of `copy_data'
drivers/infiniband/hw/built-in.o:(.opd+0xe5f8): first defined here
drivers/infiniband/sw/built-in.o:(.opd+0x1320): multiple definition of `rxe_av_from_attr'
drivers/infiniband/hw/built-in.o:(.opd+0xe280): first defined here
drivers/infiniband/sw/built-in.o:(.opd+0x18d8): multiple definition of `rxe_do_task'
drivers/infiniband/hw/built-in.o:(.opd+0xe838): first defined here

and lots of others.

Caused by commit

  8700e3e7c485 ("Soft RoCE driver")

(which was never in linux-next :-()

I just disabled teh driver for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Aug 2016 11:52:53 +1000
Subject: [PATCH] Disable the Soft RoCE driver

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/infiniband/Kconfig     | 1 -
 drivers/infiniband/sw/Makefile | 1 -
 2 files changed, 2 deletions(-)

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 0c2e55c5354b..53ef194c5be1 100644
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -86,7 +86,6 @@ source "drivers/infiniband/ulp/iser/Kconfig"
 source "drivers/infiniband/ulp/isert/Kconfig"
 
 source "drivers/infiniband/sw/rdmavt/Kconfig"
-source "drivers/infiniband/sw/rxe/Kconfig"
 
 source "drivers/infiniband/hw/hfi1/Kconfig"
 
diff --git a/drivers/infiniband/sw/Makefile b/drivers/infiniband/sw/Makefile
index 8b095b27db87..988b6a0101a4 100644
--- a/drivers/infiniband/sw/Makefile
+++ b/drivers/infiniband/sw/Makefile
@@ -1,2 +1 @@
 obj-$(CONFIG_INFINIBAND_RDMAVT)		+= rdmavt/
-obj-$(CONFIG_RDMA_RXE)			+= rxe/
-- 
2.8.1

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of Linus' tree

[Doug Ledford]

[-- Attachment #1.1: Type: text/plain, Size: 3217 bytes --]

On 8/7/2016 9:58 PM, Stephen Rothwell wrote:
> Hi all,
> 
> With Linus' tree, today's linux-next build (powerpc allyesconfig) failed
> like this:
> 
> drivers/infiniband/sw/built-in.o:(.opd+0x1698): multiple definition of `copy_data'
> drivers/infiniband/hw/built-in.o:(.opd+0xe5f8): first defined here
> drivers/infiniband/sw/built-in.o:(.opd+0x1320): multiple definition of `rxe_av_from_attr'
> drivers/infiniband/hw/built-in.o:(.opd+0xe280): first defined here

This looks very suspicious.  I think you are picking up two copies of
the rxe code.  One from Linus tree and one from probably Leon's tree.
The thing is, the rxe driver is an entirely software RoCE driver.  So,
after I picked it up, I moved it from drivers/infiniband/hw to
drivers/infiniband/sw where it more correctly belongs.  Leon's tree
doesn't have that move, and since you pull Leon's tree into your -next
process, with the allyesconfig you are trying to build two copies of it
and put them both statically into the kernel, hence all of the double
definitions.  Leon needs to drop his copy of the rxe driver and let the
one in Linus' tree be the only one in existence.

> drivers/infiniband/sw/built-in.o:(.opd+0x18d8): multiple definition of `rxe_do_task'
> drivers/infiniband/hw/built-in.o:(.opd+0xe838): first defined here
> 
> and lots of others.
> 
> Caused by commit
> 
>   8700e3e7c485 ("Soft RoCE driver")
> 
> (which was never in linux-next :-()

The code was, just not that specific commit.  I both moved the code to
infiniband/sw and also squashed it all down to one commit.  After I did
the move/squash, I got 0day and local testing to make sure I didn't
break it in the move, but I didn't get linux next as I knew it had
already been through that and a move/squash should not break anything
that linux next is testing/checking.

Leon, please drop your rxe code out of your linux-next area so we can
eliminate this issue (or replace it with the final commit I submitted).

> I just disabled teh driver for today:

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 8 Aug 2016 11:52:53 +1000
> Subject: [PATCH] Disable the Soft RoCE driver
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/infiniband/Kconfig     | 1 -
>  drivers/infiniband/sw/Makefile | 1 -
>  2 files changed, 2 deletions(-)
> 
> diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
> index 0c2e55c5354b..53ef194c5be1 100644
> --- a/drivers/infiniband/Kconfig
> +++ b/drivers/infiniband/Kconfig
> @@ -86,7 +86,6 @@ source "drivers/infiniband/ulp/iser/Kconfig"
>  source "drivers/infiniband/ulp/isert/Kconfig"
>  
>  source "drivers/infiniband/sw/rdmavt/Kconfig"
> -source "drivers/infiniband/sw/rxe/Kconfig"
>  
>  source "drivers/infiniband/hw/hfi1/Kconfig"
>  
> diff --git a/drivers/infiniband/sw/Makefile b/drivers/infiniband/sw/Makefile
> index 8b095b27db87..988b6a0101a4 100644
> --- a/drivers/infiniband/sw/Makefile
> +++ b/drivers/infiniband/sw/Makefile
> @@ -1,2 +1 @@
>  obj-$(CONFIG_INFINIBAND_RDMAVT)		+= rdmavt/
> -obj-$(CONFIG_RDMA_RXE)			+= rxe/
> 


-- 
Doug Ledford <dledford@redhat.com>
    GPG Key ID: 0E572FDD


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]

Re: linux-next: build failure after merge of Linus' tree

[Stephen Rothwell]

Hi Doug,

On Mon, 8 Aug 2016 11:37:33 -0400 Doug Ledford <dledford@redhat.com> wrote:
>
> On 8/7/2016 9:58 PM, Stephen Rothwell wrote:
> > 
> > With Linus' tree, today's linux-next build (powerpc allyesconfig) failed
> > like this:
> > 
> > drivers/infiniband/sw/built-in.o:(.opd+0x1698): multiple definition of `copy_data'
> > drivers/infiniband/hw/built-in.o:(.opd+0xe5f8): first defined here
> > drivers/infiniband/sw/built-in.o:(.opd+0x1320): multiple definition of `rxe_av_from_attr'
> > drivers/infiniband/hw/built-in.o:(.opd+0xe280): first defined here  
> 
> This looks very suspicious.  I think you are picking up two copies of
> the rxe code.  One from Linus tree and one from probably Leon's tree.

Actually the second copy is from your tree
(git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next),
Leon's trees are empty (relative to Linus' tree).  I guess when you
rebased and squashed things, you forgot to reset your for-next tag, so
I got the old version of your tree as well as the rebased version via
Linus' tree.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of Linus' tree

[Doug Ledford]

[-- Attachment #1.1: Type: text/plain, Size: 1305 bytes --]

On 8/8/2016 5:53 PM, Stephen Rothwell wrote:
> Hi Doug,
> 
> On Mon, 8 Aug 2016 11:37:33 -0400 Doug Ledford <dledford@redhat.com> wrote:
>>
>> On 8/7/2016 9:58 PM, Stephen Rothwell wrote:
>>>
>>> With Linus' tree, today's linux-next build (powerpc allyesconfig) failed
>>> like this:
>>>
>>> drivers/infiniband/sw/built-in.o:(.opd+0x1698): multiple definition of `copy_data'
>>> drivers/infiniband/hw/built-in.o:(.opd+0xe5f8): first defined here
>>> drivers/infiniband/sw/built-in.o:(.opd+0x1320): multiple definition of `rxe_av_from_attr'
>>> drivers/infiniband/hw/built-in.o:(.opd+0xe280): first defined here  
>>
>> This looks very suspicious.  I think you are picking up two copies of
>> the rxe code.  One from Linus tree and one from probably Leon's tree.
> 
> Actually the second copy is from your tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next),
> Leon's trees are empty (relative to Linus' tree).  I guess when you
> rebased and squashed things, you forgot to reset your for-next tag, so
> I got the old version of your tree as well as the rebased version via
> Linus' tree.
> 

Doh!  My apologies, that would certainly explain it.  I'll reset my
for-next tag.


-- 
Doug Ledford <dledford@redhat.com>
    GPG Key ID: 0E572FDD


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]

Re: linux-next: build failure after merge of Linus' tree

[Stephen Rothwell]

Hi Doug,

On Mon, 8 Aug 2016 19:30:57 -0400 Doug Ledford <dledford@redhat.com> wrote:
>
> Doh!  My apologies, that would certainly explain it.  I'll reset my
> for-next tag.

Thanks.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of Linus' tree

[Leon Romanovsky]

On Mon, Aug 8, 2016 at 6:37 PM, Doug Ledford <dledford@redhat.com> wrote:
> On 8/7/2016 9:58 PM, Stephen Rothwell wrote:
>> Hi all,
>>
>> With Linus' tree, today's linux-next build (powerpc allyesconfig) failed
>> like this:
>>
>> drivers/infiniband/sw/built-in.o:(.opd+0x1698): multiple definition of `copy_data'
>> drivers/infiniband/hw/built-in.o:(.opd+0xe5f8): first defined here
>> drivers/infiniband/sw/built-in.o:(.opd+0x1320): multiple definition of `rxe_av_from_attr'
>> drivers/infiniband/hw/built-in.o:(.opd+0xe280): first defined here
>
> This looks very suspicious.  I think you are picking up two copies of
> the rxe code.  One from Linus tree and one from probably Leon's tree.
> The thing is, the rxe driver is an entirely software RoCE driver.  So,
> after I picked it up, I moved it from drivers/infiniband/hw to
> drivers/infiniband/sw where it more correctly belongs.  Leon's tree
> doesn't have that move, and since you pull Leon's tree into your -next
> process, with the allyesconfig you are trying to build two copies of it
> and put them both statically into the kernel, hence all of the double
> definitions.  Leon needs to drop his copy of the rxe driver and let the
> one in Linus' tree be the only one in existence.

Doug,
Just to be clear on this point and on my flow.
I'm resetting my ->next branches on the same day of your email
announcement of acceptance.

Thanks

Re: linux-next: build failure after merge of Linus' tree

[Doug Ledford]

[-- Attachment #1.1: Type: text/plain, Size: 1660 bytes --]

On 8/9/2016 4:54 AM, Leon Romanovsky wrote:
> On Mon, Aug 8, 2016 at 6:37 PM, Doug Ledford <dledford@redhat.com> wrote:
>> On 8/7/2016 9:58 PM, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> With Linus' tree, today's linux-next build (powerpc allyesconfig) failed
>>> like this:
>>>
>>> drivers/infiniband/sw/built-in.o:(.opd+0x1698): multiple definition of `copy_data'
>>> drivers/infiniband/hw/built-in.o:(.opd+0xe5f8): first defined here
>>> drivers/infiniband/sw/built-in.o:(.opd+0x1320): multiple definition of `rxe_av_from_attr'
>>> drivers/infiniband/hw/built-in.o:(.opd+0xe280): first defined here
>>
>> This looks very suspicious.  I think you are picking up two copies of
>> the rxe code.  One from Linus tree and one from probably Leon's tree.
>> The thing is, the rxe driver is an entirely software RoCE driver.  So,
>> after I picked it up, I moved it from drivers/infiniband/hw to
>> drivers/infiniband/sw where it more correctly belongs.  Leon's tree
>> doesn't have that move, and since you pull Leon's tree into your -next
>> process, with the allyesconfig you are trying to build two copies of it
>> and put them both statically into the kernel, hence all of the double
>> definitions.  Leon needs to drop his copy of the rxe driver and let the
>> one in Linus' tree be the only one in existence.
> 
> Doug,
> Just to be clear on this point and on my flow.
> I'm resetting my ->next branches on the same day of your email
> announcement of acceptance.

Ok, thanks for the clarification.  As it turned out, I needed to reset
my for-next tag.


-- 
Doug Ledford <dledford@redhat.com>
    GPG Key ID: 0E572FDD


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]

linux-next: build failure after merge of Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 436 bytes --]

Hi all,

[reported by the kernelci.org bot]

For some time, building Linus' tree, the linux-next build (mips
mtx1_defconfig) fails like this:

ERROR: modpost: "sysrq_toggle_support" [drivers/tty/serial/serial_core.ko] undefined!
ERROR: modpost: "sysrq_mask" [drivers/tty/serial/serial_core.ko] undefined!

Caused by commit

  68af43173d3f ("serial/sysrq: Add MAGIC_SYSRQ_SERIAL_SEQUENCE")

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of Linus' tree

[Stephen Rothwell]

Hi Linus,

After merging Linus' tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

lib/string.c: In function 'strscpy':
lib/string.c:209:4: error: implicit declaration of function 'zero_bytemask' [-Werror=implicit-function-declaration]
    *(unsigned long *)(dest+res) = c & zero_bytemask(data);
    ^

Caused by commit

  30035e45753b ("string: provide strscpy()")

but only exposed by commit

  19c22f3a29fa ("word-at-a-time.h: fix some Kbuild files")

BIG_ENDIAN powerpc doesn't have a definition for this function ...

Isn't this why we have linux-next ... to find this stuff early?  :-(

Oh, well, I have applied the following (that just copies zero_bytemask
from asm-generic.  I have done no testing beyond compiling.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Oct 2015 09:29:26 +1100
Subject: [PATCH] word-at-a-time.h: powerpc: implement define zero_bytemask

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/include/asm/word-at-a-time.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/powerpc/include/asm/word-at-a-time.h b/arch/powerpc/include/asm/word-at-a-time.h
index 5b3a903adae6..4f9b6b93c18f 100644
--- a/arch/powerpc/include/asm/word-at-a-time.h
+++ b/arch/powerpc/include/asm/word-at-a-time.h
@@ -40,6 +40,8 @@ static inline bool has_zero(unsigned long val, unsigned long *data, const struct
 	return (val + c->high_bits) & ~rhs;
 }
 
+#define zero_bytemask(mask) (~1ul << __fls(mask))
+
 #else
 
 #ifdef CONFIG_64BIT
-- 
2.5.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au