Skip to contentSkip to conversation

contrib/rdmacm-mux: fix clang compilation

PATCH Superseded Marcel Apfelbaum 3 participants 13 messages Jan 12, 2019 – Jan 14, 2019 Kbuild

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover contrib/rdmacm-mux: fix clang compilation

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        | 18 +++++++++++++-----
 hw/rdma/rdma_backend.c           | 16 ++++++++++++----
 4 files changed, 27 insertions(+), 10 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 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
index be3eacb6f7..e1ff4fe569 100644
@@ -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
index 835a7f9214..64676030c5 100644
@@ -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
Reviewed-by on v1 1/3
#2 lore raw

Re: [Qemu-devel] [PATCH 1/3] contrib/rdmacm-mux: remove Wno-format-truncation flag

Quoted 42 lines · Marcel Apfelbaum

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
index be3eacb6f7..e1ff4fe569 100644
@@ -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 +3 -1
index 835a7f9214..64676030c5 100644
@@ -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);

contrib/rdmacm-mux/main.c static void parse_args(int argc, char *argv[]) · line 120

Quoted 7 lines
contrib/rdmacm-mux/main.c +1 -1
@@ -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;
 
Quoted 4 lines
contrib/rdmacm-mux/main.c +0 -0
         case 'p':
Signature · 1 line
2.17.1
#3 lore raw

PATCH 2/3 hw/rdma: modify struct initialization

In reply to Marcel Apfelbaum

Do not initialize structs with {0} since some
CLANG versions do not support it.

Use memset instead.

---
 contrib/rdmacm-mux/main.c | 12 +++++++++---
 hw/rdma/rdma_backend.c    | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)
contrib/rdmacm-mux/main.c +9 -3
index 64676030c5..d01dc76927 100644
@@ -350,9 +350,11 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     msg.hdr.msg_type = RDMACM_MUX_MSG_TYPE_REQ;
     msg.hdr.op_code = RDMACM_MUX_OP_CODE_MAD;
 
@@ -387,11 +389,13 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     rc = recv(fd, &msg, sizeof(msg), 0);
     syslog(LOG_DEBUG, "Socket %d, recv %d\n", fd, rc);
 
@@ -744,7 +748,9 @@ static void signal_handler(int sig, siginfo_t *siginfo, void *context)
 static int init(void)
 {
     int rc;
-    struct sigaction sig = {0};
+    struct sigaction sig;
+
+    memset(&sig, 0, sizeof(sig));
 
     rc = init_listener();
     if (rc) {
hw/rdma/rdma_backend.c +12 -4
index c28bfbd44d..92e95aa640 100644
@@ -190,9 +190,11 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     pr_dbg("Reading response\n");
     ret = qemu_chr_fe_read_all(mad_chr_be, (uint8_t *)&msg, sizeof(msg));
     if (ret != sizeof(msg)) {
@@ -387,10 +389,12 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     pr_dbg("num_sge=%d\n", num_sge);
 
     if (num_sge != 2) {
@@ -1112,9 +1116,11 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     pr_dbg("0x%llx, 0x%llx\n",
            (long long unsigned int)be64_to_cpu(gid->global.subnet_prefix),
            (long long unsigned int)be64_to_cpu(gid->global.interface_id));
@@ -1138,9 +1144,11 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     pr_dbg("0x%llx, 0x%llx\n",
            (long long unsigned int)be64_to_cpu(gid->global.subnet_prefix),
            (long long unsigned int)be64_to_cpu(gid->global.interface_id));
Signature · 1 line
2.17.1
Reviewed-by on v1 2/3
#4 lore raw

Re: [Qemu-devel] [PATCH 2/3] hw/rdma: modify struct initialization

Quoted 4 lines · Marcel Apfelbaum

Do not initialize structs with {0} since some
CLANG versions do not support it.

Use memset instead.

It is easier than patching CLANG ha? :)

Quoted 97 lines
---
 contrib/rdmacm-mux/main.c | 12 +++++++++---
 hw/rdma/rdma_backend.c    | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)
contrib/rdmacm-mux/main.c +9 -3
index 64676030c5..d01dc76927 100644
@@ -350,9 +350,11 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     msg.hdr.msg_type = RDMACM_MUX_MSG_TYPE_REQ;
     msg.hdr.op_code = RDMACM_MUX_OP_CODE_MAD;
 
@@ -387,11 +389,13 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     rc = recv(fd, &msg, sizeof(msg), 0);
     syslog(LOG_DEBUG, "Socket %d, recv %d\n", fd, rc);
 
@@ -744,7 +748,9 @@ static void signal_handler(int sig, siginfo_t *siginfo, void *context)
 static int init(void)
 {
     int rc;
-    struct sigaction sig = {0};
+    struct sigaction sig;
+
+    memset(&sig, 0, sizeof(sig));
 
     rc = init_listener();
     if (rc) {
hw/rdma/rdma_backend.c +9 -3
index c28bfbd44d..92e95aa640 100644
@@ -190,9 +190,11 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     pr_dbg("Reading response\n");
     ret = qemu_chr_fe_read_all(mad_chr_be, (uint8_t *)&msg, sizeof(msg));
     if (ret != sizeof(msg)) {
@@ -387,10 +389,12 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     pr_dbg("num_sge=%d\n", num_sge);
 
     if (num_sge != 2) {
@@ -1112,9 +1116,11 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     pr_dbg("0x%llx, 0x%llx\n",
            (long long unsigned int)be64_to_cpu(gid->global.subnet_prefix),
            (long long unsigned int)be64_to_cpu(gid->global.interface_id));
@@ -1138,9 +1144,11 @@ 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)

hw/rdma/rdma_backend.c int rdma_backend_add_gid(RdmaBackendDev *backend_dev, const char *ifname, · line 1154

Quoted 10 lines
hw/rdma/rdma_backend.c +3 -1
 {
-    RdmaCmMuxMsg msg = {0};
+    RdmaCmMuxMsg msg;
     int ret;
 
+    memset(&msg, 0, sizeof(msg));
+
     pr_dbg("0x%llx, 0x%llx\n",
            (long long unsigned int)be64_to_cpu(gid->global.subnet_prefix),
            (long long unsigned int)be64_to_cpu(gid->global.interface_id));

One comment though, should subject prefixed with hw/rdma or contrib/rdmacm-mux?

Quoted 3 lines
Signature · 1 line
2.17.1
#5 lore raw

Re: [Qemu-devel] [PATCH 2/3] hw/rdma: modify struct initialization

Quoted 118 lines · Yuval Shaia
Quoted 4 lines · Marcel Apfelbaum

Do not initialize structs with {0} since some
CLANG versions do not support it.

Use memset instead.

It is easier than patching CLANG ha? :)

Quoted 97 lines
---
 contrib/rdmacm-mux/main.c | 12 +++++++++---
 hw/rdma/rdma_backend.c    | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)
contrib/rdmacm-mux/main.c +9 -3
index 64676030c5..d01dc76927 100644
@@ -350,9 +350,11 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     msg.hdr.msg_type = RDMACM_MUX_MSG_TYPE_REQ;
     msg.hdr.op_code = RDMACM_MUX_OP_CODE_MAD;
 
@@ -387,11 +389,13 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     rc = recv(fd, &msg, sizeof(msg), 0);
     syslog(LOG_DEBUG, "Socket %d, recv %d\n", fd, rc);
 
@@ -744,7 +748,9 @@ static void signal_handler(int sig, siginfo_t *siginfo, void *context)
 static int init(void)
 {
     int rc;
-    struct sigaction sig = {0};
+    struct sigaction sig;
+
+    memset(&sig, 0, sizeof(sig));
 
     rc = init_listener();
     if (rc) {
hw/rdma/rdma_backend.c +9 -3
index c28bfbd44d..92e95aa640 100644
@@ -190,9 +190,11 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     pr_dbg("Reading response\n");
     ret = qemu_chr_fe_read_all(mad_chr_be, (uint8_t *)&msg, sizeof(msg));
     if (ret != sizeof(msg)) {
@@ -387,10 +389,12 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     pr_dbg("num_sge=%d\n", num_sge);
 
     if (num_sge != 2) {
@@ -1112,9 +1116,11 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
     pr_dbg("0x%llx, 0x%llx\n",
            (long long unsigned int)be64_to_cpu(gid->global.subnet_prefix),
            (long long unsigned int)be64_to_cpu(gid->global.interface_id));
@@ -1138,9 +1144,11 @@ 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)

hw/rdma/rdma_backend.c int rdma_backend_add_gid(RdmaBackendDev *backend_dev, const char *ifname, · line 1154

Quoted 10 lines
hw/rdma/rdma_backend.c +3 -1
 {
-    RdmaCmMuxMsg msg = {0};
+    RdmaCmMuxMsg msg;
     int ret;
 
+    memset(&msg, 0, sizeof(msg));
+
     pr_dbg("0x%llx, 0x%llx\n",
            (long long unsigned int)be64_to_cpu(gid->global.subnet_prefix),
            (long long unsigned int)be64_to_cpu(gid->global.interface_id));
Quoted 2 lines

One comment though, should subject prefixed with hw/rdma or contrib/rdmacm-mux?

Just noticed that patch took care of both so would it be better to have two separate patches instead?

Quoted 5 lines
Quoted 4 lines
Signature · 2 lines
-- 
2.17.1
#6 lore raw

Re: [Qemu-devel] [PATCH 2/3] hw/rdma: modify struct initialization

Quoted 116 lines · Yuval Shaia
Quoted 115 lines · Yuval Shaia
Quoted 4 lines · Marcel Apfelbaum

Do not initialize structs with {0} since some
CLANG versions do not support it.

Use memset instead.

It is easier than patching CLANG ha? :)

Quoted 96 lines
---
  contrib/rdmacm-mux/main.c | 12 +++++++++---
  hw/rdma/rdma_backend.c    | 16 ++++++++++++----
  2 files changed, 21 insertions(+), 7 deletions(-)
contrib/rdmacm-mux/main.c +9 -3
index 64676030c5..d01dc76927 100644
@@ -350,9 +350,11 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
      msg.hdr.msg_type = RDMACM_MUX_MSG_TYPE_REQ;
      msg.hdr.op_code = RDMACM_MUX_OP_CODE_MAD;
 
@@ -387,11 +389,13 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
      rc = recv(fd, &msg, sizeof(msg), 0);
      syslog(LOG_DEBUG, "Socket %d, recv %d\n", fd, rc);
 
@@ -744,7 +748,9 @@ static void signal_handler(int sig, siginfo_t *siginfo, void *context)
  static int init(void)
  {
      int rc;
-    struct sigaction sig = {0};
+    struct sigaction sig;
+
+    memset(&sig, 0, sizeof(sig));
 
      rc = init_listener();
      if (rc) {
hw/rdma/rdma_backend.c +9 -3
index c28bfbd44d..92e95aa640 100644
@@ -190,9 +190,11 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
      pr_dbg("Reading response\n");
      ret = qemu_chr_fe_read_all(mad_chr_be, (uint8_t *)&msg, sizeof(msg));
      if (ret != sizeof(msg)) {
@@ -387,10 +389,12 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
      pr_dbg("num_sge=%d\n", num_sge);
 
      if (num_sge != 2) {
@@ -1112,9 +1116,11 @@ 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;
 
+    memset(&msg, 0, sizeof(msg));
+
      pr_dbg("0x%llx, 0x%llx\n",
             (long long unsigned int)be64_to_cpu(gid->global.subnet_prefix),
             (long long unsigned int)be64_to_cpu(gid->global.interface_id));
@@ -1138,9 +1144,11 @@ 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)

hw/rdma/rdma_backend.c int rdma_backend_add_gid(RdmaBackendDev *backend_dev, const char *ifname, · line 1154

Quoted 10 lines
hw/rdma/rdma_backend.c +3 -1
  {
-    RdmaCmMuxMsg msg = {0};
+    RdmaCmMuxMsg msg;
      int ret;
 
+    memset(&msg, 0, sizeof(msg));
+
      pr_dbg("0x%llx, 0x%llx\n",
             (long long unsigned int)be64_to_cpu(gid->global.subnet_prefix),
             (long long unsigned int)be64_to_cpu(gid->global.interface_id));
Quoted 4 lines
Quoted 2 lines

One comment though, should subject prefixed with hw/rdma or contrib/rdmacm-mux?

Just noticed that patch took care of both so would it be better to have two separate patches instead?

Since is an almost trivial commit I didn't bother... I hope is ok.

Thanks,
Marcel

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Signature · 2 lines
-- 
2.17.1
#7 lore raw

Re: [Qemu-devel] [PATCH 2/3] hw/rdma: modify struct initialization

In reply to Marcel Apfelbaum
Quoted 4 lines · On Sat, 12 Jan 2019 17:02:24 +0200 Marcel Apfelbaum…

Do not initialize structs with {0} since some
CLANG versions do not support it.

Use memset instead.

Can't you use {} instead? (See, for example, commit ebf2a499a5c).

Quoted 6 lines
---
 contrib/rdmacm-mux/main.c | 12 +++++++++---
 hw/rdma/rdma_backend.c    | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)
#8 lore raw

Re: [Qemu-devel] [PATCH 2/3] hw/rdma: modify struct initialization

Hi Cornelia,

Quoted 8 lines · Cornelia Huck
Quoted 4 lines · On Sat, 12 Jan 2019 17:02:24 +0200 Marcel Apfelbaum…

Do not initialize structs with {0} since some
CLANG versions do not support it.

Use memset instead.

Can't you use {} instead? (See, for example, commit ebf2a499a5c).

I'll try it.

Thanks,
Marcel

Quoted 6 lines
Quoted 6 lines
---
  contrib/rdmacm-mux/main.c | 12 +++++++++---
  hw/rdma/rdma_backend.c    | 16 ++++++++++++----
  2 files changed, 21 insertions(+), 7 deletions(-)
#9 lore raw

PATCH 3/3 contrib/rdmacm-mux: fix clang compilation

In reply to Marcel Apfelbaum

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.

---
 Makefile                         | 2 ++
 contrib/rdmacm-mux/Makefile.objs | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
Makefile +2 -0
index a9ac16d94e..31e87e0c2d 100644
@@ -580,6 +580,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
index e1ff4fe569..3df744af89 100644
@@ -1,4 +1,3 @@
 ifdef CONFIG_PVRDMA
-CFLAGS += -libumad
 rdmacm-mux-obj-y = main.o
 endif
Signature · 1 line
2.17.1
Reviewed-by on v1 3/3
#10 lore raw
Quoted 36 lines · Marcel Apfelbaum

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.

---
 Makefile                         | 2 ++
 contrib/rdmacm-mux/Makefile.objs | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
Makefile +2 -0
index a9ac16d94e..31e87e0c2d 100644
@@ -580,6 +580,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 -0
index e1ff4fe569..3df744af89 100644

contrib/rdmacm-mux/Makefile.objs line 2

Quoted 2 lines
contrib/rdmacm-mux/Makefile.objs +0 -1
@@ -1,4 +1,3 @@
 ifdef CONFIG_PVRDMA
-CFLAGS += -libumad

My bad, thanks for doing it the right way.

Quoted 5 lines
contrib/rdmacm-mux/Makefile.objs +0 -0
 rdmacm-mux-obj-y = main.o
 endif
Signature · 1 line
2.17.1
Tested-by on the v1 series
#11 lore raw
In reply to Marcel Apfelbaum
Quoted 17 lines · On Sat, 12 Jan 2019 17:02:22 +0200 Marcel Apfelbaum…

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

Quoted 6 lines
 Makefile                         |  2 ++
 contrib/rdmacm-mux/Makefile.objs |  1 -
 contrib/rdmacm-mux/main.c        | 18 +++++++++++++-----
 hw/rdma/rdma_backend.c           | 16 ++++++++++++----
 4 files changed, 27 insertions(+), 10 deletions(-)

This fixes building on x86 with clang 6 for me. On s390x with clang 7, I run into further problems when building the s390-ccw bios (the maintainers are aware of that), but the rdma-related errors are gone.

#12 lore raw

Hi Cornelia,

Quoted 26 lines · Cornelia Huck
Quoted 17 lines · On Sat, 12 Jan 2019 17:02:22 +0200 Marcel Apfelbaum…

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

Quoted 6 lines
  Makefile                         |  2 ++
  contrib/rdmacm-mux/Makefile.objs |  1 -
  contrib/rdmacm-mux/main.c        | 18 +++++++++++++-----
  hw/rdma/rdma_backend.c           | 16 ++++++++++++----
  4 files changed, 27 insertions(+), 10 deletions(-)
Quoted 5 lines

This fixes building on x86 with clang 6 for me. On s390x with clang 7, I run into further problems when building the s390-ccw bios (the maintainers are aware of that), but the rdma-related errors are gone.

Appreciated,
Marcel