From nobody Wed May 15 18:53:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=nvidia.com); dmarc=pass(p=reject dis=none) header.from=nvidia.com ARC-Seal: i=2; a=rsa-sha256; t=1711634693; cv=pass; d=zohomail.com; s=zohoarc; b=n8LPIHNmvoSLwnWdt5Dzci/pKQGguZIdxLbutgTCvA+TjWQuQCUBctVv2F1gdsggCKvAMQulnQfX9yFC80vG0ZtJEsS2ZoI/dHPgpNgu+BroVfk3w79lz1F6qz0bA4kKDVgW+keN1PC9uqhxl1mlhPD0G0UBWEmVcFmtGzk4p2k= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711634693; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Ad3lBFmv4eP7B2XJq2P915lHjVbzo6H5dj7gnKqPPkA=; b=FAB0FOMXXU7Q6Icdkn5LNApqp566Mjh76AOSQ3Fa5PwmyzyiYGenRu190q6iB+egiBx8xc5SAnC9Vbfwu2aRppaxTJ5Xu9mJYrRDEAV/lJVktO9AuVFtKzl1RxyLiWnz8zLN+6IKC/IxRTh+6r80zTtkJkg4FyZ5FAVnlxcfLDA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=nvidia.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711634693529403.0747623749238; Thu, 28 Mar 2024 07:04:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpqMC-0002f2-Rs; Thu, 28 Mar 2024 10:03:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpqMB-0002em-Av for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:03:51 -0400 Received: from mail-dm6nam10on20611.outbound.protection.outlook.com ([2a01:111:f400:7e88::611] helo=NAM10-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpqM7-0003Ti-9F for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:03:51 -0400 Received: from SN6PR16CA0047.namprd16.prod.outlook.com (2603:10b6:805:ca::24) by SA1PR12MB6848.namprd12.prod.outlook.com (2603:10b6:806:25f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Thu, 28 Mar 2024 14:03:41 +0000 Received: from SA2PEPF00001507.namprd04.prod.outlook.com (2603:10b6:805:ca:cafe::a7) by SN6PR16CA0047.outlook.office365.com (2603:10b6:805:ca::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.33 via Frontend Transport; Thu, 28 Mar 2024 14:03:41 +0000 Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF00001507.mail.protection.outlook.com (10.167.242.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.10 via Frontend Transport; Thu, 28 Mar 2024 14:03:41 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Thu, 28 Mar 2024 07:02:57 -0700 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Thu, 28 Mar 2024 07:02:56 -0700 Received: from vdi.nvidia.com (10.127.8.9) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Thu, 28 Mar 2024 07:02:55 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kXkqSlw547YCmbE/Vg21ZkQ0L0IRjjZQMmslaHzUrV1ArIcwBn3CVtfrpXJ+QFICyhViP28KhRe23DgoZP95M89ZbzdEI+5zk1D0iQBhqq+ycfQN0/wVD5bx/l3mSNieyTYNUy0/sdPfhiTv8/ThZTFXqd+qQOVZmvbb50cBVCo2EnvHz+LVpqHGKTmXkSjnl/YD4f6Hw2eKZoU89dnNJerLF0zkn8e9BXgf+PJ1y5+VwueNeKsTC+1anRYIDwB3QyVgZxOuHlaqZvYn5/EdlO/pHs0BtW/lHaeirijau7iQSBWYfdxprWET0+WCx1E2NO3n0Xh3KCPcI/Tn3ASMJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ad3lBFmv4eP7B2XJq2P915lHjVbzo6H5dj7gnKqPPkA=; b=DjmDCq9Ki2mtbFSwpUg5t9kNEg4rJ4KA0+rexfrMBjq6s4dhnZnrux8lmCaoz0xGpOW8p5MpFzBA/zucAWZj7Hz+wZYmdfJH4sWnWFdd4HxlW/YyjnihdToo0I5RjTZq/wHps7OzfOQmE7K6nZxqMFjWWk8/2WWYJ7aLCl0XfMBM42EWDOMGL8IJi6/yMlf0aQjAoxC1gdfS0l9SrRzrAVDQiJ9gLHK1fHjTXBjccJ4CpLRN4QAlY79OgBtpcwyx6IVZyuVSWVYSw3c/Mye9A4WkYndL2l0rQwiYEqgz+3MsbNXp9KhFH14kQ6cwDQ3vYv/JPRk/Wdtc1dZgXFqpqw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=nongnu.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ad3lBFmv4eP7B2XJq2P915lHjVbzo6H5dj7gnKqPPkA=; b=uJNR+2issKMSDvRy5rOIf7BCWngPuCqUGlKntiAVlSmhLhqDMnyjVlLQx2+5Qnsi6qB0lyWutUTOh2qbqM4gob5a2bO4z39lPStDHypGVmIXwIfGVAdSBztO8bpajZinB1wtoZ6Lr6tAc0h09oygl6aQ4X1pc8wg+/++hQgbtJouv7BksB8h703X1fm2JQXmHfbfMK2XYm6cGejPV0j1iGXzTv5IHg697xqooIA0aKppnB0GmPj2bZnbipad/78UjXFQ+Zgp22lcunKbMglH3pqzUIPisr76JGTvHdoUptKGKXbqoZX4xiX7f6NG3fZgljK+T5b7/iLXPOpzgUuiQg== X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; 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 (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C From: Avihai Horon To: CC: Peter Xu , Fabiano Rosas , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Avihai Horon Subject: [PATCH for-9.0 1/2] migration: Set migration error in migration_completion() Date: Thu, 28 Mar 2024 16:02:51 +0200 Message-ID: <20240328140252.16756-2-avihaih@nvidia.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20240328140252.16756-1-avihaih@nvidia.com> References: <20240328140252.16756-1-avihaih@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00001507:EE_|SA1PR12MB6848:EE_ X-MS-Office365-Filtering-Correlation-Id: 42f59d95-f70a-4a46-35f2-08dc4f2fdfec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wzi5w9x5We/m2NBZ7XwFGVmTMQ5KpbQJv7DtS4+oZA3jTm2wtoFXhAPUUBeBAwnU/wranCYNlURTRB3OPoBf//2VxLrn8vJ3pdbqIkhChARN2oPrfuIDhnpXuuRdaiI2374yxE2hqNRev639neKGQuSTzQYZLlRoWQqyY6g9h8Qr36HCXfY2HcKDixBnIzIxX2OI7eEVhD6fUBxGM5lOhlTBV20IbCFWSn58tYnn4PLtaoBqxXFfJwCg4fBncg/sgeM8x3F1suwC81eO6bjdT3JBfAGKp4ABW3PyLdNTGJziltqNsKszhn0R6BUiHKGGaMlqWsjOSRVgVUpurtv0H33kwiZZx8d1CDhDeuQSXSBO7t+HnlubVyBfl0b1oiYO2FlnZPUMv5fFIfAZ1C+v8SElAlhXbknMMm+EzqQB3RejwPY9zuQOdOflEk94+Pb5DLe1u+jg3wk5vjrvQflIX/Ua6h0FBrHVgZQUwaNdj1pVBexE0tyRxc/hVg3BYMVqMKrLwgJfXfwdFvIx8KontDDDBU6XUBrUXMDNeVmOcZEP92o3CA+hUX0O25/2lcwlxmFycult32OXn3YKD5e37hyCZHdZmYzEBSGabgSWCw4iM529ao/25D5Gun3rWlmCjIWY5NwTvIIQwuowCPMSEFQyYLzwI8D6AjY56NNZe6tOjQ9sFyBXMbcc2bycvcBDGeSM91YO9KkOujsT3LZU3hksGxaQnleqvpY5PGCIN6n03oHZDxAJg9JgYbtuJ8Ya X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(36860700004)(82310400014)(376005)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2024 14:03:41.7218 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 42f59d95-f70a-4a46-35f2-08dc4f2fdfec X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00001507.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6848 Received-SPF: softfail client-ip=2a01:111:f400:7e88::611; envelope-from=avihaih@nvidia.com; helo=NAM10-DM6-obe.outbound.protection.outlook.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.08, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @Nvidia.com) X-ZM-MESSAGEID: 1711634694247100001 Content-Type: text/plain; charset="utf-8" After commit 9425ef3f990a ("migration: Use migrate_has_error() in close_return_path_on_source()"), close_return_path_on_source() assumes that migration error is set if an error occurs during migration. This may not be true if migration errors in migration_completion(). For example, if qemu_savevm_state_complete_precopy() errors, migration error will not be set. This in turn, will cause a migration hang bug, similar to the bug that was fixed by commit 22b04245f0d5 ("migration: Join the return path thread before releasing to_dst_file"), as shutdown() will not be issued for the return-path channel. Fix it by ensuring migration error is set in case of error in migration_completion(). Signed-off-by: Avihai Horon Acked-by: C=C3=A9dric Le Goater Reviewed-by: Peter Xu --- migration/migration.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/migration/migration.c b/migration/migration.c index 9fe8fd2afd7..b73ae3a72c4 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2799,6 +2799,7 @@ static void migration_completion(MigrationState *s) { int ret =3D 0; int current_active_state =3D s->state; + Error *local_err =3D NULL; =20 if (s->state =3D=3D MIGRATION_STATUS_ACTIVE) { ret =3D migration_completion_precopy(s, ¤t_active_state); @@ -2832,6 +2833,15 @@ static void migration_completion(MigrationState *s) return; =20 fail: + if (qemu_file_get_error_obj(s->to_dst_file, &local_err)) { + migrate_set_error(s, local_err); + error_free(local_err); + } else if (ret) { + error_setg_errno(&local_err, -ret, "Error in migration completion"= ); + migrate_set_error(s, local_err); + error_free(local_err); + } + migration_completion_failed(s, current_active_state); } =20 --=20 2.26.3 From nobody Wed May 15 18:53:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=nvidia.com); dmarc=pass(p=reject dis=none) header.from=nvidia.com ARC-Seal: i=2; a=rsa-sha256; t=1711634694; cv=pass; d=zohomail.com; s=zohoarc; b=eiWiPcLw3THVVk5CtvwiGIqm6BIcP32OUD5yR+BIZ9pdt1YwA3aM/FEb1/NLFELfYwGTaF11nSObxb57lZJdQL/3VOIHuQ69FIIbbdJKL527R2NFqi2406Jo5pbQqks39lDEKtm6tFimL6BHvjpaOQZTYIowcsivdn8w1yfErug= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711634694; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=73sNag/yzbu3j+kA6R9jGFHPgr6MhpwoKxS8rE6g3Ek=; b=IsxdUweBWKP/4K9bFlj2XlBoXW/4nrWC4bzqRkPPnOqgCQtIgEVR0o9A4g/Zqrvu8wNrdUUB4Kmzqc7LlhoB3kzdPyiMZPxbglFjz996HeUZhrMFI90tNFg4mDpcN1KPd84pfw6jkyYzdHQBVjY7WS5WspvSM0JYCKMNQx4KZhM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=nvidia.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711634694510325.4793654717158; Thu, 28 Mar 2024 07:04:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpqMQ-0002pq-IR; Thu, 28 Mar 2024 10:04:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpqMM-0002oe-Fo for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:04:02 -0400 Received: from mail-co1nam11on20600.outbound.protection.outlook.com ([2a01:111:f403:2416::600] helo=NAM11-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpqMI-0003VH-BY for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:04:02 -0400 Received: from SN6PR16CA0066.namprd16.prod.outlook.com (2603:10b6:805:ca::43) by PH7PR12MB5830.namprd12.prod.outlook.com (2603:10b6:510:1d5::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.31; Thu, 28 Mar 2024 14:03:43 +0000 Received: from SA2PEPF00001507.namprd04.prod.outlook.com (2603:10b6:805:ca:cafe::8) by SN6PR16CA0066.outlook.office365.com (2603:10b6:805:ca::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.13 via Frontend Transport; Thu, 28 Mar 2024 14:03:43 +0000 Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF00001507.mail.protection.outlook.com (10.167.242.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.10 via Frontend Transport; Thu, 28 Mar 2024 14:03:43 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Thu, 28 Mar 2024 07:02:59 -0700 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Thu, 28 Mar 2024 07:02:58 -0700 Received: from vdi.nvidia.com (10.127.8.9) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Thu, 28 Mar 2024 07:02:57 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R2k7/urcRJv6gqAlLyFHhYSEgEI+wc1WoK306YaskIh7roqcqriKLr9mTUfJnJBBOzMh7CwC3+JULKpzPrDQSBtIx2KYozqKDSfoRNwvWxC+lD3zflLDP/TsSwWfIfjfI2+w/kmiDB5MI+JKtN7Y2TDhyNL2VjZHax9PO8Aawj1GQmLL+RQwW+PI2KJlJhB8Ezx+GtDMpAJbXUOkIuG8NW4yVpvwWFk4Xsd4m+hWiuJCEUzQ+jOVZPe89b2OK+yzojWMxs3gCiHgEJcMaZ0sxKjzVAikYpGg7sXiH8rv3PYhGo8Cg3RgsJhe6L2h1L8ObkVzI8B5V5Knk+fmtS00AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=73sNag/yzbu3j+kA6R9jGFHPgr6MhpwoKxS8rE6g3Ek=; b=TBsL9hPyhwgiiJqzrg0fNj/vevD4qgNcKjAN9aBdK1EvrzUOrmnnsP4ld1A3NaAZqkK1WLNyQ5nEmZLvB+0uj6RROyYJkLpe6g13hmbWJr+uukSVP5maxI02RVkj7Gl38cGLROllFgqFB34//0OnCxm6qEwiMMmDigFD/9Ijr25ZDlOJ7UgkDy38cPDSvVUh6yNSSTg5Ik/HCrLYvpw/EGjwzeT7IhRIKSK34SjO7lRSTSCdmGSQ1Gvd0fIqtdLYQJ+aXI7mXmkqng4oprMGU3p+b+klutN7+uIslZcpjKpBKsIdnZpUE7yMbwJ+SWVN7P2E18UZdR5e4s/MaD9s2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=nongnu.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=73sNag/yzbu3j+kA6R9jGFHPgr6MhpwoKxS8rE6g3Ek=; b=OKQHkQsifX4TZxHTYrgUndeq+CZATNAaBMkqb1ryu8WussESt9HtillKLLntSSt6z5Cexe9xPBqpX9Gql9HXJqmE/7M3EufHTgk0qHVxxIJRYiMjO2i9Fl6dFxewbMF/XYvpxZPMbjN2zQffoLO0XTzTrDcjfXVvVNQHIVkEPG4F/XDNhmhVNDkwVKVJiBmGmDVWDqwJRCNvgX6BGgDSpuj+EaCKpq0NRbopEYQ8kWvKJxmFU+7+pn9TfjsU3HhwW5QKGQUaxTVd2juVMpzORa7HbpDdjmXNTwq7JsNkyxkdJgBdnOlizmsCTIX4ChrUGGFCv1AL06RXQXVq0oZooQ== X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; 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 (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C From: Avihai Horon To: CC: Peter Xu , Fabiano Rosas , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Avihai Horon Subject: [PATCH for-9.0 2/2] migration/postcopy: Ensure postcopy_start() sets errp if it fails Date: Thu, 28 Mar 2024 16:02:52 +0200 Message-ID: <20240328140252.16756-3-avihaih@nvidia.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20240328140252.16756-1-avihaih@nvidia.com> References: <20240328140252.16756-1-avihaih@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00001507:EE_|PH7PR12MB5830:EE_ X-MS-Office365-Filtering-Correlation-Id: f2c126d5-61b1-468f-51b5-08dc4f2fe0eb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lc2uSjF7ceWdAnGOVFqahbrzT6slzFchpv2LpDdUnZv5Y8mZf1AII4vZOx6i1i+DQkj1N1A+KfuupSXh9+RPlWMQl1P25FStfUW0oK6vkdig47a0IGzVr7osqGYaEzkCPd/BGXij2PMH2tgvhXuIavTwNBrBBOFwOA/j9V5fAdxrn8q8fe5+oB9Hhla6mWNwuJcd3jrXqW9D2NOqkaV6pQfKyUJAIa6FTtQrdI4/xeAwVi/cxdHAXWWA0cBrw78xFWVTq0QkHLPYphnDXFjdGfs/1EqFmPdjqVuKs2NGScbVcjK9Gr+qMobqA/UqTo12Y23hwThknoBfJFBYH9XU0LwEjScrAcsQjUDkohiDtNotu7h7h87TFkwrCfc918qK7DxT5c4v2GDKPqpXCX6nf7l7jFKUq7usblYIjeBxRt9skM/hFSBqN++HyTseF81E6mAKUX4D1At6tPxiZGsaXCJJd/Twfo7ArAhzJowO3WrzbTHTtsDt7yuK/PKb75fUcYdHnn/t50qlTx2cGpPBjm4iTbfQqIhX59uW4rRjfckSNeTZ/ygg+dPq7RxLd2CO13dYBjTgu9fxRJr1Wfe4gyEnklVIhUEA/NMvowprwHlc9ETiDJZT8cauaI+mq4+G8HxOkiH2kxv2QN8/t+4ICKQpw/6G+Vlpwmd3EXQtQvRihNXoFAuTLcxxRGWiIvyKeUZSStESewbMNaPKRk9cvP9WAb8gw0fK8AO3vEIY/WrI/zJex6akP1JsxgDuQbH1 X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(82310400014)(36860700004)(376005)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2024 14:03:43.4093 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f2c126d5-61b1-468f-51b5-08dc4f2fe0eb X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00001507.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5830 Received-SPF: softfail client-ip=2a01:111:f403:2416::600; envelope-from=avihaih@nvidia.com; helo=NAM11-CO1-obe.outbound.protection.outlook.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.08, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @Nvidia.com) X-ZM-MESSAGEID: 1711634696213100007 Content-Type: text/plain; charset="utf-8" There are several places where postcopy_start() fails without setting errp. This can cause a null pointer de-reference, as in case of error, the caller of postcopy_start() copies/prints the error set in errp. Fix it by setting errp in all of postcopy_start() error paths. Fixes: 908927db28ea ("migration: Update error description whenever migratio= n fails") Signed-off-by: Avihai Horon Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Peter Xu --- migration/migration.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/migration/migration.c b/migration/migration.c index b73ae3a72c4..86bf76e9258 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2510,6 +2510,8 @@ static int postcopy_start(MigrationState *ms, Error *= *errp) migration_wait_main_channel(ms); if (postcopy_preempt_establish_channel(ms)) { migrate_set_state(&ms->state, ms->state, MIGRATION_STATUS_FAIL= ED); + error_setg(errp, "%s: Failed to establish preempt channel", + __func__); return -1; } } @@ -2525,17 +2527,22 @@ static int postcopy_start(MigrationState *ms, Error= **errp) =20 ret =3D migration_stop_vm(ms, RUN_STATE_FINISH_MIGRATE); if (ret < 0) { + error_setg_errno(errp, -ret, "%s: Failed to stop the VM", __func__= ); goto fail; } =20 ret =3D migration_maybe_pause(ms, &cur_state, MIGRATION_STATUS_POSTCOPY_ACTIVE); if (ret < 0) { + error_setg_errno(errp, -ret, "%s: Failed in migration_maybe_pause(= )", + __func__); goto fail; } =20 ret =3D bdrv_inactivate_all(); if (ret < 0) { + error_setg_errno(errp, -ret, "%s: Failed in bdrv_inactivate_all()", + __func__); goto fail; } restart_block =3D true; @@ -2612,6 +2619,7 @@ static int postcopy_start(MigrationState *ms, Error *= *errp) =20 /* Now send that blob */ if (qemu_savevm_send_packaged(ms->to_dst_file, bioc->data, bioc->usage= )) { + error_setg(errp, "%s: Failed to send packaged data", __func__); goto fail_closefb; } qemu_fclose(fb); --=20 2.26.3