Re: linux-next: build failure after merge of the rdma tree

Re: linux-next: build failure after merge of the rdma tree

[Jason Gunthorpe]

On Tue, Jul 09, 2019 at 04:18:00AM -0300, Leon Romanovsky wrote:
> On Tue, Jul 09, 2019 at 10:04:16AM +0300, Mark Zhang wrote:
> > Hi Stephen,
> 
> Stephen,
> 
> For some reason, I wasn't in initial email report, can you please check why?
> 
> I need to be aware of any issues related to patches with my name on it
> for tracking and improving internal submission flows/checks.
> 
> >
> > Can you please try the patch below, thank you.
> 
> Jason, Doug,
> 
> Can you please take this patch?

It isn't quite enough to make the header compile stand alone, I'm
adding this instead.

From 37c1e072276b03b080eb24ff24c39080aeaf49ef Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <jgg@mellanox.com>
Date: Tue, 9 Jul 2019 09:44:47 -0300
Subject: [PATCH] RDMA/counters: Make rdma_counter.h compile stand alone

5.4-rc1 will have new compile time debugging to test that headers can be
compiled stand alone. Many rdma headers are already broken and excluded
from the mechanism, however to avoid compile failures during the merge
window fix enough so that the newly added header compiles clean.

Fixes: 413d3347503b ("RDMA/counter: Add set/clear per-port auto mode support")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Mark Zhang <markz@mellanox.com>
---
 include/rdma/rdma_counter.h | 2 +-
 include/rdma/restrack.h     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/rdma/rdma_counter.h b/include/rdma/rdma_counter.h
index 68827700ba957e..eb99856e8b3078 100644
--- a/include/rdma/rdma_counter.h
+++ b/include/rdma/rdma_counter.h
@@ -9,10 +9,10 @@
 #include <linux/mutex.h>
 #include <linux/pid_namespace.h>
 
-#include <rdma/ib_verbs.h>
 #include <rdma/restrack.h>
 #include <rdma/rdma_netlink.h>
 
+struct ib_device;
 struct ib_qp;
 
 struct auto_mode_param {
diff --git a/include/rdma/restrack.h b/include/rdma/restrack.h
index 4041a4d96524b4..b0fc6b26bdf531 100644
--- a/include/rdma/restrack.h
+++ b/include/rdma/restrack.h
@@ -14,6 +14,9 @@
 #include <uapi/rdma/rdma_netlink.h>
 #include <linux/xarray.h>
 
+struct ib_device;
+struct sk_buff;
+
 /**
  * enum rdma_restrack_type - HW objects to track
  */
@@ -52,8 +55,6 @@ enum rdma_restrack_type {
 	RDMA_RESTRACK_MAX
 };
 
-struct ib_device;
-
 /**
  * struct rdma_restrack_entry - metadata per-entry
  */
-- 
2.21.0

Re: linux-next: build failure after merge of the rdma tree

[Stephen Rothwell]

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

Hi Jason,

On Tue, 9 Jul 2019 12:46:34 +0000 Jason Gunthorpe <jgg@mellanox.com> wrote:
>
> It isn't quite enough to make the header compile stand alone, I'm
> adding this instead.
> 
> From 37c1e072276b03b080eb24ff24c39080aeaf49ef Mon Sep 17 00:00:00 2001
> From: Jason Gunthorpe <jgg@mellanox.com>
> Date: Tue, 9 Jul 2019 09:44:47 -0300
> Subject: [PATCH] RDMA/counters: Make rdma_counter.h compile stand alone

I will apply this to linux-next today and reenable the stand alone
building for rdma_counter.h

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the rdma tree

[Stephen Rothwell]

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

Hi all,

On Wed, 10 Jul 2019 11:04:43 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 9 Jul 2019 12:46:34 +0000 Jason Gunthorpe <jgg@mellanox.com> wrote:
> >
> > It isn't quite enough to make the header compile stand alone, I'm
> > adding this instead.
> > 
> > From 37c1e072276b03b080eb24ff24c39080aeaf49ef Mon Sep 17 00:00:00 2001
> > From: Jason Gunthorpe <jgg@mellanox.com>
> > Date: Tue, 9 Jul 2019 09:44:47 -0300
> > Subject: [PATCH] RDMA/counters: Make rdma_counter.h compile stand alone  
> 
> I will apply this to linux-next today and reenable the stand alone
> building for rdma_counter.h

That worked for me ...

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the rdma tree

[Stephen Rothwell]

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

Hi,

On Wed, 10 Jul 2019 14:30:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Wed, 10 Jul 2019 11:04:43 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Tue, 9 Jul 2019 12:46:34 +0000 Jason Gunthorpe <jgg@mellanox.com> wrote:  
> > >
> > > It isn't quite enough to make the header compile stand alone, I'm
> > > adding this instead.
> > > 
> > > From 37c1e072276b03b080eb24ff24c39080aeaf49ef Mon Sep 17 00:00:00 2001
> > > From: Jason Gunthorpe <jgg@mellanox.com>
> > > Date: Tue, 9 Jul 2019 09:44:47 -0300
> > > Subject: [PATCH] RDMA/counters: Make rdma_counter.h compile stand alone    
> > 
> > I will apply this to linux-next today and reenable the stand alone
> > building for rdma_counter.h  
> 
> That worked for me ...

rdma_counter.h should be able to be removed from the exceptions list now.

I have been building linux-next with this patch for a while, so maybe
it could be applied to the kbuild tree?

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Jul 2019 13:03:16 +1000
Subject: [PATCH] rdma: attempt to build rdma_counter.h stand alone again

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/Kbuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/Kbuild b/include/Kbuild
index 7e9f1acb9dd5..765ff864130d 100644
--- a/include/Kbuild
+++ b/include/Kbuild
@@ -949,7 +949,6 @@ header-test-			+= pcmcia/ds.h
 header-test-			+= rdma/ib.h
 header-test-			+= rdma/iw_portmap.h
 header-test-			+= rdma/opa_port_info.h
-header-test-			+= rdma/rdma_counter.h
 header-test-			+= rdma/rdmavt_cq.h
 header-test-			+= rdma/restrack.h
 header-test-			+= rdma/signature.h
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the rdma tree

[Masahiro Yamada]

Hi Stephen,


On Wed, Jul 17, 2019 at 8:28 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi,
>
> On Wed, 10 Jul 2019 14:30:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Wed, 10 Jul 2019 11:04:43 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > On Tue, 9 Jul 2019 12:46:34 +0000 Jason Gunthorpe <jgg@mellanox.com> wrote:
> > > >
> > > > It isn't quite enough to make the header compile stand alone, I'm
> > > > adding this instead.
> > > >
> > > > From 37c1e072276b03b080eb24ff24c39080aeaf49ef Mon Sep 17 00:00:00 2001
> > > > From: Jason Gunthorpe <jgg@mellanox.com>
> > > > Date: Tue, 9 Jul 2019 09:44:47 -0300
> > > > Subject: [PATCH] RDMA/counters: Make rdma_counter.h compile stand alone
> > >
> > > I will apply this to linux-next today and reenable the stand alone
> > > building for rdma_counter.h
> >
> > That worked for me ...
>
> rdma_counter.h should be able to be removed from the exceptions list now.
>
> I have been building linux-next with this patch for a while, so maybe
> it could be applied to the kbuild tree?
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 10 Jul 2019 13:03:16 +1000
> Subject: [PATCH] rdma: attempt to build rdma_counter.h stand alone again
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  include/Kbuild | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/include/Kbuild b/include/Kbuild
> index 7e9f1acb9dd5..765ff864130d 100644
> --- a/include/Kbuild
> +++ b/include/Kbuild
> @@ -949,7 +949,6 @@ header-test-                        += pcmcia/ds.h
>  header-test-                   += rdma/ib.h
>  header-test-                   += rdma/iw_portmap.h
>  header-test-                   += rdma/opa_port_info.h
> -header-test-                   += rdma/rdma_counter.h
>  header-test-                   += rdma/rdmavt_cq.h
>  header-test-                   += rdma/restrack.h
>  header-test-                   += rdma/signature.h

Yes, this is just a one-liner fix-up,
so I'd like to fold it into this:

https://patchwork.kernel.org/patch/11047283/


-- 
Best Regards
Masahiro Yamada

Re: linux-next: build failure after merge of the rdma tree

[Stephen Rothwell]

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

Hi Masahiro,

On Wed, 17 Jul 2019 15:33:28 +0900 Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
>
> Yes, this is just a one-liner fix-up,
> so I'd like to fold it into this:
> 
> https://patchwork.kernel.org/patch/11047283/

Fine by me.

-- 
Cheers,
Stephen Rothwell

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