From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from GVXPR05CU001.outbound.protection.outlook.com (mail-swedencentralazon11023136.outbound.protection.outlook.com [52.101.83.136]) by lore.virtuozzo.com (Postfix) with ESMTPS id 9865080B92 for ; Tue, 20 Oct 2026 16:31:04 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EuUT54wFB4/NQ4i7oYEXAIFHANN8ED1WddfBRkXMEEcSMK941Bbu12bb+5uQw1wB0ckN+O8fn775/jlbqTrZX81BvL3JTCc/1/I71aTBiS+JohK6WCdDL3z57Gicql1CFCoBB49Vmhl7cwCpC6WKnxmYhjVVw5bS0XvZqTekHWbt12kbqMwtHyWYC8TY4q0MAP8D8RZeFodZZaGyXmW1P2oNGFJA8cy5RFPHQixnGCd26Ex+TGwLk2gJvYCXjYA7M+wz3CAoWOMI8TyChNtuRygfJJbYzS9L0KvayrN3CWyL0P/YzpmS8Nr0kzP2+3A+h3V/AowulLG0PY3om3vclA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=q9+JDLCKsw+TsAjDJICn+SZn9pT1xLEE/7QjGJXg8SI=; b=pLWygMznCM36H45anK4K4Gspb9ncUMRYXiQyN7uRGyQdSXJo//ZDsC4ek3QNm0M/egQTdUWBAZ6qK6obORZwIemNoEH8gHlJmEzfdC34kQkOQ2smcguSQNZllxSK+9ooQcpFE50fR5g8XPwqRwVAm1vutSRFZX7oSyo2Cjdl9te73iTKQnhg975Sn+63RdrHpViozbiLj/Scp5/fEJNnI4GDFKMP884+wMcy3Q+N30HP0coLxTaLD+/f4tEUszM0/MXsH2ZEuQAn3kLcbJdMCtrArWvFol4VFFa7aCuIiF61DplGuYq4h+5yZ19Qe51Iza+Jr5KK4V2+CKGLZ3DvXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q9+JDLCKsw+TsAjDJICn+SZn9pT1xLEE/7QjGJXg8SI=; b=JuleGL/Jy4JGBkTmMMywYTE0UAYuPdfJtBI1l+6iN6IqQX6HsF7n4BjUdoWIBU4FtuZQcoyQGaxv6/H5CTQDU86HblcM+XxV68UOlmZTkwVSPhbSZ1iDPlcNhsfEsFIKWV48osZ/1VjUe05OpJkriDtpo+5DwYGi55QJYI/i80K1M5JLlhNRdd1zRnXczAiXVPKIAQvCC1I2RZh0v52R4bimjcKoWV7CKhUcCSFBdoyfsR9m9gznK/t2yDo6IuTXBCQuk/Roww+gldTra3jBQT/c+GJcw6PM9M6/73i2oLvnfJ7ltg19t5X8o6ETD/DqjGXFfpD242FsvKnX/aBbOw== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by AS4PR08MB7553.eurprd08.prod.outlook.com (2603:10a6:20b:4fb::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.546.15; Tue, 20 Oct 2026 16:31:02 +0000 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com ([fe80::4e37:b189:ddcd:3dd8]) by VI0PR08MB10656.eurprd08.prod.outlook.com ([fe80::4e37:b189:ddcd:3dd8%7]) with mapi id 15.21.0546.012; Tue, 20 Oct 2026 16:31:02 +0000 From: Andrey Drobyshev Date: Tue, 20 Oct 2026 19:31:06 +0300 Subject: [PATCH QEMU HCI-8.1 v4 26/31] VZ: migration/cpr-exec: abort cpr-exec if memory can't be preserved Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261020-vfio_v1-v4-26-83a5668230e5@virtuozzo.com> References: <20261020-vfio_v1-v4-0-83a5668230e5@virtuozzo.com> In-Reply-To: <20261020-vfio_v1-v4-0-83a5668230e5@virtuozzo.com> To: svt-core@virtuozzo.com Cc: Andrey Drobyshev X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIUP296CA0056.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:34b::14) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|AS4PR08MB7553:EE_ X-MS-Office365-Filtering-Correlation-Id: d7d67c7f-6c45-4adc-2de6-08df2ec7862c X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr List-Id: svt-core@virtuozzo.com X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|1800799024|376014|52116014|366016|5113699003|10067099003|22082099003|18002099003|261009223027099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: Oy02KCSk+B2HCDI6cIzeLPget2t0cbCAR0BJN21T3IJEEQ+hvd/Dx9oHzWPRvE9vTia6QRMkExLEaRxWYQsK+lOYeYzECLieVonAxYl6rHW/T8Q6e8orYcXANDGa5cMYh7jgXuJ2hKgZLREyaXRvZi7w4reeQVHew4fH6ju5D7JZDACPRhiki49n14OVd7RuPONUxW+yYoesCoh4mL3AN6QypUYBw9yZkXd4yzx318I4yzqcEDyf5lF38tbBylJz4eWhFX9tn4ayjc6sZF95xSIoM3xu8LNslZ8z9L57ObKaLBMyzOP3rHoQouQF9EdHp4+WaPN+e2IHK5yTJCEF7739nWql02AQ/Fhy28wSDYXyiIoc+McQdbWAw1Cwq7le66Ca0xapSQ/TImefo82sAxrQaS35eVtnMdMvaTsoLXXzRM/a0jv4JbT8fTLO2yCj4pXFJ5irQaTNzZl/ERzehly6Wf48ZsE1cDl7Uqd99bvhZEtjKzw3q2eI1OsljVoA+g9YH9eplrBP+akgP6vGh5BLXJKd/Kay3dd+zi6qT2ipL2f99rN1V8Yygvc9ixg1KUk/rIX4P6qaZQEncPwGMn1efh1GJzvEAU0i5YJJG06zO+TrjFjaOAZ9214it2NmP8QoiMEeRprGshnq5u0/MDfJUQyc8Ngy/yeOvj/qLaTGmsGv3eAPRU0/VKw2OGGd5GXv+ELb/h+O8Xhgw2XxmP8yE/hZkR0RLbvhiQzneew= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI0PR08MB10656.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(1800799024)(376014)(52116014)(366016)(5113699003)(10067099003)(22082099003)(18002099003)(261009223027099003)(56012099006)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SGoyL2loczU3VkhlNnVicUxXbi8zMEcvUXRJNkNkbFA5dVVveVI4dTVZMlAw?= =?utf-8?B?cWZ3OUZNOWpHRFZqSXc3Qkkyc1pJN1dyY2sxcFZaaVBvbVdienErNEk2K2Vh?= =?utf-8?B?ME4zWExLdUo3QXB3K2FXRWlsQ0VVTTdSMERseHp5djkvMkZ0a1VuS2lvUWRZ?= =?utf-8?B?TldITWNyM2VqdGZNZExZSW1MbWlYQUg2d0VQMlZOSGhiTGRReENGcGxQeFMw?= =?utf-8?B?UHlPSzYxVDVTZHl3YTdocnlFWlRyNFNTWDZIQVMyUWg0c3VOeHhhbW91bEpK?= =?utf-8?B?ODRBTVpnd2pVSmlUbkh2RmNQWDNUUmtUTTJDV2poRzh3V1pCaDlZR1A5MVJr?= =?utf-8?B?Um45Tjh2cXFLQ2ZxT2hQVmtqOXNVc0RqZGM1UUlIWGNrQUNPZmU0ZTU0NVFI?= =?utf-8?B?UWNDbHJSeHlyM0syanRCcHEzNDh6ZVBETHJPazNkUzdEL25YNlNHMDdiMVUr?= =?utf-8?B?dzZzTUNnMFR6ZGVIYWt3QXNVOVIrbHp1OWROZlNjUnRxNC9LbGVWVnNlQVhP?= =?utf-8?B?SXFDSzVYNzZlOE1OMGRMYno1MzRiU0NTQ1ovdi9jZ2dkUXVNa0FsSGZqQk5G?= =?utf-8?B?djMxeUdBWnIyTFhIcnhuY0krZ1g1MHFKdU4veFBNL3pCcW16VjZrdHNpSzR2?= =?utf-8?B?dCswQzZQZlE0SEE5Ynk2TC80eHlZM3dUNk01bDR2ZzgxU1pBOWoxMmREV3Ni?= =?utf-8?B?ZTducUhrT2dqbVo2MU0yeHR4c2xvZlQ5c1Y1TzFBMXROVnJOWUZESENIVWxz?= =?utf-8?B?bVF4YTljZlNVdXRaS0x3N3JFOG5XaWlBd0o5RkxLbXlzcEtsTFluWC91SXky?= =?utf-8?B?YlVrYUhaeXlxSmdqQmVUOU5tRE1jUUl3aG5DTU9JZjFjT0JrVkpWaHZFMkNs?= =?utf-8?B?bkx0ampYTGF1OW1zb0dvWVlBcGowWEdoaFhaV0twZm9YRWJqSkhuUU04bFMy?= =?utf-8?B?cVRhVWNSc3hGTXFlZkFHb2d6VGU3d0xpUzR5NXZlRU8wWGlXUEI0UWhwcE8w?= =?utf-8?B?ejJvenJRelhJdkdnTlVFMDRNT3NwSStZemFMVU1kaGJHWDFjS0R5SHliSHJG?= =?utf-8?B?b3hOdm1qcjFQSUQwQ0RCTVhPMXkyay9LOXB1VTljQ1Z2VlRsU0lJWFNaZWZR?= =?utf-8?B?Q0NIei9CUnFSVmthTnFic29VZ05FMEtVdlVYWlByWE5YRGprenJ4SXJLdWlr?= =?utf-8?B?c3k1SldmN1BHRTY3TDZpQ0Y1eG1CbWlRVlhyeTduRGxGYVkwdTdBdzMwOW1q?= =?utf-8?B?bjA1ZUVjZTEwbG1nYU1NU3lObkJ6OUhQTTQ2YnR0TGE1cUxBaU1ocDFUWkQw?= =?utf-8?B?bE8rdE4xak9uelFsK1VnLzEvbWNhNDcrRTg1N3ZhclFNU0ZYUVZWT0hRZjBj?= =?utf-8?B?amZHcEUybmhJWC9PRk5QOHNiMWtxRDBjRDJTME5zSlRNVytDQjVNVjFVTG83?= =?utf-8?B?QU1CWVM1TExPTENIZEViTEdHS0sydzdSaElKd0JhYmc3UFZWTTV4cmFJdzYv?= =?utf-8?B?d2FjM3I3T0VRUGVNamJKelVONHcrZm5MbEVYWXVMRmZ3M1lPNTdBbFl5aUVF?= =?utf-8?B?VE1CVng5cUpFUnR5aXdhZFRNcWN3WThzUDh0RXgvdjl2YTcxS2dnenpDcjJB?= =?utf-8?B?WHNzdHA0Qll5Z3AzVmwyNk5DM3Jwa3dWVTRSbE9PVEtJTkcyZVRxQ29mSkRL?= =?utf-8?B?NnVTVTNBaG5QZWtoNUFaU2YvREtlQ0VTT1ptM0VlYlVIL2JQMjMySDVQRTJP?= =?utf-8?B?VllrSW90bGZDUFpQMUtPNzdqMWZhcmplTXFqWGN0Sm9qU0pSWjZvb0hiaXo3?= =?utf-8?B?cFNyTFdVZjVxa1A3ejIwajNvT1NMWWVWbGdSbHFLZGFiZnI3WlJSVzFLRVhS?= =?utf-8?B?NENxZk5kZ1hjbGV1Qis2ZU11dk1iT21mWkZyaW4yZm9WQzZQYnlJZ0NhV2Z3?= =?utf-8?B?TWZrQkpNMWpheVd3QjVtYkFVdE5uY082YlZqejVPT1IzYi84NEg5YnZpZUI2?= =?utf-8?B?TXlCVU1vSEhMY3NwWU5qNG9GOCswbWR2N1RYbnhNSm5oRmE3OEoxZEl6MXlu?= =?utf-8?B?OC9wNXRuNnNrSUxTUlpwVlBkaTUvTDY2ZUJHWURhVXhURFEzblNsbWxRVFM2?= =?utf-8?B?ZWMwWFppT1lqYkJpalRYNFZqT2tEWWZSNDlxd0tJUFlqL2RsbTBOZXFUV3hn?= =?utf-8?B?L1pqVHdtUXZxMWpCdXFvZHZYNTg3N3NKd0x1RXhTY1ZCMk1MOEYzZE4raXdR?= =?utf-8?B?QXU3WlpZenhKUEkrMDJSb3daY0JBQ1RJSVluNTJUN1VCL0w1YVFjNStUSHhM?= =?utf-8?B?ZjZ6ZmJXOUdxcWhnNXllcFFnZVFMdk1XREUvb2NoUW0wNHlKM2JERVpSeVNh?= =?utf-8?Q?RH1kUpY4ETh3IRvE=3D?= X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7d67c7f-6c45-4adc-2de6-08df2ec7862c X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2026 16:30:59.5156 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hkeSjGhxGu700q2AScDsY6/1Gbh6RYLXQzgxLieQAiW5LtDgjBEtKG8QRRIgJ3o1rPjWBd89JmEG2AtpHBldHwjGgXk3eqwMyRkQqOl3p0M= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR08MB7553 cpr_exec_cb() marks all saved ramblocks with MADV_DOEXEC before exec, but ignores the result. If madvise() fails for some block, the walk stops there and the remaining blocks are not marked, yet execvp() still runs. The new QEMU then reuses addresses of guest RAM that wasn't preserved, and the guest is lost. Treat that as a failed cpr-exec: go to the same failure path as when execvp() fails, so the VM keeps running in the old QEMU. On that path also clear MADV_DOEXEC from all saved ramblocks again, just like the preserved fds get close-on-exec back. Signed-off-by: Andrey Drobyshev --- migration/cpr-exec.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/migration/cpr-exec.c b/migration/cpr-exec.c index d37293baec5..dd2ff9b26ff 100644 --- a/migration/cpr-exec.c +++ b/migration/cpr-exec.c @@ -155,6 +155,19 @@ static bool preserve_ram(cpr_ramblock_t ram, char *name) return true; } +static bool unpreserve_ram(cpr_ramblock_t ram, char *name) +{ +#ifdef MADV_DONTEXEC + qemu_madvise((void *) ram.addr, ram.length, MADV_DONTEXEC); +#endif + return true; +} + +static void cpr_exec_unpreserve_ram(void) +{ + cpr_walk_ramblock(unpreserve_ram); +} + static bool mark_ram_rdonly(cpr_ramblock_t ram, char *name) { /* @@ -203,7 +216,10 @@ static void cpr_exec_cb(void *opaque) */ cpr_exec_preserve_fds(); - cpr_walk_ramblock(preserve_ram); + if (!cpr_walk_ramblock(preserve_ram)) { + /* preserve_ram() has already reported the error and failed migration */ + goto fail; + } if (cpr_ram_rdonly) { cpr_walk_ramblock(mark_ram_rdonly); } @@ -222,18 +238,20 @@ static void cpr_exec_cb(void *opaque) * or the system is very short on resources. */ error_setg_errno(&err, errno, "execvp %s failed", argv[0]); - g_clear_pointer(&argv, g_strfreev); - cpr_exec_unpreserve_fds(); - if (cpr_ram_rdonly) { - cpr_ram_restore_rw(); - } - error_report_err(error_copy(err)); migrate_set_state(&s->state, s->state, MIGRATION_STATUS_FAILED); migrate_set_error(s, err); error_free(err); err = NULL; +fail: + g_clear_pointer(&argv, g_strfreev); + cpr_exec_unpreserve_fds(); + cpr_exec_unpreserve_ram(); + if (cpr_ram_rdonly) { + cpr_ram_restore_rw(); + } + /* Note, we can go from state COMPLETED to FAILED */ migration_call_notifiers(MIG_EVENT_PRECOPY_FAILED, NULL); -- 2.47.1