Skip to contentSkip to conversation

RDMA: fix INFINIBAND_USER_ACCESS dependency

PATCH In review Arnd Bergmann 3 participants 3 messages Jul 3, 2023 InfiniBand

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 RDMA: fix INFINIBAND_USER_ACCESS dependency

From: Arnd Bergmann <[email protected]>

After a change to the bnxt_re driver, it fails to link when CONFIG_INFINIBAND_USER_ACCESS is disabled:

aarch64-linux-ld: drivers/infiniband/hw/bnxt_re/ib_verbs.o: in function `bnxt_re_handler_BNXT_RE_METHOD_ALLOC_PAGE':
ib_verbs.c:(.text+0xd64): undefined reference to `ib_uverbs_get_ucontext_file'
aarch64-linux-ld: drivers/infiniband/hw/bnxt_re/ib_verbs.o:(.rodata+0x168): undefined reference to `uverbs_idr_class'
aarch64-linux-ld: drivers/infiniband/hw/bnxt_re/ib_verbs.o:(.rodata+0x1a8): undefined reference to `uverbs_destroy_def_handler'

The problem is that the 'bnxt_re_uapi_defs' structure is built unconditionally and references a couple of functions that are never really called in this configuration but instead require other functions that are left out.

Adding an #ifdef around the new code, or a Kconfig dependency would address this problem, but adding the compile-time check inside of the UAPI_DEF_CHAIN_OBJ_TREE_NAMED() macro seems best because that also addresses the problem in other drivers that may run into the same dependency.

Fixes 360da60d6c6ed ("RDMA/bnxt_re: Enable low latency push")
---
 include/rdma/uverbs_ioctl.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
include/rdma/uverbs_ioctl.h +4 -2
index 9d45a5b203169..06287de69cd29 100644
@@ -436,8 +436,10 @@ struct uapi_definition {
 	},								       \
 		##__VA_ARGS__
 #define UAPI_DEF_CHAIN_OBJ_TREE_NAMED(_object_enum, ...)                       \
-	UAPI_DEF_CHAIN_OBJ_TREE(_object_enum, &UVERBS_OBJECT(_object_enum),    \
-				##__VA_ARGS__)
+	UAPI_DEF_CHAIN_OBJ_TREE(_object_enum,				       \
+		PTR_IF(IS_ENABLED(CONFIG_INFINIBAND_USER_ACCESS),	       \
+		       &UVERBS_OBJECT(_object_enum)),			       \
+		##__VA_ARGS__)
 
 /*
  * =======================================
Signature · 1 line
2.39.2
Acked-by on v1 1/1
#1 lore raw
Quoted 21 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

After a change to the bnxt_re driver, it fails to link when CONFIG_INFINIBAND_USER_ACCESS is disabled:

aarch64-linux-ld: drivers/infiniband/hw/bnxt_re/ib_verbs.o: in function `bnxt_re_handler_BNXT_RE_METHOD_ALLOC_PAGE':
ib_verbs.c:(.text+0xd64): undefined reference to `ib_uverbs_get_ucontext_file'
aarch64-linux-ld: drivers/infiniband/hw/bnxt_re/ib_verbs.o:(.rodata+0x168): undefined reference to `uverbs_idr_class'
aarch64-linux-ld: drivers/infiniband/hw/bnxt_re/ib_verbs.o:(.rodata+0x1a8): undefined reference to `uverbs_destroy_def_handler'

The problem is that the 'bnxt_re_uapi_defs' structure is built unconditionally and references a couple of functions that are never really called in this configuration but instead require other functions that are left out.

Adding an #ifdef around the new code, or a Kconfig dependency would address this problem, but adding the compile-time check inside of the UAPI_DEF_CHAIN_OBJ_TREE_NAMED() macro seems best because that also addresses the problem in other drivers that may run into the same dependency.

Quoted 6 lines
Fixes 360da60d6c6ed ("RDMA/bnxt_re: Enable low latency push")
---
 include/rdma/uverbs_ioctl.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Thanks,

Linus, can you please apply this patch directly as it is overkill to send PR for one patch?

https://lore.kernel.org/all/[email protected]

Thanks

#2 lore raw
Quoted 3 lines · Leon Romanovsky

Linus, can you please apply this patch directly as it is overkill to send PR for one patch?

Done.

Linus