From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E82F3C04FF3 for ; Mon, 24 May 2021 19:10:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6EC0361411 for ; Mon, 24 May 2021 19:10:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6EC0361411 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llFy0-0004FO-HU for qemu-devel@archiver.kernel.org; Mon, 24 May 2021 15:10:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llFwZ-0003Cp-1M for qemu-devel@nongnu.org; Mon, 24 May 2021 15:08:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36595) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llFwX-0007Lx-6E for qemu-devel@nongnu.org; Mon, 24 May 2021 15:08:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621883328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+N8bQfEmekmKzJg4AxXhKkXhtg58UM5gi+Bc73TbEbc=; b=Sc39O1iBzLZM5ql9yMcxeSSFx1d2ooSFdLdP0dl8irJng9kZVeQDXV5EdMn0Pt64HSWdDf 68Ent41WM8VmSVVLqPsj1uX7orUMYufAzfBgqOERvjqchC58NLG6siPjjlo7CEXBn1aHHL AOb7CUiNWxp3y3hrQi1H6wgyq0rIX08= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-478-pwhKtZpjMVGhdAjCHPv62g-1; Mon, 24 May 2021 15:08:46 -0400 X-MC-Unique: pwhKtZpjMVGhdAjCHPv62g-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B4419CC625; Mon, 24 May 2021 19:08:45 +0000 (UTC) Received: from work-vm (ovpn-112-207.ams2.redhat.com [10.36.112.207]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BD19F14103; Mon, 24 May 2021 19:08:44 +0000 (UTC) Date: Mon, 24 May 2021 20:08:42 +0100 From: "Dr. David Alan Gilbert" To: "lizhijian@fujitsu.com" Subject: Re: [PATCH RESEND 3/4] migration/rdma: destination: create the return patch after the first accept Message-ID: References: <20210520081148.17001-1-lizhijian@cn.fujitsu.com> <20210520081148.17001-3-lizhijian@cn.fujitsu.com> <557bff12-3b43-3aab-ef70-758471ab5eb1@fujitsu.com> MIME-Version: 1.0 In-Reply-To: <557bff12-3b43-3aab-ef70-758471ab5eb1@fujitsu.com> User-Agent: Mutt/2.0.7 (2021-05-04) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "qemu-devel@nongnu.org" , "quintela@redhat.com" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * lizhijian@fujitsu.com (lizhijian@fujitsu.com) wrote: > should make some changes for this patch like below: Can you resend a version with this flattned into it please. Dave > # git diff > diff --git a/migration/rdma.c b/migration/rdma.c > index 3b228c46ebf..067ea272276 100644 > --- a/migration/rdma.c > +++ b/migration/rdma.c > @@ -316,7 +316,7 @@ typedef struct RDMALocalBlocks { >  typedef struct RDMAContext { >      char *host; >      int port; > -    const char *host_port; > +    char *host_port; > >      RDMAWorkRequestData wr_data[RDMA_WRID_MAX]; > > @@ -2393,7 +2393,9 @@ static void qemu_rdma_cleanup(RDMAContext *rdma) >          rdma->channel = NULL; >      } >      g_free(rdma->host); > +    g_free(rdma->host_port); >      rdma->host = NULL; > +    rdma->host_port = NULL; >  } > > > @@ -2649,7 +2651,7 @@ static void *qemu_rdma_data_init(const char *host_port, Error **errp) >          if (!inet_parse(addr, host_port, NULL)) { >              rdma->port = atoi(addr->port); >              rdma->host = g_strdup(addr->host); > -            rdma->host_port = host_port; > +            rdma->host_port = g_strdup(host_port); >          } else { >              ERROR(errp, "bad RDMA migration address '%s'", host_port); >              g_free(rdma); > @@ -4076,6 +4078,7 @@ err: >      error_propagate(errp, local_err); >      if (rdma) { >          g_free(rdma->host); > +        g_free(rdma->host_port); >      } >      g_free(rdma); >      g_free(rdma_return_path); > > > On 20/05/2021 16.11, Li Zhijian wrote: > > destination side: > > $ build/qemu-system-x86_64 -enable-kvm -netdev tap,id=hn0,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown -device e1000,netdev=hn0,mac=50:52:54:00:11:22 -boot c -drive if=none,file=./Fedora-rdma-server-migration.qcow2,id=drive-virtio-disk0 -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 -m 2048 -smp 2 -device piix3-usb-uhci -device usb-tablet -monitor stdio -vga qxl -spice streaming-video=filter,port=5902,disable-ticketing -incoming rdma:192.168.1.10:8888 > > (qemu) migrate_set_capability postcopy-ram on > > (qemu) > > dest_init RDMA Device opened: kernel name rocep1s0f0 uverbs device name uverbs0, infiniband_verbs class device path /sys/class/infiniband_verbs/uverbs0, infiniband class device path /sys/class/infiniband/rocep1s0f0, transport: (2) Ethernet > > Segmentation fault (core dumped) > > > > (gdb) bt > > #0 qemu_rdma_accept (rdma=0x0) at ../migration/rdma.c:3272 > > #1 rdma_accept_incoming_migration (opaque=0x0) at ../migration/rdma.c:3986 > > #2 0x0000563c9e51f02a in aio_dispatch_handler > > (ctx=ctx@entry=0x563ca0606010, node=0x563ca12b2150) at ../util/aio-posix.c:329 > > #3 0x0000563c9e51f752 in aio_dispatch_handlers (ctx=0x563ca0606010) at ../util/aio-posix.c:372 > > #4 aio_dispatch (ctx=0x563ca0606010) at ../util/aio-posix.c:382 > > #5 0x0000563c9e4f4d9e in aio_ctx_dispatch (source=, callback=, user_data=) at ../util/async.c:306 > > #6 0x00007fe96ef3fa9f in g_main_context_dispatch () at /lib64/libglib-2.0.so.0 > > #7 0x0000563c9e4ffeb8 in glib_pollfds_poll () at ../util/main-loop.c:231 > > #8 os_host_main_loop_wait (timeout=12188789) at ../util/main-loop.c:254 > > #9 main_loop_wait (nonblocking=nonblocking@entry=0) at ../util/main-loop.c:530 > > #10 0x0000563c9e3c7211 in qemu_main_loop () at ../softmmu/runstate.c:725 > > #11 0x0000563c9dfd46fe in main (argc=, argv=, envp=) at ../softmmu/main.c:50 > > > > The rdma return path will not be created when qemu incoming is starting > > since migrate_copy() is false at that moment, then a NULL return path > > rdma was referenced if the user enabled postcopy later. > > > > Signed-off-by: Li Zhijian > > --- > > migration/rdma.c | 29 ++++++++++++++++++----------- > > 1 file changed, 18 insertions(+), 11 deletions(-) > > > > diff --git a/migration/rdma.c b/migration/rdma.c > > index 651534e825..3b228c46eb 100644 > > --- a/migration/rdma.c > > +++ b/migration/rdma.c > > @@ -316,6 +316,7 @@ typedef struct RDMALocalBlocks { > > typedef struct RDMAContext { > > char *host; > > int port; > > + const char *host_port; > > > > RDMAWorkRequestData wr_data[RDMA_WRID_MAX]; > > > > @@ -2648,6 +2649,7 @@ static void *qemu_rdma_data_init(const char *host_port, Error **errp) > > if (!inet_parse(addr, host_port, NULL)) { > > rdma->port = atoi(addr->port); > > rdma->host = g_strdup(addr->host); > > + rdma->host_port = host_port; > > } else { > > ERROR(errp, "bad RDMA migration address '%s'", host_port); > > g_free(rdma); > > @@ -3276,6 +3278,7 @@ static int qemu_rdma_accept(RDMAContext *rdma) > > .private_data = &cap, > > .private_data_len = sizeof(cap), > > }; > > + RDMAContext *rdma_return_path = NULL; > > struct rdma_cm_event *cm_event; > > struct ibv_context *verbs; > > int ret = -EINVAL; > > @@ -3291,6 +3294,20 @@ static int qemu_rdma_accept(RDMAContext *rdma) > > goto err_rdma_dest_wait; > > } > > > > + /* > > + * initialize the RDMAContext for return path for postcopy after first > > + * connection is accepted. > > + */ > > + if (migrate_postcopy() && !rdma->is_return_path) { > > + rdma_return_path = qemu_rdma_data_init(rdma->host_port, NULL); > > + if (rdma_return_path == NULL) { > > + rdma_ack_cm_event(cm_event); > > + goto err_rdma_dest_wait; > > + } > > + > > + qemu_rdma_return_path_dest_init(rdma_return_path, rdma); > > + } > > + > > memcpy(&cap, cm_event->param.conn.private_data, sizeof(cap)); > > > > network_to_caps(&cap); > > @@ -3406,6 +3423,7 @@ static int qemu_rdma_accept(RDMAContext *rdma) > > err_rdma_dest_wait: > > rdma->error_state = ret; > > qemu_rdma_cleanup(rdma); > > + g_free(rdma_return_path); > > return ret; > > } > > > > @@ -4048,17 +4066,6 @@ void rdma_start_incoming_migration(const char *host_port, Error **errp) > > > > trace_rdma_start_incoming_migration_after_rdma_listen(); > > > > - /* initialize the RDMAContext for return path */ > > - if (migrate_postcopy()) { > > - rdma_return_path = qemu_rdma_data_init(host_port, &local_err); > > - > > - if (rdma_return_path == NULL) { > > - goto cleanup_rdma; > > - } > > - > > - qemu_rdma_return_path_dest_init(rdma_return_path, rdma); > > - } > > - > > qemu_set_fd_handler(rdma->channel->fd, rdma_accept_incoming_migration, > > NULL, (void *)(intptr_t)rdma); > > return; -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK