From nobody Tue Feb 10 07:23:09 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1599906596; cv=none; d=zohomail.com; s=zohoarc; b=B3KlJaICGkDIKZd8G128AjxZO+imc/jLDDybClFGOcpQlsaNMdM3nRuXHBpz8F/Tvoi5PQeoVuOxBjNm6sSRAAjbFpRvHfkF2h8YYSu1+H2ybqgIwEshFTpeDn3ccMXv8SyxA1Hcaoxx03mNB+n5gAsTtJAUXUlYZ3mBl9dHsEM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599906596; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dJBNAos0kaBhlLMJECNXeQQI6icUu9z7MrqP+OKTx8U=; b=UTEfLOIkq4++cyYm5W6JKSgdr5h5QzXMAb7OvtZ66JUk2cZgLXeTikO2CtfiLoq6TwGuqlGenTn5TqftDMWeb24EQsPrT1xfnEf/KzpMpsJ8mqD15sJOa99MVkI8pPx8HCbh0u3anHcIBWv9yMvJQG3GEqTMmQ1IWGSJzcCByR4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159990659626930.332101681327003; Sat, 12 Sep 2020 03:29:56 -0700 (PDT) Received: from localhost ([::1]:41418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kH2n5-0003cb-1T for importer@patchew.org; Sat, 12 Sep 2020 06:29:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kH2jM-0005KR-5D for qemu-devel@nongnu.org; Sat, 12 Sep 2020 06:26:04 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:4741 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kH2jG-000884-Hd for qemu-devel@nongnu.org; Sat, 12 Sep 2020 06:26:03 -0400 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 93FA71400BF92FAB66BD; Sat, 12 Sep 2020 18:25:51 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.487.0; Sat, 12 Sep 2020 18:25:43 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v2 6/6] migration/tls: add trace points for multifd-tls Date: Sat, 12 Sep 2020 18:36:19 +0800 Message-ID: <1599906979-17240-7-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599906979-17240-1-git-send-email-zhengchuan@huawei.com> References: <1599906979-17240-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.191; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/12 06:25:47 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: zhengchuan@huawei.com, zhang.zhanghailiang@huawei.com, yuxiating@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, alex.chen@huawei.com, jinyan12@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" add trace points for multifd-tls for debug. Signed-off-by: Chuan Zheng Signed-off-by: Yan Jin --- migration/multifd.c | 10 +++++++++- migration/trace-events | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/migration/multifd.c b/migration/multifd.c index 8aea4e0..0760502 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -732,7 +732,11 @@ static void multifd_tls_outgoing_handshake(QIOTask *ta= sk, QIOChannel *ioc =3D QIO_CHANNEL(qio_task_get_source(task)); Error *err =3D NULL; =20 - qio_task_propagate_error(task, &err); + if (qio_task_propagate_error(task, &err)) { + trace_multifd_tls_outgoing_handshake_error(ioc, error_get_pretty(e= rr)); + } else { + trace_multifd_tls_outgoing_handshake_complete(ioc); + } multifd_channel_connect(p, ioc, err); } =20 @@ -749,6 +753,7 @@ static void multifd_tls_channel_connect(MultiFDSendPara= ms *p, return; } =20 + trace_multifd_tls_outgoing_handshake_start(ioc, tioc, hostname); qio_channel_set_name(QIO_CHANNEL(tioc), "multifd-tls-outgoing"); qio_channel_tls_handshake(tioc, multifd_tls_outgoing_handshake, @@ -764,6 +769,9 @@ static bool multifd_channel_connect(MultiFDSendParams *= p, { MigrationState *s =3D p->s; =20 + trace_multifd_set_outgoing_channel( + ioc, object_get_typename(OBJECT(ioc)), s->hostname, error); + if (!error) { if (s->parameters.tls_creds && *s->parameters.tls_creds && diff --git a/migration/trace-events b/migration/trace-events index 4ab0a50..78db982 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -109,6 +109,11 @@ multifd_send_sync_main_wait(uint8_t id) "channel %d" multifd_send_terminate_threads(bool error) "error %d" multifd_send_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "cha= nnel %d packets %" PRIu64 " pages %" PRIu64 multifd_send_thread_start(uint8_t id) "%d" +multifd_tls_outgoing_handshake_start(void *ioc, void *tioc, const char *ho= stname) "ioc=3D%p tioc=3D%p hostname=3D%s" +multifd_tls_outgoing_handshake_error(void *ioc, const char *err) "ioc=3D%p= err=3D%s" +multifd_tls_outgoing_handshake_complete(void *ioc, void) "ioc=3D%p" +multifd_set_outgoing_channel(void *ioc, const char *ioctype, const char *h= ostname, void *err) "ioc=3D%p ioctype=3D%s hostname=3D%s err=3D%p" + ram_discard_range(const char *rbname, uint64_t start, size_t len) "%s: sta= rt: %" PRIx64 " %zx" ram_load_loop(const char *rbname, uint64_t addr, int flags, void *host) "%= s: addr: 0x%" PRIx64 " flags: 0x%x host: %p" ram_load_postcopy_loop(uint64_t addr, int flags) "@%" PRIx64 " %x" --=20 1.8.3.1