[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 31/52] migration/rdma: Retire macro ERROR()
|
From: |
Markus Armbruster |
|
Subject: |
[PATCH 31/52] migration/rdma: Retire macro ERROR() |
|
Date: |
Mon, 18 Sep 2023 16:41:45 +0200 |
ERROR() has become "error_setg() unless an error has been set
already". Hiding the conditional in the macro is in the way of
further work. Replace the macro uses by their expansion, and delete
the macro.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
migration/rdma.c | 168 +++++++++++++++++++++++++++++++++--------------
1 file changed, 120 insertions(+), 48 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index be31694d4f..df5b3a8e2c 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -40,13 +40,6 @@
#include "options.h"
#include <poll.h>
-#define ERROR(errp, fmt, ...) \
- do { \
- if (errp && (*(errp) == NULL)) { \
- error_setg(errp, "RDMA ERROR: " fmt, ## __VA_ARGS__); \
- } \
- } while (0)
-
#define RDMA_RESOLVE_TIMEOUT_MS 10000
/* Do not merge data if larger than this. */
@@ -859,7 +852,10 @@ static int qemu_rdma_broken_ipv6_kernel(struct ibv_context
*verbs, Error **errp)
if (ibv_query_port(verbs, 1, &port_attr)) {
ibv_close_device(verbs);
- ERROR(errp, "Could not query initial IB port");
+ if (errp && !*errp) {
+ error_setg(errp,
+ "RDMA ERROR: Could not query initial IB port");
+ }
return -1;
}
@@ -882,9 +878,12 @@ static int qemu_rdma_broken_ipv6_kernel(struct ibv_context
*verbs, Error **errp)
" migrate over the IB fabric until the kernel "
" fixes the bug.\n");
} else {
- ERROR(errp, "You only have RoCE / iWARP devices in your
systems"
- " and your management software has specified
'[::]'"
- ", but IPv6 over RoCE / iWARP is not supported in
Linux.");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: "
+ "You only have RoCE / iWARP devices in your
systems"
+ " and your management software has specified
'[::]'"
+ ", but IPv6 over RoCE / iWARP is not supported
in Linux.");
+ }
return -1;
}
}
@@ -900,13 +899,18 @@ static int qemu_rdma_broken_ipv6_kernel(struct
ibv_context *verbs, Error **errp)
/* IB ports start with 1, not 0 */
if (ibv_query_port(verbs, 1, &port_attr)) {
- ERROR(errp, "Could not query initial IB port");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: Could not query initial IB port");
+ }
return -1;
}
if (port_attr.link_layer == IBV_LINK_LAYER_ETHERNET) {
- ERROR(errp, "Linux kernel's RoCE / iWARP does not support IPv6 "
- "(but patches on linux-rdma in progress)");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: "
+ "Linux kernel's RoCE / iWARP does not support IPv6 "
+ "(but patches on linux-rdma in progress)");
+ }
return -1;
}
@@ -930,21 +934,27 @@ static int qemu_rdma_resolve_host(RDMAContext *rdma,
Error **errp)
struct rdma_addrinfo *e;
if (rdma->host == NULL || !strcmp(rdma->host, "")) {
- ERROR(errp, "RDMA hostname has not been set");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: RDMA hostname has not been set");
+ }
return -1;
}
/* create CM channel */
rdma->channel = rdma_create_event_channel();
if (!rdma->channel) {
- ERROR(errp, "could not create CM channel");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: could not create CM channel");
+ }
return -1;
}
/* create CM id */
ret = rdma_create_id(rdma->channel, &rdma->cm_id, NULL, RDMA_PS_TCP);
if (ret < 0) {
- ERROR(errp, "could not create channel id");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: could not create channel id");
+ }
goto err_resolve_create_id;
}
@@ -953,7 +963,10 @@ static int qemu_rdma_resolve_host(RDMAContext *rdma, Error
**errp)
ret = rdma_getaddrinfo(rdma->host, port_str, NULL, &res);
if (ret) {
- ERROR(errp, "could not rdma_getaddrinfo address %s", rdma->host);
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: could not rdma_getaddrinfo address
%s",
+ rdma->host);
+ }
goto err_resolve_get_addr;
}
@@ -976,7 +989,10 @@ static int qemu_rdma_resolve_host(RDMAContext *rdma, Error
**errp)
}
rdma_freeaddrinfo(res);
- ERROR(errp, "could not resolve address %s", rdma->host);
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: could not resolve address %s",
+ rdma->host);
+ }
goto err_resolve_get_addr;
route:
@@ -985,13 +1001,18 @@ route:
ret = rdma_get_cm_event(rdma->channel, &cm_event);
if (ret < 0) {
- ERROR(errp, "could not perform event_addr_resolved");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: could not perform
event_addr_resolved");
+ }
goto err_resolve_get_addr;
}
if (cm_event->event != RDMA_CM_EVENT_ADDR_RESOLVED) {
- ERROR(errp, "result not equal to event_addr_resolved %s",
- rdma_event_str(cm_event->event));
+ if (errp && !*errp) {
+ error_setg(errp,
+ "RDMA ERROR: result not equal to event_addr_resolved
%s",
+ rdma_event_str(cm_event->event));
+ }
error_report("rdma_resolve_addr");
rdma_ack_cm_event(cm_event);
goto err_resolve_get_addr;
@@ -1001,18 +1022,25 @@ route:
/* resolve route */
ret = rdma_resolve_route(rdma->cm_id, RDMA_RESOLVE_TIMEOUT_MS);
if (ret < 0) {
- ERROR(errp, "could not resolve rdma route");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: could not resolve rdma route");
+ }
goto err_resolve_get_addr;
}
ret = rdma_get_cm_event(rdma->channel, &cm_event);
if (ret < 0) {
- ERROR(errp, "could not perform event_route_resolved");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: could not perform
event_route_resolved");
+ }
goto err_resolve_get_addr;
}
if (cm_event->event != RDMA_CM_EVENT_ROUTE_RESOLVED) {
- ERROR(errp, "result not equal to event_route_resolved: %s",
- rdma_event_str(cm_event->event));
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: "
+ "result not equal to event_route_resolved: %s",
+ rdma_event_str(cm_event->event));
+ }
rdma_ack_cm_event(cm_event);
goto err_resolve_get_addr;
}
@@ -2443,15 +2471,20 @@ static int qemu_rdma_source_init(RDMAContext *rdma,
bool pin_all, Error **errp)
ret = qemu_rdma_alloc_pd_cq(rdma);
if (ret < 0) {
- ERROR(errp, "rdma migration: error allocating pd and cq! Your mlock()"
- " limits may be too low. Please check $ ulimit -a # and "
- "search for 'ulimit -l' in the output");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: "
+ "rdma migration: error allocating pd and cq! Your
mlock()"
+ " limits may be too low. Please check $ ulimit -a # and
"
+ "search for 'ulimit -l' in the output");
+ }
goto err_rdma_source_init;
}
ret = qemu_rdma_alloc_qp(rdma);
if (ret < 0) {
- ERROR(errp, "rdma migration: error allocating qp!");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: rdma migration: error allocating
qp!");
+ }
goto err_rdma_source_init;
}
@@ -2468,8 +2501,11 @@ static int qemu_rdma_source_init(RDMAContext *rdma, bool
pin_all, Error **errp)
for (idx = 0; idx < RDMA_WRID_MAX; idx++) {
ret = qemu_rdma_reg_control(rdma, idx);
if (ret < 0) {
- ERROR(errp, "rdma migration: error registering %d control!",
- idx);
+ if (errp && !*errp) {
+ error_setg(errp,
+ "RDMA ERROR: rdma migration: error registering %d
control!",
+ idx);
+ }
goto err_rdma_source_init;
}
}
@@ -2497,19 +2533,29 @@ static int qemu_get_cm_event_timeout(RDMAContext *rdma,
} while (ret < 0 && errno == EINTR);
if (ret == 0) {
- ERROR(errp, "poll cm event timeout");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: poll cm event timeout");
+ }
return -1;
} else if (ret < 0) {
- ERROR(errp, "failed to poll cm event, errno=%i", errno);
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: failed to poll cm event, errno=%i",
+ errno);
+ }
return -1;
} else if (poll_fd.revents & POLLIN) {
if (rdma_get_cm_event(rdma->channel, cm_event) < 0) {
- ERROR(errp, "failed to get cm event");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: failed to get cm event");
+ }
return -1;
}
return 0;
} else {
- ERROR(errp, "no POLLIN event, revent=%x", poll_fd.revents);
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: no POLLIN event, revent=%x",
+ poll_fd.revents);
+ }
return -1;
}
}
@@ -2542,14 +2588,18 @@ static int qemu_rdma_connect(RDMAContext *rdma, bool
return_path,
ret = qemu_rdma_post_recv_control(rdma, RDMA_WRID_READY);
if (ret < 0) {
- ERROR(errp, "posting second control recv");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: posting second control recv");
+ }
goto err_rdma_source_connect;
}
ret = rdma_connect(rdma->cm_id, &conn_param);
if (ret < 0) {
perror("rdma_connect");
- ERROR(errp, "connecting to destination!");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: connecting to destination!");
+ }
goto err_rdma_source_connect;
}
@@ -2558,7 +2608,9 @@ static int qemu_rdma_connect(RDMAContext *rdma, bool
return_path,
} else {
ret = rdma_get_cm_event(rdma->channel, &cm_event);
if (ret < 0) {
- ERROR(errp, "failed to get cm event");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: failed to get cm event");
+ }
}
}
if (ret < 0) {
@@ -2568,7 +2620,9 @@ static int qemu_rdma_connect(RDMAContext *rdma, bool
return_path,
if (cm_event->event != RDMA_CM_EVENT_ESTABLISHED) {
error_report("rdma_get_cm_event != EVENT_ESTABLISHED after
rdma_connect");
- ERROR(errp, "connecting to destination!");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: connecting to destination!");
+ }
rdma_ack_cm_event(cm_event);
goto err_rdma_source_connect;
}
@@ -2615,14 +2669,18 @@ static int qemu_rdma_dest_init(RDMAContext *rdma, Error
**errp)
}
if (!rdma->host || !rdma->host[0]) {
- ERROR(errp, "RDMA host is not set!");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: RDMA host is not set!");
+ }
rdma->errored = true;
return -1;
}
/* create CM channel */
rdma->channel = rdma_create_event_channel();
if (!rdma->channel) {
- ERROR(errp, "could not create rdma event channel");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: could not create rdma event
channel");
+ }
rdma->errored = true;
return -1;
}
@@ -2630,7 +2688,9 @@ static int qemu_rdma_dest_init(RDMAContext *rdma, Error
**errp)
/* create CM id */
ret = rdma_create_id(rdma->channel, &listen_id, NULL, RDMA_PS_TCP);
if (ret < 0) {
- ERROR(errp, "could not create cm_id!");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: could not create cm_id!");
+ }
goto err_dest_init_create_listen_id;
}
@@ -2639,14 +2699,19 @@ static int qemu_rdma_dest_init(RDMAContext *rdma, Error
**errp)
ret = rdma_getaddrinfo(rdma->host, port_str, NULL, &res);
if (ret) {
- ERROR(errp, "could not rdma_getaddrinfo address %s", rdma->host);
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: could not rdma_getaddrinfo address
%s",
+ rdma->host);
+ }
goto err_dest_init_bind_addr;
}
ret = rdma_set_option(listen_id, RDMA_OPTION_ID, RDMA_OPTION_ID_REUSEADDR,
&reuse, sizeof reuse);
if (ret < 0) {
- ERROR(errp, "Error: could not set REUSEADDR option");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: Error: could not set REUSEADDR
option");
+ }
goto err_dest_init_bind_addr;
}
for (e = res; e != NULL; e = e->ai_next) {
@@ -2668,7 +2733,9 @@ static int qemu_rdma_dest_init(RDMAContext *rdma, Error
**errp)
rdma_freeaddrinfo(res);
if (!e) {
- ERROR(errp, "Error: could not rdma_bind_addr!");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: Error: could not rdma_bind_addr!");
+ }
goto err_dest_init_bind_addr;
}
@@ -2720,7 +2787,10 @@ static RDMAContext *qemu_rdma_data_init(const char
*host_port, Error **errp)
rdma->host = g_strdup(addr->host);
rdma->host_port = g_strdup(host_port);
} else {
- ERROR(errp, "bad RDMA migration address '%s'", host_port);
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: bad RDMA migration address '%s'",
+ host_port);
+ }
g_free(rdma);
rdma = NULL;
}
@@ -4106,7 +4176,9 @@ void rdma_start_incoming_migration(const char *host_port,
Error **errp)
ret = rdma_listen(rdma->listen_id, 5);
if (ret < 0) {
- ERROR(errp, "listening on socket!");
+ if (errp && !*errp) {
+ error_setg(errp, "RDMA ERROR: listening on socket!");
+ }
goto cleanup_rdma;
}
--
2.41.0
- [PATCH 05/52] migration/rdma: Consistently use uint64_t for work request IDs, (continued)
- [PATCH 18/52] migration/rdma: Fix qemu_rdma_broken_ipv6_kernel() to set error, Markus Armbruster, 2023/09/18
- [PATCH 31/52] migration/rdma: Retire macro ERROR(),
Markus Armbruster <=
- [PATCH 44/52] migration/rdma: Silence qemu_rdma_resolve_host(), Markus Armbruster, 2023/09/18
- [PATCH 29/52] migration/rdma: Plug a memory leak and improve a message, Markus Armbruster, 2023/09/18
- [PATCH 08/52] migration/rdma: Fix qemu_rdma_accept() to return failure on errors, Markus Armbruster, 2023/09/18
- [PATCH 24/52] migration/rdma: Return -1 instead of negative errno code, Markus Armbruster, 2023/09/18