LKML Archive on lore.kernel.org
 help / Atom feed
* linux-next: build failure after merge of the rdma tree
@ 2018-12-04  0:47 Stephen Rothwell
  2018-12-04  1:52 ` Jason Gunthorpe
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2018-12-04  0:47 UTC (permalink / raw)
  To: Doug Ledford, Jason Gunthorpe
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Guy Levi,
	Majd Dibbiny, Leon Romanovsky

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

Hi all,

After merging the rdma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "mlx5_get_send_wqe" [drivers/infiniband/hw/mlx5/mlx5_ib.ko] undefined!

Caused by commit

  34f4c9554d8b ("IB/mlx5: Use fragmented QP's buffer for in-kernel users")

mlx5_get_send_wqe() is still used in drivers/infiniband/hw/mlx5/cq.c
and declared in drivers/infiniband/hw/mlx5/mlx5_ib.h ...

I have used the version of the rdma tree from next-20181203 for today.



-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2018-12-04  0:47 linux-next: build failure after merge of the rdma tree Stephen Rothwell
@ 2018-12-04  1:52 ` Jason Gunthorpe
  2018-12-04  9:42   ` Leon Romanovsky
  2018-12-05 12:25   ` Guy Levi(SW)
  0 siblings, 2 replies; 35+ messages in thread
From: Jason Gunthorpe @ 2018-12-04  1:52 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Doug Ledford, Linux Next Mailing List, Linux Kernel Mailing List,
	Guy Levi(SW),
	Majd Dibbiny, Leon Romanovsky

On Tue, Dec 04, 2018 at 11:47:31AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the rdma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "mlx5_get_send_wqe" [drivers/infiniband/hw/mlx5/mlx5_ib.ko] undefined!
> 
> Caused by commit
> 
>   34f4c9554d8b ("IB/mlx5: Use fragmented QP's buffer for in-kernel users")
> 
> mlx5_get_send_wqe() is still used in drivers/infiniband/hw/mlx5/cq.c
> and declared in drivers/infiniband/hw/mlx5/mlx5_ib.h ...
> 
> I have used the version of the rdma tree from next-20181203 for today.

Huh. So apparently every compiler that tested this patch (0-day, mine,
the submitters) optimized this call away because is_atomic_response()
always returns 0: meaning mlx5_get_atomic_laddr is never callable and
can be deleted entirely, including the call to mlx5_get_send_wqe.

Not sure what compiler setup will hit this, but it is clearly wrong
code..

Guy/Leon, please send a fixup.. Maybe just delete all this
handle_atomics stuff?

Thanks,
Jason

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2018-12-04  1:52 ` Jason Gunthorpe
@ 2018-12-04  9:42   ` Leon Romanovsky
  2018-12-07  2:41     ` Stephen Rothwell
  2018-12-05 12:25   ` Guy Levi(SW)
  1 sibling, 1 reply; 35+ messages in thread
From: Leon Romanovsky @ 2018-12-04  9:42 UTC (permalink / raw)
  To: Jason Gunthorpe
  Cc: Stephen Rothwell, Doug Ledford, Linux Next Mailing List,
	Linux Kernel Mailing List, Guy Levi(SW),
	Majd Dibbiny

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

On Tue, Dec 04, 2018 at 01:52:54AM +0000, Jason Gunthorpe wrote:
> On Tue, Dec 04, 2018 at 11:47:31AM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the rdma tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > ERROR: "mlx5_get_send_wqe" [drivers/infiniband/hw/mlx5/mlx5_ib.ko] undefined!
> >
> > Caused by commit
> >
> >   34f4c9554d8b ("IB/mlx5: Use fragmented QP's buffer for in-kernel users")
> >
> > mlx5_get_send_wqe() is still used in drivers/infiniband/hw/mlx5/cq.c
> > and declared in drivers/infiniband/hw/mlx5/mlx5_ib.h ...
> >
> > I have used the version of the rdma tree from next-20181203 for today.
>
> Huh. So apparently every compiler that tested this patch (0-day, mine,
> the submitters) optimized this call away because is_atomic_response()
> always returns 0: meaning mlx5_get_atomic_laddr is never callable and
> can be deleted entirely, including the call to mlx5_get_send_wqe.
>
> Not sure what compiler setup will hit this, but it is clearly wrong
> code..
>
> Guy/Leon, please send a fixup.. Maybe just delete all this
> handle_atomics stuff?

I deleted it and will wait for the results of regression prior to send the patch.

Thanks

>
> Thanks,
> Jason

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

^ permalink raw reply	[flat|nested] 35+ messages in thread

* RE: linux-next: build failure after merge of the rdma tree
  2018-12-04  1:52 ` Jason Gunthorpe
  2018-12-04  9:42   ` Leon Romanovsky
@ 2018-12-05 12:25   ` Guy Levi(SW)
  2018-12-05 22:58     ` Stephen Rothwell
  1 sibling, 1 reply; 35+ messages in thread
From: Guy Levi(SW) @ 2018-12-05 12:25 UTC (permalink / raw)
  To: Jason Gunthorpe, Stephen Rothwell
  Cc: Doug Ledford, Linux Next Mailing List, Linux Kernel Mailing List,
	Majd Dibbiny, Leon Romanovsky

> 
> Huh. So apparently every compiler that tested this patch (0-day, mine,
> the submitters) optimized this call away because is_atomic_response()
> always returns 0: meaning mlx5_get_atomic_laddr is never callable and
> can be deleted entirely, including the call to mlx5_get_send_wqe.
> 
> Not sure what compiler setup will hit this, but it is clearly wrong
> code..

Flag -o0  ?


> 
> Guy/Leon, please send a fixup.. Maybe just delete all this
> handle_atomics stuff?
> 
> Thanks,
> Jason

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2018-12-05 12:25   ` Guy Levi(SW)
@ 2018-12-05 22:58     ` Stephen Rothwell
  2018-12-10  0:43       ` Changbin Du
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2018-12-05 22:58 UTC (permalink / raw)
  To: Guy Levi(SW)
  Cc: Jason Gunthorpe, Doug Ledford, Linux Next Mailing List,
	Linux Kernel Mailing List, Majd Dibbiny, Leon Romanovsky,
	Changbin Du, Masahiro Yamada

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

Hi Guy,

On Wed, 5 Dec 2018 12:25:57 +0000 "Guy Levi(SW)" <guyle@mellanox.com> wrote:
>
> > 
> > Huh. So apparently every compiler that tested this patch (0-day, mine,
> > the submitters) optimized this call away because is_atomic_response()
> > always returns 0: meaning mlx5_get_atomic_laddr is never callable and
> > can be deleted entirely, including the call to mlx5_get_send_wqe.
> > 
> > Not sure what compiler setup will hit this, but it is clearly wrong
> > code..  
> 
> Flag -o0  ?

No, but the kbuild tree contains a change that allows turning off of
gcc's autoinlining and the CONFIG option guarding that gets turned on
for allmodconfig builds among others.

Masahiro, should CONFIG_NO_AUTO_INLINE maybe need to be off unless
explicitly enabled (like CONFIG_DEBUG_INFO and others)?

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2018-12-04  9:42   ` Leon Romanovsky
@ 2018-12-07  2:41     ` Stephen Rothwell
  0 siblings, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2018-12-07  2:41 UTC (permalink / raw)
  To: Leon Romanovsky
  Cc: Jason Gunthorpe, Doug Ledford, Linux Next Mailing List,
	Linux Kernel Mailing List, Guy Levi(SW),
	Majd Dibbiny

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

Hi all,

On Tue, 4 Dec 2018 09:42:59 +0000 Leon Romanovsky <leonro@mellanox.com> wrote:
>
> On Tue, Dec 04, 2018 at 01:52:54AM +0000, Jason Gunthorpe wrote:
> > On Tue, Dec 04, 2018 at 11:47:31AM +1100, Stephen Rothwell wrote:  
> > >
> > > After merging the rdma tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > ERROR: "mlx5_get_send_wqe" [drivers/infiniband/hw/mlx5/mlx5_ib.ko] undefined!
> > >
> > > Caused by commit
> > >
> > >   34f4c9554d8b ("IB/mlx5: Use fragmented QP's buffer for in-kernel users")
> > >
> > > mlx5_get_send_wqe() is still used in drivers/infiniband/hw/mlx5/cq.c
> > > and declared in drivers/infiniband/hw/mlx5/mlx5_ib.h ...
> > >
> > > I have used the version of the rdma tree from next-20181203 for today.  
> >
> > Huh. So apparently every compiler that tested this patch (0-day, mine,
> > the submitters) optimized this call away because is_atomic_response()
> > always returns 0: meaning mlx5_get_atomic_laddr is never callable and
> > can be deleted entirely, including the call to mlx5_get_send_wqe.
> >
> > Not sure what compiler setup will hit this, but it is clearly wrong
> > code..
> >
> > Guy/Leon, please send a fixup.. Maybe just delete all this
> > handle_atomics stuff?  
> 
> I deleted it and will wait for the results of regression prior to send the patch.

I am still getting this error.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2018-12-05 22:58     ` Stephen Rothwell
@ 2018-12-10  0:43       ` Changbin Du
  0 siblings, 0 replies; 35+ messages in thread
From: Changbin Du @ 2018-12-10  0:43 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Guy Levi(SW),
	Jason Gunthorpe, Doug Ledford, Linux Next Mailing List,
	Linux Kernel Mailing List, Majd Dibbiny, Leon Romanovsky,
	Changbin Du, Masahiro Yamada

On Thu, Dec 06, 2018 at 09:58:15AM +1100, Stephen Rothwell wrote:
> Hi Guy,
> 
> On Wed, 5 Dec 2018 12:25:57 +0000 "Guy Levi(SW)" <guyle@mellanox.com> wrote:
> >
> > > 
> > > Huh. So apparently every compiler that tested this patch (0-day, mine,
> > > the submitters) optimized this call away because is_atomic_response()
> > > always returns 0: meaning mlx5_get_atomic_laddr is never callable and
> > > can be deleted entirely, including the call to mlx5_get_send_wqe.
> > > 
> > > Not sure what compiler setup will hit this, but it is clearly wrong
> > > code..  
> > 
> > Flag -o0  ?
> 
> No, but the kbuild tree contains a change that allows turning off of
> gcc's autoinlining and the CONFIG option guarding that gets turned on
> for allmodconfig builds among others.
>
Let me turn it off to pass allmodconfig build. it is a pure debug
option.

> Masahiro, should CONFIG_NO_AUTO_INLINE maybe need to be off unless
> explicitly enabled (like CONFIG_DEBUG_INFO and others)?
> 
> -- 
> Cheers,
> Stephen Rothwell



-- 
Thanks,
Changbin Du

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2018-01-25  8:50 ` Leon Romanovsky
@ 2018-01-25 16:08   ` Doug Ledford
  0 siblings, 0 replies; 35+ messages in thread
From: Doug Ledford @ 2018-01-25 16:08 UTC (permalink / raw)
  To: Leon Romanovsky, Stephen Rothwell
  Cc: Jason Gunthorpe, Linux-Next Mailing List,
	Linux Kernel Mailing List, Bart Van Assche

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

On Thu, 2018-01-25 at 10:50 +0200, Leon Romanovsky wrote:
> On Thu, Jan 25, 2018 at 06:22:59PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the rdma tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > ERROR: "init_rcu_head" [drivers/infiniband/ulp/srpt/ib_srpt.ko] undefined!
> > 
> > Caused by commit
> > 
> >   a11253142e6d ("IB/srpt: Rework multi-channel support")
> > 
> > I have used the rdma tree from next-20180119 for today.
> 
> Hi Stephen,
> 
> Please see this patch: https://patchwork.kernel.org/patch/10181845/

This has been pulled into the rdma-next area, you shouldn't have a
problem with this after today.

-- 
Doug Ledford <dledford@redhat.com>
    GPG KeyID: B826A3330E572FDD
    Key fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2018-01-25  7:22 Stephen Rothwell
@ 2018-01-25  8:50 ` Leon Romanovsky
  2018-01-25 16:08   ` Doug Ledford
  0 siblings, 1 reply; 35+ messages in thread
From: Leon Romanovsky @ 2018-01-25  8:50 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Doug Ledford, Jason Gunthorpe, Linux-Next Mailing List,
	Linux Kernel Mailing List, Bart Van Assche

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

On Thu, Jan 25, 2018 at 06:22:59PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the rdma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: "init_rcu_head" [drivers/infiniband/ulp/srpt/ib_srpt.ko] undefined!
>
> Caused by commit
>
>   a11253142e6d ("IB/srpt: Rework multi-channel support")
>
> I have used the rdma tree from next-20180119 for today.

Hi Stephen,

Please see this patch: https://patchwork.kernel.org/patch/10181845/

Thanks

>
> --
> Cheers,
> Stephen Rothwell

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 35+ messages in thread

* linux-next: build failure after merge of the rdma tree
@ 2018-01-25  7:22 Stephen Rothwell
  2018-01-25  8:50 ` Leon Romanovsky
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2018-01-25  7:22 UTC (permalink / raw)
  To: Doug Ledford, Jason Gunthorpe
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Bart Van Assche

Hi all,

After merging the rdma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "init_rcu_head" [drivers/infiniband/ulp/srpt/ib_srpt.ko] undefined!

Caused by commit

  a11253142e6d ("IB/srpt: Rework multi-channel support")

I have used the rdma tree from next-20180119 for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 35+ messages in thread

* linux-next: build failure after merge of the rdma tree
@ 2017-07-31  2:07 Stephen Rothwell
  0 siblings, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2017-07-31  2:07 UTC (permalink / raw)
  To: Doug Ledford
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Matan Barak

Hi Doug,

After merging the rdma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/infiniband/hw/hns/hns_roce_eq.c: In function 'hns_roce_init_eq_table':
drivers/infiniband/hw/hns/hns_roce_eq.c:711:9: error: implicit declaration of function 'request_irq' [-Werror=implicit-function-declaration]
   ret = request_irq(eq_table->eq[j].irq, hns_roce_msi_x_interrupt,
         ^
drivers/infiniband/hw/hns/hns_roce_eq.c:726:3: error: implicit declaration of function 'free_irq' [-Werror=implicit-function-declaration]
   free_irq(eq_table->eq[j].irq, eq_table->eq + j);
   ^

Probably exposed by commit

  e89bf462b6be ("IB/hns: Support compile test for hns RoCE driver")

But maybe caused by another commit thet modified includes so that
linux/interrupt.h is not longer implictly included ...

I have used the rdma tree from next-20170728 for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2017-04-21  2:21   ` Doug Ledford
@ 2017-04-21  2:23     ` Stephen Rothwell
  0 siblings, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2017-04-21  2:23 UTC (permalink / raw)
  To: Doug Ledford
  Cc: Joe Perches, Linux-Next Mailing List, Linux Kernel Mailing List,
	Steve Wise

Hi Doug,

On Thu, 20 Apr 2017 22:21:15 -0400 Doug Ledford <dledford@redhat.com> wrote:
>
> I created a fix and added it to my tree.

Thanks.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2017-04-21  1:58 ` Joe Perches
  2017-04-21  2:21   ` Doug Ledford
@ 2017-04-21  2:21   ` Stephen Rothwell
  1 sibling, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2017-04-21  2:21 UTC (permalink / raw)
  To: Joe Perches
  Cc: Doug Ledford, Linux-Next Mailing List, Linux Kernel Mailing List,
	Steve Wise

Hi Joe,

On Thu, 20 Apr 2017 18:58:55 -0700 Joe Perches <joe@perches.com> wrote:
>
> Pretty sure there were crossing commits adding PDBG()
> as the original patches were written against next-20170209
> 
> From my tree:
> 
> $ git log --pretty=oneline -5 747edc68212781296de30dd2b4e63711240da7a9
> 747edc68212781296de30dd2b4e63711240da7a9 cxgb4: Convert PDBG to pr_debug
> d054cd530aeef452c7c252504f7d4d6ebba31ae3 cxgb4: Use more common logging style
> 41a74ceecd35cf2f38e2a1a1a394c7718547deb6 cxgb3: Convert PDBG to pr_debug
> 15772862930dfd2f2e10574b86c063d781976a89 cxgb3: Use more common logging style
> 9f7e70ff42dbf3af7ed0699906b699c41930b265 Add linux-next specific files for 20170209
> 
> $ git grep -w PDBG 747edc68212781296de30dd2b4e63711240da7a9
> $

In the rdma tree:

$ git log --pretty=oneline -5 a9a42886d0b3
a9a42886d0b3b989166472b7ea59b1c157d90f9b cxgb4: Convert PDBG to pr_debug
700456bd25946ef531773d1ad2dd511e1cc4515e cxgb4: Use more common logging style
b7b37ee0e137c8384c6cb3a37c4621649d5acdf6 cxgb3: Convert PDBG to pr_debug
46b2d4e8eca752003b903e68c3bec6b15fd7eba0 cxgb3: Use more common logging style
cd565b4b51e5fe258d6ce9ddc167ee51f3044ba5 IB/IPoIB: Support acceleration options callbacks
$ git grep -w PDBG a9a42886d0b3
a9a42886d0b3:drivers/infiniband/hw/cxgb4/cm.c:                          PDBG("%s snd_isn %u\n", __func__, t6req->rsvd);
a9a42886d0b3:drivers/infiniband/hw/cxgb4/cm.c:                          PDBG("%s snd_isn %u\n", __func__, t6req6->rsvd);

So these were added somewhere in Doug's tree and they need to be fixed
up there.  Your patches were rebased/cherrypicked/applied on to Doug's tree.

Ah, the new ones come from commit

  192539f4ce36 "iw_cxgb4: clean up send_connect()"

but that is in v4.11-rc1 and so should would not have been in next-20170209.
-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2017-04-21  1:58 ` Joe Perches
@ 2017-04-21  2:21   ` Doug Ledford
  2017-04-21  2:23     ` Stephen Rothwell
  2017-04-21  2:21   ` Stephen Rothwell
  1 sibling, 1 reply; 35+ messages in thread
From: Doug Ledford @ 2017-04-21  2:21 UTC (permalink / raw)
  To: Joe Perches, Stephen Rothwell
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Steve Wise

On Thu, 2017-04-20 at 18:58 -0700, Joe Perches wrote:
> On Fri, 2017-04-21 at 11:42 +1000, Stephen Rothwell wrote:
> > 
> > Hi Doug,
> > 
> > After merging the rdma tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > drivers/infiniband/hw/cxgb4/cm.c: In function 'send_connect':
> > drivers/infiniband/hw/cxgb4/cm.c:830:5: error: implicit declaration
> > of function 'PDBG' [-Werror=implicit-function-declaration]
> >      PDBG("%s snd_isn %u\n", __func__, t6req->rsvd);
> >      ^
> > 
> > Caused by commit
> > 
> >   a9a42886d0b3 ("cxgb4: Convert PDBG to pr_debug")
> > 
> > I have used the rdma tree from next-20170420 for today.
> > 
> > There was another PDBG() missed in that file as well.
> 
> Pretty sure there were crossing commits adding PDBG()
> as the original patches were written against next-20170209
> 
> From my tree:
> 
> $ git log --pretty=oneline -5
> 747edc68212781296de30dd2b4e63711240da7a9
> 747edc68212781296de30dd2b4e63711240da7a9 cxgb4: Convert PDBG to
> pr_debug
> d054cd530aeef452c7c252504f7d4d6ebba31ae3 cxgb4: Use more common
> logging style
> 41a74ceecd35cf2f38e2a1a1a394c7718547deb6 cxgb3: Convert PDBG to
> pr_debug
> 15772862930dfd2f2e10574b86c063d781976a89 cxgb3: Use more common
> logging style
> 9f7e70ff42dbf3af7ed0699906b699c41930b265 Add linux-next specific
> files for 20170209
> 
> $ git grep -w PDBG 747edc68212781296de30dd2b4e63711240da7a9
> $

I created a fix and added it to my tree.

-- 
Doug Ledford <dledford@redhat.com>
    GPG KeyID: B826A3330E572FDD
   
Key fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2017-04-21  1:42 Stephen Rothwell
@ 2017-04-21  1:58 ` Joe Perches
  2017-04-21  2:21   ` Doug Ledford
  2017-04-21  2:21   ` Stephen Rothwell
  0 siblings, 2 replies; 35+ messages in thread
From: Joe Perches @ 2017-04-21  1:58 UTC (permalink / raw)
  To: Stephen Rothwell, Doug Ledford
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Steve Wise

On Fri, 2017-04-21 at 11:42 +1000, Stephen Rothwell wrote:
> Hi Doug,
> 
> After merging the rdma tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/infiniband/hw/cxgb4/cm.c: In function 'send_connect':
> drivers/infiniband/hw/cxgb4/cm.c:830:5: error: implicit declaration of function 'PDBG' [-Werror=implicit-function-declaration]
>      PDBG("%s snd_isn %u\n", __func__, t6req->rsvd);
>      ^
> 
> Caused by commit
> 
>   a9a42886d0b3 ("cxgb4: Convert PDBG to pr_debug")
> 
> I have used the rdma tree from next-20170420 for today.
> 
> There was another PDBG() missed in that file as well.

Pretty sure there were crossing commits adding PDBG()
as the original patches were written against next-20170209

>From my tree:

$ git log --pretty=oneline -5 747edc68212781296de30dd2b4e63711240da7a9
747edc68212781296de30dd2b4e63711240da7a9 cxgb4: Convert PDBG to pr_debug
d054cd530aeef452c7c252504f7d4d6ebba31ae3 cxgb4: Use more common logging style
41a74ceecd35cf2f38e2a1a1a394c7718547deb6 cxgb3: Convert PDBG to pr_debug
15772862930dfd2f2e10574b86c063d781976a89 cxgb3: Use more common logging style
9f7e70ff42dbf3af7ed0699906b699c41930b265 Add linux-next specific files for 20170209

$ git grep -w PDBG 747edc68212781296de30dd2b4e63711240da7a9
$

^ permalink raw reply	[flat|nested] 35+ messages in thread

* linux-next: build failure after merge of the rdma tree
@ 2017-04-21  1:42 Stephen Rothwell
  2017-04-21  1:58 ` Joe Perches
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2017-04-21  1:42 UTC (permalink / raw)
  To: Doug Ledford
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Joe Perches,
	Steve Wise

Hi Doug,

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

drivers/infiniband/hw/cxgb4/cm.c: In function 'send_connect':
drivers/infiniband/hw/cxgb4/cm.c:830:5: error: implicit declaration of function 'PDBG' [-Werror=implicit-function-declaration]
     PDBG("%s snd_isn %u\n", __func__, t6req->rsvd);
     ^

Caused by commit

  a9a42886d0b3 ("cxgb4: Convert PDBG to pr_debug")

I have used the rdma tree from next-20170420 for today.

There was another PDBG() missed in that file as well.
-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2017-02-15  1:05 ` Doug Ledford
@ 2017-02-15  5:09   ` Selvin Xavier
  0 siblings, 0 replies; 35+ messages in thread
From: Selvin Xavier @ 2017-02-15  5:09 UTC (permalink / raw)
  To: Doug Ledford
  Cc: Stephen Rothwell, David Miller, Networking, linux-next,
	linux-kernel, Michael Chan, Eddie Wai, Devesh Sharma,
	Somnath Kotur, Sriharsha Basavapatna

On Wed, Feb 15, 2017 at 6:35 AM, Doug Ledford <dledford@redhat.com> wrote:
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Wed, 15 Feb 2017 11:23:25 +1100
>> Subject: [PATCH] RDMA/bnxt_re: fix for "bnxt_en: Update to firmware interface spec 1.7.0."
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Thanks Stephen.  I had been forewarned about this by Selvin and I
> instructed him to send me a fixup patch that would resolve the issue.  I
> would apply it to my tree before merging with Linus.  He just hadn't
> time to send it yet.  Your patch is sufficient as well, so I may just
> pull it in.  Thanks again.

Thanks Stephen and Doug for taking care of this.

Acked-by: Selvin Xavier <selvin.xavier@broadcom.com>

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2017-02-15  0:30 Stephen Rothwell
@ 2017-02-15  1:05 ` Doug Ledford
  2017-02-15  5:09   ` Selvin Xavier
  0 siblings, 1 reply; 35+ messages in thread
From: Doug Ledford @ 2017-02-15  1:05 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, Networking
  Cc: linux-next, linux-kernel, Michael Chan, Selvin Xavier, Eddie Wai,
	Devesh Sharma, Somnath Kotur, Sriharsha Basavapatna

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

On 2/14/2017 7:30 PM, Stephen Rothwell wrote:
> Hi Doug,
> 
> After merging the rdma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/infiniband/hw/bnxt_re/main.c: In function 'bnxt_re_net_ring_free':
> drivers/infiniband/hw/bnxt_re/main.c:231:18: error: 'RING_ALLOC_REQ_RING_TYPE_CMPL' undeclared (first use in this function)
>   req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
>                   ^
> drivers/infiniband/hw/bnxt_re/main.c:231:18: note: each undeclared identifier is reported only once for each function it appears in
> drivers/infiniband/hw/bnxt_re/main.c: In function 'bnxt_re_net_ring_alloc':
> drivers/infiniband/hw/bnxt_re/main.c:271:18: error: 'RING_ALLOC_REQ_RING_TYPE_CMPL' undeclared (first use in this function)
>   req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
>                   ^
> 
> Caused by commit
> 
>   1ac5a4047975 ("RDMA/bnxt_re: Add bnxt_re RoCE driver")
> 
> interacting with commit
> 
>   bac9a7e0f5d6 ("bnxt_en: Update to firmware interface spec 1.7.0.")
> 
> from the net-next tree.
> 
> I added this merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 15 Feb 2017 11:23:25 +1100
> Subject: [PATCH] RDMA/bnxt_re: fix for "bnxt_en: Update to firmware interface spec 1.7.0."
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks Stephen.  I had been forewarned about this by Selvin and I
instructed him to send me a fixup patch that would resolve the issue.  I
would apply it to my tree before merging with Linus.  He just hadn't
time to send it yet.  Your patch is sufficient as well, so I may just
pull it in.  Thanks again.

> ---
>  drivers/infiniband/hw/bnxt_re/main.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
> index 6b9f1178050f..bd452a92b386 100644
> --- a/drivers/infiniband/hw/bnxt_re/main.c
> +++ b/drivers/infiniband/hw/bnxt_re/main.c
> @@ -228,7 +228,7 @@ static int bnxt_re_net_ring_free(struct bnxt_re_dev *rdev, u16 fw_ring_id,
>  	}
>  
>  	bnxt_re_init_hwrm_hdr(rdev, (void *)&req, HWRM_RING_FREE, -1, -1);
> -	req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
> +	req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;
>  	req.ring_id = cpu_to_le16(fw_ring_id);
>  	bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
>  			    sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);
> @@ -268,7 +268,7 @@ static int bnxt_re_net_ring_alloc(struct bnxt_re_dev *rdev, dma_addr_t *dma_arr,
>  	/* Association of ring index with doorbell index and MSIX number */
>  	req.logical_id = cpu_to_le16(map_index);
>  	req.length = cpu_to_le32(ring_mask + 1);
> -	req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
> +	req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;
>  	req.int_mode = RING_ALLOC_REQ_INT_MODE_MSIX;
>  	bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
>  			    sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);
> 


-- 
Doug Ledford <dledford@redhat.com>
    GPG Key ID: B826A3330E572FDD
    Key fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD


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

^ permalink raw reply	[flat|nested] 35+ messages in thread

* linux-next: build failure after merge of the rdma tree
@ 2017-02-15  0:30 Stephen Rothwell
  2017-02-15  1:05 ` Doug Ledford
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2017-02-15  0:30 UTC (permalink / raw)
  To: Doug Ledford, David Miller, Networking
  Cc: linux-next, linux-kernel, Michael Chan, Selvin Xavier, Eddie Wai,
	Devesh Sharma, Somnath Kotur, Sriharsha Basavapatna

Hi Doug,

After merging the rdma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/infiniband/hw/bnxt_re/main.c: In function 'bnxt_re_net_ring_free':
drivers/infiniband/hw/bnxt_re/main.c:231:18: error: 'RING_ALLOC_REQ_RING_TYPE_CMPL' undeclared (first use in this function)
  req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
                  ^
drivers/infiniband/hw/bnxt_re/main.c:231:18: note: each undeclared identifier is reported only once for each function it appears in
drivers/infiniband/hw/bnxt_re/main.c: In function 'bnxt_re_net_ring_alloc':
drivers/infiniband/hw/bnxt_re/main.c:271:18: error: 'RING_ALLOC_REQ_RING_TYPE_CMPL' undeclared (first use in this function)
  req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
                  ^

Caused by commit

  1ac5a4047975 ("RDMA/bnxt_re: Add bnxt_re RoCE driver")

interacting with commit

  bac9a7e0f5d6 ("bnxt_en: Update to firmware interface spec 1.7.0.")

from the net-next tree.

I added this merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 15 Feb 2017 11:23:25 +1100
Subject: [PATCH] RDMA/bnxt_re: fix for "bnxt_en: Update to firmware interface spec 1.7.0."

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/infiniband/hw/bnxt_re/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
index 6b9f1178050f..bd452a92b386 100644
--- a/drivers/infiniband/hw/bnxt_re/main.c
+++ b/drivers/infiniband/hw/bnxt_re/main.c
@@ -228,7 +228,7 @@ static int bnxt_re_net_ring_free(struct bnxt_re_dev *rdev, u16 fw_ring_id,
 	}
 
 	bnxt_re_init_hwrm_hdr(rdev, (void *)&req, HWRM_RING_FREE, -1, -1);
-	req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
+	req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;
 	req.ring_id = cpu_to_le16(fw_ring_id);
 	bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
 			    sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);
@@ -268,7 +268,7 @@ static int bnxt_re_net_ring_alloc(struct bnxt_re_dev *rdev, dma_addr_t *dma_arr,
 	/* Association of ring index with doorbell index and MSIX number */
 	req.logical_id = cpu_to_le16(map_index);
 	req.length = cpu_to_le32(ring_mask + 1);
-	req.ring_type = RING_ALLOC_REQ_RING_TYPE_CMPL;
+	req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;
 	req.int_mode = RING_ALLOC_REQ_INT_MODE_MSIX;
 	bnxt_re_fill_fw_msg(&fw_msg, (void *)&req, sizeof(req), (void *)&resp,
 			    sizeof(resp), DFLT_HWRM_CMD_TIMEOUT);
-- 
2.10.2

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2016-09-28 15:00   ` Doug Ledford
  2016-09-28 15:23     ` Greg KH
@ 2016-09-28 21:45     ` Stephen Rothwell
  1 sibling, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2016-09-28 21:45 UTC (permalink / raw)
  To: Doug Ledford
  Cc: linux-next, linux-kernel, Christoph Hellwig, Greg KH,
	Oleg Drokin, Andreas Dilger

Hi Doug,

On Wed, 28 Sep 2016 11:00:11 -0400 Doug Ledford <dledford@redhat.com> wrote:
>
> That doesn't seem like a particularly good thing to put in.  Wouldn't
> you end up just reverting it later when they fix lustre?  And are you
> going to revert the revert when it breaks again and revert the revert of
> the revert when it's fixed again?  That just seems a lot of churn.  I
> thought it was generally accepted that things in staging might or might
> not work and if they don't, we don't care?  Am I wrong on that?

The allmodconfig build needs to work.  Linus does an allmodconfig build
as part of his testing ...

Part of the fix patch should reenable building of the currently broken code.
-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2016-09-28 15:23     ` Greg KH
@ 2016-09-28 15:26       ` Doug Ledford
  0 siblings, 0 replies; 35+ messages in thread
From: Doug Ledford @ 2016-09-28 15:26 UTC (permalink / raw)
  To: Greg KH
  Cc: Stephen Rothwell, linux-next, linux-kernel, Christoph Hellwig,
	Oleg Drokin, Andreas Dilger

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

On 9/28/16 11:23 AM, Greg KH wrote:
> On Wed, Sep 28, 2016 at 11:00:11AM -0400, Doug Ledford wrote:
>> On 9/27/16 9:43 PM, Stephen Rothwell wrote:
>>> Hi Stephen,
>>>
>>> On Tue, 27 Sep 2016 11:23:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>>
>>>> Hi Doug,
>>>>
>>>> After merging the rdma tree, today's linux-next build (x86_64
>>>> allmodconfig) failed like this:
>>>>
>>>> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_hdev_setup_mrs':
>>>> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2317:7: error: implicit declaration of function 'ib_get_dma_mr' [-Werror=implicit-function-declaration]
>>>>   mr = ib_get_dma_mr(hdev->ibh_pd, acflags);
>>>>        ^
>>>> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2317:5: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>>>>   mr = ib_get_dma_mr(hdev->ibh_pd, acflags);
>>>>      ^
>>>>
>>>> Caused by commit
>>>>
>>>>   5ef990f06bd7 ("IB/core: remove ib_get_dma_mr")
>>>>
>>>> I have used the rdma tree from next-20160923 for today.
>>>
>>> As pointed out by Christoph, I should have just disabled the driver in
>>> staging, so today I just applied the patch below.  Doug, that should
>>> probably be applied to the rdma tree so that you don't break Linus'
>>> tree when it gets merged.
>>>
>>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>>> Date: Wed, 28 Sep 2016 11:35:28 +1000
>>> Subject: [PATCH] starging/lustre: disable LNET infiniband support
>>>
>>> Commit 5ef990f06bd7 ("IB/core: remove ib_get_dma_mr") broke the
>>> lustre LNET infiniband support.  Since this is in drivers/staging,
>>> lets just disable it for now until ti can be fixed properly.
>>>
>>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>>> ---
>>>  drivers/staging/lustre/lnet/Kconfig | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/drivers/staging/lustre/lnet/Kconfig b/drivers/staging/lustre/lnet/Kconfig
>>> index 2b5930150cda..13b43278a38d 100644
>>> --- a/drivers/staging/lustre/lnet/Kconfig
>>> +++ b/drivers/staging/lustre/lnet/Kconfig
>>> @@ -35,6 +35,7 @@ config LNET_SELFTEST
>>>  config LNET_XPRT_IB
>>>  	tristate "LNET infiniband support"
>>>  	depends on LNET && INFINIBAND && INFINIBAND_ADDR_TRANS
>>> +	depends on BROKEN
>>>  	default LNET && INFINIBAND
>>>  	help
>>>  	  This option allows the LNET users to use infiniband as an
>>>
>>
>> That doesn't seem like a particularly good thing to put in.  Wouldn't
>> you end up just reverting it later when they fix lustre?  And are you
>> going to revert the revert when it breaks again and revert the revert of
>> the revert when it's fixed again?
> 
> Yup :)
> 
> Well, in reality just keep adding and removing the line without dealing
> with reverts, much simpler...
> 
>> That just seems a lot of churn.  I
>> thought it was generally accepted that things in staging might or might
>> not work and if they don't, we don't care?  Am I wrong on that?
> 
> Nope, you are not wrong, but it is nice to not break some people's
> builds if it's possible.

Okie dokie, got it.


-- 
Doug Ledford <dledford@redhat.com>    GPG Key ID: 0E572FDD
  Red Hat, Inc.
  100 E. Davie St
  Raleigh, NC 27601 USA


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

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2016-09-28 15:00   ` Doug Ledford
@ 2016-09-28 15:23     ` Greg KH
  2016-09-28 15:26       ` Doug Ledford
  2016-09-28 21:45     ` Stephen Rothwell
  1 sibling, 1 reply; 35+ messages in thread
From: Greg KH @ 2016-09-28 15:23 UTC (permalink / raw)
  To: Doug Ledford
  Cc: Stephen Rothwell, linux-next, linux-kernel, Christoph Hellwig,
	Oleg Drokin, Andreas Dilger

On Wed, Sep 28, 2016 at 11:00:11AM -0400, Doug Ledford wrote:
> On 9/27/16 9:43 PM, Stephen Rothwell wrote:
> > Hi Stephen,
> > 
> > On Tue, 27 Sep 2016 11:23:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >>
> >> Hi Doug,
> >>
> >> After merging the rdma tree, today's linux-next build (x86_64
> >> allmodconfig) failed like this:
> >>
> >> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_hdev_setup_mrs':
> >> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2317:7: error: implicit declaration of function 'ib_get_dma_mr' [-Werror=implicit-function-declaration]
> >>   mr = ib_get_dma_mr(hdev->ibh_pd, acflags);
> >>        ^
> >> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2317:5: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
> >>   mr = ib_get_dma_mr(hdev->ibh_pd, acflags);
> >>      ^
> >>
> >> Caused by commit
> >>
> >>   5ef990f06bd7 ("IB/core: remove ib_get_dma_mr")
> >>
> >> I have used the rdma tree from next-20160923 for today.
> > 
> > As pointed out by Christoph, I should have just disabled the driver in
> > staging, so today I just applied the patch below.  Doug, that should
> > probably be applied to the rdma tree so that you don't break Linus'
> > tree when it gets merged.
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Wed, 28 Sep 2016 11:35:28 +1000
> > Subject: [PATCH] starging/lustre: disable LNET infiniband support
> > 
> > Commit 5ef990f06bd7 ("IB/core: remove ib_get_dma_mr") broke the
> > lustre LNET infiniband support.  Since this is in drivers/staging,
> > lets just disable it for now until ti can be fixed properly.
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/staging/lustre/lnet/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/staging/lustre/lnet/Kconfig b/drivers/staging/lustre/lnet/Kconfig
> > index 2b5930150cda..13b43278a38d 100644
> > --- a/drivers/staging/lustre/lnet/Kconfig
> > +++ b/drivers/staging/lustre/lnet/Kconfig
> > @@ -35,6 +35,7 @@ config LNET_SELFTEST
> >  config LNET_XPRT_IB
> >  	tristate "LNET infiniband support"
> >  	depends on LNET && INFINIBAND && INFINIBAND_ADDR_TRANS
> > +	depends on BROKEN
> >  	default LNET && INFINIBAND
> >  	help
> >  	  This option allows the LNET users to use infiniband as an
> > 
> 
> That doesn't seem like a particularly good thing to put in.  Wouldn't
> you end up just reverting it later when they fix lustre?  And are you
> going to revert the revert when it breaks again and revert the revert of
> the revert when it's fixed again?

Yup :)

Well, in reality just keep adding and removing the line without dealing
with reverts, much simpler...

> That just seems a lot of churn.  I
> thought it was generally accepted that things in staging might or might
> not work and if they don't, we don't care?  Am I wrong on that?

Nope, you are not wrong, but it is nice to not break some people's
builds if it's possible.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2016-09-28  1:43 ` Stephen Rothwell
@ 2016-09-28 15:00   ` Doug Ledford
  2016-09-28 15:23     ` Greg KH
  2016-09-28 21:45     ` Stephen Rothwell
  0 siblings, 2 replies; 35+ messages in thread
From: Doug Ledford @ 2016-09-28 15:00 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Christoph Hellwig, Greg KH,
	Oleg Drokin, Andreas Dilger

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

On 9/27/16 9:43 PM, Stephen Rothwell wrote:
> Hi Stephen,
> 
> On Tue, 27 Sep 2016 11:23:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Hi Doug,
>>
>> After merging the rdma tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_hdev_setup_mrs':
>> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2317:7: error: implicit declaration of function 'ib_get_dma_mr' [-Werror=implicit-function-declaration]
>>   mr = ib_get_dma_mr(hdev->ibh_pd, acflags);
>>        ^
>> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2317:5: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>>   mr = ib_get_dma_mr(hdev->ibh_pd, acflags);
>>      ^
>>
>> Caused by commit
>>
>>   5ef990f06bd7 ("IB/core: remove ib_get_dma_mr")
>>
>> I have used the rdma tree from next-20160923 for today.
> 
> As pointed out by Christoph, I should have just disabled the driver in
> staging, so today I just applied the patch below.  Doug, that should
> probably be applied to the rdma tree so that you don't break Linus'
> tree when it gets merged.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 28 Sep 2016 11:35:28 +1000
> Subject: [PATCH] starging/lustre: disable LNET infiniband support
> 
> Commit 5ef990f06bd7 ("IB/core: remove ib_get_dma_mr") broke the
> lustre LNET infiniband support.  Since this is in drivers/staging,
> lets just disable it for now until ti can be fixed properly.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/staging/lustre/lnet/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/staging/lustre/lnet/Kconfig b/drivers/staging/lustre/lnet/Kconfig
> index 2b5930150cda..13b43278a38d 100644
> --- a/drivers/staging/lustre/lnet/Kconfig
> +++ b/drivers/staging/lustre/lnet/Kconfig
> @@ -35,6 +35,7 @@ config LNET_SELFTEST
>  config LNET_XPRT_IB
>  	tristate "LNET infiniband support"
>  	depends on LNET && INFINIBAND && INFINIBAND_ADDR_TRANS
> +	depends on BROKEN
>  	default LNET && INFINIBAND
>  	help
>  	  This option allows the LNET users to use infiniband as an
> 

That doesn't seem like a particularly good thing to put in.  Wouldn't
you end up just reverting it later when they fix lustre?  And are you
going to revert the revert when it breaks again and revert the revert of
the revert when it's fixed again?  That just seems a lot of churn.  I
thought it was generally accepted that things in staging might or might
not work and if they don't, we don't care?  Am I wrong on that?

-- 
Doug Ledford <dledford@redhat.com>    GPG Key ID: 0E572FDD
  Red Hat, Inc.
  100 E. Davie St
  Raleigh, NC 27601 USA


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

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2016-09-27  1:23 Stephen Rothwell
  2016-09-27  5:04 ` Christoph Hellwig
@ 2016-09-28  1:43 ` Stephen Rothwell
  2016-09-28 15:00   ` Doug Ledford
  1 sibling, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2016-09-28  1:43 UTC (permalink / raw)
  To: Doug Ledford
  Cc: linux-next, linux-kernel, Christoph Hellwig, Greg KH,
	Oleg Drokin, Andreas Dilger

Hi Stephen,

On Tue, 27 Sep 2016 11:23:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Doug,
> 
> After merging the rdma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_hdev_setup_mrs':
> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2317:7: error: implicit declaration of function 'ib_get_dma_mr' [-Werror=implicit-function-declaration]
>   mr = ib_get_dma_mr(hdev->ibh_pd, acflags);
>        ^
> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2317:5: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>   mr = ib_get_dma_mr(hdev->ibh_pd, acflags);
>      ^
> 
> Caused by commit
> 
>   5ef990f06bd7 ("IB/core: remove ib_get_dma_mr")
> 
> I have used the rdma tree from next-20160923 for today.

As pointed out by Christoph, I should have just disabled the driver in
staging, so today I just applied the patch below.  Doug, that should
probably be applied to the rdma tree so that you don't break Linus'
tree when it gets merged.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2016 11:35:28 +1000
Subject: [PATCH] starging/lustre: disable LNET infiniband support

Commit 5ef990f06bd7 ("IB/core: remove ib_get_dma_mr") broke the
lustre LNET infiniband support.  Since this is in drivers/staging,
lets just disable it for now until ti can be fixed properly.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/staging/lustre/lnet/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/lustre/lnet/Kconfig b/drivers/staging/lustre/lnet/Kconfig
index 2b5930150cda..13b43278a38d 100644
--- a/drivers/staging/lustre/lnet/Kconfig
+++ b/drivers/staging/lustre/lnet/Kconfig
@@ -35,6 +35,7 @@ config LNET_SELFTEST
 config LNET_XPRT_IB
 	tristate "LNET infiniband support"
 	depends on LNET && INFINIBAND && INFINIBAND_ADDR_TRANS
+	depends on BROKEN
 	default LNET && INFINIBAND
 	help
 	  This option allows the LNET users to use infiniband as an
-- 
2.8.1

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2016-09-27 13:39     ` Christoph Hellwig
@ 2016-09-27 17:15       ` Doug Ledford
  0 siblings, 0 replies; 35+ messages in thread
From: Doug Ledford @ 2016-09-27 17:15 UTC (permalink / raw)
  To: Christoph Hellwig, Stephen Rothwell; +Cc: linux-next, linux-kernel

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

On 9/27/16 9:39 AM, Christoph Hellwig wrote:
> On Tue, Sep 27, 2016 at 03:48:20PM +1000, Stephen Rothwell wrote:
>> Yeah, sorry.  Note, however, that you bothered to fix up this same
>> staging file in another of your patches ...
> 
> It's generally not that I don't fix them up because I hate them, it's
> just because they are doing something so incredibly stupid that it would
> take forever to fix up (and something that would have been could if it
> ever had been through review).   For this particular case I think everyone
> would be served much better if this module was simply dropped from the
> tree, as there will be lots of future patches that will break it.
> 

I don't know that I would drop them, but certainly turn them off.  They
can keep their driver up to date.

-- 
Doug Ledford <dledford@redhat.com>    GPG Key ID: 0E572FDD
  Red Hat, Inc.
  100 E. Davie St
  Raleigh, NC 27601 USA


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

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2016-09-27  5:48   ` Stephen Rothwell
@ 2016-09-27 13:39     ` Christoph Hellwig
  2016-09-27 17:15       ` Doug Ledford
  0 siblings, 1 reply; 35+ messages in thread
From: Christoph Hellwig @ 2016-09-27 13:39 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Christoph Hellwig, Doug Ledford, linux-next, linux-kernel

On Tue, Sep 27, 2016 at 03:48:20PM +1000, Stephen Rothwell wrote:
> Yeah, sorry.  Note, however, that you bothered to fix up this same
> staging file in another of your patches ...

It's generally not that I don't fix them up because I hate them, it's
just because they are doing something so incredibly stupid that it would
take forever to fix up (and something that would have been could if it
ever had been through review).   For this particular case I think everyone
would be served much better if this module was simply dropped from the
tree, as there will be lots of future patches that will break it.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2016-09-27  5:04 ` Christoph Hellwig
@ 2016-09-27  5:48   ` Stephen Rothwell
  2016-09-27 13:39     ` Christoph Hellwig
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2016-09-27  5:48 UTC (permalink / raw)
  To: Christoph Hellwig; +Cc: Doug Ledford, linux-next, linux-kernel

Hi Christoph,

On Tue, 27 Sep 2016 07:04:15 +0200 Christoph Hellwig <hch@lst.de> wrote:
>
> On Tue, Sep 27, 2016 at 11:23:34AM +1000, Stephen Rothwell wrote:
> > Hi Doug,
> > 
> > After merging the rdma tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:  
> 
> Please just disable broken staging code like lustre for the linux-next
> builds. We had that discussion before, didn't we?

Yeah, sorry.  Note, however, that you bothered to fix up this same
staging file in another of your patches ...

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2016-09-27  1:23 Stephen Rothwell
@ 2016-09-27  5:04 ` Christoph Hellwig
  2016-09-27  5:48   ` Stephen Rothwell
  2016-09-28  1:43 ` Stephen Rothwell
  1 sibling, 1 reply; 35+ messages in thread
From: Christoph Hellwig @ 2016-09-27  5:04 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Doug Ledford, linux-next, linux-kernel, Christoph Hellwig

On Tue, Sep 27, 2016 at 11:23:34AM +1000, Stephen Rothwell wrote:
> Hi Doug,
> 
> After merging the rdma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:

Please just disable broken staging code like lustre for the linux-next
builds. We had that discussion before, didn't we?

^ permalink raw reply	[flat|nested] 35+ messages in thread

* linux-next: build failure after merge of the rdma tree
@ 2016-09-27  1:23 Stephen Rothwell
  2016-09-27  5:04 ` Christoph Hellwig
  2016-09-28  1:43 ` Stephen Rothwell
  0 siblings, 2 replies; 35+ messages in thread
From: Stephen Rothwell @ 2016-09-27  1:23 UTC (permalink / raw)
  To: Doug Ledford; +Cc: linux-next, linux-kernel, Christoph Hellwig

Hi Doug,

After merging the rdma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c: In function 'kiblnd_hdev_setup_mrs':
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2317:7: error: implicit declaration of function 'ib_get_dma_mr' [-Werror=implicit-function-declaration]
  mr = ib_get_dma_mr(hdev->ibh_pd, acflags);
       ^
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:2317:5: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
  mr = ib_get_dma_mr(hdev->ibh_pd, acflags);
     ^

Caused by commit

  5ef990f06bd7 ("IB/core: remove ib_get_dma_mr")

I have used the rdma tree from next-20160923 for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 35+ messages in thread

* RE: linux-next: build failure after merge of the rdma tree
  2016-03-16 19:02   ` Doug Ledford
  2016-03-16 20:41     ` Stephen Rothwell
@ 2016-03-16 22:14     ` Ismail, Mustafa
  1 sibling, 0 replies; 35+ messages in thread
From: Ismail, Mustafa @ 2016-03-16 22:14 UTC (permalink / raw)
  To: Doug Ledford, Herbert Xu, Stephen Rothwell
  Cc: linux-next, linux-kernel, Latif, Faisal

Faisal is out until 3/18. We will make the changes and send a patch shortly.
Thanks Herbert for the pointers. Regards.

-----Original Message-----
From: linux-next-owner@vger.kernel.org [mailto:linux-next-owner@vger.kernel.org] On Behalf Of Doug Ledford
Sent: Wednesday, March 16, 2016 2:03 PM
To: Herbert Xu <herbert@gondor.apana.org.au>; Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Latif, Faisal <faisal.latif@intel.com>
Subject: Re: linux-next: build failure after merge of the rdma tree

On 3/16/2016 2:49 AM, Herbert Xu wrote:
> On Wed, Mar 16, 2016 at 12:15:38PM +1100, Stephen Rothwell wrote:
>> Hi Doug,
>>
>> After merging the rdma tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> In file included from drivers/infiniband/hw/i40iw/i40iw.h:57:0,
>>                  from drivers/infiniband/hw/i40iw/i40iw_cm.c:63:
>> drivers/infiniband/hw/i40iw/i40iw_osdep.h:175:12: warning: 'struct hash_desc' declared inside parameter list
>>             u32 length, u32 value);
>>             ^
>>
>> And it went downhill badly after that.
>>
>> Caused by commit
>>
>>   896545098777 ("crypto: hash - Remove crypto_hash interface")
>>
>> from the crypto tree interacting with commits
>>
>>   786c6adb3a94 ("i40iw: add puda code")
>>   4e9042e647ff ("i40iw: add hw and utils files")
>>
>> (at least) from the rdma tree.
>>
>> Its a bit of a pain finding these conflicts now - it would have been 
>> better a few weeks ago.
>>
>> For now, all I can do is to use the rdma tree from next-20160315 for 
>> today.
>>
>> Herbert, any hints for Doug, Faisal?
> 
> crypto_hash is obsolete.  You should be using shash if your input is 
> completely linear or ahash if you need SG lists.  For an example of 
> how you can do the conversion, have a look at
> 
> commit 69110e3cedbb8aad1c70d91ed58a9f4f0ed9eec6
> Author: Herbert Xu <herbert@gondor.apana.org.au>
> Date:   Sun Jan 24 21:19:52 2016 +0800
> 
>     iscsi-target: Use shash and ahash
> 
> Cheers,
> 

Pending an update from Intel on the i40iw driver, I have pulled it from my for-next area.  This should not be a problem with tonight's merge.

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2016-03-16 19:02   ` Doug Ledford
@ 2016-03-16 20:41     ` Stephen Rothwell
  2016-03-16 22:14     ` Ismail, Mustafa
  1 sibling, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2016-03-16 20:41 UTC (permalink / raw)
  To: Doug Ledford; +Cc: Herbert Xu, linux-next, linux-kernel, Faisal Latif

Hi Doug,

On Wed, 16 Mar 2016 15:02:42 -0400 Doug Ledford <dledford@redhat.com> wrote:
>
> Pending an update from Intel on the i40iw driver, I have pulled it from
> my for-next area.  This should not be a problem with tonight's merge.

Thanks.
-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2016-03-16  6:49 ` Herbert Xu
@ 2016-03-16 19:02   ` Doug Ledford
  2016-03-16 20:41     ` Stephen Rothwell
  2016-03-16 22:14     ` Ismail, Mustafa
  0 siblings, 2 replies; 35+ messages in thread
From: Doug Ledford @ 2016-03-16 19:02 UTC (permalink / raw)
  To: Herbert Xu, Stephen Rothwell; +Cc: linux-next, linux-kernel, Faisal Latif

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

On 3/16/2016 2:49 AM, Herbert Xu wrote:
> On Wed, Mar 16, 2016 at 12:15:38PM +1100, Stephen Rothwell wrote:
>> Hi Doug,
>>
>> After merging the rdma tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> In file included from drivers/infiniband/hw/i40iw/i40iw.h:57:0,
>>                  from drivers/infiniband/hw/i40iw/i40iw_cm.c:63:
>> drivers/infiniband/hw/i40iw/i40iw_osdep.h:175:12: warning: 'struct hash_desc' declared inside parameter list
>>             u32 length, u32 value);
>>             ^
>>
>> And it went downhill badly after that.
>>
>> Caused by commit
>>
>>   896545098777 ("crypto: hash - Remove crypto_hash interface")
>>
>> from the crypto tree interacting with commits
>>
>>   786c6adb3a94 ("i40iw: add puda code")
>>   4e9042e647ff ("i40iw: add hw and utils files")
>>
>> (at least) from the rdma tree.
>>
>> Its a bit of a pain finding these conflicts now - it would have been
>> better a few weeks ago.
>>
>> For now, all I can do is to use the rdma tree from next-20160315 for
>> today.
>>
>> Herbert, any hints for Doug, Faisal?
> 
> crypto_hash is obsolete.  You should be using shash if your input
> is completely linear or ahash if you need SG lists.  For an example
> of how you can do the conversion, have a look at
> 
> commit 69110e3cedbb8aad1c70d91ed58a9f4f0ed9eec6
> Author: Herbert Xu <herbert@gondor.apana.org.au>
> Date:   Sun Jan 24 21:19:52 2016 +0800
> 
>     iscsi-target: Use shash and ahash
> 
> Cheers,
> 

Pending an update from Intel on the i40iw driver, I have pulled it from
my for-next area.  This should not be a problem with tonight's merge.



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

^ permalink raw reply	[flat|nested] 35+ messages in thread

* Re: linux-next: build failure after merge of the rdma tree
  2016-03-16  1:15 Stephen Rothwell
@ 2016-03-16  6:49 ` Herbert Xu
  2016-03-16 19:02   ` Doug Ledford
  0 siblings, 1 reply; 35+ messages in thread
From: Herbert Xu @ 2016-03-16  6:49 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Doug Ledford, linux-next, linux-kernel, Faisal Latif

On Wed, Mar 16, 2016 at 12:15:38PM +1100, Stephen Rothwell wrote:
> Hi Doug,
> 
> After merging the rdma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from drivers/infiniband/hw/i40iw/i40iw.h:57:0,
>                  from drivers/infiniband/hw/i40iw/i40iw_cm.c:63:
> drivers/infiniband/hw/i40iw/i40iw_osdep.h:175:12: warning: 'struct hash_desc' declared inside parameter list
>             u32 length, u32 value);
>             ^
> 
> And it went downhill badly after that.
> 
> Caused by commit
> 
>   896545098777 ("crypto: hash - Remove crypto_hash interface")
> 
> from the crypto tree interacting with commits
> 
>   786c6adb3a94 ("i40iw: add puda code")
>   4e9042e647ff ("i40iw: add hw and utils files")
> 
> (at least) from the rdma tree.
> 
> Its a bit of a pain finding these conflicts now - it would have been
> better a few weeks ago.
> 
> For now, all I can do is to use the rdma tree from next-20160315 for
> today.
> 
> Herbert, any hints for Doug, Faisal?

crypto_hash is obsolete.  You should be using shash if your input
is completely linear or ahash if you need SG lists.  For an example
of how you can do the conversion, have a look at

commit 69110e3cedbb8aad1c70d91ed58a9f4f0ed9eec6
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date:   Sun Jan 24 21:19:52 2016 +0800

    iscsi-target: Use shash and ahash

Cheers,
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 35+ messages in thread

* linux-next: build failure after merge of the rdma tree
@ 2016-03-16  1:15 Stephen Rothwell
  2016-03-16  6:49 ` Herbert Xu
  0 siblings, 1 reply; 35+ messages in thread
From: Stephen Rothwell @ 2016-03-16  1:15 UTC (permalink / raw)
  To: Doug Ledford, Herbert Xu; +Cc: linux-next, linux-kernel, Faisal Latif

Hi Doug,

After merging the rdma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from drivers/infiniband/hw/i40iw/i40iw.h:57:0,
                 from drivers/infiniband/hw/i40iw/i40iw_cm.c:63:
drivers/infiniband/hw/i40iw/i40iw_osdep.h:175:12: warning: 'struct hash_desc' declared inside parameter list
            u32 length, u32 value);
            ^

And it went downhill badly after that.

Caused by commit

  896545098777 ("crypto: hash - Remove crypto_hash interface")

from the crypto tree interacting with commits

  786c6adb3a94 ("i40iw: add puda code")
  4e9042e647ff ("i40iw: add hw and utils files")

(at least) from the rdma tree.

Its a bit of a pain finding these conflicts now - it would have been
better a few weeks ago.

For now, all I can do is to use the rdma tree from next-20160315 for
today.

Herbert, any hints for Doug, Faisal?

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 35+ messages in thread

* linux-next: build failure after merge of the rdma tree
@ 2016-01-13  1:35 Stephen Rothwell
  0 siblings, 0 replies; 35+ messages in thread
From: Stephen Rothwell @ 2016-01-13  1:35 UTC (permalink / raw)
  To: Doug Ledford, David Miller, netdev
  Cc: linux-next, linux-kernel, Maor Gottlieb, Achiad Shochat

Hi Doug,

After merging the rdma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/infiniband/hw/mlx5/main.c: In function 'mlx5_ib_add':
drivers/infiniband/hw/mlx5/main.c:2255:6: error: too few arguments to function 'mlx5_ib_port_link_layer'
  if (mlx5_ib_port_link_layer(&dev->ib_dev) ==
      ^
drivers/infiniband/hw/mlx5/main.c:89:1: note: declared here
 mlx5_ib_port_link_layer(struct ib_device *device, u8 port_num)
 ^

Caused by commit

  ebd61f68e1c7 ("IB/mlx5: Support IB device's callback for getting the link layer")

interacting with commit

  038d2ef87572 ("IB/mlx5: Add flow steering support")

from the net-next tree.

I have added the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 13 Jan 2016 12:30:50 +1100
Subject: [PATCH] IB/mlx5: merge fix for mlx5_ib_port_link_layer API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/infiniband/hw/mlx5/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 307a8c040a11..a2613d828578 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -2252,7 +2252,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
 			(1ull << IB_USER_VERBS_CMD_CLOSE_XRCD);
 	}
 
-	if (mlx5_ib_port_link_layer(&dev->ib_dev) ==
+	if (mlx5_ib_port_link_layer(&dev->ib_dev, 1) ==
 	    IB_LINK_LAYER_ETHERNET) {
 		dev->ib_dev.create_flow	= mlx5_ib_create_flow;
 		dev->ib_dev.destroy_flow = mlx5_ib_destroy_flow;
-- 
2.6.4

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

^ permalink raw reply	[flat|nested] 35+ messages in thread

end of thread, back to index

Thread overview: 35+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-04  0:47 linux-next: build failure after merge of the rdma tree Stephen Rothwell
2018-12-04  1:52 ` Jason Gunthorpe
2018-12-04  9:42   ` Leon Romanovsky
2018-12-07  2:41     ` Stephen Rothwell
2018-12-05 12:25   ` Guy Levi(SW)
2018-12-05 22:58     ` Stephen Rothwell
2018-12-10  0:43       ` Changbin Du
  -- strict thread matches above, loose matches on Subject: below --
2018-01-25  7:22 Stephen Rothwell
2018-01-25  8:50 ` Leon Romanovsky
2018-01-25 16:08   ` Doug Ledford
2017-07-31  2:07 Stephen Rothwell
2017-04-21  1:42 Stephen Rothwell
2017-04-21  1:58 ` Joe Perches
2017-04-21  2:21   ` Doug Ledford
2017-04-21  2:23     ` Stephen Rothwell
2017-04-21  2:21   ` Stephen Rothwell
2017-02-15  0:30 Stephen Rothwell
2017-02-15  1:05 ` Doug Ledford
2017-02-15  5:09   ` Selvin Xavier
2016-09-27  1:23 Stephen Rothwell
2016-09-27  5:04 ` Christoph Hellwig
2016-09-27  5:48   ` Stephen Rothwell
2016-09-27 13:39     ` Christoph Hellwig
2016-09-27 17:15       ` Doug Ledford
2016-09-28  1:43 ` Stephen Rothwell
2016-09-28 15:00   ` Doug Ledford
2016-09-28 15:23     ` Greg KH
2016-09-28 15:26       ` Doug Ledford
2016-09-28 21:45     ` Stephen Rothwell
2016-03-16  1:15 Stephen Rothwell
2016-03-16  6:49 ` Herbert Xu
2016-03-16 19:02   ` Doug Ledford
2016-03-16 20:41     ` Stephen Rothwell
2016-03-16 22:14     ` Ismail, Mustafa
2016-01-13  1:35 Stephen Rothwell

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \
		linux-kernel@vger.kernel.org linux-kernel@archiver.kernel.org
	public-inbox-index lkml


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel


AGPL code for this site: git clone https://public-inbox.org/ public-inbox