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 14C9FC2B9F7 for ; Wed, 26 May 2021 11:32:01 +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 85069613F9 for ; Wed, 26 May 2021 11:32:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 85069613F9 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]:57044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llrlX-0000jl-LE for qemu-devel@archiver.kernel.org; Wed, 26 May 2021 07:31:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llrkO-0008T7-Ur for qemu-devel@nongnu.org; Wed, 26 May 2021 07:30:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23736) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llrkN-0007YE-4o for qemu-devel@nongnu.org; Wed, 26 May 2021 07:30:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622028646; 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: in-reply-to:in-reply-to:references:references; bh=oyk3IIBdxzU/IH5GBc5brGLLAgtguIqCD2UHev7s1gE=; b=ZTF8URBgLeI98JsQDA6h0c6Q3ppCtP+MxlGFeubIDXJLxnVF1z/1u/okKfqSO+qKUbRDni Ri2Ivq0XlksjNhFNm5v4rxkX2n2FljNpmYeX1bh2H9FhvSRGGFxHy2PKv0nkXeEloLy4cl 4LYAkFBo5YgC7rKvtBZNMTXnbqBSurM= 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-52-uNWpJ2AVO9GSbHHbh__qmA-1; Wed, 26 May 2021 07:30:44 -0400 X-MC-Unique: uNWpJ2AVO9GSbHHbh__qmA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C6B5A501F9; Wed, 26 May 2021 11:30:43 +0000 (UTC) Received: from work-vm (ovpn-114-247.ams2.redhat.com [10.36.114.247]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E35541349A; Wed, 26 May 2021 11:30:42 +0000 (UTC) Date: Wed, 26 May 2021 12:30:40 +0100 From: "Dr. David Alan Gilbert" To: Li Zhijian Subject: Re: [PATCH v2 1/4] migration/rdma: cleanup rmda in rdma_start_incoming_migration error path Message-ID: References: <20210525080552.28259-1-lizhijian@cn.fujitsu.com> MIME-Version: 1.0 In-Reply-To: <20210525080552.28259-1-lizhijian@cn.fujitsu.com> User-Agent: Mutt/2.0.7 (2021-05-04) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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=us-ascii Content-Disposition: inline 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" * Li Zhijian (lizhijian@cn.fujitsu.com) wrote: > the error path after calling qemu_rdma_dest_init() should do rdma cleanup > > Signed-off-by: Li Zhijian > Reviewed-by: Dr. David Alan Gilbert Queued > --- > migration/rdma.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/migration/rdma.c b/migration/rdma.c > index 41726cc74a8..7e7595faabf 100644 > --- a/migration/rdma.c > +++ b/migration/rdma.c > @@ -4040,7 +4040,7 @@ void rdma_start_incoming_migration(const char *host_port, Error **errp) > > if (ret) { > ERROR(errp, "listening on socket!"); > - goto err; > + goto cleanup_rdma; > } > > trace_rdma_start_incoming_migration_after_rdma_listen(); > @@ -4050,7 +4050,7 @@ void rdma_start_incoming_migration(const char *host_port, Error **errp) > rdma_return_path = qemu_rdma_data_init(host_port, &local_err); > > if (rdma_return_path == NULL) { > - goto err; > + goto cleanup_rdma; > } > > qemu_rdma_return_path_dest_init(rdma_return_path, rdma); > @@ -4059,6 +4059,9 @@ void rdma_start_incoming_migration(const char *host_port, Error **errp) > qemu_set_fd_handler(rdma->channel->fd, rdma_accept_incoming_migration, > NULL, (void *)(intptr_t)rdma); > return; > + > +cleanup_rdma: > + qemu_rdma_cleanup(rdma); > err: > error_propagate(errp, local_err); > if (rdma) { > -- > 2.30.2 > > > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK