From nobody Sun Apr 28 19:18:03 2024 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=1599662785; cv=none; d=zohomail.com; s=zohoarc; b=c8mrlSXcM6C7gzDUm30FXYKfs0B69EZTAtahWsRaXmQGRnWDC/qyPqikfAFhC6FQqvi6q7S+/yW3sIYw+P2/dXy7gvfYFDkRPinyqrLiL/fTiOrx46FkSU479ooIaerW5brp1IfLHagykZzdRlExunZScGwqpBvnPZs/00smv5E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599662785; 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=QVzGyFoyzscEYGg/bL0A36OKLN13pllpvqsV95ejovo=; b=IPuVL/CxC7g/qmaqRxEDvV2DgvfqjiqZCdWSfB/rjmCvKffgIJ1U/s9UVCJIybE0GVyM7u6bQbY3JNZR7tJmH2XUOWnyjP2qllRCqR8zCEPjImUMmoX681Iu9hYfR24/eHI1OiQQsK+Afu8mSCwDfN0RuHE9+qTu1fTHfMvldjY= 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 1599662785675681.5048108846165; Wed, 9 Sep 2020 07:46:25 -0700 (PDT) Received: from localhost ([::1]:45948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kG1Me-0002C8-8B for importer@patchew.org; Wed, 09 Sep 2020 10:46:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kG1Ii-0002Nh-Cj for qemu-devel@nongnu.org; Wed, 09 Sep 2020 10:42:20 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4683 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 1kG1Ig-00070l-Ah for qemu-devel@nongnu.org; Wed, 09 Sep 2020 10:42:19 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id EB2C86CC4B218949602A; Wed, 9 Sep 2020 22:42:07 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.487.0; Wed, 9 Sep 2020 22:41:57 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v1 1/7] migration/tls: save hostname into MigrationState Date: Wed, 9 Sep 2020 22:52:51 +0800 Message-ID: <1599663177-53993-2-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599663177-53993-1-git-send-email-zhengchuan@huawei.com> References: <1599663177-53993-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.190; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/09 10:42:09 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" hostname is need in multifd-tls, save hostname into MigrationState Signed-off-by: Chuan Zheng Signed-off-by: Yan Jin --- migration/channel.c | 5 +++++ migration/migration.c | 1 + migration/migration.h | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/migration/channel.c b/migration/channel.c index 20e4c8e..2af3069 100644 --- a/migration/channel.c +++ b/migration/channel.c @@ -66,6 +66,11 @@ void migration_channel_connect(MigrationState *s, trace_migration_set_outgoing_channel( ioc, object_get_typename(OBJECT(ioc)), hostname, error); =20 + /* Save hostname into MigrationState for handshake */ + if (hostname) { + s->hostname =3D g_strdup(hostname); + } + if (!error) { if (s->parameters.tls_creds && *s->parameters.tls_creds && diff --git a/migration/migration.c b/migration/migration.c index 58a5452..e20b778 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1883,6 +1883,7 @@ void migrate_init(MigrationState *s) s->migration_thread_running =3D false; error_free(s->error); s->error =3D NULL; + s->hostname =3D NULL; =20 migrate_set_state(&s->state, MIGRATION_STATUS_NONE, MIGRATION_STATUS_S= ETUP); =20 diff --git a/migration/migration.h b/migration/migration.h index ae497bd..758f803 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -261,6 +261,11 @@ struct MigrationState * (which is in 4M chunk). */ uint8_t clear_bitmap_shift; + + /* + * This save hostname when out-going migration starts + */ + char *hostname; }; =20 void migrate_set_state(int *state, int old_state, int new_state); --=20 1.8.3.1 From nobody Sun Apr 28 19:18:03 2024 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=1599662608; cv=none; d=zohomail.com; s=zohoarc; b=Clzduqpge19nMBmp91bxf2DsGJLNXEqWVKK1fNW6O8LNOBQQ/iSMK37G6df0WvSzJMgrqkt9enDynamfFPUoHJzZQuvQQZT7BTdGz/lYwD3gyAZ8AgF3ik7Oyi29jRcFLDysX1VUQM6/gqdHled+3CHyuRI7OrT0Mk24cELYk9A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599662608; 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=nAMJnT1PkHH4lUHVpmwYR6IMApAW3NUxb3EBzCBWA6Y=; b=M1cecmsmMi16lbm0KuZyf2OdFjMN8qx0eDuJX+cI4bt6AxcvKH7Mme7b3wZxasH+I2szil6VyTRkMNwNpok7GazPfnS2kATTEtpRkMgjo62pP5IztxquvwwcjpzNDmnntBQBbBoH1ZBIt8gqPTHCEfPyfH/FLROS3FI/8A3f27Y= 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 1599662608729606.0560446018493; Wed, 9 Sep 2020 07:43:28 -0700 (PDT) Received: from localhost ([::1]:57826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kG1Jm-0003vP-D0 for importer@patchew.org; Wed, 09 Sep 2020 10:43:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kG1If-0002Fu-BY for qemu-devel@nongnu.org; Wed, 09 Sep 2020 10:42:17 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4680 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 1kG1Ic-0006zz-FA for qemu-devel@nongnu.org; Wed, 09 Sep 2020 10:42:17 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id D79F47E1DF47EF9C00E0; Wed, 9 Sep 2020 22:42:07 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.487.0; Wed, 9 Sep 2020 22:41:58 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v1 2/7] migration/tls: extract migration_tls_client_create for common-use Date: Wed, 9 Sep 2020 22:52:52 +0800 Message-ID: <1599663177-53993-3-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599663177-53993-1-git-send-email-zhengchuan@huawei.com> References: <1599663177-53993-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.190; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/09 10:42:09 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" migration_tls_client_create will be used in multifd-tls, let's extract it. Signed-off-by: Chuan Zheng Signed-off-by: Yan Jin Reviewed-by: Daniel P. Berrang=C3=A9 --- migration/tls.c | 26 ++++++++++++++++++-------- migration/tls.h | 6 ++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/migration/tls.c b/migration/tls.c index 7a02ec8..e888698 100644 --- a/migration/tls.c +++ b/migration/tls.c @@ -22,7 +22,6 @@ #include "channel.h" #include "migration.h" #include "tls.h" -#include "io/channel-tls.h" #include "crypto/tlscreds.h" #include "qemu/error-report.h" #include "qapi/error.h" @@ -125,11 +124,10 @@ static void migration_tls_outgoing_handshake(QIOTask = *task, object_unref(OBJECT(ioc)); } =20 - -void migration_tls_channel_connect(MigrationState *s, - QIOChannel *ioc, - const char *hostname, - Error **errp) +QIOChannelTLS *migration_tls_client_create(MigrationState *s, + QIOChannel *ioc, + const char *hostname, + Error **errp) { QCryptoTLSCreds *creds; QIOChannelTLS *tioc; @@ -137,7 +135,7 @@ void migration_tls_channel_connect(MigrationState *s, creds =3D migration_tls_get_creds( s, QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, errp); if (!creds) { - return; + return NULL; } =20 if (s->parameters.tls_hostname && *s->parameters.tls_hostname) { @@ -145,11 +143,23 @@ void migration_tls_channel_connect(MigrationState *s, } if (!hostname) { error_setg(errp, "No hostname available for TLS"); - return; + return NULL; } =20 tioc =3D qio_channel_tls_new_client( ioc, creds, hostname, errp); + + return tioc; +} + +void migration_tls_channel_connect(MigrationState *s, + QIOChannel *ioc, + const char *hostname, + Error **errp) +{ + QIOChannelTLS *tioc; + + tioc =3D migration_tls_client_create(s, ioc, hostname, errp); if (!tioc) { return; } diff --git a/migration/tls.h b/migration/tls.h index cdd7000..d4a0861 100644 --- a/migration/tls.h +++ b/migration/tls.h @@ -22,11 +22,17 @@ #define QEMU_MIGRATION_TLS_H =20 #include "io/channel.h" +#include "io/channel-tls.h" =20 void migration_tls_channel_process_incoming(MigrationState *s, QIOChannel *ioc, Error **errp); =20 +QIOChannelTLS *migration_tls_client_create(MigrationState *s, + QIOChannel *ioc, + const char *hostname, + Error **errp); + void migration_tls_channel_connect(MigrationState *s, QIOChannel *ioc, const char *hostname, --=20 1.8.3.1 From nobody Sun Apr 28 19:18:03 2024 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=1599662699; cv=none; d=zohomail.com; s=zohoarc; b=BI4HmyJZaeAILK+8d5XQhI017pQDXB2v3BMnYr5SZa5+kjWgoh2kbiXc1JvvUm7wOzHEA7lUggc1FNMbZy5fVGlQpxhu4oLH+XlO1Qt86+jrHFt8j+J8Jcg7jpeLPmJn7l8sqJ82CWKTQwP41j+VfoozIcywLD0O/WuOBsvhwDk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599662699; 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=BJRdqUgTX4PQa62I3k6bKQN1swTEWN8Z6xMwYOLLXJ4=; b=YrBifdjXv1e6/3NQlQ0p4XWRk0izOwPw6wOPMgEkSggSEX0Q7dTYmVKAzOUov51LTh+iEHextyZvRNp5FVAWDJPRXN8SMlr2/pDBlTnDoMb9ueLneIqko9It3dhrVZBxw61kQvZmAlqbdcHMNGyOqwQDPUURXvmuLGq65tiMZgc= 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 15996626998481019.4656873222186; Wed, 9 Sep 2020 07:44:59 -0700 (PDT) Received: from localhost ([::1]:37952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kG1LG-0007IC-JB for importer@patchew.org; Wed, 09 Sep 2020 10:44:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kG1Ij-0002Pd-24 for qemu-devel@nongnu.org; Wed, 09 Sep 2020 10:42:21 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4684 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 1kG1Ig-00070n-BJ for qemu-devel@nongnu.org; Wed, 09 Sep 2020 10:42:20 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id E6A2B12E030EF7F686AC; Wed, 9 Sep 2020 22:42:07 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.487.0; Wed, 9 Sep 2020 22:41:59 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v1 3/7] migration/tls: add MigrationState into MultiFDSendParams Date: Wed, 9 Sep 2020 22:52:53 +0800 Message-ID: <1599663177-53993-4-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599663177-53993-1-git-send-email-zhengchuan@huawei.com> References: <1599663177-53993-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.190; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/09 10:42:09 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" MigrationState is need for tls session build, add MigrationState into MultiFDSendParams. Signed-off-by: Chuan Zheng Signed-off-by: Yan Jin Reviewed-by: Daniel P. Berrang=C3=A9 --- migration/multifd.c | 2 ++ migration/multifd.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/migration/multifd.c b/migration/multifd.c index d044120..2e04803 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -543,6 +543,7 @@ void multifd_save_cleanup(void) =20 socket_send_channel_destroy(p->c); p->c =3D NULL; + p->s =3D NULL; qemu_mutex_destroy(&p->mutex); qemu_sem_destroy(&p->sem); qemu_sem_destroy(&p->sem_sync); @@ -738,6 +739,7 @@ static void multifd_new_send_channel_async(QIOTask *tas= k, gpointer opaque) object_unref(OBJECT(sioc)); error_free(local_err); } else { + p->s =3D migrate_get_current(); p->c =3D QIO_CHANNEL(sioc); qio_channel_set_delay(p->c, false); p->running =3D true; diff --git a/migration/multifd.h b/migration/multifd.h index 448a03d..8175b3c 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -66,6 +66,8 @@ typedef struct { } MultiFDPages_t; =20 typedef struct { + /* Migration State */ + MigrationState *s; /* this fields are not changed once the thread is created */ /* channel number */ uint8_t id; --=20 1.8.3.1 From nobody Sun Apr 28 19:18:03 2024 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=1599662695; cv=none; d=zohomail.com; s=zohoarc; b=jIspV6KvEbgegLCAM20pG7euJZmcqvhkhIkWWtyySrIESQozXW+u9lTUWWffj0DQDNOIMXaY4/dv+WDIpUYfGqMusSUJzLu03SwXB54ZR/29Nrt5jf/5o1zBLZoNBPodW5iGF/bQkQOxTYgnPWUy+pCCVLwbnG7PlSJbsXWloLc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599662695; 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=Z+m1Jz3kKYGkw27cx9s7qhmyacxInUYBo5ipjFKqOk0=; b=aQCRpITfOOeMKoVfa5YjUPiySZU6geQ2h8RG1AOyagyReBUy+M4q5uBclVG1dovFU5lqBcncZeWUTj9TK2XGe7Cii/icctqN6GGK+5b2R3lpQr0+7uBD2HZMTHITkIGqG0V/w3nNRYhZLr4uaBUGztWTYsIAaIMzMdAUzQDg79s= 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 1599662694808434.17656166058475; Wed, 9 Sep 2020 07:44:54 -0700 (PDT) Received: from localhost ([::1]:37386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kG1LB-00073w-Dp for importer@patchew.org; Wed, 09 Sep 2020 10:44:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kG1Id-0002E6-UK for qemu-devel@nongnu.org; Wed, 09 Sep 2020 10:42:15 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4681 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 1kG1Ic-000701-1J for qemu-devel@nongnu.org; Wed, 09 Sep 2020 10:42:15 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id DCE62620DDB8EBD41794; Wed, 9 Sep 2020 22:42:07 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.487.0; Wed, 9 Sep 2020 22:41:59 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v1 4/7] migration/tls: extract cleanup function for common-use Date: Wed, 9 Sep 2020 22:52:54 +0800 Message-ID: <1599663177-53993-5-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599663177-53993-1-git-send-email-zhengchuan@huawei.com> References: <1599663177-53993-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.190; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/09 10:42:09 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" multifd channel cleanup is need if multifd handshake failed, let's extract it. Signed-off-by: Chuan Zheng Signed-off-by: Yan Jin Reviewed-by: Daniel P. Berrang=C3=A9 --- migration/multifd.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index 2e04803..b2e741c 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -718,6 +718,23 @@ out: return NULL; } =20 +static void multifd_new_send_channel_cleanup(MultiFDSendParams *p, + QIOChannel *ioc, Error *err) +{ + migrate_set_error(migrate_get_current(), err); + /* Error happen, we need to tell who pay attention to me */ + qemu_sem_post(&multifd_send_state->channels_ready); + qemu_sem_post(&p->sem_sync); + /* + * Although multifd_send_thread is not created, but main migration + * thread neet to judge whether it is running, so we need to mark + * its status. + */ + p->quit =3D true; + object_unref(OBJECT(ioc)); + error_free(err); +} + static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque) { MultiFDSendParams *p =3D opaque; @@ -726,18 +743,7 @@ static void multifd_new_send_channel_async(QIOTask *ta= sk, gpointer opaque) =20 trace_multifd_new_send_channel_async(p->id); if (qio_task_propagate_error(task, &local_err)) { - migrate_set_error(migrate_get_current(), local_err); - /* Error happen, we need to tell who pay attention to me */ - qemu_sem_post(&multifd_send_state->channels_ready); - qemu_sem_post(&p->sem_sync); - /* - * Although multifd_send_thread is not created, but main migration - * thread neet to judge whether it is running, so we need to mark - * its status. - */ - p->quit =3D true; - object_unref(OBJECT(sioc)); - error_free(local_err); + goto cleanup; } else { p->s =3D migrate_get_current(); p->c =3D QIO_CHANNEL(sioc); @@ -745,7 +751,11 @@ static void multifd_new_send_channel_async(QIOTask *ta= sk, gpointer opaque) p->running =3D true; qemu_thread_create(&p->thread, p->name, multifd_send_thread, p, QEMU_THREAD_JOINABLE); + return; } + +cleanup: + multifd_new_send_channel_cleanup(p, sioc, local_err); } =20 int multifd_save_setup(Error **errp) --=20 1.8.3.1 From nobody Sun Apr 28 19:18:03 2024 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=1599662701; cv=none; d=zohomail.com; s=zohoarc; b=LiW2wIyCFmEBUDw0C7GywmyUvbFdNbXbu5TKJwUHGyXzWCUg+EfQo30vLh9iZikNbavfJrtSAEkORRVRl6q/J+ULcStKIvBx59eEQgUKwnxOX1g6ynjsLAze5VTsL18TLUoZ0FSD5MPZIjpXrdB+mMhaOpWa7m6DkHD+9vqsLA4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599662701; 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=djdgQ7f7mbM9TP9SmB4I+1qHws//zgj4VF3OoMLgGBg=; b=JW/mBESDwdXUgKXTlTHP1GogjYq4Lwbqi2XxN+AiNamxDKJPklePFglHfccI2ME63NXRgEX7iFQrKz03hqT6jrgdb6M+PFpFAOWdwPPY6f4mCovjPdh9IHd4fd1NG/IzRRil0NCTy4PfCuBYAQYfr7W4G4RbjSVv9l5wolH+t+M= 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 1599662701540963.8342632840576; Wed, 9 Sep 2020 07:45:01 -0700 (PDT) Received: from localhost ([::1]:38246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kG1LI-0007PQ-6Q for importer@patchew.org; Wed, 09 Sep 2020 10:45:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kG1If-0002GQ-Nd for qemu-devel@nongnu.org; Wed, 09 Sep 2020 10:42:17 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4678 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 1kG1Ic-0006zy-Ui for qemu-devel@nongnu.org; Wed, 09 Sep 2020 10:42:17 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id CD169767F18A2CD0878E; Wed, 9 Sep 2020 22:42:07 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.487.0; Wed, 9 Sep 2020 22:42:00 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v1 5/7] migration/tls: add support for tls check Date: Wed, 9 Sep 2020 22:52:55 +0800 Message-ID: <1599663177-53993-6-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599663177-53993-1-git-send-email-zhengchuan@huawei.com> References: <1599663177-53993-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.190; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/09 10:42:09 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 multifd_channel_connect to support for tls check. Signed-off-by: Chuan Zheng Signed-off-by: Yan Jin Reviewed-by: Daniel P. Berrang=C3=A9 --- migration/multifd.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index b2e741c..b2076d7 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -20,6 +20,7 @@ #include "ram.h" #include "migration.h" #include "socket.h" +#include "tls.h" #include "qemu-file.h" #include "trace.h" #include "multifd.h" @@ -718,6 +719,47 @@ out: return NULL; } =20 +static void multifd_tls_channel_connect(MultiFDSendParams *p, + QIOChannel *ioc, + Error **errp) +{ + /* TODO */ +} + +static bool multifd_channel_connect(MultiFDSendParams *p, + QIOChannel *ioc, + Error *error) +{ + MigrationState *s =3D p->s; + + if (!error) { + if (s->parameters.tls_creds && + *s->parameters.tls_creds && + !object_dynamic_cast(OBJECT(ioc), + TYPE_QIO_CHANNEL_TLS)) { + multifd_tls_channel_connect(p, ioc, &error); + if (!error) { + /* + * tls_channel_connect will call back to this + * function after the TLS handshake, + * so we mustn't call multifd_send_thread until then + */ + return false; + } else { + return true; + } + } else { + /* update for tls qio channel */ + p->c =3D ioc; + qemu_thread_create(&p->thread, p->name, multifd_send_thread, p, + QEMU_THREAD_JOINABLE); + } + return false; + } + + return true; +} + static void multifd_new_send_channel_cleanup(MultiFDSendParams *p, QIOChannel *ioc, Error *err) { @@ -749,8 +791,9 @@ static void multifd_new_send_channel_async(QIOTask *tas= k, gpointer opaque) p->c =3D QIO_CHANNEL(sioc); qio_channel_set_delay(p->c, false); p->running =3D true; - qemu_thread_create(&p->thread, p->name, multifd_send_thread, p, - QEMU_THREAD_JOINABLE); + if (multifd_channel_connect(p, sioc, local_err)) { + goto cleanup; + } return; } =20 --=20 1.8.3.1 From nobody Sun Apr 28 19:18:03 2024 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=1599662602; cv=none; d=zohomail.com; s=zohoarc; b=BRgj5g1vgIU11our+y/zMnmgk65GqtkzPcnRrjuGkViPxuYQpJA6IodA5QG9S9GS0jW0gW8e7hAM2/aBVqlPWAqELSKT1X4tJTKJ/qU3seS/0m+u9IsnlXGDuiRxL5c1I/YD5TTZLdL27O+CQuqhuOi4wEQkA28ZTSPXFCQByD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599662602; 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=IsrXqDjJeLr+iDaKg3aBBHDuEeTg3VvowH4MZ4xiPcg=; b=R7K5kgXXWIAQv0uG4NHOotpakCiBoobvaaaGXz+PV+9IqwSfytq1kJ6XDyuvGgdTs4TqV4+UuEd7tqAeN47m+x5lzPO+bP+2q3JExLGkYb1v+bZtGxsdigxvebWByJziGha80MNarDfXe7YYHeL4pc0fjEPIGhomOvfQVIZQ/CI= 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 1599662602704535.1372063438776; Wed, 9 Sep 2020 07:43:22 -0700 (PDT) Received: from localhost ([::1]:57732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kG1Jh-0003tA-C0 for importer@patchew.org; Wed, 09 Sep 2020 10:43:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kG1Id-0002Df-K1 for qemu-devel@nongnu.org; Wed, 09 Sep 2020 10:42:15 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4679 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 1kG1Ib-000702-QH for qemu-devel@nongnu.org; Wed, 09 Sep 2020 10:42:15 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id E1DCD657BD3BBC3609F7; Wed, 9 Sep 2020 22:42:07 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.487.0; Wed, 9 Sep 2020 22:42:01 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v1 6/7] migration/tls: add support for multifd tls-handshake Date: Wed, 9 Sep 2020 22:52:56 +0800 Message-ID: <1599663177-53993-7-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599663177-53993-1-git-send-email-zhengchuan@huawei.com> References: <1599663177-53993-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.190; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/09 10:42:09 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 support for multifd tls-handshake Signed-off-by: Chuan Zheng Signed-off-by: Yan Jin Reviewed-by: Daniel P. Berrang=C3=A9 --- migration/multifd.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/migration/multifd.c b/migration/multifd.c index b2076d7..2509187 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -719,11 +719,41 @@ out: return NULL; } =20 +static bool multifd_channel_connect(MultiFDSendParams *p, + QIOChannel *ioc, + Error *error); + +static void multifd_tls_outgoing_handshake(QIOTask *task, + gpointer opaque) +{ + MultiFDSendParams *p =3D opaque; + QIOChannel *ioc =3D QIO_CHANNEL(qio_task_get_source(task)); + Error *err =3D NULL; + + qio_task_propagate_error(task, &err); + multifd_channel_connect(p, ioc, err); +} + static void multifd_tls_channel_connect(MultiFDSendParams *p, QIOChannel *ioc, Error **errp) { - /* TODO */ + MigrationState *s =3D p->s; + const char *hostname =3D s->hostname; + QIOChannelTLS *tioc; + + tioc =3D migration_tls_client_create(s, ioc, hostname, errp); + if (!tioc) { + return; + } + + qio_channel_set_name(QIO_CHANNEL(tioc), "multifd-tls-outgoing"); + qio_channel_tls_handshake(tioc, + multifd_tls_outgoing_handshake, + p, + NULL, + NULL); + } =20 static bool multifd_channel_connect(MultiFDSendParams *p, --=20 1.8.3.1 From nobody Sun Apr 28 19:18:03 2024 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=1599662608; cv=none; d=zohomail.com; s=zohoarc; b=YxnqTATDdExFtJNFsdwkhDfmqlAZcBZusW8SU1HqB5RZEeJUSVtEZLm0TmVt1Hq2RN+XaU+0FwHuaOz8QVFlZRgl6WnEoDmTjDDMRNk8cT2VdIRyOO8Kp3W7FX5N15vgoDcqKXt8clBaMFYOKhbQUvkNM7z0LlMZ0CcdZq7udC8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599662608; 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=9fPBtqa5xmj3QBkFcM8jArAjT0lGhzVAIHU34/DuwRk=; b=DdbhDFbgT+Ad5s4dtkiS6OCxxqYShQaG+h1EGLSCJgx8xhh+ljgZVOYn1oOOYgEiwxEDBU0ubh/hd6xnnbLw5P/48eS7VI+XTRFztLKbfXBMSepLa7SLXqH7NMZOFRHl5JfW2tEefuPKPbRzWzMd+Ni7My3n4B4awia+6O477zE= 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 1599662608589968.3585772738904; Wed, 9 Sep 2020 07:43:28 -0700 (PDT) Received: from localhost ([::1]:57920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kG1Jn-0003xb-1x for importer@patchew.org; Wed, 09 Sep 2020 10:43:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kG1Ie-0002FN-UN for qemu-devel@nongnu.org; Wed, 09 Sep 2020 10:42:16 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4682 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 1kG1Ic-000700-Eq for qemu-devel@nongnu.org; Wed, 09 Sep 2020 10:42:16 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id D2644304815B491BD701; Wed, 9 Sep 2020 22:42:07 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.487.0; Wed, 9 Sep 2020 22:42:01 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v1 7/7] migration/tls: add trace points for multifd-tls Date: Wed, 9 Sep 2020 22:52:57 +0800 Message-ID: <1599663177-53993-8-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599663177-53993-1-git-send-email-zhengchuan@huawei.com> References: <1599663177-53993-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.190; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/09 10:42:09 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 2509187..26935b6 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -730,7 +730,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(error_get_pretty(err)); + } else { + trace_multifd_tls_outgoing_handshake_complete(); + } multifd_channel_connect(p, ioc, err); } =20 @@ -747,6 +751,7 @@ static void multifd_tls_channel_connect(MultiFDSendPara= ms *p, return; } =20 + trace_multifd_tls_outgoing_handshake_start(hostname); qio_channel_set_name(QIO_CHANNEL(tioc), "multifd-tls-outgoing"); qio_channel_tls_handshake(tioc, multifd_tls_outgoing_handshake, @@ -762,6 +767,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..860d2c4 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(const char *hostname) "hostname=3D%s" +multifd_tls_outgoing_handshake_error(const char *err) "err=3D%s" +multifd_tls_outgoing_handshake_complete(void) "" +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