From patchwork Fri Aug 3 09:13:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 858585 jemmy X-Patchwork-Id: 953140 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ESR/Fae3"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41hhN75J2Mz9s2g for ; Fri, 3 Aug 2018 19:20:23 +1000 (AEST) Received: from localhost ([::1]:49765 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flWFx-0006NN-Bf for incoming@patchwork.ozlabs.org; Fri, 03 Aug 2018 05:20:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flWA9-0001Zr-4T for qemu-devel@nongnu.org; Fri, 03 Aug 2018 05:14:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1flWA6-0001pT-AO for qemu-devel@nongnu.org; Fri, 03 Aug 2018 05:14:21 -0400 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]:38336) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1flWA6-0001ng-4o for qemu-devel@nongnu.org; Fri, 03 Aug 2018 05:14:18 -0400 Received: by mail-pl0-x244.google.com with SMTP id u11-v6so2310480plq.5 for ; Fri, 03 Aug 2018 02:14:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pEFezLYVk4Oxp4U1uMRNW8tjw1DGFNquuUXNxb7t4Nk=; b=ESR/Fae3dy794IpO/17Mf3iiCBrm5QOeZ/agSLmwYxE+smbysQe+9D49E+aahH6a18 jc2hS7RHWJ8m/q2Q4mwTuTc8Y1POBlzgGrKush8YGfSUvQbv6JZQPDX+Xm3D9+dKDKAR hIOastNaELsPR8x32jjXAT0dQXbdvONuNm++jX2WVzpPi3gxLOpH836wXK4iaUcIPd6h qRckGkzI7bOg7ekHhj41WNl7Ky8ZKPaoTBQMhsU1OoS4u61CRSXm+P57KJeXbIUJEJUK UI8+cltb9Ew+GMCuTaK6Te6QgkHRLDMbqBi/5Tenc1KVj8OTV9PB7i8jm/caOEE9cWks pAaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pEFezLYVk4Oxp4U1uMRNW8tjw1DGFNquuUXNxb7t4Nk=; b=K+I2aZIpxZaaGVeKKnK/OxubTkV6+NceSJ/R7KJKOFsmYEP++VCaf20ZvBNbXXhAve 82F85ZZLjr1HraAwcy9/8xcd/EyGM/jLbiRAyIvTYCJ3lVsJmop9HbGvZD5KCs8E+J1d xaWWyY6946brSe+r8GFGkxWNJmp/h4qUM5vfcBbLqbP0Wl6o07yxQl+KX8BflvIcZo00 KynAEjPWzjXIX+OZLMwQPBcDmiR6X8v50AMcmb5wfQqXQEzsz1V8HN3OZmdLgHG3nN2s UZ5NT0nsYKTXSL0F5vBEyot8Mc1XbP4TbRKlof4q9lXZAZkaPemgk94FKUIWHhpHx1FT 5Vrg== X-Gm-Message-State: AOUpUlGNQeqRhu/HdaoIBIsdOkx2rwrOq3yRENki9s0RxLeJLrGzEWbZ 11o/lnYbCFPjBVszOAmyZ24= X-Google-Smtp-Source: AAOMgpcKRQOQn5VMxZz7pGfml54q36gqO4h+ra3QzmtixPy3GIbKck9y1Fqfwzq1FtZJCD+2xKeS1Q== X-Received: by 2002:a17:902:622:: with SMTP id 31-v6mr2732103plg.153.1533287657339; Fri, 03 Aug 2018 02:14:17 -0700 (PDT) Received: from VM_120_46_centos.localdomain ([119.28.87.64]) by smtp.gmail.com with ESMTPSA id e21-v6sm7991352pfl.187.2018.08.03.02.14.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Aug 2018 02:14:16 -0700 (PDT) From: Lidong Chen X-Google-Original-From: Lidong Chen To: zhang.zhanghailiang@huawei.com, quintela@redhat.com, dgilbert@redhat.com Date: Fri, 3 Aug 2018 17:13:49 +0800 Message-Id: <1533287630-4221-12-git-send-email-lidongchen@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1533287630-4221-1-git-send-email-lidongchen@tencent.com> References: <1533287630-4221-1-git-send-email-lidongchen@tencent.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::244 Subject: [Qemu-devel] [PATCH v6 11/12] migration: remove the unnecessary RDMA_CONTROL_ERROR message X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, Lidong Chen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It's not necessary to send RDMA_CONTROL_ERROR when clean up rdma resource. If rdma->error_state is ture, the message may not send successfully. and the cm event can also notify the peer qemu. Signed-off-by: Lidong Chen --- migration/rdma.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 62de2ec..14cdf82 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2305,17 +2305,6 @@ static void qemu_rdma_cleanup(RDMAContext *rdma) int idx; if (rdma->cm_id && rdma->connected) { - if ((rdma->error_state || - migrate_get_current()->state == MIGRATION_STATUS_CANCELLING) && - !rdma->received_error) { - RDMAControlHeader head = { .len = 0, - .type = RDMA_CONTROL_ERROR, - .repeat = 1, - }; - error_report("Early error. Sending error."); - qemu_rdma_post_send_control(rdma, NULL, &head); - } - rdma_disconnect(rdma->cm_id); trace_qemu_rdma_cleanup_disconnect(); rdma->connected = false;