From nobody Mon Feb 9 13:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635929285600770.4901401615052; Wed, 3 Nov 2021 01:48:05 -0700 (PDT) Received: from localhost ([::1]:54076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miBwC-0002GP-Gp for importer@patchew.org; Wed, 03 Nov 2021 04:48:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBv7-0000VH-Vc for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:46:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:30273) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBuN-0003JU-SV for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:46:57 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-277-64KuU-_2P-WlZTAcYa63yQ-1; Wed, 03 Nov 2021 04:46:09 -0400 Received: by mail-wm1-f72.google.com with SMTP id o22-20020a1c7516000000b0030d6f9c7f5fso747274wmc.1 for ; Wed, 03 Nov 2021 01:46:09 -0700 (PDT) Received: from localhost (static-233-86-86-188.ipcom.comunitel.net. [188.86.86.233]) by smtp.gmail.com with ESMTPSA id o25sm1292323wms.17.2021.11.03.01.46.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 01:46:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635929170; 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=RTVcSwYRk8dbp7MwPIS3nc/ClGGDvA9iyBntZZqREjc=; b=XI1t02VyMuvV2tZj2dToA1X4Y4DEm97dYeVxoKzO/DWnl0Gn49qeTc7dsTu7dtTl++ZZwi gFur6zCyfPKb07cq4I/TAjyQJDhA7HxO8QvWv5Poi3ZO2pqIWeToYVwhmirbiB47vVM+Ql 8VASlBzh7hQMtno5uQ6TFDVkyfCuCJQ= X-MC-Unique: 64KuU-_2P-WlZTAcYa63yQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RTVcSwYRk8dbp7MwPIS3nc/ClGGDvA9iyBntZZqREjc=; b=HNNZFqZcR256XWEr5Aeggs30Y9ZpBk8LdVjNlrXCmPGLRr/xlbmXs+zxTk1N6bsY/1 kYmCTwlLnR0gdl9onuogi4XnrW/CCsH+ZCdhq8yKWtDZOukyN17yWPNoqFH4viupiF5g 2luO4srss8HnG0poaWH/IiHC+QKc0oPNjk76h8i3WeYSS6w/DI/S9Tj/suPNz04MZZUD /QvABkEXmrkDOLOgWMC8PWSFNlrzqFNOArBIC0bpEhTjuaG5O8W33N4G53kwUjSioBer rLm78pUIcq1LePNOLJk+DsNa+ICF0B71hYKcwbFF6wyvfkzce5VOXR/hZm2WnTk3T0Nk vuvg== X-Gm-Message-State: AOAM530L9KUQOub5NN1QiHasK9gIxB9y/F3Xi8ea+YtOMQ8fx9gI2X1u V2eFBgUfg8E7NFRlyUO0Yuggw6vVLgpQiGpgls311gSSCMsijRn4Vdy6VKv6ORWV80D7U4jxO+e Toa+Wt7G0fMiaHKY3xCFRvF5tQr4BB5bzOcBHNh3XqzWVOrM4/Q68Jd1SECxBhaare9I= X-Received: by 2002:adf:e50b:: with SMTP id j11mr47426884wrm.430.1635929168501; Wed, 03 Nov 2021 01:46:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfMB1V3xTdrYIlqA6I7TVNehaZiqEwwZtzb+4m/Ds2GB9YZKM3Hu9VthodNdUZYPIcNXY8rg== X-Received: by 2002:adf:e50b:: with SMTP id j11mr47426845wrm.430.1635929168195; Wed, 03 Nov 2021 01:46:08 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 01/11] migration: provide an error message to migration_cancel() Date: Wed, 3 Nov 2021 09:45:55 +0100 Message-Id: <20211103084605.20027-2-quintela@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103084605.20027-1-quintela@redhat.com> References: <20211103084605.20027-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.702, 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, URG_BIZ=0.573 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Hailiang Zhang , Li Zhijian , Juan Quintela , Jason Wang , "Dr. David Alan Gilbert" , Zhang Chen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1635929286769100001 Content-Type: text/plain; charset="utf-8" From: Laurent Vivier This avoids to call migrate_get_current() in the caller function whereas migration_cancel() already needs the pointer to the current migration state. Signed-off-by: Laurent Vivier Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/migration.h | 2 +- migration/migration.c | 9 ++++++--- migration/ram.c | 3 +-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/migration/migration.h b/migration/migration.h index 7a5aa8c2fd..8130b703eb 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -388,7 +388,7 @@ int foreach_not_ignored_block(RAMBlockIterFunc func, vo= id *opaque); void migration_make_urgent_request(void); void migration_consume_urgent_request(void); bool migration_rate_limit(void); -void migration_cancel(void); +void migration_cancel(const Error *error); =20 void populate_vfio_info(MigrationInfo *info); =20 diff --git a/migration/migration.c b/migration/migration.c index 53b9a8af96..ec3d87f0a9 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -215,8 +215,11 @@ void migration_object_init(void) dirty_bitmap_mig_init(); } =20 -void migration_cancel(void) +void migration_cancel(const Error *error) { + if (error) { + migrate_set_error(current_migration, error); + } migrate_fd_cancel(current_migration); } =20 @@ -226,7 +229,7 @@ void migration_shutdown(void) * Cancel the current migration - that will (eventually) * stop the migration using this structure */ - migration_cancel(); + migration_cancel(NULL); object_unref(OBJECT(current_migration)); =20 /* @@ -2334,7 +2337,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool = blk, =20 void qmp_migrate_cancel(Error **errp) { - migration_cancel(); + migration_cancel(NULL); } =20 void qmp_migrate_continue(MigrationStatus state, Error **errp) diff --git a/migration/ram.c b/migration/ram.c index 680a5158aa..f5d39db4e4 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -4323,9 +4323,8 @@ static void ram_mig_ram_block_resized(RAMBlockNotifie= r *n, void *host, * Abort and indicate a proper reason. */ error_setg(&err, "RAM block '%s' resized during precopy.", rb->ids= tr); - migrate_set_error(migrate_get_current(), err); + migration_cancel(err); error_free(err); - migration_cancel(); } =20 switch (ps) { --=20 2.33.1 From nobody Mon Feb 9 13:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635929407640871.8590491545001; Wed, 3 Nov 2021 01:50:07 -0700 (PDT) Received: from localhost ([::1]:34388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miByA-0007wa-KT for importer@patchew.org; Wed, 03 Nov 2021 04:50:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBvD-0000fs-IS for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:47:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:31700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBuO-0003KY-QN for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:47:02 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-404-iChbU_idMiyqWh35hTFSAQ-1; Wed, 03 Nov 2021 04:46:10 -0400 Received: by mail-wm1-f72.google.com with SMTP id z138-20020a1c7e90000000b003319c5f9164so2414040wmc.7 for ; Wed, 03 Nov 2021 01:46:10 -0700 (PDT) Received: from localhost (static-233-86-86-188.ipcom.comunitel.net. [188.86.86.233]) by smtp.gmail.com with ESMTPSA id h17sm4634001wmb.44.2021.11.03.01.46.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 01:46:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635929171; 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=hXMAM6I60VvVCZ9lewhAVLrOV0nNhGUlSeWi+acDDgk=; b=VB/RmqbBqsDpl5IglwnejBeX1i/Ce7BuhBkOEzq1V3lfw2XffbR1rVM/BsGxPRXiCrxGno ZZOvFbngzqIxHBwFL6Jr0fhrd2cZBj7orrd5iP+RYyxj0sduHJ29p53QgAFzw/IRO91f82 iWBcxMZv1YinMFpCYuOvOeoX+CdK3kc= X-MC-Unique: iChbU_idMiyqWh35hTFSAQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hXMAM6I60VvVCZ9lewhAVLrOV0nNhGUlSeWi+acDDgk=; b=dor4YVpfVoI/RXGIhTI6Q0nTZFT8EYsBzZoz/GDRi9dFHXLF8Qd8E7yFwjjUUM7G74 MCRF1+O5gJd6serdOgkZvQA50mzgzxrLeoFdPOkFSJvefHQe2DHMC18b4LvY8XAYrcvg 5uSGOVrMcuL3MQNwOlmqRwJJzIagcZYkyGSFZ2Pzf10nuPkDwRU9tyYhqZNWT4d1eWis jJwMMCEIUX0QQgEC5rh/SkvpebT6mmq9f8/sN5dKPlmsLmw/ZwUFlQzI3R76NhHgaO2Q i8XMaa0WHX0yyl0Qj+Ez2s/tKaxBSJrXjzCSAM8rvGw8M+Rg2t4B4wRVWU+InykdQvbU 6xOw== X-Gm-Message-State: AOAM530ghvNGkBkHhOPte9h/TuxHjogkmRBfhVEGBteAr3IEZN8wYiyy WM4Z+DTedmnoCfp6V6ZFL2E+OyB1XHULi5YYTwgVemBsFS15eGc6dddXSNnRBC242jnt3jO/dLK 1T3na6LiZo381Zab0GL9T11tT+PEXPCXiGNppKGHzAa8xjgfERUuhBz/uN3B8HF+Zvh4= X-Received: by 2002:a05:6000:1885:: with SMTP id a5mr15277282wri.258.1635929169484; Wed, 03 Nov 2021 01:46:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqN6VmNHZYWJSeqzQACLGaHyFOjxfIxGSPpU2GV40uUxHkevYd7WItlvyqIL3eGGHnAn9DeQ== X-Received: by 2002:a05:6000:1885:: with SMTP id a5mr15277250wri.258.1635929169256; Wed, 03 Nov 2021 01:46:09 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 02/11] migration: initialise compression_counters for a new migration Date: Wed, 3 Nov 2021 09:45:56 +0100 Message-Id: <20211103084605.20027-3-quintela@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103084605.20027-1-quintela@redhat.com> References: <20211103084605.20027-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.702, 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hailiang Zhang , Li Zhijian , Juan Quintela , Jason Wang , "Dr. David Alan Gilbert" , Zhang Chen , yuxiating Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1635929408831100001 Content-Type: text/plain; charset="utf-8" From: yuxiating If the compression migration fails or is canceled, the query for the value = of compression_counters during the next compression migration is wrong. Signed-off-by: yuxiating Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migration/migration.c b/migration/migration.c index ec3d87f0a9..edc0dac80a 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2271,10 +2271,11 @@ static bool migrate_prepare(MigrationState *s, bool= blk, bool blk_inc, =20 migrate_init(s); /* - * set ram_counters memory to zero for a + * set ram_counters compression_counters memory to zero for a * new migration */ memset(&ram_counters, 0, sizeof(ram_counters)); + memset(&compression_counters, 0, sizeof(compression_counters)); =20 return true; } --=20 2.33.1 From nobody Mon Feb 9 13:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635929591020955.8538418320594; Wed, 3 Nov 2021 01:53:11 -0700 (PDT) Received: from localhost ([::1]:43964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miC17-0005yh-RW for importer@patchew.org; Wed, 03 Nov 2021 04:53:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBwG-0003nr-R0 for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:48:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:33117) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBvi-0004C1-HL for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:48:08 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-351-fbGy3SDlOBWxB44Ffejbwg-1; Wed, 03 Nov 2021 04:46:12 -0400 Received: by mail-wm1-f72.google.com with SMTP id k5-20020a7bc3050000b02901e081f69d80so721790wmj.8 for ; Wed, 03 Nov 2021 01:46:12 -0700 (PDT) Received: from localhost (static-233-86-86-188.ipcom.comunitel.net. [188.86.86.233]) by smtp.gmail.com with ESMTPSA id h17sm4634055wmb.44.2021.11.03.01.46.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 01:46:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635929252; 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=us5yL/LqGuf7LMjnpArZSR01ZcPo+BzJKGcWtuRA6yw=; b=gSbETT72NJwKsj4aRc+do0KZjw1ES7HsOJADcOpge9JJs6p9OvAr4g5ErUkYTja1K6QrGE z3b06t9yxLoAwzefzI0Odf79TDKZqt/MpOUK7+QqBmZdalrOueWeVpi/FWay1ZI//frlqk PnTJIbQ6rNJVFjPC5BOvXYLK/Kok3eA= X-MC-Unique: fbGy3SDlOBWxB44Ffejbwg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=us5yL/LqGuf7LMjnpArZSR01ZcPo+BzJKGcWtuRA6yw=; b=CIIAPcL7nhucsa+pltVx3jUOigW8hSUPLbbzNsLmnZRG0s+8JgglX4Dc9/u+YGLyu/ xCioi7MnNh78BXJ5KEOQK5vvS7olJwlQABD3mvsS87mLSs8bN1dzx0sVKoIl06lzNjJg 9ouDOWsMbUO+AicPHFQYA6LV5zwsUCwf3EcoCBPpXfLbt80hTLnLkKEaay36v8LpNbuI caxDK8oagHgnYNNvuwQOUWZWDYPt/IjgtpchXYXG1J0yh0ITsdukXxC5zTmQtTJO+rt9 2upqin8c0aOEmIoGM+jo0OnGYRRVNwS5YW2E9hZy/YU91VmVFjGjHnE4ZOI6VHYFGQM1 JR/A== X-Gm-Message-State: AOAM531jl/05k7svfz/T/esMJ4VhePM5hBIMaZH3/aeor/PX+fYaNA2k tBVo2H26wz15d8b2/+3BatmL+a4xRLtxUkGLD3ZP4xug2qwqahFPk016E0iq/LeW7KkafZ+30PI 3gpJpEl1GbHbZEnKjyb9I14DtKGwpRe9atRlZKVAnyPd2JWdxwwFVSKQ/KrTUfQnk69Q= X-Received: by 2002:a05:600c:4f08:: with SMTP id l8mr13655409wmq.47.1635929170860; Wed, 03 Nov 2021 01:46:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyc29D2tqKE2yjo7SvzjmkPHEZEATE8DSozj1l5K7mPBfWKD0pGNljZFqnk9uPWWuEhyP00iQ== X-Received: by 2002:a05:600c:4f08:: with SMTP id l8mr13655385wmq.47.1635929170628; Wed, 03 Nov 2021 01:46:10 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 03/11] migration: Zero migration compression counters Date: Wed, 3 Nov 2021 09:45:57 +0100 Message-Id: <20211103084605.20027-4-quintela@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103084605.20027-1-quintela@redhat.com> References: <20211103084605.20027-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.702, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hailiang Zhang , Li Zhijian , Juan Quintela , Jason Wang , "Dr. David Alan Gilbert" , Zhang Chen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1635929592813100001 Content-Type: text/plain; charset="utf-8" Based on previous patch from yuxiating Signed-off-by: Juan Quintela --- migration/savevm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/migration/savevm.c b/migration/savevm.c index 7b7b64bd13..d59e976d50 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1567,6 +1567,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **err= p) =20 migrate_init(ms); memset(&ram_counters, 0, sizeof(ram_counters)); + memset(&compression_counters, 0, sizeof(compression_counters)); ms->to_dst_file =3D f; =20 qemu_mutex_unlock_iothread(); --=20 2.33.1 From nobody Mon Feb 9 13:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635929821588199.06795726057555; Wed, 3 Nov 2021 01:57:01 -0700 (PDT) Received: from localhost ([::1]:53042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miC4q-0003fZ-Lc for importer@patchew.org; Wed, 03 Nov 2021 04:57:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBwD-0003Zn-6U for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:48:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:39578) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBvi-0004Bz-EC for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:48:04 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-371-xn4ubC9bOnuEWCWSsnJxug-1; Wed, 03 Nov 2021 04:46:13 -0400 Received: by mail-wm1-f71.google.com with SMTP id v18-20020a7bcb52000000b00322fea1d5b7so735183wmj.9 for ; Wed, 03 Nov 2021 01:46:13 -0700 (PDT) Received: from localhost (static-233-86-86-188.ipcom.comunitel.net. [188.86.86.233]) by smtp.gmail.com with ESMTPSA id b9sm1295200wrx.24.2021.11.03.01.46.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 01:46:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635929252; 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=xyDtKIeZOhYuuJfxcpgBYSE4NgNR496g+ae1/CpdsJs=; b=aAwC5Tbd/hdOWlTXTSq26dK+NvwgqnTtwNVm33aAwmOREg217jjtjL22thNi8mfRTbDJHe 0aFzimDWWZo9uC7yx8Zv6LHzXQgmxAMSBn5vhOa0YWAr2quQ3FGvSNCIY2bO7C70B7yYd6 Fp5DaXXfwyL56OjFS37qMs/FPLpll3o= X-MC-Unique: xn4ubC9bOnuEWCWSsnJxug-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xyDtKIeZOhYuuJfxcpgBYSE4NgNR496g+ae1/CpdsJs=; b=D0KkXiAgBhMxevmVu2rwYbqvffdM8M1kkYKHxx0dbjNJ2XJ4f9ADZG8jsyRoZUVhmO egzsf3HIueWAZ5C6vv7XnuHZ/G1zfeWiEVIhNn3YFU2pRjdaQi9Nv/e81RPBpmQQiGVM RwsAUZakcSlOLkn20FQBZ0Ob37PvDdMLnXecHwKLlIOEWdJQcoOiQiP0kn8Jtp6BEeS9 e7BovzOdZVciHwAz+jsg1ZNaix/igE3jQkx3psTQ3oi5HIgL38buIaDyvs/uIznWtFds ArhEg5jDiNl8Tpz/jEj+U5A1gJrDBsFJoUN5wmBdVutTn380FAAmu5QH8iVpWtc+0tzy 3FwA== X-Gm-Message-State: AOAM533Lu/kRBIm+7tgi5WeJGfomK9sYwkc5mnlt4KmiIHipsTSqI/3h hiemCqRcRHTXfMszhqKHK8Q/u4G0u4xyeQxkXQYct6dgFUbKpRwkKrwV7p7zX/W5/Fo1U+BGNk/ 8R4JzqMMtSjzSIbfrGUxU1Bi2E25iqDMIzGuznb5CG0Rg+akoPLiXvI0jrrdiIYdY3+8= X-Received: by 2002:a05:600c:2dc1:: with SMTP id e1mr13370360wmh.170.1635929172187; Wed, 03 Nov 2021 01:46:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOfZGqUfNi1mDAp3ekntvtiQhiq4S+jgjs/VvyCu6UPaVgrZGr3xrvGQCL17HM9wej+4O6QA== X-Received: by 2002:a05:600c:2dc1:: with SMTP id e1mr13370331wmh.170.1635929171954; Wed, 03 Nov 2021 01:46:11 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 04/11] Some minor optimizations for COLO Date: Wed, 3 Nov 2021 09:45:58 +0100 Message-Id: <20211103084605.20027-5-quintela@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103084605.20027-1-quintela@redhat.com> References: <20211103084605.20027-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.702, 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, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hailiang Zhang , Li Zhijian , Juan Quintela , Jason Wang , "Dr. David Alan Gilbert" , Zhang Chen , "Rao, Lei" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1635929823169100001 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" Signed-off-by: Lei Rao Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/colo.c | 2 +- net/colo-compare.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/colo.c b/migration/colo.c index 79fa1f6619..616dc00af7 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -152,7 +152,7 @@ static void primary_vm_do_failover(void) * kick COLO thread which might wait at * qemu_sem_wait(&s->colo_checkpoint_sem). */ - colo_checkpoint_notify(migrate_get_current()); + colo_checkpoint_notify(s); =20 /* * Wake up COLO thread which may blocked in recv() or send(), diff --git a/net/colo-compare.c b/net/colo-compare.c index b100e7b51f..4a64a5d386 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -170,7 +170,7 @@ static bool packet_matches_str(const char *str, return false; } =20 - return !memcmp(str, buf, strlen(str)); + return !memcmp(str, buf, packet_len); } =20 static void notify_remote_frame(CompareState *s) --=20 2.33.1 From nobody Mon Feb 9 13:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635929552248747.3189409772023; Wed, 3 Nov 2021 01:52:32 -0700 (PDT) Received: from localhost ([::1]:41552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miC0V-0004MZ-Av for importer@patchew.org; Wed, 03 Nov 2021 04:52:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBvV-0001Jw-5d for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:47:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBuU-0003P0-8B for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:47:20 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-485-9C5ZuVIyPbaazRFz5smb9Q-1; Wed, 03 Nov 2021 04:46:15 -0400 Received: by mail-wm1-f70.google.com with SMTP id c1-20020a05600c0ac100b00322fcaa2bc7so750824wmr.4 for ; Wed, 03 Nov 2021 01:46:14 -0700 (PDT) Received: from localhost (static-233-86-86-188.ipcom.comunitel.net. [188.86.86.233]) by smtp.gmail.com with ESMTPSA id r1sm5348673wmr.36.2021.11.03.01.46.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 01:46:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635929175; 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=I3iYNe8nWxPJdzmtR1DHJj8zXxHknQ9MlqDPFS2quic=; b=gJr9EEqGkY8z5CcZ/fcb5ctF7ATjuQstfpHBgaVAm+RCQfd57vaT6+/XVQ5sTkpoUv+IJs nSOOHYrfTFTEPqO89kGiWpvhWAmnpulh8uvoI2kLnPg2IEBh9qhjpXtsjOpQpVB8NQtSVW 5CWGtxJLadGUKn8aFc9J/PJRXeeoJF4= X-MC-Unique: 9C5ZuVIyPbaazRFz5smb9Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I3iYNe8nWxPJdzmtR1DHJj8zXxHknQ9MlqDPFS2quic=; b=hf+lgTkRcTEavmX3CLqYHuhsn5W6p5nZ9/OlUatGySjCAPsEB/ZzGKwpBHHMUddg2h ESEul3PpZz9spgrkR65w982ove9B8MizC2o9pFl/lEnk7dRNQjUmXoyR7Vql9VAwCbTH t0wPM2cUmLhlGpjIrtPrgEOgj63QUgcHM9zpEPgvLq9M8VgrwMmq5faBoGQ/sCUJLMgn UZMAm31hWjSbbXoIGGVblOzZ2uU6dWtyGYxW4/fZXxyGPn+GpK9/159xWxJpPeBNYv7C t+nxFlC2HJvG0m6/eYwptNw+eSZy9NY5Qngj6TF430p7aTwSHrfFg/0zJjhCtmmLhBMv SO7g== X-Gm-Message-State: AOAM532101dC/zDFTbeZQgYoClycro5UZDecWxXtfi/r7jfQDtQa1vwH lSgfvvZ3JAafUT9v1+tZZuflyxNVp55OTBHiGA/Te0p+Zl6WNjB8KemcBtici/ush/QE/DThFj7 rk7O+gvYMCOyiAy0Glw5wH6XfDftupWu1QlCuSDQ1J0JDjjkKlHRCm6pkfwIqfJarT+A= X-Received: by 2002:a5d:6d09:: with SMTP id e9mr34071294wrq.17.1635929173597; Wed, 03 Nov 2021 01:46:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzcCNuK2660wzEqvrHTeB6rgFwxG2p6R+fYAjOaO0HxWjO+JjTZdk/pxcuZwyl7HrpuKnTvCg== X-Received: by 2002:a5d:6d09:: with SMTP id e9mr34071267wrq.17.1635929173423; Wed, 03 Nov 2021 01:46:13 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 05/11] Fixed qemu crash when guest power off in COLO mode Date: Wed, 3 Nov 2021 09:45:59 +0100 Message-Id: <20211103084605.20027-6-quintela@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103084605.20027-1-quintela@redhat.com> References: <20211103084605.20027-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.702, 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hailiang Zhang , Li Zhijian , Juan Quintela , Jason Wang , "Dr. David Alan Gilbert" , Zhang Chen , "Rao, Lei" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1635929554263100001 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" This patch fixes the following: qemu-system-x86_64: invalid runstate transition: 'shutdown' -> 'running' Aborted (core dumped) The gdb bt as following: 0 __GI_raise (sig=3Dsig@entry=3D6) at ../sysdeps/unix/sysv/linux/raise.c:50 1 0x00007faa3d613859 in __GI_abort () at abort.c:79 2 0x000055c5a21268fd in runstate_set (new_state=3DRUN_STATE_RUNNING) at vl= .c:723 3 0x000055c5a1f8cae4 in vm_prepare_start () at /home/workspace/colo-qemu/c= pus.c:2206 4 0x000055c5a1f8cb1b in vm_start () at /home/workspace/colo-qemu/cpus.c:22= 13 5 0x000055c5a2332bba in migration_iteration_finish (s=3D0x55c5a4658810) at= migration/migration.c:3376 6 0x000055c5a2332f3b in migration_thread (opaque=3D0x55c5a4658810) at migr= ation/migration.c:3527 7 0x000055c5a251d68a in qemu_thread_start (args=3D0x55c5a5491a70) at util/= qemu-thread-posix.c:519 8 0x00007faa3d7e9609 in start_thread (arg=3D) at pthread_cr= eate.c:477 9 0x00007faa3d710293 in clone () at ../sysdeps/unix/sysv/linux/x86_64/clon= e.S:95 Signed-off-by: Lei Rao Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/migration.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/migration/migration.c b/migration/migration.c index edc0dac80a..3fb856f6e1 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3626,7 +3626,9 @@ static void migration_iteration_finish(MigrationState= *s) case MIGRATION_STATUS_CANCELLED: case MIGRATION_STATUS_CANCELLING: if (s->vm_was_running) { - vm_start(); + if (!runstate_check(RUN_STATE_SHUTDOWN)) { + vm_start(); + } } else { if (runstate_check(RUN_STATE_FINISH_MIGRATE)) { runstate_set(RUN_STATE_POSTMIGRATE); --=20 2.33.1 From nobody Mon Feb 9 13:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635929744458202.7919334086239; Wed, 3 Nov 2021 01:55:44 -0700 (PDT) Received: from localhost ([::1]:50830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miC3b-0002B5-ET for importer@patchew.org; Wed, 03 Nov 2021 04:55:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBw1-0002qa-1M for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:47:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:38138) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBvW-00048l-UP for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:47:52 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-475-RfqhDxivPz2VHRkYGYHplw-1; Wed, 03 Nov 2021 04:46:16 -0400 Received: by mail-wm1-f71.google.com with SMTP id m14-20020a05600c3b0e00b0033308dcc933so289396wms.7 for ; Wed, 03 Nov 2021 01:46:16 -0700 (PDT) Received: from localhost (static-233-86-86-188.ipcom.comunitel.net. [188.86.86.233]) by smtp.gmail.com with ESMTPSA id u19sm1325631wmm.5.2021.11.03.01.46.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 01:46:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635929242; 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=hsQ8hXBn7WkAri1/B/nJyK+EZjImeCKuGXRF/WepPqo=; b=XtryX7jmJKozKNkOoPm8VO2OIGVv5dZWtDcHphIT4JpEv9OXn7SIyYsQp5oR3lXCHblKgt XmCfmBlpuVJhHnn3+uDWnKAFeCrlFNPx91O2BbWbTw+C9hjPpT+lWfY6UgfYF1vLfq00IM oA90IRDDRGTCofAZACG5I+r9vWd8860= X-MC-Unique: RfqhDxivPz2VHRkYGYHplw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hsQ8hXBn7WkAri1/B/nJyK+EZjImeCKuGXRF/WepPqo=; b=uDeojjdzgWryAVgx3zf+UtlHAV9Uw1Gttejq7UvBL2RRIkXMIAYA7r7d/igAusqZWJ JRnzJe1RYBSvW1Gl5kGZgkZDniKF/WAjC9IS9MLvICnP28eOso/X9AMI8ocXIvZHewKt QZNqRSDNMNtLtbChVWXKV8JQFkMNXbT+lLYEAz5UbnlX98O/60aOps0c+YMaMVBaJY9r kt+7J6oDL56QuuUMIRDoXgbLtB3XXC0tqTVel3wG3NYXv+kpi5uttWpMgMjLu7XnUF5C KeFcAdU+C2cv64B6lLuKbAirebmEUJQX7LJbUd4tpum8NNb9FKqauDzogXw3SIgz6ODd VwjA== X-Gm-Message-State: AOAM530gICt9L1SXLWGVyZgblTUGee3ZZWpuN5RpdlXZiqluzfXmwXpw s8S4zxq9pgjXp4/hqX2fUYhVbXKVui4Cjlf9WAZeKz5OIjXCX8++8cX+TiklVcKZei9djY2Hqqa RgVO/yhUHQsuC9bUq3V+sKcoFPOPvAhzn5GYJBkgfk9LW0JZ9vENDf0+cs4tWIjsWHdY= X-Received: by 2002:adf:e54a:: with SMTP id z10mr43727617wrm.328.1635929174994; Wed, 03 Nov 2021 01:46:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw00E5UDZhwc6Tbj13Lif2FxQzdCLYIQHzj/ixj0s1ag48c2KkhkAR3RvF4ZczpKOaFQIXfpw== X-Received: by 2002:adf:e54a:: with SMTP id z10mr43727570wrm.328.1635929174550; Wed, 03 Nov 2021 01:46:14 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 06/11] Fixed SVM hang when do failover before PVM crash Date: Wed, 3 Nov 2021 09:46:00 +0100 Message-Id: <20211103084605.20027-7-quintela@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103084605.20027-1-quintela@redhat.com> References: <20211103084605.20027-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.702, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hailiang Zhang , Li Zhijian , Juan Quintela , Jason Wang , "Dr. David Alan Gilbert" , Zhang Chen , "Rao, Lei" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1635929745319100001 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" This patch fixed as follows: Thread 1 (Thread 0x7f34ee738d80 (LWP 11212)): #0 __pthread_clockjoin_ex (threadid=3D139847152957184, thread_return=3D= 0x7f30b1febf30, clockid=3D, abstime=3D, block= =3D) at pthread_join_common.c:145 #1 0x0000563401998e36 in qemu_thread_join (thread=3D0x563402d66610) at = util/qemu-thread-posix.c:587 #2 0x00005634017a79fa in process_incoming_migration_co (opaque=3D0x0) a= t migration/migration.c:502 #3 0x00005634019b59c9 in coroutine_trampoline (i0=3D63395504, i1=3D2206= 8) at util/coroutine-ucontext.c:115 #4 0x00007f34ef860660 in ?? () at ../sysdeps/unix/sysv/linux/x86_64/__s= tart_context.S:91 from /lib/x86_64-linux-gnu/libc.so.6 #5 0x00007f30b21ee730 in ?? () #6 0x0000000000000000 in ?? () Thread 13 (Thread 0x7f30b3dff700 (LWP 11747)): #0 __lll_lock_wait (futex=3Dfutex@entry=3D0x56340218ffa0 , private=3D0) at lowlevellock.c:52 #1 0x00007f34efa000a3 in _GI__pthread_mutex_lock (mutex=3D0x56340218ff= a0 ) at ../nptl/pthread_mutex_lock.c:80 #2 0x0000563401997f99 in qemu_mutex_lock_impl (mutex=3D0x56340218ffa0 = , file=3D0x563401b7a80e "migration/colo.c", line=3D806) = at util/qemu-thread-posix.c:78 #3 0x0000563401407144 in qemu_mutex_lock_iothread_impl (file=3D0x56340= 1b7a80e "migration/colo.c", line=3D806) at /home/workspace/colo-qemu/cpus.c= :1899 #4 0x00005634017ba8e8 in colo_process_incoming_thread (opaque=3D0x5634= 02d664c0) at migration/colo.c:806 #5 0x0000563401998b72 in qemu_thread_start (args=3D0x5634039f8370) at = util/qemu-thread-posix.c:519 #6 0x00007f34ef9fd609 in start_thread (arg=3D) at pthre= ad_create.c:477 #7 0x00007f34ef924293 in clone () at ../sysdeps/unix/sysv/linux/x86_64= /clone.S:95 The QEMU main thread is holding the lock: (gdb) p qemu_global_mutex $1 =3D {lock =3D {_data =3D {lock =3D 2, __count =3D 0, __owner =3D 112= 12, __nusers =3D 9, __kind =3D 0, __spins =3D 0, __elision =3D 0, __list = =3D {_prev =3D 0x0, __next =3D 0x0}}, __size =3D "\002\000\000\000\000\000\000\000\314+\000\000\t", '\000' <= repeats 26 times>, __align =3D 2}, file =3D 0x563401c07e4b "util/main-loop.= c", line =3D 240, initialized =3D true} >From the call trace, we can see it is a deadlock bug. and the QEMU main th= read holds the global mutex to wait until the COLO thread ends. and the col= o thread wants to acquire the global mutex, which will cause a deadlock. So, we shou= ld release the qemu_global_mutex before waiting colo thread ends. Signed-off-by: Lei Rao Reviewed-by: Li Zhijian Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/migration.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/migration/migration.c b/migration/migration.c index 3fb856f6e1..abaf6f9e3d 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -590,8 +590,10 @@ static void process_incoming_migration_co(void *opaque) mis->have_colo_incoming_thread =3D true; qemu_coroutine_yield(); =20 + qemu_mutex_unlock_iothread(); /* Wait checkpoint incoming thread exit before free resource */ qemu_thread_join(&mis->colo_incoming_thread); + qemu_mutex_lock_iothread(); /* We hold the global iothread lock, so it is safe here */ colo_release_ram_cache(); } --=20 2.33.1 From nobody Mon Feb 9 13:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635929509586660.649151982336; Wed, 3 Nov 2021 01:51:49 -0700 (PDT) Received: from localhost ([::1]:38972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miBzo-0002d9-G5 for importer@patchew.org; Wed, 03 Nov 2021 04:51:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBw2-0002ur-3m for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:47:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51888) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBvX-00048n-0T for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:47:53 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-324-Mkp8CBs6PQ6Meuyi2TpdJw-1; Wed, 03 Nov 2021 04:46:18 -0400 Received: by mail-wm1-f72.google.com with SMTP id n189-20020a1c27c6000000b00322f2e380f2so2417025wmn.6 for ; Wed, 03 Nov 2021 01:46:18 -0700 (PDT) Received: from localhost (static-233-86-86-188.ipcom.comunitel.net. [188.86.86.233]) by smtp.gmail.com with ESMTPSA id c79sm1271281wme.43.2021.11.03.01.46.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 01:46:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635929242; 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=xjqwBivHnKKYRjeDOM8AfeK5sPEZs3YRYp0z4oV32b4=; b=cDq4qX5pJ/zlDsZtQBQ3qejfSbMSN4K+UeGfoEvJr3aZ1xID9w2N291XUj56NLFlFdPl6b tmeWoeZq4qClgzI2Os8uI8z8juumEF7qWHfDnSeOympS1QEppKTBgw+KvTw/zypJym+Z10 Yd5+lcWhYPl5qsWjbhI8C9SE8Sj5OEQ= X-MC-Unique: Mkp8CBs6PQ6Meuyi2TpdJw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xjqwBivHnKKYRjeDOM8AfeK5sPEZs3YRYp0z4oV32b4=; b=aiUVXsD/C080xBQGbyEBUnlH5G9TvBmD4/LyX8LHYYKVXofG02NSkcbyregrfONJtz +3+wuN6NnVZpJp6o90Qwu+ivVsfHq8WGeNjseXAbGaCimdmUNmjMF19uIXeBy2EbPM4B RVxEFBOnlZzbiwjH4hE03aWFhU6w5VV1l0FUKBDSWuh5fXCTeg4nm1hKiIrSYqFtQFDQ w9NBiIb9ZWZNDG0aGrnI/f3caUdcR4gyLOWd34vF7RzEcbZNNFMHU9yLxvquzxKoDy5D 1rP9pJsi0GrtiX+fbHq7q+lnMgziM0PKoAbXGZPSlc4CerfJ+uoH1Rb/u9e2o9oP/jBB dtYA== X-Gm-Message-State: AOAM530wdH8JQEhVAHirP+rY8TNPkQ4ycEqlQRw4OQqxGRqUgOjrqOBZ OJ87uP17jzTj+jH+BZLydH8aG0kCs6MmUMcoaWT1uvw5D/25xDfcBdjNh5gykVOJAcqlBmfpxD5 AMH0wXLNtJ/Kk2WpeN8OaS7ntZPeeeaSKvZIdyWNUciLSvdgpjRx5VoBFXcAxWmuNsM8= X-Received: by 2002:adf:d1cd:: with SMTP id b13mr3516108wrd.323.1635929176312; Wed, 03 Nov 2021 01:46:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxeiFFnCBMRIbU9tTLAH/L9rA/pOuNNNsE5CFyFz7UidEnscw0G4VCNyX5J4A3N+VGFxb5DNA== X-Received: by 2002:adf:d1cd:: with SMTP id b13mr3516084wrd.323.1635929176130; Wed, 03 Nov 2021 01:46:16 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 07/11] colo: fixed 'Segmentation fault' when the simplex mode PVM poweroff Date: Wed, 3 Nov 2021 09:46:01 +0100 Message-Id: <20211103084605.20027-8-quintela@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103084605.20027-1-quintela@redhat.com> References: <20211103084605.20027-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.702, 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hailiang Zhang , Li Zhijian , Juan Quintela , Jason Wang , "Dr. David Alan Gilbert" , Zhang Chen , "Rao, Lei" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1635929511292100001 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" The GDB statck is as follows: Program terminated with signal SIGSEGV, Segmentation fault. 0 object_class_dynamic_cast (class=3D0x55c8f5d2bf50, typename=3D0x55c8f2f7= 379e "qio-channel") at qom/object.c:832 if (type->class->interfaces && [Current thread is 1 (Thread 0x7f756e97eb00 (LWP 1811577))] (gdb) bt 0 object_class_dynamic_cast (class=3D0x55c8f5d2bf50, typename=3D0x55c8f2f7= 379e "qio-channel") at qom/object.c:832 1 0x000055c8f2c3dd14 in object_dynamic_cast (obj=3D0x55c8f543ac00, typenam= e=3D0x55c8f2f7379e "qio-channel") at qom/object.c:763 2 0x000055c8f2c3ddce in object_dynamic_cast_assert (obj=3D0x55c8f543ac00, = typename=3D0x55c8f2f7379e "qio-channel", file=3D0x55c8f2f73780 "migration/qemu-file-channel.c", line=3D117, func= =3D0x55c8f2f73800 <__func__.18724> "channel_shutdown") at qom/object.c:786 3 0x000055c8f2bbc6ac in channel_shutdown (opaque=3D0x55c8f543ac00, rd=3Dtr= ue, wr=3Dtrue, errp=3D0x0) at migration/qemu-file-channel.c:117 4 0x000055c8f2bba56e in qemu_file_shutdown (f=3D0x7f7558070f50) at migrati= on/qemu-file.c:67 5 0x000055c8f2ba5373 in migrate_fd_cancel (s=3D0x55c8f4ccf3f0) at migratio= n/migration.c:1699 6 0x000055c8f2ba1992 in migration_shutdown () at migration/migration.c:187 7 0x000055c8f29a5b77 in main (argc=3D69, argv=3D0x7fff3e9e8c08, envp=3D0x7= fff3e9e8e38) at vl.c:4512 The root cause is that we still want to shutdown the from_dst_file in migrate_fd_cancel() after qemu_close in colo_process_checkpoint(). So, we should set the s->rp_state.from_dst_file =3D NULL after qemu_close(). Signed-off-by: Lei Rao Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/colo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/migration/colo.c b/migration/colo.c index 616dc00af7..907241ab5c 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -640,6 +640,7 @@ out: */ if (s->rp_state.from_dst_file) { qemu_fclose(s->rp_state.from_dst_file); + s->rp_state.from_dst_file =3D NULL; } } =20 --=20 2.33.1 From nobody Mon Feb 9 13:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635929271146471.782716639481; Wed, 3 Nov 2021 01:47:51 -0700 (PDT) Received: from localhost ([::1]:52906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miBvy-0001Sz-5A for importer@patchew.org; Wed, 03 Nov 2021 04:47:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBuf-0008F1-4l for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:46:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23875) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBuY-0003UF-2s for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:46:27 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-384-Y6ap3ULCMs25oB1YGc1-8g-1; Wed, 03 Nov 2021 04:46:19 -0400 Received: by mail-wm1-f72.google.com with SMTP id v5-20020a1cac05000000b0032ccf04ba2cso2425270wme.2 for ; Wed, 03 Nov 2021 01:46:19 -0700 (PDT) Received: from localhost (static-233-86-86-188.ipcom.comunitel.net. [188.86.86.233]) by smtp.gmail.com with ESMTPSA id l11sm1285771wrp.61.2021.11.03.01.46.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 01:46:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635929180; 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=AF92BaXYMeJIpGOLIdcfVi696Z627qsFx2fUZChIz50=; b=EDFCt/DRsqbVFvStGyXES2GoLGSXM2EbD78WFoAZTWwY8a8zEKO33wNyrKKWdXhd6HoXj7 v3fjz1LpuXzMpp/rSks9T9y3gZKsV87fesSDgTc5Fe5VUiP7kmzL494u8aJrnno6pTxLzV CCcgSPpYpOuMZK67ZvD2bxOcxpUgRj4= X-MC-Unique: Y6ap3ULCMs25oB1YGc1-8g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AF92BaXYMeJIpGOLIdcfVi696Z627qsFx2fUZChIz50=; b=XZN83Ou3fQA4sT/FGOnUXJwAOrUd1iKgbAFWGqorkVqf30WN98QPpTBVwZFr0DBAI7 zM66QTVm6fqLC1fSSntQgsjkN9YwuQ+gADqo0erhMyaRM0AOh8IHUt3+emk6fk3S8wia 41T8aZItvvtcmaC36ieMFjRPsqO12w8aYPF+IJJYWbsL9lZ04vB6ykjGWRkd6IB3o2ei DYoPA+zYTgdtyj1ELGRX5tZHEUy7zRrYCBiLK+3pD5Kh0INRSR533w5drlQpu1MHqDU+ pCDz2MZ5UYPXbfsk/rO2oFGydJexHJ+2bIMU+pgo4MOfiGpZp2W0wIajBbE3Tg2JNWmY 6HfQ== X-Gm-Message-State: AOAM532ohsMc4OxEvZgUTKuX8If28SDbA3UuNx/D6/NNvKOPa0t2P6BQ btprfzfete1zX7zc6HtsIVBEZp3EFMoShdJNSPE7aQ6J7Bkg3iTE7N6kbD7a7ZS5L3cpTejFFlk SFRW3JQHGiLmrKv8fF33Vpmg9ZkPp/OCrRsV+lWUCnA9tRDj1NVI+OMxGU+pWAACaw5s= X-Received: by 2002:a05:6000:10cb:: with SMTP id b11mr42298057wrx.71.1635929178200; Wed, 03 Nov 2021 01:46:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRDZ2jkzUZrwSUla6hKEHlGAt2TnUFR7aLtKQa/KDhrpudEGBYLYp1mzO20f/ePIeK8XNDmw== X-Received: by 2002:a05:6000:10cb:: with SMTP id b11mr42298035wrx.71.1635929178039; Wed, 03 Nov 2021 01:46:18 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 08/11] Removed the qemu_fclose() in colo_process_incoming_thread Date: Wed, 3 Nov 2021 09:46:02 +0100 Message-Id: <20211103084605.20027-9-quintela@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103084605.20027-1-quintela@redhat.com> References: <20211103084605.20027-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hailiang Zhang , Li Zhijian , Juan Quintela , Jason Wang , "Dr. David Alan Gilbert" , Zhang Chen , "Rao, Lei" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1635929271942100001 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" After the live migration, the related fd will be cleanup in migration_incoming_state_destroy(). So, the qemu_close() in colo_process_incoming_thread is not necessary. Signed-off-by: Lei Rao Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/colo.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/migration/colo.c b/migration/colo.c index 907241ab5c..71fc82a040 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -919,11 +919,6 @@ out: /* Hope this not to be too long to loop here */ qemu_sem_wait(&mis->colo_incoming_sem); qemu_sem_destroy(&mis->colo_incoming_sem); - /* Must be called after failover BH is completed */ - if (mis->to_src_file) { - qemu_fclose(mis->to_src_file); - mis->to_src_file =3D NULL; - } =20 rcu_unregister_thread(); return NULL; --=20 2.33.1 From nobody Mon Feb 9 13:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635929394938718.0142727219317; Wed, 3 Nov 2021 01:49:54 -0700 (PDT) Received: from localhost ([::1]:33064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miBxy-00074z-1C for importer@patchew.org; Wed, 03 Nov 2021 04:49:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBuf-0008GN-GV for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:46:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:46262) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBuY-0003WC-NQ for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:46:27 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-161-EcZK14JsMdO_9qqu44LyMg-1; Wed, 03 Nov 2021 04:46:20 -0400 Received: by mail-wr1-f71.google.com with SMTP id k8-20020a5d5248000000b001763e7c9ce5so271862wrc.22 for ; Wed, 03 Nov 2021 01:46:20 -0700 (PDT) Received: from localhost (static-233-86-86-188.ipcom.comunitel.net. [188.86.86.233]) by smtp.gmail.com with ESMTPSA id q4sm1319511wrs.56.2021.11.03.01.46.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 01:46:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635929181; 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=SEXspVMmfGtE+DiNvaMKmF2UapwNbWjKsW47Dll7cHM=; b=Bj61xHjmcdeBzHJtOnlLxo9L+Xd7oje0T47TGrjh9ogR5Wkgvpl2oPY7fc5s/mlEvv3jKt xZpQhbke0ATdAUVgWq5M7lH0cp1zKxW3OjNoHBGQAPwY3ET+92ed0B5t7cgZ1nHipaUJT5 lmqdrFMZfItVVueU2vDgJhNE5O6tVuE= X-MC-Unique: EcZK14JsMdO_9qqu44LyMg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SEXspVMmfGtE+DiNvaMKmF2UapwNbWjKsW47Dll7cHM=; b=ZK/JHNLyjmLfW5tbA2LO2rvEI0B0YP3eIbuwbLFhC0aGeBUhIOTNeWNrE1/d9SFeu2 veHz/IGAgI3eTqVfbVNE71csD5Y3yX94eGyWY3V4KW4hNHEKKZDHjlEqeTfQoNOVU5yf EFSkwd2UvYtjxlnha9vHrJrAZSZ4NY7Zk72fNqCfJCEFUoVuk+G7Atf0CtgkudVzgWug sjqkojkNRYPxpxk71Nem53EXtgTnGNNCKk+l7tcsEKjEcFzGbPmRbrsFqY6VNrMABst8 AQGpeHAD26Er4+JqUq/69TLlqMvlDtBpE70QbVHS3KimbYQZHwNXxOaNj2cIkRVoJk2e 3HYQ== X-Gm-Message-State: AOAM532EA2wHiaI16mmfDykqqzIHfG5RWVGafHaH+MsyDUk0ed8+StTb 1fX8ffxM6uafGjpS0LSmmZ/cM08r4mKikIYMErGf0BflQXKInILOqekGGuB98vU7O6rZPlvgWxg jakTzd/m9dh4lxsEQHXhHo5xegh9XT4pRmboWWqKrDTw4ECcE7PoVBfieMwnWBEkHrtQ= X-Received: by 2002:a5d:584c:: with SMTP id i12mr15312528wrf.95.1635929179416; Wed, 03 Nov 2021 01:46:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSDMfRozQs83jQd6/fnc3G6crCnW7enJimwHWTs3QMH9oJ4TlgxRw5t/BvyUorRpFyMLMR+Q== X-Received: by 2002:a5d:584c:: with SMTP id i12mr15312506wrf.95.1635929179182; Wed, 03 Nov 2021 01:46:19 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 09/11] Changed the last-mode to none of first start COLO Date: Wed, 3 Nov 2021 09:46:03 +0100 Message-Id: <20211103084605.20027-10-quintela@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103084605.20027-1-quintela@redhat.com> References: <20211103084605.20027-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hailiang Zhang , Li Zhijian , Juan Quintela , Jason Wang , "Dr. David Alan Gilbert" , Zhang Chen , "Rao, Lei" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1635929396180100001 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" When we first stated the COLO, the last-mode is as follows: { "execute": "query-colo-status" } {"return": {"last-mode": "primary", "mode": "primary", "reason": "none"}} The last-mode is unreasonable. After the patch, will be changed to the following: { "execute": "query-colo-status" } {"return": {"last-mode": "none", "mode": "primary", "reason": "none"}} Signed-off-by: Lei Rao Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/colo.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/migration/colo.c b/migration/colo.c index 71fc82a040..e3b1f136f4 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -205,7 +205,7 @@ void colo_do_failover(void) vm_stop_force_state(RUN_STATE_COLO); } =20 - switch (get_colo_mode()) { + switch (last_colo_mode =3D get_colo_mode()) { case COLO_MODE_PRIMARY: primary_vm_do_failover(); break; @@ -530,8 +530,7 @@ static void colo_process_checkpoint(MigrationState *s) Error *local_err =3D NULL; int ret; =20 - last_colo_mode =3D get_colo_mode(); - if (last_colo_mode !=3D COLO_MODE_PRIMARY) { + if (get_colo_mode() !=3D COLO_MODE_PRIMARY) { error_report("COLO mode must be COLO_MODE_PRIMARY"); return; } @@ -830,8 +829,7 @@ void *colo_process_incoming_thread(void *opaque) migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, MIGRATION_STATUS_COLO); =20 - last_colo_mode =3D get_colo_mode(); - if (last_colo_mode !=3D COLO_MODE_SECONDARY) { + if (get_colo_mode() !=3D COLO_MODE_SECONDARY) { error_report("COLO mode must be COLO_MODE_SECONDARY"); return NULL; } --=20 2.33.1 From nobody Mon Feb 9 13:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635929317008979.3505282082496; Wed, 3 Nov 2021 01:48:37 -0700 (PDT) Received: from localhost ([::1]:57032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miBwh-0004ET-W5 for importer@patchew.org; Wed, 03 Nov 2021 04:48:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBvY-0001TS-Nf for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:47:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBua-0003Xz-TR for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:47:24 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-460-Qv0fhb6HNcqv5Bv7BDRypQ-1; Wed, 03 Nov 2021 04:46:22 -0400 Received: by mail-wm1-f71.google.com with SMTP id k25-20020a05600c1c9900b00332f798ba1dso2424197wms.4 for ; Wed, 03 Nov 2021 01:46:22 -0700 (PDT) Received: from localhost (static-233-86-86-188.ipcom.comunitel.net. [188.86.86.233]) by smtp.gmail.com with ESMTPSA id z6sm1383764wmp.1.2021.11.03.01.46.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 01:46:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635929183; 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=2M+OuUyISgXvCG9YPhIzkFcGQHD6D2pRsVs+iBRO2Uo=; b=OeHrh+DHmg/0J5/yIgsvknz/iHB4pQQUxosUzuL6yc/Cx4KKwO0RkuHUYPR6xpJyjFPQMi gmWtb6BS61tzyw6IcvEqbHxAmFj2Ls7HAOHJU91cnZqkjxEXw/oGCARn2aIFwHfNf5O3do /j5SQw4ZZbzn3sPqRt7IyTWiMcY+C5s= X-MC-Unique: Qv0fhb6HNcqv5Bv7BDRypQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2M+OuUyISgXvCG9YPhIzkFcGQHD6D2pRsVs+iBRO2Uo=; b=M37/zZPO9LTcZ/7QeT81siDKARXWd9G1zK5v8KsxpeyvuyxBfn8LGsM5KVmwp4a0t/ 2H3jHb0r1WoZS9rhFzvJQ8yDyvHoR766FagZg1O8+B3wE0ugjKjbhArdR2oS2ltI8KYi nKJXwdpjayYM+jnrOrozAscT+ggs7YFJF6tzORjk1M6M08ON77iVkY/oTPaPiw9qZQdT tV0mJw4Vp2GyD91ahv7ALzw07cNtQzP5/9gC5iMazVCOjUjUVZq/OSHMwtwufgowLqjT 4O55iW+Np+nJB2DAk0e4NoWbLuxKBYeUE/3nc0o2hAZz6xG0vU4GDw9cWz1lIAiOmzBH zb0Q== X-Gm-Message-State: AOAM533koMXdCBo1e+QHzcAhS+/H2y6YibJtaZaSPB1cHmssPlq2VC+s 5U6Ct8iMyKpijd/F8xujd+mMrE4dfaL3m1pOwq1YsIgz7ADyOJ8E46Vo7xoeiReiXFpj35J35cb lhpr6UKKH6Kn7CdtTWQUnn135CUF4DbbF3Zyem1tfmpkik5c1nN9kQaihld/a08Dp0+s= X-Received: by 2002:adf:c40f:: with SMTP id v15mr44983282wrf.302.1635929180837; Wed, 03 Nov 2021 01:46:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwo1nz7S6u6i4B4iwdnk1QHIDPtk8JFON2B4NJBsVxzmrYv5Pkwn3dgMJKlcOOfMX/F3JMrqw== X-Received: by 2002:adf:c40f:: with SMTP id v15mr44983245wrf.302.1635929180535; Wed, 03 Nov 2021 01:46:20 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 10/11] colo: Don't dump colo cache if dump-guest-core=off Date: Wed, 3 Nov 2021 09:46:04 +0100 Message-Id: <20211103084605.20027-11-quintela@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103084605.20027-1-quintela@redhat.com> References: <20211103084605.20027-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.702, 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lukas Straub , Hailiang Zhang , Li Zhijian , Juan Quintela , Jason Wang , "Dr. David Alan Gilbert" , Zhang Chen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1635929317280100001 Content-Type: text/plain; charset="utf-8" From: Lukas Straub One might set dump-guest-core=3Doff to make coredumps smaller and still allow to debug many qemu bugs. Extend this option to the colo cache. Signed-off-by: Lukas Straub Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/ram.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index f5d39db4e4..847af461f2 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -56,6 +56,8 @@ #include "multifd.h" #include "sysemu/runstate.h" =20 +#include "hw/boards.h" /* for machine_dump_guest_core() */ + #if defined(__linux__) #include "qemu/userfaultfd.h" #endif /* defined(__linux__) */ @@ -3542,6 +3544,10 @@ int colo_init_ram_cache(void) } return -errno; } + if (!machine_dump_guest_core(current_machine)) { + qemu_madvise(block->colo_cache, block->used_length, + QEMU_MADV_DONTDUMP); + } } } =20 --=20 2.33.1 From nobody Mon Feb 9 13:07:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635929318491343.87783247844345; Wed, 3 Nov 2021 01:48:38 -0700 (PDT) Received: from localhost ([::1]:57088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miBwj-0004GK-GT for importer@patchew.org; Wed, 03 Nov 2021 04:48:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBvZ-0001WQ-Se for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:47:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50936) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miBud-0003ap-34 for qemu-devel@nongnu.org; Wed, 03 Nov 2021 04:47:25 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-571-Qv3KJ-jgMw63OpFHrtdgEg-1; Wed, 03 Nov 2021 04:46:23 -0400 Received: by mail-wr1-f69.google.com with SMTP id r12-20020adfdc8c000000b0017d703c07c0so281176wrj.0 for ; Wed, 03 Nov 2021 01:46:23 -0700 (PDT) Received: from localhost (static-233-86-86-188.ipcom.comunitel.net. [188.86.86.233]) by smtp.gmail.com with ESMTPSA id r8sm1500987wrz.43.2021.11.03.01.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 01:46:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635929184; 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=tMbn646NxPo11ghluGX0Bj9WsBwth9tbkanSVUa4oF8=; b=ZSaTm6rv0UeTDhHuqpiIQ0sEFcceldkook8m91UKmdSHBBCCC6AIYMyBtxV8pihbWQOSV0 FmYE/TwV74RxD3/JP0wF7/pInFi//zti72zdPpDl2/VcPfBQHMsBY/hnqKrPyvJk+PDf9v uEWm9LUHVRCjMomZcXPevSwEwpMhr3E= X-MC-Unique: Qv3KJ-jgMw63OpFHrtdgEg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tMbn646NxPo11ghluGX0Bj9WsBwth9tbkanSVUa4oF8=; b=KIICm2m8CgG/YHpSS1a2Zf6XGWijUtnTUyjBFKgHxhJpuIW2ycbkGfKu4H38gD0kt8 lxf3Nl/COD2NzS3cMKf5sGYUhCpSRcB9oSfedROxzsgtMn94BYtj/TICri4NR2LWairP 07YkIv0QseK8FclTZuoOgjw9i5oICixsttQ/Lvnozqliqo/GBTDcKf0TVJ+t04E2RtiL lbSXB0xYkce3e1s4evoXsmHy10Fidpu7NZUOfJOcknnnhVdVn3j7Tyguw9YuBSR4VVTO 3uw7/TUrFoj/VhPJ6ZKz1daqUGNUHqu3kMC1VLbPq00xAcknMCvbQnykTIO9Rccvb0Yi 8zDg== X-Gm-Message-State: AOAM532ZZ+6gUK1qHnGxDcI0KK0LH9Mh+nVErWL1D/WBj2Xeda7VaHMS mf3YXkA1WMdnY3eBNbSQakUZIWlwCRVy4hshKrkxmio+JSpvWuTQ6ry1pWsVP1KU3zhBKpXVmE1 plzF6kxJlIsGwHYBmR2/0lZrmwoV0vKIEDR0zaGvUsUZszqYnAKfC5pab3Lh/iRmiPqI= X-Received: by 2002:a05:600c:4108:: with SMTP id j8mr13364574wmi.139.1635929182074; Wed, 03 Nov 2021 01:46:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJDwELJIln/2VqytPZIWQP5cRt1jcKqKoWYVDRKNgjqVh4+clGHBYcqD/7a+tHEtIDdzh40Q== X-Received: by 2002:a05:600c:4108:: with SMTP id j8mr13364544wmi.139.1635929181815; Wed, 03 Nov 2021 01:46:21 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 11/11] Optimized the function of fill_connection_key. Date: Wed, 3 Nov 2021 09:46:05 +0100 Message-Id: <20211103084605.20027-12-quintela@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103084605.20027-1-quintela@redhat.com> References: <20211103084605.20027-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.702, 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hailiang Zhang , Li Zhijian , Juan Quintela , Jason Wang , "Dr. David Alan Gilbert" , Zhang Chen , Juan Quintela , "Rao, Lei" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1635929319511100001 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" Remove some unnecessary code to improve the performance of the filter-rewriter module. Signed-off-by: Lei Rao Reviewed-by: Zhang Chen Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- net/colo.h | 6 +++--- net/colo-compare.c | 2 +- net/colo.c | 31 ++++++++++++------------------- net/filter-rewriter.c | 10 +--------- 4 files changed, 17 insertions(+), 32 deletions(-) diff --git a/net/colo.h b/net/colo.h index d91cd245c4..8b3e8d5a83 100644 --- a/net/colo.h +++ b/net/colo.h @@ -89,9 +89,9 @@ typedef struct Connection { uint32_t connection_key_hash(const void *opaque); int connection_key_equal(const void *opaque1, const void *opaque2); int parse_packet_early(Packet *pkt); -void extract_ip_and_port(uint32_t tmp_ports, ConnectionKey *key, Packet *p= kt); -void fill_connection_key(Packet *pkt, ConnectionKey *key); -void reverse_connection_key(ConnectionKey *key); +void extract_ip_and_port(uint32_t tmp_ports, ConnectionKey *key, + Packet *pkt, bool reverse); +void fill_connection_key(Packet *pkt, ConnectionKey *key, bool reverse); Connection *connection_new(ConnectionKey *key); void connection_destroy(void *opaque); Connection *connection_get(GHashTable *connection_track_table, diff --git a/net/colo-compare.c b/net/colo-compare.c index 4a64a5d386..b8876d7fd9 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -264,7 +264,7 @@ static int packet_enqueue(CompareState *s, int mode, Co= nnection **con) pkt =3D NULL; return -1; } - fill_connection_key(pkt, &key); + fill_connection_key(pkt, &key, false); =20 conn =3D connection_get(s->connection_track_table, &key, diff --git a/net/colo.c b/net/colo.c index 3a3e6e89a0..1f8162f59f 100644 --- a/net/colo.c +++ b/net/colo.c @@ -83,19 +83,26 @@ int parse_packet_early(Packet *pkt) return 0; } =20 -void extract_ip_and_port(uint32_t tmp_ports, ConnectionKey *key, Packet *p= kt) +void extract_ip_and_port(uint32_t tmp_ports, ConnectionKey *key, + Packet *pkt, bool reverse) { + if (reverse) { + key->src =3D pkt->ip->ip_dst; + key->dst =3D pkt->ip->ip_src; + key->src_port =3D ntohs(tmp_ports & 0xffff); + key->dst_port =3D ntohs(tmp_ports >> 16); + } else { key->src =3D pkt->ip->ip_src; key->dst =3D pkt->ip->ip_dst; key->src_port =3D ntohs(tmp_ports >> 16); key->dst_port =3D ntohs(tmp_ports & 0xffff); + } } =20 -void fill_connection_key(Packet *pkt, ConnectionKey *key) +void fill_connection_key(Packet *pkt, ConnectionKey *key, bool reverse) { - uint32_t tmp_ports; + uint32_t tmp_ports =3D 0; =20 - memset(key, 0, sizeof(*key)); key->ip_proto =3D pkt->ip->ip_p; =20 switch (key->ip_proto) { @@ -106,29 +113,15 @@ void fill_connection_key(Packet *pkt, ConnectionKey *= key) case IPPROTO_SCTP: case IPPROTO_UDPLITE: tmp_ports =3D *(uint32_t *)(pkt->transport_header); - extract_ip_and_port(tmp_ports, key, pkt); break; case IPPROTO_AH: tmp_ports =3D *(uint32_t *)(pkt->transport_header + 4); - extract_ip_and_port(tmp_ports, key, pkt); break; default: break; } -} =20 -void reverse_connection_key(ConnectionKey *key) -{ - struct in_addr tmp_ip; - uint16_t tmp_port; - - tmp_ip =3D key->src; - key->src =3D key->dst; - key->dst =3D tmp_ip; - - tmp_port =3D key->src_port; - key->src_port =3D key->dst_port; - key->dst_port =3D tmp_port; + extract_ip_and_port(tmp_ports, key, pkt, reverse); } =20 Connection *connection_new(ConnectionKey *key) diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index cb3a96cde1..bf05023dc3 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -279,15 +279,7 @@ static ssize_t colo_rewriter_receive_iov(NetFilterStat= e *nf, */ if (pkt && is_tcp_packet(pkt)) { =20 - fill_connection_key(pkt, &key); - - if (sender =3D=3D nf->netdev) { - /* - * We need make tcp TX and RX packet - * into one connection. - */ - reverse_connection_key(&key); - } + fill_connection_key(pkt, &key, sender =3D=3D nf->netdev); =20 /* After failover we needn't change new TCP packet */ if (s->failover_mode && --=20 2.33.1