From patchwork Fri Aug 9 20:05:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mrhines@linux.vnet.ibm.com X-Patchwork-Id: 266150 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (unknown [IPv6:2001:4830:134:3::12]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 709792C00A2 for ; Sat, 10 Aug 2013 06:07:01 +1000 (EST) Received: from localhost ([::1]:34495 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7sxe-0003Rc-2O for incoming@patchwork.ozlabs.org; Fri, 09 Aug 2013 16:06:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7swq-0003Pa-Nu for qemu-devel@nongnu.org; Fri, 09 Aug 2013 16:06:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V7swh-0002ax-PR for qemu-devel@nongnu.org; Fri, 09 Aug 2013 16:06:08 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:39728) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7swh-0002ac-KV for qemu-devel@nongnu.org; Fri, 09 Aug 2013 16:05:59 -0400 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 9 Aug 2013 16:05:57 -0400 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e7.ny.us.ibm.com (192.168.1.107) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 9 Aug 2013 16:05:56 -0400 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id A24406E803C for ; Fri, 9 Aug 2013 16:05:50 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r79K5tBA154076 for ; Fri, 9 Aug 2013 16:05:55 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r79K5t0b009148 for ; Fri, 9 Aug 2013 16:05:55 -0400 Received: from mrhinesdev.klabtestbed.com (klinux.watson.ibm.com [9.2.208.21]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r79K5sVZ008973; Fri, 9 Aug 2013 16:05:55 -0400 From: mrhines@linux.vnet.ibm.com To: qemu-devel@nongnu.org Date: Fri, 9 Aug 2013 16:05:43 -0400 Message-Id: <1376078746-24948-5-git-send-email-mrhines@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1376078746-24948-1-git-send-email-mrhines@linux.vnet.ibm.com> References: <1376078746-24948-1-git-send-email-mrhines@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13080920-5806-0000-0000-0000225E9BAC X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.182.137 Cc: yamahata@private.email.ne.jp, aliguori@us.ibm.com, quintela@redhat.com, frank.yangjie@gmail.com, owasserm@redhat.com, mrhines@us.ibm.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v2 for-1.6 4/6] rdma: proper getaddrinfo() handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Michael R. Hines" getaddrinfo() already knows what it's doing, but it can potentially return multiple addresses. We need to handle that... Reviewed-by: Orit Wasserman Signed-off-by: Michael R. Hines --- migration-rdma.c | 56 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/migration-rdma.c b/migration-rdma.c index 30e08cd..d71cca5 100644 --- a/migration-rdma.c +++ b/migration-rdma.c @@ -392,7 +392,6 @@ typedef struct RDMAContext { uint64_t unregistrations[RDMA_SIGNALED_SEND_MAX]; GHashTable *blockmap; - bool ipv6; } RDMAContext; /* @@ -745,7 +744,7 @@ static int qemu_rdma_resolve_host(RDMAContext *rdma, Error **errp) char port_str[16]; struct rdma_cm_event *cm_event; char ip[40] = "unknown"; - int af = rdma->ipv6 ? PF_INET6 : PF_INET; + struct addrinfo *e; if (rdma->host == NULL || !strcmp(rdma->host, "")) { ERROR(errp, "RDMA hostname has not been set"); @@ -775,18 +774,23 @@ static int qemu_rdma_resolve_host(RDMAContext *rdma, Error **errp) goto err_resolve_get_addr; } - inet_ntop(af, &((struct sockaddr_in *) res->ai_addr)->sin_addr, - ip, sizeof ip); - DPRINTF("%s => %s\n", rdma->host, ip); + for (e = res; e != NULL; e = e->ai_next) { + inet_ntop(e->ai_family, + &((struct sockaddr_in *) e->ai_addr)->sin_addr, ip, sizeof ip); + DPRINTF("Trying %s => %s\n", rdma->host, ip); - /* resolve the first address */ - ret = rdma_resolve_addr(rdma->cm_id, NULL, res->ai_addr, - RDMA_RESOLVE_TIMEOUT_MS); - if (ret) { - ERROR(errp, "could not resolve address %s", rdma->host); - goto err_resolve_get_addr; + /* resolve the first address */ + ret = rdma_resolve_addr(rdma->cm_id, NULL, e->ai_addr, + RDMA_RESOLVE_TIMEOUT_MS); + if (!ret) { + goto route; + } } + ERROR(errp, "could not resolve address %s", rdma->host); + goto err_resolve_get_addr; + +route: qemu_rdma_dump_gid("source_resolve_addr", rdma->cm_id); ret = rdma_get_cm_event(rdma->channel, &cm_event); @@ -2260,8 +2264,6 @@ err_rdma_source_connect: static int qemu_rdma_dest_init(RDMAContext *rdma, Error **errp) { int ret = -EINVAL, idx; - int af = rdma->ipv6 ? PF_INET6 : PF_INET; - struct sockaddr_in sin; struct rdma_cm_id *listen_id; char ip[40] = "unknown"; struct addrinfo *res; @@ -2292,35 +2294,36 @@ static int qemu_rdma_dest_init(RDMAContext *rdma, Error **errp) goto err_dest_init_create_listen_id; } - memset(&sin, 0, sizeof(sin)); - sin.sin_family = af; - sin.sin_port = htons(rdma->port); snprintf(port_str, 16, "%d", rdma->port); port_str[15] = '\0'; if (rdma->host && strcmp("", rdma->host)) { + struct addrinfo *e; + ret = getaddrinfo(rdma->host, port_str, NULL, &res); if (ret < 0) { ERROR(errp, "could not getaddrinfo address %s", rdma->host); goto err_dest_init_bind_addr; } + for (e = res; e != NULL; e = e->ai_next) { + inet_ntop(e->ai_family, + &((struct sockaddr_in *) e->ai_addr)->sin_addr, ip, sizeof ip); + DPRINTF("Trying %s => %s\n", rdma->host, ip); + ret = rdma_bind_addr(listen_id, e->ai_addr); + if (!ret) { + goto listen; + } + } - inet_ntop(af, &((struct sockaddr_in *) res->ai_addr)->sin_addr, - ip, sizeof ip); + ERROR(errp, "Error: could not rdma_bind_addr!"); + goto err_dest_init_bind_addr; } else { ERROR(errp, "migration host and port not specified!"); ret = -EINVAL; goto err_dest_init_bind_addr; } - - DPRINTF("%s => %s\n", rdma->host, ip); - - ret = rdma_bind_addr(listen_id, res->ai_addr); - if (ret) { - ERROR(errp, "Error: could not rdma_bind_addr!"); - goto err_dest_init_bind_addr; - } +listen: rdma->listen_id = listen_id; qemu_rdma_dump_gid("dest_init", listen_id); @@ -2351,7 +2354,6 @@ static void *qemu_rdma_data_init(const char *host_port, Error **errp) if (addr != NULL) { rdma->port = atoi(addr->port); rdma->host = g_strdup(addr->host); - rdma->ipv6 = addr->ipv6; } else { ERROR(errp, "bad RDMA migration address '%s'", host_port); g_free(rdma);