INFINIBAND_SRPT code depends on INFINIBAND_ADDR_TRANS provided symbols.
So declare the kconfig dependency. This is necessary to allow for
enabling INFINIBAND without INFINIBAND_ADDR_TRANS.
Signed-off-by: Greg Thelen <[email protected]>
Cc: Tarick Bedeir <[email protected]>
---
drivers/infiniband/ulp/srpt/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/ulp/srpt/Kconfig b/drivers/infiniband/ulp/srpt/Kconfig
index 31ee83d528d9..fb8b7182f05e 100644
--- a/drivers/infiniband/ulp/srpt/Kconfig
+++ b/drivers/infiniband/ulp/srpt/Kconfig
@@ -1,6 +1,6 @@
config INFINIBAND_SRPT
tristate "InfiniBand SCSI RDMA Protocol target support"
- depends on INFINIBAND && TARGET_CORE
+ depends on INFINIBAND && INFINIBAND_ADDR_TRANS && TARGET_CORE
---help---
Support for the SCSI RDMA Protocol (SRP) Target driver. The
--
2.17.0.441.gb46fe60e1d-goog
On Wed, Apr 25, 2018 at 03:33:39PM -0700, Greg Thelen wrote:
> INFINIBAND_SRPT code depends on INFINIBAND_ADDR_TRANS provided symbols.
> So declare the kconfig dependency. This is necessary to allow for
> enabling INFINIBAND without INFINIBAND_ADDR_TRANS.
>
> Signed-off-by: Greg Thelen <[email protected]>
> Cc: Tarick Bedeir <[email protected]>
> drivers/infiniband/ulp/srpt/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/ulp/srpt/Kconfig b/drivers/infiniband/ulp/srpt/Kconfig
> index 31ee83d528d9..fb8b7182f05e 100644
> +++ b/drivers/infiniband/ulp/srpt/Kconfig
> @@ -1,6 +1,6 @@
> config INFINIBAND_SRPT
> tristate "InfiniBand SCSI RDMA Protocol target support"
> - depends on INFINIBAND && TARGET_CORE
> + depends on INFINIBAND && INFINIBAND_ADDR_TRANS && TARGET_CORE
Isn't INFINIBAND && INFINIBAND_ADDR_TRANS a bit redundant? Can't have
INFINIBAND_ADDR_TRANS without INFINIBAND.
Jason
On Mon, Apr 30, 2018 at 4:35 PM Jason Gunthorpe <[email protected]> wrote:
> On Wed, Apr 25, 2018 at 03:33:39PM -0700, Greg Thelen wrote:
> > INFINIBAND_SRPT code depends on INFINIBAND_ADDR_TRANS provided symbols.
> > So declare the kconfig dependency. This is necessary to allow for
> > enabling INFINIBAND without INFINIBAND_ADDR_TRANS.
> >
> > Signed-off-by: Greg Thelen <[email protected]>
> > Cc: Tarick Bedeir <[email protected]>
> > drivers/infiniband/ulp/srpt/Kconfig | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/infiniband/ulp/srpt/Kconfig
b/drivers/infiniband/ulp/srpt/Kconfig
> > index 31ee83d528d9..fb8b7182f05e 100644
> > +++ b/drivers/infiniband/ulp/srpt/Kconfig
> > @@ -1,6 +1,6 @@
> > config INFINIBAND_SRPT
> > tristate "InfiniBand SCSI RDMA Protocol target support"
> > - depends on INFINIBAND && TARGET_CORE
> > + depends on INFINIBAND && INFINIBAND_ADDR_TRANS && TARGET_CORE
> Isn't INFINIBAND && INFINIBAND_ADDR_TRANS a bit redundant? Can't have
> INFINIBAND_ADDR_TRANS without INFINIBAND.
By kconfig INFINIBAND_ADDR_TRANS depends on INFINIBAND. So yes, it seems
redundant. I don't know if anyone has designs to break this dependency and
allow for ADDR_TRANS without INFINIBAND. Assuming not, I'd be willing to
amend my series removing redundant INFINIBAND and a followup series to
remove it from similar depends. Though I'm not familiar with rdma dev tree
lifecycle. Is rdma/for-rc a throw away branch (akin to linux-next), or
will it be merged into linus/master? If throwaway, then we can amend
its patches, otherwise followups will be needed.
Let me know what you'd prefer. Thanks.
FYI from v4.17-rc3:
drivers/staging/lustre/lnet/Kconfig: depends on LNET && PCI && INFINIBAND
&& INFINIBAND_ADDR_TRANS
net/9p/Kconfig: depends on INET && INFINIBAND && INFINIBAND_ADDR_TRANS
net/rds/Kconfig: depends on RDS && INFINIBAND && INFINIBAND_ADDR_TRANS
net/sunrpc/Kconfig: depends on SUNRPC && INFINIBAND &&
INFINIBAND_ADDR_TRANS
On Tue, 2018-05-01 at 03:08 +0000, Greg Thelen wrote:
> On Mon, Apr 30, 2018 at 4:35 PM Jason Gunthorpe <[email protected]> wrote:
>
> > On Wed, Apr 25, 2018 at 03:33:39PM -0700, Greg Thelen wrote:
> > > INFINIBAND_SRPT code depends on INFINIBAND_ADDR_TRANS provided symbols.
> > > So declare the kconfig dependency. This is necessary to allow for
> > > enabling INFINIBAND without INFINIBAND_ADDR_TRANS.
> > >
> > > Signed-off-by: Greg Thelen <[email protected]>
> > > Cc: Tarick Bedeir <[email protected]>
> > > drivers/infiniband/ulp/srpt/Kconfig | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/infiniband/ulp/srpt/Kconfig
>
> b/drivers/infiniband/ulp/srpt/Kconfig
> > > index 31ee83d528d9..fb8b7182f05e 100644
> > > +++ b/drivers/infiniband/ulp/srpt/Kconfig
> > > @@ -1,6 +1,6 @@
> > > config INFINIBAND_SRPT
> > > tristate "InfiniBand SCSI RDMA Protocol target support"
> > > - depends on INFINIBAND && TARGET_CORE
> > > + depends on INFINIBAND && INFINIBAND_ADDR_TRANS && TARGET_CORE
> > Isn't INFINIBAND && INFINIBAND_ADDR_TRANS a bit redundant? Can't have
> > INFINIBAND_ADDR_TRANS without INFINIBAND.
>
> By kconfig INFINIBAND_ADDR_TRANS depends on INFINIBAND. So yes, it seems
> redundant. I don't know if anyone has designs to break this dependency and
> allow for ADDR_TRANS without INFINIBAND.
No, not at the moment (and I'm not sure we ever would, it would only
happen if the subsystem itself became something like RDMA and INFINIBAND
specifically related only to the INFINIBAND link layer support, in which
case you might want to enable RoCE without INFINIBAND or something like
that, but no one has plans to do that as far as I'm aware).
> Assuming not, I'd be willing to
> amend my series removing redundant INFINIBAND and a followup series to
> remove it from similar depends. Though I'm not familiar with rdma dev tree
> lifecycle. Is rdma/for-rc a throw away branch (akin to linux-next), or
> will it be merged into linus/master? If throwaway, then we can amend
> its patches, otherwise followups will be needed.
Followups will be needed.
> Let me know what you'd prefer. Thanks.
>
> FYI from v4.17-rc3:
> drivers/staging/lustre/lnet/Kconfig: depends on LNET && PCI && INFINIBAND
> && INFINIBAND_ADDR_TRANS
> net/9p/Kconfig: depends on INET && INFINIBAND && INFINIBAND_ADDR_TRANS
> net/rds/Kconfig: depends on RDS && INFINIBAND && INFINIBAND_ADDR_TRANS
> net/sunrpc/Kconfig: depends on SUNRPC && INFINIBAND &&
> INFINIBAND_ADDR_TRANS
--
Doug Ledford <[email protected]>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
On Tue, May 01, 2018 at 03:08:57AM +0000, Greg Thelen wrote:
> On Mon, Apr 30, 2018 at 4:35 PM Jason Gunthorpe <[email protected]> wrote:
>
> > On Wed, Apr 25, 2018 at 03:33:39PM -0700, Greg Thelen wrote:
> > > INFINIBAND_SRPT code depends on INFINIBAND_ADDR_TRANS provided symbols.
> > > So declare the kconfig dependency. This is necessary to allow for
> > > enabling INFINIBAND without INFINIBAND_ADDR_TRANS.
> > >
> > > Signed-off-by: Greg Thelen <[email protected]>
> > > Cc: Tarick Bedeir <[email protected]>
> > > drivers/infiniband/ulp/srpt/Kconfig | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/infiniband/ulp/srpt/Kconfig
> b/drivers/infiniband/ulp/srpt/Kconfig
> > > index 31ee83d528d9..fb8b7182f05e 100644
> > > +++ b/drivers/infiniband/ulp/srpt/Kconfig
> > > @@ -1,6 +1,6 @@
> > > config INFINIBAND_SRPT
> > > tristate "InfiniBand SCSI RDMA Protocol target support"
> > > - depends on INFINIBAND && TARGET_CORE
> > > + depends on INFINIBAND && INFINIBAND_ADDR_TRANS && TARGET_CORE
>
> > Isn't INFINIBAND && INFINIBAND_ADDR_TRANS a bit redundant? Can't have
> > INFINIBAND_ADDR_TRANS without INFINIBAND.
>
> By kconfig INFINIBAND_ADDR_TRANS depends on INFINIBAND. So yes, it seems
> redundant. I don't know if anyone has designs to break this dependency and
> allow for ADDR_TRANS without INFINIBAND. Assuming not, I'd be willing to
> amend my series removing redundant INFINIBAND and a followup series to
> remove it from similar depends. Though I'm not familiar with rdma dev tree
> lifecycle. Is rdma/for-rc a throw away branch (akin to linux-next), or
> will it be merged into linus/master? If throwaway, then we can amend
> its patches, otherwise followups will be needed.
>
> Let me know what you'd prefer. Thanks.
I think a single update patch to fix all of these, and the
pre-existing ones would be great
Jason
On Tue, May 1, 2018 at 1:48 PM Jason Gunthorpe <[email protected]> wrote:
> On Tue, May 01, 2018 at 03:08:57AM +0000, Greg Thelen wrote:
> > On Mon, Apr 30, 2018 at 4:35 PM Jason Gunthorpe <[email protected]> wrote:
> >
> > > On Wed, Apr 25, 2018 at 03:33:39PM -0700, Greg Thelen wrote:
> > > > INFINIBAND_SRPT code depends on INFINIBAND_ADDR_TRANS provided
symbols.
> > > > So declare the kconfig dependency. This is necessary to allow for
> > > > enabling INFINIBAND without INFINIBAND_ADDR_TRANS.
> > > >
> > > > Signed-off-by: Greg Thelen <[email protected]>
> > > > Cc: Tarick Bedeir <[email protected]>
> > > > drivers/infiniband/ulp/srpt/Kconfig | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/infiniband/ulp/srpt/Kconfig
> > b/drivers/infiniband/ulp/srpt/Kconfig
> > > > index 31ee83d528d9..fb8b7182f05e 100644
> > > > +++ b/drivers/infiniband/ulp/srpt/Kconfig
> > > > @@ -1,6 +1,6 @@
> > > > config INFINIBAND_SRPT
> > > > tristate "InfiniBand SCSI RDMA Protocol target support"
> > > > - depends on INFINIBAND && TARGET_CORE
> > > > + depends on INFINIBAND && INFINIBAND_ADDR_TRANS && TARGET_CORE
> >
> > > Isn't INFINIBAND && INFINIBAND_ADDR_TRANS a bit redundant? Can't have
> > > INFINIBAND_ADDR_TRANS without INFINIBAND.
> >
> > By kconfig INFINIBAND_ADDR_TRANS depends on INFINIBAND. So yes, it
seems
> > redundant. I don't know if anyone has designs to break this dependency
and
> > allow for ADDR_TRANS without INFINIBAND. Assuming not, I'd be willing
to
> > amend my series removing redundant INFINIBAND and a followup series to
> > remove it from similar depends. Though I'm not familiar with rdma dev
tree
> > lifecycle. Is rdma/for-rc a throw away branch (akin to linux-next), or
> > will it be merged into linus/master? If throwaway, then we can amend
> > its patches, otherwise followups will be needed.
> >
> > Let me know what you'd prefer. Thanks.
> I think a single update patch to fix all of these, and the
> pre-existing ones would be great
I just posted the cleanup: https://lkml.org/lkml/2018/5/3/1045