contrib/rdmacm-mux: fix clang compilation
v2 cover contrib/rdmacm-mux: fix clang compilation
v1 -> v2:
* Use {} construct instead memset to make both gcc and clang happy (Cornelia)
* Rebased on master
* Added Yuval's RB and Cornelia's Tested-by tags (thanks!)
Fix Commit a5d2f6f877 (contrib/rdmacm-mux: Add implementation
of RDMA User MAD multiplexer).
The above commit introduces a new contrib target, adding a global dependency to libumad library in case pvrdma configuration option is enabled. Clang forbids it:
clang-6.0: error: -libumad: 'linker' input unused
[-Werror,-Wunused-command-line-argument]
Fix by limiting the scope to the rdmacm-mux target itself. Fix related clang errors while at it.
Marcel Apfelbaum (3):
contrib/rdmacm-mux: remove Wno-format-truncation flag hw/rdma: modify struct initialization contrib/rdmacm-mux: fix clang compilation
Makefile | 2 ++ contrib/rdmacm-mux/Makefile.objs | 1 - contrib/rdmacm-mux/main.c | 12 +++++++----- hw/rdma/rdma_backend.c | 8 ++++---- 4 files changed, 13 insertions(+), 10 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/3 contrib/rdmacm-mux: remove Wno-format-truncation flag
The flag is not recognized by some CLANG versions. Add proper constraints in code instead.
--- contrib/rdmacm-mux/Makefile.objs | 2 +- contrib/rdmacm-mux/main.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
contrib/rdmacm-mux/Makefile.objs +1 -1
@@ -1,4 +1,4 @@ ifdef CONFIG_PVRDMA -CFLAGS += -libumad -Wno-format-truncation +CFLAGS += -libumad rdmacm-mux-obj-y = main.o endif
contrib/rdmacm-mux/main.c +4 -2
@@ -42,6 +42,8 @@/* The below can be override by command line parameter */ #define UNIX_SOCKET_PATH "/var/run/rdmacm-mux" +/* Has format %s-%s-%d" <path>-<rdma-dev--name>-<port> */ +#define SOCKET_PATH_MAX (PATH_MAX - NAME_MAX - sizeof(int) - 2)#define RDMA_PORT_NUM 1 typedef struct RdmaCmServerArgs {
@@ -95,7 +97,7 @@ static void help(const char *progname)static void parse_args (int argc,char *argv[]) {int c; -char unix_socket_path[PATH_MAX ]; +char unix_socket_path[SOCKET_PATH_MAX ];strcpy (server.args.rdma_dev_name,"" );strcpy (unix_socket_path,UNIX_SOCKET_PATH );
@@ -113,7 +115,7 @@ static void parse_args(int argc, char *argv[])case 's' :/* This is temporary, final name will build below */ -strncpy (unix_socket_path, optarg,PATH_MAX ); +strncpy (unix_socket_path, optarg,SOCKET_PATH_MAX );break ;case 'p' :
Signature · 1 line
2.17.1
PATCH v2 2/3 hw/rdma: modify struct initialization
In reply to Marcel ApfelbaumDo not initialize structs with {0} since some CLANG versions do not support it.
Use {} construct instead.
--- contrib/rdmacm-mux/main.c | 6 +++--- hw/rdma/rdma_backend.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)
contrib/rdmacm-mux/main.c +3 -3
@@ -350,7 +350,7 @@ static int get_fd(const char *mad, int *fd, __be64 *gid_ifid)static void *umad_recv_thread_func (void *args) {int rc; -RdmaCmMuxMsg msg = {0 }; +RdmaCmMuxMsg msg = {};int fd =-2 ; msg.hdr.msg_type =RDMACM_MUX_MSG_TYPE_REQ ;
@@ -387,7 +387,7 @@ static void *umad_recv_thread_func(void *args)static int read_and_process (int fd) {int rc; -RdmaCmMuxMsg msg = {0 }; +RdmaCmMuxMsg msg = {};struct umad_hdr *hdr;uint32_t *comm_id =0 ;uint16_t attr_id;
@@ -744,7 +744,7 @@ static void signal_handler(int sig, siginfo_t *siginfo, void *context)static int init (void ) {int rc; -struct sigaction sig = {0 }; +struct sigaction sig = {}; rc =init_listener ();if (rc) {
hw/rdma/rdma_backend.c +4 -4
@@ -190,7 +190,7 @@ static inline int rdmacm_mux_can_process_async(RdmaBackendDev *backend_dev)static int check_mux_op_status (CharBackend *mad_chr_be) { -RdmaCmMuxMsg msg = {0 }; +RdmaCmMuxMsg msg = {};int ret;pr_dbg ("Reading response\n" );
@@ -387,7 +387,7 @@ static int build_host_sge_array(RdmaDeviceResources *rdma_dev_res,static int mad_send (RdmaBackendDev *backend_dev,uint8_t sgid_idx,union ibv_gid *sgid,struct ibv_sge *sge,uint32_t num_sge) { -RdmaCmMuxMsg msg = {0 }; +RdmaCmMuxMsg msg = {};char *hdr, *data;int ret;
@@ -1112,7 +1112,7 @@ int rdma_backend_get_gid_index(RdmaBackendDev *backend_dev,int rdma_backend_add_gid (RdmaBackendDev *backend_dev,const char *ifname,union ibv_gid *gid) { -RdmaCmMuxMsg msg = {0 }; +RdmaCmMuxMsg msg = {};int ret; pr_dbg("0x%llx, 0x%llx\n",
@@ -1138,7 +1138,7 @@ int rdma_backend_add_gid(RdmaBackendDev *backend_dev, const char *ifname,int rdma_backend_del_gid (RdmaBackendDev *backend_dev,const char *ifname,union ibv_gid *gid) { -RdmaCmMuxMsg msg = {0 }; +RdmaCmMuxMsg msg = {};int ret; pr_dbg("0x%llx, 0x%llx\n",
Signature · 1 line
2.17.1
Re: [Qemu-devel] [PATCH v2 2/3] hw/rdma: modify struct initialization
Quoted 5 lines · On Fri, 18 Jan 2019 14:46:13 +0200 Marcel Apfelbaum…
Do not initialize structs with {0} since some CLANG versions do not support it.
Use {} construct instead.
Quoted 7 lines
Reviewed-by Yuval Shaia <[email protected]>Tested-by Cornelia Huck <[email protected]>Signed-off-by Marcel Apfelbaum <[email protected]>--- contrib/rdmacm-mux/main.c | 6 +++--- hw/rdma/rdma_backend.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)
PATCH v2 3/3 contrib/rdmacm-mux: fix clang compilation
In reply to Marcel ApfelbaumFix Commit a5d2f6f877 (contrib/rdmacm-mux: Add implementation
of RDMA User MAD multiplexer).
The above commit introduces a new contrib target, adding a global dependency to libumad library in case pvrdma configuration option is enabled. Clang forbids it:
clang-6.0: error: -libumad: 'linker' input unused
[-Werror,-Wunused-command-line-argument]
Fix by limiting the scope to the rdmacm-mux target itself.
--- Makefile | 2 ++ contrib/rdmacm-mux/Makefile.objs | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
Makefile +2 -0
@@ -581,6 +581,8 @@ vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a $(call LINK, $^) vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) libvhost-user.a $(call LINK, $^) + +rdmacm-mux$(EXESUF): LIBS += "-libumad" rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) $(call LINK, $^)
contrib/rdmacm-mux/Makefile.objs +0 -1
@@ -1,4 +1,3 @@ ifdef CONFIG_PVRDMA -CFLAGS += -libumad rdmacm-mux-obj-y = main.o endif
Signature · 1 line
2.17.1