Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

preload: fix build issue with clang 19 #1572

Merged
merged 4 commits into from
Apr 10, 2025
Merged

preload: fix build issue with clang 19 #1572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
660479a
preload: fix build issue with clang 19
clan Mar 3, 2025
c13a26a
libibverbs.map: ibv_cmd_query_device had been removed
clan Mar 4, 2025
f564d19
libefa.map: efadv_wc_read_sgid is static inline
clan Mar 5, 2025
25cf877
cmake: add ${BUILD_INCLUDE} for __SOCKADDR_ARG test
clan Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,16 @@ if (NOT HAVE_LONG_LONG_U64)
add_definitions("-D__SANE_USERSPACE_TYPES__")
endif()

# Check __SOCKADDR_ARG exist and is union
set(SAFE_CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES}")
set(CMAKE_REQUIRED_INCLUDES "${BUILD_INCLUDE}")
RDMA_Check_C_Compiles(HAVE_SOCKADDR_ARG_AS_UNION "
#define _GNU_SOURCE
#include <sys/socket.h>
int main(int argc,const char *argv[]) {struct sockaddr addr;__SOCKADDR_ARG sa; sa.__sockaddr__ = (struct sockaddr *)&addr; (void)addr; (void)sa; return 0;}"
)
set(CMAKE_REQUIRED_INCLUDES "${SAFE_CMAKE_REQUIRED_INCLUDES}")

# glibc and kernel uapi headers can co-exist
CHECK_C_SOURCE_COMPILES("
#include <sys/socket.h>
Expand Down
2 changes: 2 additions & 0 deletions buildlib/config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@

#cmakedefine HAVE_WORKING_IF_H 1

#cmakedefine HAVE_SOCKADDR_ARG_AS_UNION 1

// Operating mode for symbol versions
#cmakedefine HAVE_FULL_SYMBOL_VERSIONS 1
#cmakedefine HAVE_LIMITED_SYMBOL_VERSIONS 1
Expand Down
1 change: 0 additions & 1 deletion libibverbs/libibverbs.map.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@ IBVERBS_PRIVATE_@IBVERBS_PABI_VERSION@ {
ibv_cmd_post_send;
ibv_cmd_post_srq_recv;
ibv_cmd_query_context;
ibv_cmd_query_device;
ibv_cmd_query_device_any;
ibv_cmd_query_mr;
ibv_cmd_query_port;
Expand Down
9 changes: 9 additions & 0 deletions librdmacm/preload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,12 +794,21 @@ ssize_t recv(int socket, void *buf, size_t len, int flags)
}

ssize_t recvfrom(int socket, void *buf, size_t len, int flags,
#if HAVE_SOCKADDR_ARG_AS_UNION
__SOCKADDR_ARG src_addr, socklen_t *addrlen)
#else
struct sockaddr *src_addr, socklen_t *addrlen)
#endif
{
int fd;
return (fd_fork_get(socket, &fd) == fd_rsocket) ?
#if HAVE_SOCKADDR_ARG_AS_UNION
rrecvfrom(fd, buf, len, flags, src_addr.__sockaddr__, addrlen) :
real.recvfrom(fd, buf, len, flags, src_addr.__sockaddr__, addrlen);
#else
rrecvfrom(fd, buf, len, flags, src_addr, addrlen) :
real.recvfrom(fd, buf, len, flags, src_addr, addrlen);
#endif
}

ssize_t recvmsg(int socket, struct msghdr *msg, int flags)
Expand Down
1 change: 0 additions & 1 deletion providers/efa/libefa.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ EFA_1.2 {
global:
efadv_cq_from_ibv_cq_ex;
efadv_create_cq;
efadv_wc_read_sgid;
} EFA_1.1;

EFA_1.3 {
Expand Down