CIFS: SMBD: fix configurations with INFINIBAND=m
Subsystems (2)
PATCH 1/1 CIFS: SMBD: fix configurations with INFINIBAND=m
A built-in SMB file system cannot link against a modular infiniband core module:
fs/cifs/smbdirect.o: In function `smbd_destroy_rdma_work':
smbdirect.c:(.text+0x28e3): undefined reference to ib_drain_qp' smbdirect.c:(.text+0x2915): undefined reference to rdma_destroy_qp' smbdirect.c:(.text+0x2d08): undefined reference to ib_free_cq' smbdirect.c:(.text+0x2d3d): undefined reference to ib_free_cq' smbdirect.c:(.text+0x2d6f): undefined reference to ib_dealloc_pd' smbdirect.c:(.text+0x2d9a): undefined reference to rdma_destroy_id' fs/cifs/smbdirect.o: In function `smbd_disconnect_rdma_work':
smbdirect.c:(.text+0x3d3e): undefined reference to rdma_disconnect' fs/cifs/smbdirect.o: In function _smbd_get_connection':
smbdirect.c:(.text+0x5bc2): undefined reference to rdma_create_id' smbdirect.c:(.text+0x5cc5): undefined reference to rdma_resolve_addr' smbdirect.c:(.text+0x5cda): undefined reference to rdma_destroy_id' smbdirect.c:(.text+0x5da7): undefined reference to rdma_destroy_id' smbdirect.c:(.text+0x5e89): undefined reference to rdma_resolve_route' smbdirect.c:(.text+0x5f07): undefined reference to rdma_destroy_id'
This changes the Kconfig dependency to enforce selecting one of the valid configurations.
--- fs/cifs/Kconfig | 1 + 1 file changed, 1 insertion(+)
fs/cifs/Kconfig +1 -0
@@ -199,6 +199,7 @@ config CIFS_SMB311 config CIFS_SMB_DIRECT bool "SMB Direct support (Experimental)" depends on CIFS && INFINIBAND + depends on CIFS=m || INFINIBAND=y help Enables SMB Direct experimental support for SMB 3.0, 3.02 and 3.1.1. SMB Direct allows transferring SMB packets over RDMA. If unsure,
Signature · 1 line
2.9.0
Hi Arnd,
fs/cifs/Kconfig config CIFS_SMB311 · line 205
Quoted 12 lines
fs/cifs/Kconfig +1
-0@@ -199,6 +199,7 @@ config CIFS_SMB311 config CIFS_SMB_DIRECT bool "SMB Direct support (Experimental)" depends on CIFS && INFINIBAND + depends on CIFS=m || INFINIBAND=y help Enables SMB Direct experimental support for SMB 3.0, 3.02 and 3.1.1. SMB Direct allows transferring SMB packets over RDMA. If unsure,
Is this really correct? Should CIFS_SMB_DIRECT be allowed with:
CIFS=n and INFINIBAND=y ???
or
CIFS=m and INFINIBAND=n ???
I guess a more complex logic should be used here
or am I missing something?
metze
Quoted 17 lines · Stefan Metzmacher
Hi Arnd,
fs/cifs/Kconfig config CIFS_SMB311 · line 205
Quoted 12 lines
fs/cifs/Kconfig +1
-0@@ -199,6 +199,7 @@ config CIFS_SMB311 config CIFS_SMB_DIRECT bool "SMB Direct support (Experimental)" depends on CIFS && INFINIBAND + depends on CIFS=m || INFINIBAND=y help Enables SMB Direct experimental support for SMB 3.0, 3.02 and 3.1.1. SMB Direct allows transferring SMB packets over RDMA. If unsure,Is this really correct? Should
CIFS_SMB_DIRECTbe allowed with:
Quoted 6 lines
CIFS=n and INFINIBAND=y ???
or
CIFS=m and INFINIBAND=n ???I guess a more complex logic should be used here
or am I missing something?
The two ones you listed are prohibited by the existing 'depends on CIFS && INFINIBAND' dependency.
We could rephrase the dependency as
depends on (CIFS=y && INFINIBAND=y) || \
(CIFS=m && INFINIBAND=y) || \
(CIFS=m && INFINIBAND=m)which has the same effect as
depends on CIFS && INFINIBAND
depends on CIFS=m || INFINIBAND=ybut I don't think that adds any clarity.
Arnd
Am 19.12.2017 um 11:56 schrieb Arnd Bergmann via samba-technical:
Quoted 34 lines · Stefan Metzmacher
Quoted 17 lines
Hi Arnd,
fs/cifs/Kconfig config CIFS_SMB311 · line 205
Quoted 12 lines
fs/cifs/Kconfig +1
-0@@ -199,6 +199,7 @@ config CIFS_SMB311 config CIFS_SMB_DIRECT bool "SMB Direct support (Experimental)" depends on CIFS && INFINIBAND + depends on CIFS=m || INFINIBAND=y help Enables SMB Direct experimental support for SMB 3.0, 3.02 and 3.1.1. SMB Direct allows transferring SMB packets over RDMA. If unsure,Is this really correct? Should
CIFS_SMB_DIRECTbe allowed with:Quoted 6 lines
CIFS=n and INFINIBAND=y ???
or
CIFS=m and INFINIBAND=n ???I guess a more complex logic should be used here
or am I missing something?The two ones you listed are prohibited by the existing 'depends on CIFS && INFINIBAND' dependency.
We could rephrase the dependency as
depends on (CIFS=y && INFINIBAND=y) || \ (CIFS=m && INFINIBAND=y) || \ (CIFS=m && INFINIBAND=m)
Quoted 6 lines
which has the same effect as
depends on CIFS && INFINIBAND depends on CIFS=m || INFINIBAND=ybut I don't think that adds any clarity.
Thanks for the clarification!
I somehow assumed the patch has been:
- depends on CIFS && INFINIBAND
+ depends on CIFS=m || INFINIBAND=y
instead of:
depends on CIFS && INFINIBAND
+ depends on CIFS=m || INFINIBAND=y
metze
Quoted 34 lines · Arnd Bergmann
A built-in SMB file system cannot link against a modular infiniband core module:
fs/cifs/smbdirect.o: In function `smbd_destroy_rdma_work':
smbdirect.c:(.text+0x28e3): undefined reference toib_drain_qp' smbdirect.c:(.text+0x2915): undefined reference tordma_destroy_qp' smbdirect.c:(.text+0x2d08): undefined reference toib_free_cq' smbdirect.c:(.text+0x2d3d): undefined reference toib_free_cq' smbdirect.c:(.text+0x2d6f): undefined reference toib_dealloc_pd' smbdirect.c:(.text+0x2d9a): undefined reference tordma_destroy_id'fs/cifs/smbdirect.o: In function `smbd_disconnect_rdma_work':
smbdirect.c:(.text+0x3d3e): undefined reference tordma_disconnect' fs/cifs/smbdirect.o: In function_smbd_get_connection':
smbdirect.c:(.text+0x5bc2): undefined reference tordma_create_id' smbdirect.c:(.text+0x5cc5): undefined reference tordma_resolve_addr' smbdirect.c:(.text+0x5cda): undefined reference tordma_destroy_id' smbdirect.c:(.text+0x5da7): undefined reference tordma_destroy_id' smbdirect.c:(.text+0x5e89): undefined reference tordma_resolve_route' smbdirect.c:(.text+0x5f07): undefined reference tordma_destroy_id'This changes the
Kconfigdependency to enforce selecting one of the valid configurations.Fixes bbc50d2ad317 ("CIFS: SMBD: Introduce kernel config option CONFIG_CIFS_SMB_DIRECT")Signed-off-by Arnd Bergmann <[email protected]>--- fs/cifs/Kconfig | 1 + 1 file changed, 1 insertion(+)fs/cifs/Kconfig +0
-0
fs/cifs/Kconfig config CIFS_SMB311 · line 205
Quoted 7 lines
fs/cifs/Kconfig +1
-0@@ -199,6 +199,7 @@ config CIFS_SMB311 config CIFS_SMB_DIRECT bool "SMB Direct support (Experimental)" depends on CIFS && INFINIBAND + depends on CIFS=m || INFINIBAND=y help Enables SMB Direct experimental support for SMB 3.0, 3.02 and 3.1.1. SMB Direct allows transferring SMB packets over RDMA. If unsure,
Looks good to me.
Signature · 2 lines
Jean Delvare SUSE L3 Support
fs/cifs/Kconfig config CIFS_SMB311 · line 202
Quoted 2 lines
fs/cifs/Kconfig +1
-0depends on CIFS && INFINIBAND + depends on CIFS=m || INFINIBAND=y
How about we change them to
depends on CIFS=m && INFINIBAND || CIFS=y && INFINIBAND=y
This makes it easy to read.
Am 19.12.2017 um 22:21 schrieb Long Li via samba-technical:
Quoted 8 lines
fs/cifs/Kconfig config CIFS_SMB311 · line 202
Quoted 2 lines
fs/cifs/Kconfig +1
-0depends on CIFS && INFINIBAND + depends on CIFS=m || INFINIBAND=yHow about we change them to
depends on CIFS=m && INFINIBAND || CIFS=y && INFINIBAND=yThis makes it easy to read.
I like it :-)
metze
Quoted 8 lines · Long Li
Quoted 2 lines
depends on CIFS && INFINIBAND+ depends on CIFS=m || INFINIBAND=y
How about we change them to
depends on CIFS=m && INFINIBAND || CIFS=y && INFINIBAND=yThis makes it easy to read.
Yes, that seems fine. I would normally group them using () to avoid any confusion with operator precedence, but your version is also correct, so just pick the one you like best.
Arnd