From nobody Sat Sep 26 20:52:08 2026 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=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1789375319; cv=pass; d=zohomail.com; s=zohoarc; b=Zpw1+cDwjovwh3EU82qgRePrv7wxLVqjwa+pm0hCLDY1EHel2o2yJ5BK6BzdfDr3HFvL3eHV2m9M68pqJn54P4JvbasL2Y54mx2LBQzspZjStkJP0QeFqkzKOtLldgS+FB95v3/SnFn253N4xFDQ4R2kJYlaMVsdqW5/7OjZvt0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789375319; 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=nQsJ0KTWNLp0OJ7kXGs1faxhgmR2rW05Le4fZX94OTs=; b=MyWwdakQbDgowcZv9wCppT52+SzpJJ/2Ht2HoSsSXlFwpoB1glYmQym63FgFOwYcDfWWTt5Ytc6mbk5ENzeZOoDXeCJGdEeK9ErZaLHHvq6VL0xM5TWXXAfhI3La8vhGyGgu9/ExLJeaOqjcxzuCNF5Onr+qsQ98ux/+nwqPneI= 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=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789375319473362.7693403125321; Mon, 14 Sep 2026 01:41:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x62FH-0004HK-9R; Mon, 14 Sep 2026 04:40:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x62FD-0004Gk-Sj for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:40:56 -0400 Received: from mail-swedencentralazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c202::7] helo=GVXPR05CU001.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 1x62F8-0005Pw-TJ for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:40:53 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GVXPR08MB10916.eurprd08.prod.outlook.com (2603:10a6:150:1f7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7; Mon, 14 Sep 2026 08:40:23 +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.0428.004; Mon, 14 Sep 2026 08:40:23 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=T5/Xsld+hwMmyx55n8zbDHwhFXmvknOADfxsyw2WkyHojUkiRimT8OPpyZXSBndNXbMRm4nc12VnjKxGzj54BBoQGGELE/XYK+/5Td0AVg5Aq7hqxDFOSAebv8FE6FotzVq3dg35cFFi3D3XnhV+VpNQjrdKvHLStMR3chPQ1B6Fu4uBZztI7T38VLDOnKRYxZaIC7Daz422tfxaRgvid7CI3av78ohV7LYtw8mPtrMch/Gk3amc304hd6ZBwb/hbapK6YVvOJYfy4sPOC8WXRNg6WURL3DjtTqT0ge1xLvSwL+KxByFUm6Yi9A1zlCHPFN1YEiTT9J1ontoixDA4A== 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=nQsJ0KTWNLp0OJ7kXGs1faxhgmR2rW05Le4fZX94OTs=; b=O/gXablmpRnsfozs/qjefeKo85RrcxZWJqAqHkMcyM27nePvOSMV7AchzQe9JScFixkmK9+2pcdeZpfRKjYVBswngnww50XFclAHu7EKkfAYX9JQitndlYPU2YhSQfmLGurIlN6MyGcGLAV23+uqBpK0bekeNHPFQiEIoAmHGHfpW4ZTD91OXHkNA3RG0Rkx4MuADhwdv9JrRE8GuvRbv5xYPT+xkzYVxaXLp35A9j278VQq+b0G5hWVKEnjPIGaMHMR3Okr+HloAIkKiuftw47qMvP/2l717b0phxQTbGtNOAj/pbMSvuFzySZ+tmjF7La3k4Ablc0e0w5wAVbl4A== 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=nQsJ0KTWNLp0OJ7kXGs1faxhgmR2rW05Le4fZX94OTs=; b=zmsn5syyd8OSrIDla45KNleaKPXRqcL/leTf8IRT2CKsr3wgXLfL5vCozi2sEPJvjmjuYQnGonf7L9afHa8oy3SYE1Xg33udqIpDvdCDfceEZAb1Ojl34enWt/QH0xBPaky8B7NxPgMbf1V7IDkwqOkJ42q+G3enhPX1Cr202Fq1KVbDBxXuRHoIjQW5/EjE1ZHLYYY2co4zW3FbCe8jPS5FKplvAu1U3LDa9tgZ2zgSvBKnNAelJ39UmDkeUCOsCVxX5nnkOZWdVJvBlrg0N+oLnQ9ZsR+H9BffubII4xOefSRkgo/l4K26PS9m6KNJu47RaDdOY9QhMbwMuhi73Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev Date: Mon, 14 Sep 2026 11:37:32 +0300 Subject: [PATCH v5 01/14] migration/cpr: forbid saving duplicate CprFds into hash table Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-up-vsock-vhost-v5-v5-1-d17423589f48@virtuozzo.com> References: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> In-Reply-To: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> To: qemu-devel@nongnu.org Cc: mst@redhat.com, philmd@oss.qualcomm.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, farosas@suse.de, peterx@redhat.com, clg@redhat.com, andrey.drobyshev@virtuozzo.com, sgarzare@redhat.com, dongli.zhang@oracle.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIXP296CA0028.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:36e::13) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB10916:EE_ X-MS-Office365-Filtering-Correlation-Id: 4bbadd7f-2a7e-4158-f1a7-08df123bcfb1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|10067099003|22082099003|18002099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: IL6qh8vkHSLwz7YGFC7Ghpp+ZcS8slBYduQ+JIOS+wfpRCQ7gXhCH2mYmxnLf78CI15P50huGObO7nYqrydXihtmNb+fbRccZWqsBWdDbcLiH32VA9y3nBevZdLTRIf5U1WtTz/a7sgp3rBxW6ZDknJ0PuoMtiU/iQ8KePP/FkFwoGxmv5Rq+R8OAkJmRSIZhztrNnwTQ1WZmAmGIzRQ9aKnPzviPXPs3hn1f55WlQQ4IinH7JtAgBEw48p3nkLc1wxTjWSZ2RvlkeZJddznbbMMrIkuaUYKvw4D/x3yEH7Ab7+cbzEOSdkONCtbiYturbBv9V7Nf0GmPp33WhYmyaPTwHt6qb2duW85vdUVqouFuAkw8NJFWHGalp4pBsgcupM1VkdewHrFz2xwpXWPK8aOnTxoK1WMzas4J9n/2KxHdUuO3bCeZn54Zn2ohhkGzfBJu/3wquDCQZg5jPgjujj07BhU4my9FfVwXa8Jmj3chT6cs+JW1dUxpSkVyuNd66h/XXWcsi11ap3axdIiWpNJ2tyU5ShtDl5SRHnAczHqLBmWB+XVJN6Pz+yNUmZ2mkYQdynpYvSYcq3v3rr4YQQW9miRzuWdaKznZnzz84IYxibKhY8jil3DidGetgpiHntyZqmGSZ0CFVijEj4K/lwHgTBFeXkjqazszn45ZKs= 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)(376014)(7416014)(52116014)(23010399003)(1800799024)(366016)(10067099003)(22082099003)(18002099003)(56012099006)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MU92QnF5V1g1eUxUdC9QWG5DK1ZPeUl2Y2NCQmN2NVk0b3VCbVF1aHJLelJs?= =?utf-8?B?Mzg4TUdXQlBpU3ltY0JIb2xZdkRUTnFldjR2Um1wU3V4ZnZCUjFjemFzK1R2?= =?utf-8?B?bkZEZmJYSWRsY01OVElnUW5qaTI5eHRhWGc4eDFZTFJqR3owNzNiV3lXRXdx?= =?utf-8?B?N2QrbnQ0S1FxbVcwaDljVEtwYTdqNytreUdlVVVUNFlSY3NCM0M1NHV4WXpO?= =?utf-8?B?NHNuTE1zMFdGWWhBR2NiTFF5U0JuT0V6ZGc4SW9UV2hmNGgzOHB6dTdsdGx4?= =?utf-8?B?UTY3UTZmSkZHWS9WYUlmTjB3WW5TS3RUU0pjNXkvQmJRRVcwMTFoT3pESHpo?= =?utf-8?B?cGp5Nm80dTJpNWlOWk1hOFlmR3Y4L2ZESm5wTUMyaUh4Qkw1enYrUlJOZ2xL?= =?utf-8?B?VCtvMVduUUlCampkbUs5WUZhQjZrTDJwTitKQ0tsS1RuR3RpMnlGbXRsU2hy?= =?utf-8?B?R0JwdnFlaDI5ZVBtdUkwWjBTditVRUI2YVc5VGRONm5MblVCRWJHdkd5aU9E?= =?utf-8?B?bnlnNTlqeEdXMDhnZk05N0dZRVhlbEtRdTlKUlpUeTNQQ25HN1Fyb3VNN1lJ?= =?utf-8?B?UnF1Vjl1TVVJbkJLcHlSOWptVk5jdEN2ZHJPbkkzcnFpQnFQaHBmNzMybEEr?= =?utf-8?B?RVpKSktRVzlQRUI5YjNLUGd6N0hqZXVNQ0NEOXE0ZFI2bGZFbVB2TE5EUFhH?= =?utf-8?B?ZWtRZTFQSWhwNHVmZkdYSHQvUE50cE13ekZ3UzJTMzRGb21yRmVyYXNxaG5E?= =?utf-8?B?c3RDSjFjSFBXMTF1ajJtZWVhNk43azdubmtHclFtTlNkdUM0V1FuVlZNVzFl?= =?utf-8?B?QnNlL3VBRFdHU2psRlI4VXUyczU3bGU0YmY3UFQ2bGxBMElTbU1PemZaby9m?= =?utf-8?B?L3BoYlVTcG5jMTROWVpibWJaWllOYTN2NE9wak4wWktLUXBzN2p4SkJlZzhq?= =?utf-8?B?SFBjWldmdnNkcTl2V2JZd1hOODJHM1NmdFl0U2htOGYzUDkyYTVXODlRUVAy?= =?utf-8?B?RnhVTXFBKy9aVzNkWWQ3Wk5rK0tsQ1pzdUNWVmkxRVgyejFaY3NXTDU1cCtY?= =?utf-8?B?RzRsMGJNREJGbStsMEV3bkZnaFQ5MkR1TmpNRDBrNW5oeC9aWEpnVTdSVmxL?= =?utf-8?B?TGNWcWlyNmZMcjJjK09iZGUvM3JoWDRmbFZjSkVEc1lOZGFQOHA0bWovc09m?= =?utf-8?B?MFZ6MFUwNEhaWVlmNk0xN3orUUIzQ1V0bkxiNXlPVG9iK0lDRXJ1d0pVMUw4?= =?utf-8?B?TkpzbzdVWkdGTzBteCtsVkFZMGVpTDdIUGRRZUdDUWNvZjFsai9uNVFSMENL?= =?utf-8?B?c1VBWHAvaWU2Q1JMMmlmclFjZjB2TGljYmE1ZG40QlZvdFphMVZRbFA5aEtO?= =?utf-8?B?eDh6L3lwQVB1eFpKUVdYd2hVQVFseUpRYVdoanFBbEhHYnZUZWtSTlZrbHlX?= =?utf-8?B?WVhFM3luNTVURnUvcTJDNlNDU2FFdUU2alA2TytVM3NTZWV0QTdieVV2bk5Q?= =?utf-8?B?aFpMMll4S3NPRVVGajJKbkd6Wmx6dWhqNFdXa255L2kra0RtWkRVL1FwRjc1?= =?utf-8?B?Z29qZ0V3Qjc1cWltaU1HR0lzK3hJZGZPMEszRUxURDdxYnRxQWJFVFRleFN3?= =?utf-8?B?NDIwVlBZbkRxMjFuTk9oZ3kzcys1MjNoTEtTK2JELzJOYzVJMnpQbTlndi9h?= =?utf-8?B?TnRvS3YwUm90N0JzR0dTTGI3SXRwY2dTTm81ekk1RmhETzlBZlQ2a1JleTZy?= =?utf-8?B?SmFaVnNyYTlGcUxablhpU0N3NUNqZkFCdmUvSnc4NDVEWmpnakhabzVaWHI0?= =?utf-8?B?Mk1HZ3lWd29BQTg5aUlTRGMvYno3Y0NqWit0OXZnM1NzaU9keUVLYWhWdGZ3?= =?utf-8?B?Y2hQMVBGQ0xXaHBvcEpueUlndnFmaFBJVkF2Z3ZHelhBaytGcjA1VG5HQjE4?= =?utf-8?B?cW40Z0R2akFncFdRcDZvZklVQkRpL2NEZUYyRUNQVXNyM3dKZDN0eG9CVFpy?= =?utf-8?B?c05mWXpNYzlvL1RlUmFVSVZ1eEtEU3dqMzhmQjk5KzNLSDFGVU1WVFlnMVd1?= =?utf-8?B?NnFJazZjb0g4UFZoSi9aZEVpQ1hnQ0xvcW1NUkcrZzFvek1FSjBsMEpDaW9E?= =?utf-8?B?My93MVo1b0VENExFYjFGYjJpNlk3KzA2bGRRMGhidUZIUUZPaytiaW5DaU9G?= =?utf-8?B?cTZHdklCVnZGOEk2NlRUb1dsdnZkQ2Z2WG9NUVU2cGVJajZtRWl5VHVBalpk?= =?utf-8?B?VE14YjIwK3dhUGRxVFl0YlRhU2oxN1ZyVW1SRkRLcGp6bHRMeFJXR0VCT0JN?= =?utf-8?B?SEswVmRvMnBXUW8rUkRPcFdSbTJzY3J1dHRpWmVRYzBDNm5GcG1vNWhXUm5C?= =?utf-8?Q?vzRY9/6oB5rbzJvg=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4bbadd7f-2a7e-4158-f1a7-08df123bcfb1 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2026 08:40:20.7713 (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: LaeXXkE8+PIRNsv7zfSiPSLTDKpOgX2LWdc6Fm1LHABbmKqERcGL5e69P9c+rkkXEyKZmjiQ02u17OsPtpoemaZ8/N5eou1ovX4qWPuC41Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB10916 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a01:111:f403:c202::7; envelope-from=andrey.drobyshev@virtuozzo.com; helo=GVXPR05CU001.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_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: qemu development 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 @virtuozzo.com) X-ZM-MESSAGEID: 1789375321409158500 In its current form, the mechanism for saving CPR FDs into hash table has flaws. The CPR fd hash table uses the same CprFd for both key and value, and is created with a key destroy function. Inserting a second element with the same (name, id) key leads to a use after free. According to GLib docs [1], g_hash_table_insert() keeps the old key, replaces the value with the new element, and destroys the new key. Thus when inserting 2 CprFd elements fd1 and fd2 with equal keys we get: g_hash_table_insert(table, fd1, fd1); /* table has fd1 -> fd1 */ g_hash_table_insert(table, fd2, fd2); /* table has fd1 -> fd2, fd2 freed= */ Any subsequent cpr_find_fd() for that key then returns freed memory. This is reachable whenever two CPR-aware objects register fds under the same name, and it happens long before an actual CPR, since cpr_save_fd() is typically called from .realize(), i.e. at boot time. Apart from the UAF itself, when the user decides to perform CPR migration, on CPR target we'd get corrupted FD from the hash table and fail somewhere in .realize() for affected devices. As a solution, let's altogether prohibit adding CprFds with duplicate keys. Since FDs are being registered for a subsequent CPR right at the startup in .realize(), that'll allow us to error out and exit QEMU (or fail a device hotplug op) gracefully instead of delaying potential problems for later. To do so, let's make cpr_save_fd() return 'bool' instead of 'void' and provide an 'errp' argument to it. That way caller becomes responsible for checking the return value and propagating the error. Also update all the callers to use the adjusted interface to keep things compilable and bisectable. [1] https://docs.gtk.org/glib/type_func.HashTable.insert.html Fixes: a181df93bb3 ("migration/cpr: use hashtable for cpr fds") Signed-off-by: Andrey Drobyshev --- backends/hostmem-memfd.c | 5 ++++- backends/hostmem-shm.c | 5 ++++- backends/iommufd.c | 4 +++- hw/vfio/container-legacy.c | 17 +++++++++----- hw/vfio/cpr-legacy.c | 10 +++++---- hw/vfio/cpr.c | 6 ++--- hw/vfio/pci.c | 5 ++++- include/hw/vfio/vfio-cpr.h | 6 ++--- include/migration/cpr.h | 2 +- migration/cpr.c | 55 ++++++++++++++++++++++++++++++------------= ---- system/physmem.c | 5 +++-- 11 files changed, 78 insertions(+), 42 deletions(-) diff --git a/backends/hostmem-memfd.c b/backends/hostmem-memfd.c index 923239f9cf6..a072115216a 100644 --- a/backends/hostmem-memfd.c +++ b/backends/hostmem-memfd.c @@ -54,7 +54,10 @@ memfd_backend_memory_alloc(HostMemoryBackend *backend, E= rror **errp) if (fd =3D=3D -1) { return false; } - cpr_save_fd(name, 0, fd); + if (!cpr_save_fd(name, 0, fd, errp)) { + close(fd); + return false; + } =20 have_fd: backend->aligned =3D true; diff --git a/backends/hostmem-shm.c b/backends/hostmem-shm.c index 806e2670e03..2fa7b823a62 100644 --- a/backends/hostmem-shm.c +++ b/backends/hostmem-shm.c @@ -48,7 +48,10 @@ shm_backend_memory_alloc(HostMemoryBackend *backend, Err= or **errp) if (fd < 0) { return false; } - cpr_save_fd(backend_name, 0, fd); + if (!cpr_save_fd(backend_name, 0, fd, errp)) { + close(fd); + return false; + } =20 have_fd: /* Let's do the same as memory-backend-ram,share=3Don would do. */ diff --git a/backends/iommufd.c b/backends/iommufd.c index 15f2a513501..45fd2e44c7f 100644 --- a/backends/iommufd.c +++ b/backends/iommufd.c @@ -85,7 +85,9 @@ static void iommufd_backend_complete(UserCreatable *uc, E= rror **errp) if (cpr_is_incoming()) { be->fd =3D cpr_find_fd(name, 0); } else { - cpr_save_fd(name, 0, be->fd); + if (!cpr_save_fd(name, 0, be->fd, errp)) { + return; + } } } else if (!g_file_test("/dev/iommu", G_FILE_TEST_EXISTS)) { error_setg(errp, "/dev/iommu does not exist" diff --git a/hw/vfio/container-legacy.c b/hw/vfio/container-legacy.c index 7ac7b372145..1d2c8356189 100644 --- a/hw/vfio/container-legacy.c +++ b/hw/vfio/container-legacy.c @@ -844,16 +844,21 @@ static void vfio_group_put(VFIOGroup *group) static bool vfio_device_get(VFIOGroup *group, const char *name, VFIODevice *vbasedev, Error **errp) { + ERRP_GUARD(); g_autofree struct vfio_device_info *info =3D NULL; int fd; =20 - fd =3D vfio_cpr_group_get_device_fd(group->fd, name); + fd =3D vfio_cpr_group_get_device_fd(group->fd, name, errp); if (fd < 0) { - error_setg_errno(errp, errno, "error getting device from group %d", - group->groupid); - error_append_hint(errp, - "Verify all devices in group %d are bound to vfio- " - "or pci-stub and not already in use\n", group->group= id); + if (!*errp) { + error_setg_errno(errp, errno, + "error getting device from group %d", + group->groupid); + error_append_hint(errp, + "Verify all devices in group %d are bound to= " + "vfio- or pci-stub and not already in u= se\n", + group->groupid); + } return false; } =20 diff --git a/hw/vfio/cpr-legacy.c b/hw/vfio/cpr-legacy.c index 2d40d8baeaf..14a06a1fa59 100644 --- a/hw/vfio/cpr-legacy.c +++ b/hw/vfio/cpr-legacy.c @@ -254,15 +254,16 @@ bool vfio_cpr_ram_discard_replay_populated(VFIOContai= ner *bcontainer, &vrdl->listener) =3D=3D 0; } =20 -int vfio_cpr_group_get_device_fd(int d, const char *name) +int vfio_cpr_group_get_device_fd(int d, const char *name, Error **errp) { const int id =3D 0; int fd =3D cpr_find_fd(name, id); =20 if (fd < 0) { fd =3D ioctl(d, VFIO_GROUP_GET_DEVICE_FD, name); - if (fd >=3D 0) { - cpr_save_fd(name, id, fd); + if (fd >=3D 0 && !cpr_save_fd(name, id, fd, errp)) { + close(fd); + fd =3D -1; } } return fd; @@ -291,6 +292,7 @@ bool vfio_cpr_container_match(VFIOLegacyContainer *cont= ainer, VFIOGroup *group, */ cpr_delete_fd("vfio_container_for_group", group->groupid); close(fd); - cpr_save_fd("vfio_container_for_group", group->groupid, container->fd); + cpr_save_fd("vfio_container_for_group", group->groupid, container->fd, + &error_abort); return true; } diff --git a/hw/vfio/cpr.c b/hw/vfio/cpr.c index ffa4f8e099d..6e1659dcddc 100644 --- a/hw/vfio/cpr.c +++ b/hw/vfio/cpr.c @@ -32,11 +32,11 @@ int vfio_cpr_reboot_notifier(NotifierWithReturn *notifi= er, #define STRDUP_VECTOR_FD_NAME(vdev, name) \ g_strdup_printf("%s_%s", (vdev)->vbasedev.name, (name)) =20 -void vfio_cpr_save_vector_fd(VFIOPCIDevice *vdev, const char *name, int nr, - int fd) +bool vfio_cpr_save_vector_fd(VFIOPCIDevice *vdev, const char *name, int nr, + int fd, Error **errp) { g_autofree char *fdname =3D STRDUP_VECTOR_FD_NAME(vdev, name); - cpr_save_fd(fdname, nr, fd); + return cpr_save_fd(fdname, nr, fd, errp); } =20 int vfio_cpr_load_vector_fd(VFIOPCIDevice *vdev, const char *name, int nr) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 428ab2f0698..ad13f2306f1 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -76,7 +76,10 @@ static bool vfio_notifier_init(VFIOPCIDevice *vdev, Even= tNotifier *e, } =20 fd =3D event_notifier_get_fd(e); - vfio_cpr_save_vector_fd(vdev, name, nr, fd); + if (!vfio_cpr_save_vector_fd(vdev, name, nr, fd, errp)) { + event_notifier_cleanup(e); + return false; + } return true; } =20 diff --git a/include/hw/vfio/vfio-cpr.h b/include/hw/vfio/vfio-cpr.h index ecabe0c747d..e57766e7e2b 100644 --- a/include/hw/vfio/vfio-cpr.h +++ b/include/hw/vfio/vfio-cpr.h @@ -60,7 +60,7 @@ void vfio_iommufd_cpr_register_device(struct VFIODevice *= vbasedev); void vfio_iommufd_cpr_unregister_device(struct VFIODevice *vbasedev); void vfio_cpr_load_device(struct VFIODevice *vbasedev); =20 -int vfio_cpr_group_get_device_fd(int d, const char *name); +int vfio_cpr_group_get_device_fd(int d, const char *name, Error **errp); =20 bool vfio_cpr_container_match(struct VFIOLegacyContainer *container, struct VFIOGroup *group, int fd); @@ -71,8 +71,8 @@ void vfio_cpr_giommu_remap(struct VFIOContainer *bcontain= er, bool vfio_cpr_ram_discard_replay_populated( struct VFIOContainer *bcontainer, const MemoryRegionSection *section); =20 -void vfio_cpr_save_vector_fd(struct VFIOPCIDevice *vdev, const char *name, - int nr, int fd); +bool vfio_cpr_save_vector_fd(struct VFIOPCIDevice *vdev, const char *name, + int nr, int fd, Error **errp); int vfio_cpr_load_vector_fd(struct VFIOPCIDevice *vdev, const char *name, int nr); void vfio_cpr_delete_vector_fd(struct VFIOPCIDevice *vdev, const char *nam= e, diff --git a/include/migration/cpr.h b/include/migration/cpr.h index 56fb67e6b4d..3ad084d5bab 100644 --- a/include/migration/cpr.h +++ b/include/migration/cpr.h @@ -28,7 +28,7 @@ typedef struct CprState { =20 extern CprState cpr_state; =20 -void cpr_save_fd(const char *name, int id, int fd); +bool cpr_save_fd(const char *name, int id, int fd, Error **errp); void cpr_delete_fd(const char *name, int id); int cpr_find_fd(const char *name, int id); void cpr_resave_fd(const char *name, int id, int fd); diff --git a/migration/cpr.c b/migration/cpr.c index bca43e9bf35..aeb9ad12392 100644 --- a/migration/cpr.c +++ b/migration/cpr.c @@ -82,10 +82,27 @@ static GHashTable *get_cpr_fds_hash(void) return cpr_fds_hash; } =20 +static CprFd *find_fd(const char *name, int id) +{ + CprFd key =3D { + .name =3D (char *)name, + .id =3D id, + }; + + return g_hash_table_lookup(get_cpr_fds_hash(), &key); +} + static void cpr_fd_hash_insert(CprFd *elem) { - /* Use the same CprFd as key and value. */ - g_hash_table_insert(get_cpr_fds_hash(), elem, elem); + GHashTable *hash =3D get_cpr_fds_hash(); + + /* + * The same CprFd is used as key and value, and the table owns the key. + * Inserting a duplicate would destroy the new element while keeping it + * as the value, so a duplicate key is a bug in the caller. + */ + g_assert(!g_hash_table_contains(hash, elem)); + g_hash_table_insert(hash, elem, elem); } =20 static int cpr_fd_pre_save(void *opaque) @@ -127,26 +144,24 @@ static int cpr_fd_post_load(void *opaque, int version= _id) return 0; } =20 -void cpr_save_fd(const char *name, int id, int fd) +bool cpr_save_fd(const char *name, int id, int fd, Error **errp) { - CprFd *elem =3D g_new0(CprFd, 1); + CprFd *elem; =20 + if (find_fd(name, id)) { + error_setg(errp, "cpr fd '%s' id %d is already registered", name, = id); + return false; + } + + elem =3D g_new0(CprFd, 1); trace_cpr_save_fd(name, id, fd); elem->name =3D g_strdup(name); elem->namelen =3D strlen(name) + 1; elem->id =3D id; elem->fd =3D fd; cpr_fd_hash_insert(elem); -} - -static CprFd *find_fd(const char *name, int id) -{ - CprFd key =3D { - .name =3D (char *)name, - .id =3D id, - }; =20 - return g_hash_table_lookup(get_cpr_fds_hash(), &key); + return true; } =20 void cpr_delete_fd(const char *name, int id) @@ -176,7 +191,7 @@ void cpr_resave_fd(const char *name, int id, int fd) int old_fd =3D elem ? elem->fd : -1; =20 if (old_fd < 0) { - cpr_save_fd(name, id, fd); + cpr_save_fd(name, id, fd, &error_abort); } else if (old_fd !=3D fd) { error_report("internal error: cpr fd '%s' id %d value %d " "already saved with a different value %d", @@ -192,8 +207,9 @@ int cpr_open_fd(const char *path, int flags, const char= *name, int id, =20 if (fd < 0) { fd =3D qemu_open(path, flags, errp); - if (fd >=3D 0) { - cpr_save_fd(name, id, fd); + if (fd >=3D 0 && !cpr_save_fd(name, id, fd, errp)) { + close(fd); + fd =3D -1; } } return fd; @@ -400,10 +416,11 @@ int cpr_get_fd_param(const char *name, const char *fd= name, int index, } } else { fd =3D monitor_fd_param(monitor_cur(), fdname, errp); - if (fd >=3D 0) { - cpr_save_fd(name, index, fd); - } else { + if (fd < 0) { error_prepend(errp, "Could not parse object fd %s:", fdname); + } else if (!cpr_save_fd(name, index, fd, errp)) { + close(fd); + fd =3D -1; } } return fd; diff --git a/system/physmem.c b/system/physmem.c index a4a6a4710c6..e94fe5d4a4a 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2445,8 +2445,9 @@ static int qemu_ram_get_shared_fd(const char *name, b= ool *reused, Error **errp) fd =3D qemu_shm_alloc(0, errp); } =20 - if (fd >=3D 0) { - cpr_save_fd(name, 0, fd); + if (fd >=3D 0 && !cpr_save_fd(name, 0, fd, errp)) { + close(fd); + fd =3D -1; } *reused =3D false; return fd; --=20 2.47.1 From nobody Sat Sep 26 20:52:08 2026 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=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1789375270; cv=pass; d=zohomail.com; s=zohoarc; b=ETU26hffKbm+/kz444aRTO5izNNFJQi61/p3bjPkdF4LTpGuqOxVeuKufVHS3TLYeZzVkR+mp83Jk+jPTF0lIW0SV+XT2FpnKPwPdqimXxKLU7Iog5zAOWiRKcL5vS+U78qjzELIOFXHK7KLsJZj2E6D8RdGPq1ijCSVUk+RrNQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789375270; 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=b1BPlhQEjh1ve1t5MaJwKpaCjZIQvshKVhE9sp4dYpE=; b=K8nimUE16bv4XXEjZ/l8U3iYl66TGgSx+ohixdM0xLb/gPG5ZFuqy2MTwBcs+9yywhHPqtF+kqhK7ZJJRU3UTdmhctksXuq5UbvMoxBKdMlZM1qRDTIOfQpgvyWaKBvGod8Yw1zshW/X4liDYOpmysHBAQnU0t4X2VDohPzGo9E= 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=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789375269804972.1503002139538; Mon, 14 Sep 2026 01:41:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x62F5-0004Fl-NK; Mon, 14 Sep 2026 04:40:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x62F1-0004FK-Br for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:40:43 -0400 Received: from mail-norwayeastazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c20f::7] helo=OSPPR02CU001.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 1x62Ex-0005PZ-Bl for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:40:41 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GVXPR08MB10916.eurprd08.prod.outlook.com (2603:10a6:150:1f7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7; Mon, 14 Sep 2026 08:40:23 +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.0428.004; Mon, 14 Sep 2026 08:40:23 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qRfr3Bp/uf1scw3z6NYhlvIDANz3kJWSmrTcXLPQ9QGYXWThCqxlQvqz9cTJt7mvyXMVsNCJ8nJ4nh3xp36PfoMPGKgj0V0+wlqlye63bCTn0xYw70fZJeDPUjWmywe0Us2iwfl4LbXaNV81OWXu1+X1XCE8YyZBZtQvb/0BUfz2SQs0JBsQcxPoGm4a0OVXWnsKSvYJ5oyAQsz2E1OzqGln+08WGsViQaAlOKFHcxS5St3YaxoRwDFNDX3V6VcumxGG+O3gC+Ihr3ld/DA4MwJbZIMVjZSUrKwD9izYTHLuWVmRSsDq+NW/Y4RfdBBDgaTlb0CKnyhmRghjRTIAzw== 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=b1BPlhQEjh1ve1t5MaJwKpaCjZIQvshKVhE9sp4dYpE=; b=Yt9A4VkoJOiRlzwcYgZL2J9qPqfotbsPmKnwLAzCTltZmr5mz0B+9o9Ji1M370EwZlcvF0c75HaOgzVxBttg5UZLbEXz6iDeiL+Z49nR0B2I8RUWBSQjy9hKbig3FirQBEpn9EiJc9YuLQeEhP8pbcFFZTCMOLrkITee9UtIoBn3bwUCPv7lUdcgsXzhJB2fBhETe+grOYUTOz9qjTKI4y35SIG0GT7GCgdRFm2wL20Do17PeChY6oQGdVqdmUXmZBmqlkCzhdDn2DXZj56/VD7QwYgE9f4IuQMMbFK0GOWpPcGdz4DMKbLnkGdRhU0Pfu+ph2TffiZiP9WsxpRevA== 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=b1BPlhQEjh1ve1t5MaJwKpaCjZIQvshKVhE9sp4dYpE=; b=ohtbtKsLw4GUUyo86xRHO+okr5CIbgCpeQwHo34265O+c78ZkwdHQ6iFp+dK2GNgjKfHh8GmhQxvXpA5HBBuJOEKrIAbZmoTjnHEPaVA1um+sBFdA76/5yQX8v/YwYvGtL7D0b2DNMENtLmHo7I6ZzlKxVn3QHFJSFmj6aFOg7FjlNT0RCthBlyTWo/GKeCYCw/EqRXpPLeCLqTQ8OdfAeoelV0B+I18eLPSPVzdGbqz5vvRp6qCBigM47jhoqRXSEqjqYUCJjD5p4XbvnmKacGghCgdqdUcRQtSrKG/TIgQViG+Zhhq62D7zElb3HCGmTGzo1tIItndstEaRPkcqA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev Date: Mon, 14 Sep 2026 11:37:33 +0300 Subject: [PATCH v5 02/14] tests/unit: add test for duplicate keys in CPR FD table Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-up-vsock-vhost-v5-v5-2-d17423589f48@virtuozzo.com> References: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> In-Reply-To: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> To: qemu-devel@nongnu.org Cc: mst@redhat.com, philmd@oss.qualcomm.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, farosas@suse.de, peterx@redhat.com, clg@redhat.com, andrey.drobyshev@virtuozzo.com, sgarzare@redhat.com, dongli.zhang@oracle.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIXP296CA0028.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:36e::13) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB10916:EE_ X-MS-Office365-Filtering-Correlation-Id: 3264fa6e-e0b0-4952-813c-08df123bd007 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|10067099003|3023799007|22082099003|18002099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: 1ODT5tX2JOQIfee2TI8ggopOFuZgX1Hwfm75e0FHb5j6hK3czxkYrh4fei7IGW8/1OuEZ4IWmNAwxAQFRZgambChT69v/0re7LmBgeDqY7WdZXC4jcOEMx67e/WmkR7tPLOmNgTSzcO6dbfOx112djvrjVlkeQ/26ifpd2kDCVxXYN0RdcOGrTxw7z312+xgBRHLjeDGd61+Sr0dwRNxGzUfevW3IuwW7XKPe/NBsdvebnAIOqgVZ3GSM8p2QHPNMeCgteriJ86SG0AelL0kVZKG2Nni2z//EYY0ezvopvoF+X/rMymacQDmx+9x7vWCoH9g43coJLGB1w4jDPpuOeRDH3RaXPbiNcqa57CwfgIr8YT7F+qgw44cpOXfUpLobpKQJ6aUoCM8C/ZfnRJD14X3aAht+zpQNJVe3JWvks9V48KztB/3g/frElUmacrGy90Ua4KJnMsoFpnt+D4pMAL1r6AYqZil7v/6j37vEhl+04KIb1IgB3qnzzLXgHQEvlsTPaAUsmXqVWmM6KGH+D6Rx+o1NJfAfB7W1RMl6fcTRrux3vig9T3Pq+HirWukO67DJpZ4D7KGnVO75FiMCAnQeR8cwlkuU69tg/+z74x4Tu5gllnvgctal2ir1o44XAU12WT+BYgFkdsqs9x0+7ciW7+4D7BroyzNZGPhiyejman91fA8Xuxi5lxmkI+Y7afANIlm/tFi8QkOVcLMxy9CK+Qanfb7BajwPebE+M4= 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)(376014)(7416014)(52116014)(23010399003)(1800799024)(366016)(10067099003)(3023799007)(22082099003)(18002099003)(56012099006)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eWlrdTdjSENNalo3VE1hUjliRGpkR1RQZnl2d0NDeUQ1NUx3dXJuQVJ5NTl6?= =?utf-8?B?WW5vVnpSSy9hVVhqTjAwa24xVjNnb1NsUW9BZmRmTWNKb0Q3VmlkR3NxV1px?= =?utf-8?B?S0hVWHM4amlId3NsdTdDTTFhK1Evb08rRHR4cTJRbWNrUytaYS9vRWRYekpy?= =?utf-8?B?SG5ZSS8za0lXVjI3SkVRZjBNOG5paHViQndWQk9uZXhMYmpoZ3BSRTNlS0Ey?= =?utf-8?B?Zkc0MFMzZWw2MzRaZGtsbGs0THJhL2QzV2o2RW0wS3l5aFM1ckNyQmt6eThK?= =?utf-8?B?YkxpODV2MUcyVUFBQ090amx5Mm50VjBjamJ3dno5YVJESk1qUTQwek04a0Ny?= =?utf-8?B?R1dHTFpoblhNbmVqZ21qZ3lFamg1WW1QVG9hSmNqU0MzTUlEUEdEVFFJWlpS?= =?utf-8?B?ZkN0cmp0WWxjMUFORHM1UWJGZURMck5UUk9XRzFsOXNhTGFEcGwya1ZUd25P?= =?utf-8?B?aGFHN2RQNXRrVWozK2xMTmV2SDJMT3VTUUFFZUNHelRpcmRXSTR3aXVjdDFC?= =?utf-8?B?TnBBM283Z01UbGd5UnBocWZJMGFaVEFRWHhvQ0QyV3R0V3ZvL0ZiazRySnB3?= =?utf-8?B?cTczcDdBKzFOYklReGdaZ0ZEUHBFWUp3cThSQjh2MUt3MGZjcG9BTXpIZWdz?= =?utf-8?B?ZzRleXVUaUlMREtZSXVIRnF0Q3p0NnppRENUU0VwSVRwYVVvNVplRlNpL2Ex?= =?utf-8?B?TmVDNW1yeWxzL1NpS2NYckZaUnRkVVVmbzY1a0VMWmVuck55VTBwY0pEeGJ6?= =?utf-8?B?UzJoZVMySisyaTNjMDBsVUlQalZxaGpXRVUrc3lQRDlOWDdjWkw0RUh4Mi9n?= =?utf-8?B?TUxKZnlHZURUelRUK1NBZ0g5dmRpMFlZbWdsazZjRFU2UnpNNm95d2JjbWpS?= =?utf-8?B?RXBJNWRvV3VlU2h3TDZ2ZmYyWW0ydHhNUjF2ZVFDZHBKV2NwVDRDYjRZYmor?= =?utf-8?B?ejRhd0FPZHVJbDZPbEYyWnhkUk1mZnN0OSt6aldMWC8vUkl1MEgyTUdTMWlK?= =?utf-8?B?OW8rQVE1Qkd4WklpRnFFYlZFeXZ0VEhSQmY1ek5GOWlPMzhIWm5WWWl2L3d2?= =?utf-8?B?Ty9ia1hPZDZVZFRLV05iRm9GMjN6UzZHZUV6bmdLelFMY2tvY28wRVBvamtw?= =?utf-8?B?a1JXRVZFQVVyRXYvNGZxREU2dnY2ZmFIbVBLckxlL1RJeGJUVFJ3UlFkQmZ1?= =?utf-8?B?dTh2YzVQMmlGUStWaGdDWk5qa0JiU2Z4K3p1amQxR3ZkREdpcUpQRW9BWE1i?= =?utf-8?B?b3BmRVpvNmpXTkxRWWtsZ2p6TmlQTkhWS2RJTERvd2FnUEUxaGIzcnU2ejBV?= =?utf-8?B?MTd2TlNRTUFiYWZjdU16dTdQa2x3U2svZ0hWL05VTDJiSTMvZ1RTUGRnV2tz?= =?utf-8?B?cWlaNFdGaWxCOVVSWmtJQ2tkMnZqaUZCQzRjZDl5YmVTN1loN3RYeDdlTmUw?= =?utf-8?B?REhQYzkrZGVQalJRblhWR0RFSE95bjZuTHE5NDZ6TUFTOFQ1YWJFNTk2T1Y2?= =?utf-8?B?WktNcHdsZFJnYUdXblNMVlhzSFpNc3NLb0lNNXVNTVpESFNOUEJ1RWhxT0lo?= =?utf-8?B?S0tZeTVKa00yNUZ5clhXSmtrd2NrMTVGM1ZkS1NXMlBJUkpzenpYclRPUG9V?= =?utf-8?B?d2lWQUlsM2VpZ1hidm02QnVVWnQ2S3ozdWlKMHpOMytNNG9xdW1KTHZybW1p?= =?utf-8?B?dko4T2JMazd5V2ZMOGZlaUtOY0phcmtHNDlQUTJvanIwVndPS1hLLytKYjds?= =?utf-8?B?TUpFMi9zVVdWS1Vvb05WbzJxaHU2dVFkM1l3QnRaUVJja0FYUDFTa244YVV1?= =?utf-8?B?Q1huSHRVVThGU3FTZkMwdnd2bUQ3dmdEbW55aE8rMU9lK3orMXpXOXN3MGd4?= =?utf-8?B?VjVMM2tDZWxqcG5RM1lpS0FIWDFzWlBhUmVBc0FsSlZvaFVwNjk2R2o4NHY5?= =?utf-8?B?VVQ3b1U5VFc1SUd5clg5QmZta1djSnJMUzFoZXc4b0ZVL3dLOVpTNDhhUWxi?= =?utf-8?B?QjU4OUhFa2U4V0llbWVSeXBMa1BsQ2hsdU1XV09SR0FSQVpWYWozSWVFdndh?= =?utf-8?B?RitMNXEvMjZFS1NXcUxYcm9ueFhpT0FhbnJackQ4RnpqeGV1TnhGRmErMmRh?= =?utf-8?B?dmpZandvM1k2NXhTMWJ6TTR5TGVrVHMyMjVSWGNnWk1OZlREQkJNRGJOZUEr?= =?utf-8?B?SWxUUlFIbjF1UERUbzUyVmxHdDdkQjhPaHM5KzZpeWxrRlUzMXZpSWVrZkJG?= =?utf-8?B?NmtjOFBybFYzeFRva0xhUGh6aDJ4c3Z3VGhWbjJQVjAvZXdQdnUzcTZkWDJv?= =?utf-8?B?dzRoSVl2dm1mN3FDcGJQaktjVlozV2RRYU9RNXpXclI5QlpROFBubUVZc2lU?= =?utf-8?Q?780aPAxenqm7f9Yo=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3264fa6e-e0b0-4952-813c-08df123bd007 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2026 08:40:21.3602 (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: W/Z7OAWTQQMrY9wTPYThgpsYT49FGyFFcxDxwd+iWqwwxIpYH/eCj7bSwmjpLs1Da69AH60e151WJQVkVx1+scAW82ZUqmiN/kbZfJY1p8I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB10916 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a01:111:f403:c20f::7; envelope-from=andrey.drobyshev@virtuozzo.com; helo=OSPPR02CU001.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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: qemu development 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 @virtuozzo.com) X-ZM-MESSAGEID: 1789375271714158500 cpr_save_fd() now refuses to register an FD under a (name, id) key which is already taken. Add a test which checks that 2nd registration fails with an error while the 1st one is left intact, that different names or ids don't clash, and that the key can be reused once deleted. Signed-off-by: Andrey Drobyshev --- tests/unit/meson.build | 1 + tests/unit/test-cpr.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 99 insertions(+) diff --git a/tests/unit/meson.build b/tests/unit/meson.build index e47bc7225ab..8d229ff60e6 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -140,6 +140,7 @@ if have_system 'test-bufferiszero': [], 'test-smp-parse': [qom, meson.project_source_root() / 'hw/core/machine= -smp.c'], 'test-vmstate': [migration, io], + 'test-cpr': [migration, io, meson.project_source_root() / 'migration/c= pr.c'], 'test-yank': ['socket-helpers.c', qom, io, chardev], 'test-ram-discard-manager': [ 'test-ram-discard-manager.c', diff --git a/tests/unit/test-cpr.c b/tests/unit/test-cpr.c new file mode 100644 index 00000000000..dfc6b1f2ec0 --- /dev/null +++ b/tests/unit/test-cpr.c @@ -0,0 +1,98 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Unit tests for the CPR fd table + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "migration/cpr.h" +#include "migration/vmstate.h" +#include "monitor/monitor.h" +#include "hw/vfio/vfio-cpr.h" + +/* Stubs for the parts of migration/cpr.c that these tests don't exercise = */ + +const VMStateDescription vmstate_cpr_vfio_devices =3D { + .name =3D "cpr vfio devices", + .fields =3D (const VMStateField[]) { + VMSTATE_END_OF_LIST() + } +}; + +QEMUFile *cpr_transfer_output(MigrationChannel *channel, Error **errp) +{ + g_assert_not_reached(); +} + +QEMUFile *cpr_transfer_input(MigrationChannel *channel, Error **errp) +{ + g_assert_not_reached(); +} + +QEMUFile *cpr_exec_output(Error **errp) +{ + g_assert_not_reached(); +} + +QEMUFile *cpr_exec_input(Error **errp) +{ + g_assert_not_reached(); +} + +bool cpr_exec_persist_state(QEMUFile *f, Error **errp) +{ + g_assert_not_reached(); +} + +bool cpr_exec_has_state(void) +{ + return false; +} + +void cpr_exec_unpreserve_fds(void) +{ +} + +int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp) +{ + g_assert_not_reached(); +} + +static void test_cpr_fd_duplicate(void) +{ + Error *err =3D NULL; + + g_assert_true(cpr_save_fd("dup", 0, 10, &error_abort)); + + /* A second registration of the same (name, id) key must be refused */ + g_assert_false(cpr_save_fd("dup", 0, 11, &err)); + g_assert_nonnull(err); + g_assert_nonnull(strstr(error_get_pretty(err), "already registered")); + error_free(err); + + /* and the first registration must be left intact */ + g_assert_cmpint(cpr_find_fd("dup", 0), =3D=3D, 10); + + /* A different id or name is a different key */ + g_assert_true(cpr_save_fd("dup", 1, 12, &error_abort)); + g_assert_true(cpr_save_fd("other", 0, 13, &error_abort)); + g_assert_cmpint(cpr_find_fd("dup", 1), =3D=3D, 12); + g_assert_cmpint(cpr_find_fd("other", 0), =3D=3D, 13); + + /* Once deleted, the key can be registered again */ + cpr_delete_fd("dup", 0); + g_assert_cmpint(cpr_find_fd("dup", 0), =3D=3D, -1); + g_assert_true(cpr_save_fd("dup", 0, 14, &error_abort)); + g_assert_cmpint(cpr_find_fd("dup", 0), =3D=3D, 14); + + cpr_delete_fd("dup", 0); + cpr_delete_fd("dup", 1); + cpr_delete_fd("other", 0); +} + +int main(int argc, char **argv) +{ + g_test_init(&argc, &argv, NULL); + g_test_add_func("/cpr/fd/duplicate", test_cpr_fd_duplicate); + return g_test_run(); +} --=20 2.47.1 From nobody Sat Sep 26 20:52:08 2026 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=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1789375287; cv=pass; d=zohomail.com; s=zohoarc; b=RgJF6lWhGiQmNbCAu+f9BsVmPXssoDgDJ2WWmkNm2zmTt5SY4KVfMrs2p1wyF+IHJevitk5fuxyZc3smxNCbOyLuG44am6MCIIsINe1WMsB/M33fhme9K9qFrnP2iRB2KUuEM9auYl3TyUQFUbU96dKZpxGvwRGdQgjVQ5Nza4o= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789375287; 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=THowUMNoBVC1QYYFnQYYycsuK+2HYGeLLHDFJBBq7iw=; b=fx/ZFOWh1TkCiyIpdTEb4CNuiFRS6NPsO0d1A8e/SRnt39PG07DP8jFhnb6dgk4Ys7ix/YJiyNw41uKblOpaLppgYPSq9AZL0wlSCH7a7P7CiUSj9B5B3NefTQgYV3iLWFIQjA4Z99DGy66KJJmLbbpDby+kPJGtw9se6yWApI0= 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=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178937528747415.96732591699174; Mon, 14 Sep 2026 01:41:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x62FC-0004GM-EM; Mon, 14 Sep 2026 04:40:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x62F7-0004G3-QJ for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:40:51 -0400 Received: from mail-swedencentralazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c202::7] helo=GVXPR05CU001.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 1x62F3-0005Pw-Pu for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:40:48 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GVXPR08MB10916.eurprd08.prod.outlook.com (2603:10a6:150:1f7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7; Mon, 14 Sep 2026 08:40:24 +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.0428.004; Mon, 14 Sep 2026 08:40:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SegtJFep6YJ+lpPfXMGS19P2GgaQJeU+LdZqR7GK8samkEWQT6PXUnm4HHqrP6pV2qXrO2abaUErU4XW2QclUZ6VerL9tFHJBnrpnkDm4wtFPFr8802Fxmuy1w6n77XK6JEvNK4imj0wjEfrX16iWyaj29CBrx4RAsmHzVlJNkQoFFaGJe8XkMRegV0xwPoeBR7LES/8eX8lS+Db+YMpxI6y0/yD0YnjslATdDFFDq+xZ1+BUaCber3lJW0PbR332s88g1BZtGFDZDjtc4FyUs+E2dwu53lqI8vdlB5Pk8qqg9npXHxukDxSpcgLdVhwsKYt60Kne4DK58ho+Wg5gg== 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=THowUMNoBVC1QYYFnQYYycsuK+2HYGeLLHDFJBBq7iw=; b=j4Bezg873bEcYG8bO8kyKGmbXdetuntK1Ila6kr0WFp3jrsZ+4qlpmE2RkTKfPf9i5igAQHF2QrZssX1/P27UXU1vIKjDz473IYsMLe5B+yF7q1oikTWrtHMcybWGjZh7OGl7VWawenhxWkTvAaGSQqXx5u/SpzeVnxcvXb74a0ubb0kVAzVmxwK0aV+z+gpuCDB8PG3i6N1VOXm9PD+u1GsN8N2VttD0DSNVSebhO+kMXit2Fl5io1t/a9fQy56X3jhllKf55UEMScqkOKjVSmWUh+M5zN9B+m/D/s3XeTejmDNy9rg0fdGELQY+WMhZMfB5xzHD4nMrydDitOm2w== 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=THowUMNoBVC1QYYFnQYYycsuK+2HYGeLLHDFJBBq7iw=; b=PfsOvmt0o5xqFBIWFFmOKWXll5fiY8buQ40HQV9FKymUHVsVND9wp4G0u+4ZXKBkjdXtQUMHNXxLphByxt4G5DHy5reXO/laJEaFsJaKT1afIBsRo/gqs2TU/RSUJjr+QhQ8DUG2W2OO21D5LvOXwIYz9D8idJdSp85M/B2N+coPpMoVmYEdF+RiDfJoi0qesDVWQTzcPWTp1SLuTeiKKX0U5Ay9yc9g5dh3oQee9Cix8T/EY/t5TYZPuTlUmv3VC4agkOI7oN7e6nrxzXks6P5QWY2k2vJlQXiGHg/cCf8zN+y6JCCG6ClqoYZ6KJXAc/Bd87kDnNxfX2cCYzbHJg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev Date: Mon, 14 Sep 2026 11:37:34 +0300 Subject: [PATCH v5 03/14] migration: forbid snapshots in CPR migration modes Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-up-vsock-vhost-v5-v5-3-d17423589f48@virtuozzo.com> References: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> In-Reply-To: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> To: qemu-devel@nongnu.org Cc: mst@redhat.com, philmd@oss.qualcomm.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, farosas@suse.de, peterx@redhat.com, clg@redhat.com, andrey.drobyshev@virtuozzo.com, sgarzare@redhat.com, dongli.zhang@oracle.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIXP296CA0028.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:36e::13) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB10916:EE_ X-MS-Office365-Filtering-Correlation-Id: b250ebfe-af84-4f14-7d3b-08df123bd05f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|10067099003|3023799007|22082099003|18002099003|5023799004|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: eYKk/ZiJHkll5tsHvqId1XfvplLiWH8GRB3B7zF0Z948hcymZmr+CNbagGS/CdpOMiFBKJpJB2taQSJT6pqfChMWoNpdC0I57+JTGG+w87R6xADdlSIw9OGj6X6uqDhvdb7L1QWf/7A6bMW5K8MoW29+VuusmxEYdNxNG7IA1HleUPU2dZ7QT5UExcsSmsN08PHDmjqXdIJUtGd4u8waoaaM0wBSL0eqANq+Viv1F2O1XG+/ERHodjOS+vV9v+DUKGcoqpqo/gg1hiR+LFxx7XAbzDj5ZT+bSvjA9j6MGCZkPTvHPGL+Phpb5MMdoybU1xRVjnbWxqbktLCpAt9JIF0voI5b2HkPWg+gEOzQH42wobm8qEBwCs99a699Lmd3QDxIyHoXLIRZBf4n/LmWAobv97NFdOu5RrdhZtwhz8tnvQvczD7lqz/zEc+sMUloMYlAXTEAV1t47Hnr4wo+u5UUbZ+Yw25fEzCVZT9w6rPNWvtaUjs+BHt8TYjhD14ocvT7v2mWATAvdETkYj3oaMqx2Q/wHxInqVno6orf/YxBto0S5BWE6+uTEwmDeOleH3/zOEsYIFOdiUqlmv0mZ7KGOtlCYoraxNCT2xAs1swSn8Ejg+cXJjnC2sSpXJ42bpLjyGC/9jp5iaDmVXW5bVkXbgr4VKru6zSoJpYsbfhf+e8Y9DGRCYLFl2xOHWUumVdOD3wamXWTnXexkr+6oF6nhTVkeD6K0mp6ASZBfRs= 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)(376014)(7416014)(52116014)(23010399003)(1800799024)(366016)(10067099003)(3023799007)(22082099003)(18002099003)(5023799004)(56012099006)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MkJoeG5DZzVOSnREV1dQVzNyeXIxbnRmanQ4cXVFS3lkRW42L2laZXFveDFr?= =?utf-8?B?UXcyc3dFbU1GN1cvTnV1bTJJRFVCSlVUcW9selI2MGNOSks1UVVld1BTKy8x?= =?utf-8?B?WTJOSWdPRmlHZnZYQmNpR1RBcUFQTFppRVdJL1hXVWtzMWxzZzZFcWVUVXBO?= =?utf-8?B?QStzYnJ3MzhKQ0xqYTRCODl4YzNoUk54MVFIUHRURG41bllIcStZSkYvMlFj?= =?utf-8?B?OWxCSnhpVUk0WDZOSHE5VmVoSmV1SjN0ekNNeFQ4UkpQV1UrbFVJeXowUURS?= =?utf-8?B?NitUQkhZNjV6cFE2MEFsRmxpbEtoWUpwQk0vWFBOMXJweUJDTExXdE9ORGpP?= =?utf-8?B?NGx4cWN3OUd1dXBXb05rellleEtJVmZGR2UrN0NCVXU2dDloMXgyeUJaZ0ZC?= =?utf-8?B?SFhPWFlJU3FZQThKWjVoUE1iYjFHU2tOTFdIWWh3RlJ3a2ZKTGFpWFQ1N1g5?= =?utf-8?B?UGREdU1ub0p0bDVxUktrbXNocEtLencvMGRnOFBSdENveUhpZWZBbDM5MVll?= =?utf-8?B?UDhZMzRqTm1ST1Q3TklOSjZkM3gxemxhTmZYSnlrR080VUdvRFdkR0RUaEVG?= =?utf-8?B?VTluSDMzRmJ2ZWdyenF6MUdVTWgvb1Rqem5GQWRZK2Y4S1N6eFpvMzNVNm9x?= =?utf-8?B?bnR4MlkrSWNqUldJZGExSjBlNUxzWXpLcUxraG4yclBseXpJSzNmZWlvbU04?= =?utf-8?B?bDRkbGdqK2w0V1NGVFFFZVJWQ1RBK3NUVURkRm1hWFVLdk9ZdGJNWnZiK3BO?= =?utf-8?B?MERqRlMzRW4zWnRwZ0tEZjF6OFZXR3VzMjFCT3BpQk0zVytsNlVrcG90WlNa?= =?utf-8?B?R3B6Qm5IcEJwVG0yQm1uV2NCaGx2WTg3ekdWL1pRZE5zR1IzSEd4dCtTWU5a?= =?utf-8?B?OFlaSUNETkVubE9YWkRha0JhcWdKV3Z0UDdXeGF4b3Bobmh4eVVXNGJVOXNB?= =?utf-8?B?dmdWUEZQNEYra3hSN1AwQ2NsV1pXcUZ6VXNzYW4zbHZOK0JRdHJWVWc0bStP?= =?utf-8?B?UDA5NXU1YVJpV1A3Rks0VDhDTG43dytuT1k2Nk5kcERnY0R4WjJqMXlONmwy?= =?utf-8?B?TFpLZytHWWk1MjlQNXZ1VDcwOUtWeTNtS20zS21rZ1hTRU9meVVWazF3QnBM?= =?utf-8?B?QXhRTXl4alNBc1ZPNUVHcnpHOER5ZTl6UWxiVWVWTkVCTTJ0V0lDMTFsWGh5?= =?utf-8?B?ZFN6LzNwWHd1YitOaFkyU0hONlhjNTdCdEtkZS94ODBLR1IxQlgxMldJTmZv?= =?utf-8?B?ZlNGUEExcEM2Zlg4R3NRZFdRdjkrTi83ZkVBeit6b3VyUTR1dmsya09JTTVF?= =?utf-8?B?amc5QnlLUGNxdHh4V1d5S0hoQ0VtQXBpTnhiL2JlNEt3TmhMZHkxcFVIUFNQ?= =?utf-8?B?ellhNm5oeUUwcUc5Z0lPaHdjd1NjdmdmT2ozSmVhTURZN1dudHY4aGpjWmNW?= =?utf-8?B?eHZMdkpIU2F5T2lZWkMydWl1SzdCMDNxTE5xbDBUUStsMSszbiswWTdSUnV6?= =?utf-8?B?dmJoRnFicjFRNS9MbW5JYmRiRmNJL0V2ZDhDZDNraDZtSFlzYTh1Z0daWUdE?= =?utf-8?B?eGFkcGdwMk9RVjRBM3daeEl1cFNaY0dGU2YydkV3eHFpa2dRVklwR2ppVDNJ?= =?utf-8?B?M3ZuVHdLbytTTFJGSDRhU1BmTFRpMmExdWRJcEZLalB0REtNMnNFRG8wUXlF?= =?utf-8?B?dDJCQStnSERHdGtJTmpYbFVxcGxhcHRlVTVVdHBsT3VEbWxoQnpJZHI4MTU3?= =?utf-8?B?azR2SjU4STRGK3BOVXBkYlAyeG1BWG5sYjRMbTJsdWRRZXZIeE9DeGFEMlB0?= =?utf-8?B?UHpDK0pRRXFoOGpsSWVTdEhDTGhLSmd1TWJlUVhEamZPN0ZQVytGNHZDc2Jm?= =?utf-8?B?alcrNldiV1hmejEwcndjM05paHdselRLZng1MldnM3lPVGk5TDNvcHJUSVRU?= =?utf-8?B?d25hQnVqRkFMaG5sN3lLWFd4NWtZZk11dFFGWUMrNldKQW5pS0htNUJTQUZ0?= =?utf-8?B?dEZaL2w3ZGR2VUZJU2ZIT3RQQ1dEVTdMK3ZYZWxDR1E0dHBhUnY2azljZFBH?= =?utf-8?B?bFZLbnVkMjgwd0dyVkp3SE1PVUpzRTh1dWc3emkwTXgwUnpoMTdaVXBobk9P?= =?utf-8?B?Y3g0NWI3V3YxN0hxTVNGemlHWFJyOFBwZEhkZHNYUk1ESTROc1JqNjMyWUdH?= =?utf-8?B?WEtaMXJoWnMzclBYQWV2NlNVRUVMUjhUZWpkS2hGTUprc2h0YzNSb25OOGlL?= =?utf-8?B?YkQ1dUNWWVFYckNWZk9aOGZZU3cxSTJ3WVZxaXhPemRBMU4wNHZ4MFVQZmNQ?= =?utf-8?B?bEwvOTRPY2hqc0Jjdm5Xb3dKck9Bc3pUcEhXdVBjWXdBS3BrQy9LNkwwKzhS?= =?utf-8?Q?FAziISn+pfN4vosw=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b250ebfe-af84-4f14-7d3b-08df123bd05f X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2026 08:40:21.9272 (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: iL39+KpLDEOFwLH9qVdm2IcYxmcefGJHdiVedt5FmPpQ9cW4hSXkY1jX/r+K3BnUkxsBmw6TqBZaaropK3uwq2hKjYNvPA/u8gaAmLhXjDs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB10916 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a01:111:f403:c202::7; envelope-from=andrey.drobyshev@virtuozzo.com; helo=GVXPR05CU001.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_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: qemu development 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 @virtuozzo.com) X-ZM-MESSAGEID: 1789375289135158500 The savevm/loadvm operation doesn't make any sense in any of the CPR modes. Saving VM state implies saving its RAM entirely, while the whole point of CPR is avoiding that: in cpr-transfer and cpr-exec modes RAM is preserved in place and never put into the migration stream (see migrate_ram_is_ignored() in migration/ram.c). As a result, a snapshot taken with such a mode set has no RAM in it, and loading a snapshot with such a mode set fails in the RAM loader. Currently nothing stops these operations from firing with a CPR mode still set, e.g. after an earlier CPR attempt. Reject them early in migrate_can_snapshot(), which guards 'savevm'/'loadvm' HMP commands as well as 'snapshot-save'/'snapshot-load' QMP commands. Signed-off-by: Andrey Drobyshev --- migration/options.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/migration/options.c b/migration/options.c index d2575edb6cb..a8e3eb73b3b 100644 --- a/migration/options.c +++ b/migration/options.c @@ -547,8 +547,15 @@ static bool migrate_incoming_started(void) bool migrate_can_snapshot(Error **errp) { MigrationState *s =3D migrate_get_current(); + MigMode mode =3D migrate_mode(); int i; =20 + if (mode !=3D MIG_MODE_NORMAL) { + error_setg(errp, "Snapshots are not compatible with migration mode= %s", + MigMode_str(mode)); + return false; + } + for (i =3D 0; i < check_caps_savevm.size; i++) { int incomp_cap =3D check_caps_savevm.caps[i]; =20 --=20 2.47.1 From nobody Sat Sep 26 20:52:08 2026 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=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1789375554; cv=pass; d=zohomail.com; s=zohoarc; b=mbnapIh6wFrY9Fjbe+rxXb74ALtiWnh8+zUeIgPfUqr/FnXq83W+RxtPlMtGgXzZLIx4AX1JmeAnZAU37sfV45JOPLektUe9ro5IVei72HVmpowpb0gzXIIF9wKJ4L+XDyhT6IvPKMvyZL79QIY17GviOt9NLnZ7zOxZzOzKtXk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789375554; 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=qh12CtVAVL9lQ0ICmhFjXMynrjuk0p8D6nzg+2i5aro=; b=S2gGfC0cEq0kkjSW6OH8ukHaA+mNXba28//gCfobJ5hdpfUNAXFjX7UYTFTW9qQ8v2w1D+VKy/SJlYMosWCqvo5s8LguSaWODW5h4sBc0/AhPB/uaCv8K/tF+rvU/AwYFond6/jBWSmYEycOtbVDYJws1qDgle73gApn3kCzzM0= 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=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789375554037484.3529119656706; Mon, 14 Sep 2026 01:45:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x62Jl-0001Sq-Dg; Mon, 14 Sep 2026 04:45:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x62Ji-0001SA-0f for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:45:35 -0400 Received: from mail-northeuropeazon11020120.outbound.protection.outlook.com ([52.101.84.120] helo=DB3PR0202CU003.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 1x62Jg-0006Wy-4D for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:45:33 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GVXPR08MB10916.eurprd08.prod.outlook.com (2603:10a6:150:1f7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7; Mon, 14 Sep 2026 08:40:24 +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.0428.004; Mon, 14 Sep 2026 08:40:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bQw5c8eMVYamEl2WLTKMMfAkq9wjaJsdN/xFDq7u7H3ZxOqp8a2uZZIB945GM9p2bFYzdWjNiaEsBtE2SivJFAC/SP9SZsudZWDqXL2H+sFsUX4BFs/aOYPIMVEBKaI85iWQDrfi/MJj9UaKLZE8CVP+ZcE5pzztbh24vmg9dRehy1kT6FDxdl62RY8vVnxN47QiqjlVB6r556mTCOf+pqdGvt7FTh1xlCjlKPItHliPDSSAIaVhEQLPy0bwKD3imqaSu4uIAguvF3/zrAIuRGwEWyrggV8e/Z1n53TmI4hd3rhbY4pE98otrm2fbsvvPe2YQUz31JITtplvAkySYw== 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=qh12CtVAVL9lQ0ICmhFjXMynrjuk0p8D6nzg+2i5aro=; b=sCg4xEHzF/wWwPe3auunfLWN68uvKPgaIfevYvV3qs9pI12ad/2YJE15j2Hr7g5ApFjngLW7emTg/zA3BxrbqAGzHKMaXaMhGE+Bg6jgOP1Avt32QrxG+l2zd55uwiYY1RbcuC+304EkAAbv0ju8SfhJpwSJfUrfRgNPv32qY/zQn5oP62E27O9U+IIFYDAD+7MY7vByxnk/SPGbNCmg1ekfJyb18Kv2aPOc0eeRzAPUcsgoopZVGGec/2yihUAQRKHCMzP3gV2dsxf3tNCe5hqIYhHjDbE8XdIpEa14+QUGW8wtCSSUKl55BURxbpgfTvPkuPr75QeplQtcpF4cug== 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=qh12CtVAVL9lQ0ICmhFjXMynrjuk0p8D6nzg+2i5aro=; b=pH1yYkOUfqxgCRmIWHKcllApmre7lCyWIQKwqM5F+8gra2upJ8Ff4U5wvHwVSfgYGWuAaW9BQbM75xk+Zuzvx8huRcbSjkoY5iTOv5wMs6FRBy/3+1+M6OmsPuj0tTT9LGgThDWYH1qDWsCNh/7dVQn7ZwYOeMGyWDlrFTUG/XL27qKtkBKYsdnygOWFoxMKN7PtkmfRDVHcTis9fS2PTgWZRss0SGbMROiGCp/XZRoExnaQDfOss9562Bosn47jn3cK3WxSN7Acf3ezcw6zDE3ZK0VZ1Hj8X7dwH2opHdjS2XOPEkgC7C3PF3jiP22DLUG7za25gTKqtB2ND0qPRg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev Date: Mon, 14 Sep 2026 11:37:35 +0300 Subject: [PATCH v5 04/14] tests/qtest/migration: add test for snapshot rejection in CPR modes Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-up-vsock-vhost-v5-v5-4-d17423589f48@virtuozzo.com> References: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> In-Reply-To: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> To: qemu-devel@nongnu.org Cc: mst@redhat.com, philmd@oss.qualcomm.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, farosas@suse.de, peterx@redhat.com, clg@redhat.com, andrey.drobyshev@virtuozzo.com, sgarzare@redhat.com, dongli.zhang@oracle.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIXP296CA0028.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:36e::13) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB10916:EE_ X-MS-Office365-Filtering-Correlation-Id: 45bc47a9-8f45-4181-5813-08df123bd0b7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|10067099003|22082099003|18002099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: yZ7hLURfS0Qk6n3qC/wPekJejXnrnSxr9qz+OMJVMzFxy39VmilaCwbaanlw1eeFRe0B/JwAKPSknJBWyVlVYVVsRg7wjoapR8grjfxINaqtaYCWDas5tER6xFiU3pUmJd+ltv96+k7lKsZhpjT55iJgSNaGuh6EW17qEOCYFt6MlfFiGUuw4/u37KZUYhwYBmsNBSDVRYorceefIAQs7z0N/Lj0ddwK+02YrpewmXLBqYA4FDlBj+wEvSzbiABn07QcIRWfVSF5bExrQSAUrAYT5s1YGc435t7BENNml2kd7PPWCVNDz/Z99K1dugUdLfvrFfbVLL09pN+fYYpGtICNlTgGLnOnnkPTqq7HkPpXYVlK9Slyk2LREg/zvDrfTsukpkpSNa2ZzwcGI9vA9cpZzzCIMsZHl9CM9kzaJKNRiA9KC3eZFqcs+xGQoJ8ZipVNYns+RDXB1VVE/y5sZ0yrZ+SLNv3yXc2SleLs/3r09WnfRi1CUlorU7s0ICCXbOmIQEvqBdDmoYWUQIwjGAR4DR6vy1aOUV66uw5e+xyTJunL9FSXii5HtJyVXnaUczaWKDaGHxJOLZ3hXSsJq/xSjvZbXMKWiYLXY0iPliHInZY8ICOpaFBAiAEjWKinOhWYZv2EkuaBLCdVjAYph23lu/qZtFskzswTcK3BQNGaRHlOLSPF/FmitXA5EiSwSmeaF5sHp0H/8+r3vcw2zA== 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)(376014)(7416014)(52116014)(23010399003)(1800799024)(366016)(10067099003)(22082099003)(18002099003)(56012099006)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cU5KTjk1WHQ5UVhYSkEwUllEQ0plRFFSSzZ2TkZLQjZKczZqcUhPcFdMRUd2?= =?utf-8?B?QkdmSzJEOXp1OE50UEE2eW43dk5uYWxyTW1xaEUwSTVoYTRmeVdnNmplRkpu?= =?utf-8?B?bDg0VVVXaGNJMXJyUC9aUEdvMk1LUnB2SzMraVVEWDAvU0I4Sk1lQVpZbGhS?= =?utf-8?B?VjFXQlE3RDgzVTcvNWNVZk9nRmUwYVYxV3IyTTBKcUtOQUJYRFY5Yk1EWVZT?= =?utf-8?B?SGFrNWhiMlZyeVA3ZFdMNWxqN3lSTDFNMmZuKzgvNURPcUhVT3VQR3hTaWVO?= =?utf-8?B?cTIrTDVHQlpqaFN4SlMvQWJsOG5WbFovVTcvV21ORGduUDdlR2dRUk9jUHMx?= =?utf-8?B?MmpsQmtrcHNtVXZjeEVmMjlDMGQwL2tIZWtHdVoxMzVnaXVXQURDWTVJTUE2?= =?utf-8?B?R2VqWGJMVEZJMjZWRHV6a3BUNXVtR0g0dnVmdXJCTjJXb0QydXVkaE1Uajhm?= =?utf-8?B?bThKOTlZN21yTG1LcmhzaUFESS90Q3hLOEMxeGlZSG92THdJdW1NVDh1Q2I3?= =?utf-8?B?M0twOFZ0RWxYVTROMXI2S21Pbm9sdVBzMUxab2huWEt4bCtaYTh6VmwzTzRC?= =?utf-8?B?Q3p0bkgzNFIxSE5WYVFoSy81RjhvSG90UHBLaEdkZUNZdzg0bnlDOEgweDB1?= =?utf-8?B?K0hyeFJmVG5qNEZ0NElQSDM5RkhKVjlrTzZWRzhDUVJyM1FWczdTL0FDd0Fk?= =?utf-8?B?VFRyNFhQdGFRYkZBY1VNYnhBTHc0SzNudlptbnFQSG50NFhscW54ZEtaQlJH?= =?utf-8?B?bHU3RzZHUXNJdklIYUdXbjk1T3MzRklpL2RHZ0NvQXYzVzhhOFNoZGF4ODhO?= =?utf-8?B?ck55ZHVXOVQ5TEtnU25zQy9talRiVTFTUEREbkNhckQ0NlZGblhGdlppaTAw?= =?utf-8?B?Vm4rS3JMNEpQK2pNbzJYR1diMmV1cTY4NUthOVVueGVtWXFFNG56Rm1oSEdl?= =?utf-8?B?TStwcDRQSzc2cmN1TEZkYTlPbUsrNXAwNnUrWFoyc2d5endzd3ZiWTJrV0xz?= =?utf-8?B?bkFQMEdPbnZZbVJrdDR3MFduUi9teXFkZjBidVY4R1NlczAwY0NZbXZ3dnNR?= =?utf-8?B?Y0Z3SXFYUGtQTVVaZ0JZbUxrcDhuZ3pQdGQyTTdvMm5mK2tvUGRBbzJJb1gv?= =?utf-8?B?SU15TXFzTDhreWx5YmdyUmhybm4wcXRnRGR0REprV1E1ZzMrd28zVCtyWDBk?= =?utf-8?B?SlR1SXp0NDA4TXQwRmhqZE8xQWdIRU1tc2lPQzgyRW5IWUFBWTQ5dVpoeUtK?= =?utf-8?B?am84K2JyejYvQzBiT0VTZ3lZakF2L0N3ZDdYYXZpek9kQkNjTHFzUnVwNXdI?= =?utf-8?B?S2pXbVdDY3RndC9IbmdNK1dsOGFZeDcySVQxeGpqNnZWOTZ2bnhUajBVM2VN?= =?utf-8?B?N1pya28yWXFSN2k2b2tJcURGSUpsQm4rRzBNR0JmMjBkMUNYSjdpRmJYUEh5?= =?utf-8?B?WnhNVldaNE5IemJaK0xrMTF3MFBXRVpYNFo0VDdvT0Z0blFPN0lSNlRUcW53?= =?utf-8?B?NkJqOVErb3Z2cithenZTb0ZXb0tLd25SS3RLTDlvM0t2cE1na1NZUXNNaTdC?= =?utf-8?B?cVBCZmpGVDBFZkxnMGdxd3VnT2V4S1pqZThzRU0yK1JMclltOHQ3MlQ2bG9o?= =?utf-8?B?aUpPUlQ5dXpEbjFscVdhUVNxeFBLbFA1a2lHZnhHY1B0S3B5Z1ZWNW1Wcytt?= =?utf-8?B?S2JPSGFNdEdKZnZFUUZ2Q1lFeWpFYkhWMllOZWpMMklXZXhuU242MFBoZlM5?= =?utf-8?B?NUhGYnZwd05HL1BMNjExOW42alcvaVpZSXQzR1NkRTNFdVZFdDRVSFJKVDR1?= =?utf-8?B?MHQ1MzdOMjNXZ0VUdkpmTzdybVNrdXA5c3Qxb1U1dk5tVXJ4WGRqeTUvVTRR?= =?utf-8?B?eFdiWkpyTFNYR2twdjdhRi9LU2Y0aW9LdmtmUEVPWktrMmFOcVljbUpuZTZ1?= =?utf-8?B?WnRMQVBwRUlkeTVyZjdLN25wMnkvcWhYZjlKSXZHeXVEVnpQSkpUK1pqa3Bl?= =?utf-8?B?MG9IbU5CMGVGS2YvaHVTZUlZZnhTRTlLWGl0dVN2Z3oyaEdhaUJjY25aZkxE?= =?utf-8?B?UmRWcisvaUxGMjM1QTU3bFZncEhyWERyVE9TbXpvcGsyWmxqTEw1VEcyOXZ5?= =?utf-8?B?SHRiZnRFK3MzdzdzeFN6Mi9FOVdWSHJacDJVeTRhTG5KMGRCYXh0RjRHS3ZH?= =?utf-8?B?LzlCK1ZZMVVtUlU1WTRKWm5FTU5vYlNQR2hXMTg5ditjWWlVUEVmVTVvRjFO?= =?utf-8?B?aEQwT3dBVWVKNEIzcVVyMSt5S1doVnZOQnhsc1NZOG96clhQMURKTE55UWl6?= =?utf-8?B?cFdOeXFYcVF6OU5aOXNUckpjeWF5NnNZS3I5S1hMOS9XU3poY0lQQ1pmUzQz?= =?utf-8?Q?wUQFe7Dv4jhIwWGk=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45bc47a9-8f45-4181-5813-08df123bd0b7 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2026 08:40:22.5083 (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: 04Mpe3Dv2N2hqLRWF3Elw0tLCCR4iaZSonOxeZ1jg60OToZEEczW4O1kOZPyJH+rhaQiS2lNel9BBk1HH3u+Re8QX0oC9pOwVdOG4N6kKMQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB10916 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=lists1p.gnu.org; Received-SPF: pass client-ip=52.101.84.120; envelope-from=andrey.drobyshev@virtuozzo.com; helo=DB3PR0202CU003.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.01, 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: qemu development 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 @virtuozzo.com) X-ZM-MESSAGEID: 1789375554682158500 Snapshots are refused whenever a CPR migration mode is set. Add a test which sets each of the CPR modes in turn and checks that 'savevm' and 'loadvm' fail with the corresponding error, then switches back to 'normal' mode and checks that the error is gone. Signed-off-by: Andrey Drobyshev --- tests/qtest/migration/cpr-tests.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/tests/qtest/migration/cpr-tests.c b/tests/qtest/migration/cpr-= tests.c index 0bec753b4ab..a5255193101 100644 --- a/tests/qtest/migration/cpr-tests.c +++ b/tests/qtest/migration/cpr-tests.c @@ -290,11 +290,45 @@ static void test_mode_exec(char *name, MigrateCommon = *args) test_cpr_exec(args); } =20 +/* Snapshots must be refused while a CPR migration mode is set */ +static void test_mode_no_snapshot(char *name, MigrateCommon *args) +{ + static const char *const modes[] =3D { + "cpr-reboot", "cpr-transfer", "cpr-exec", + }; + QTestState *vm =3D qtest_init("-nodefaults"); + char *out; + int i; + + for (i =3D 0; i < ARRAY_SIZE(modes); i++) { + g_autofree char *expected =3D g_strdup_printf( + "Snapshots are not compatible with migration mode %s", modes[i= ]); + + migrate_set_parameter_str(vm, "mode", modes[i]); + + out =3D qtest_hmp(vm, "savevm snap"); + g_assert_nonnull(strstr(out, expected)); + g_free(out); + + out =3D qtest_hmp(vm, "loadvm snap"); + g_assert_nonnull(strstr(out, expected)); + g_free(out); + } + + /* Back in normal mode the mode check no longer fires */ + migrate_set_parameter_str(vm, "mode", "normal"); + out =3D qtest_hmp(vm, "savevm snap"); + g_assert_null(strstr(out, "not compatible with migration mode")); + g_free(out); + + qtest_quit(vm); +} + void migration_test_add_cpr(MigrationTestEnv *env) { tmpfs =3D env->tmpfs; =20 - /* no tests in the smoke set for now */ + migration_test_add("/migration/mode/no-snapshot", test_mode_no_snapsho= t); =20 if (!env->full_set) { return; --=20 2.47.1 From nobody Sat Sep 26 20:52:08 2026 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=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1789375270; cv=pass; d=zohomail.com; s=zohoarc; b=Dvv+f5XFZ96+kTRtKjwMK3px7EmwsvefxemK5w1qRiGgbe9P4HZ9kTNCq9acyxZDhYBnQ+UILQDwV4LcNi2EYGvlsxzfyZywsU/lwPzapDRQnZItZ0MUyrRxkmOoH/hpTYyIrIxiV07LcTqPGAGXFMAM03kCR0xPHhQEfKrTlkw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789375270; 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=42TxjWWVF52+WjX+vXTK/F5rsdLUfNrhRilXbJ+LOJc=; b=l7BHjdPfl9stub0x18qHCpwwpQ5mGp7MRi/gQBHq/oWacpzrc9QICn+HA2hP8qNXifPAB2fa+rEOvLo/MtUYS0rrpi8hVraoftn2ffDfbG7Bl/ndTO4m+ZfnlyUWnwN0DjENKf5WrGbApzHVBuKivao7mgjHE6BULireeZvO2F0= 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=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789375269956501.8213125063239; Mon, 14 Sep 2026 01:41:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x62FE-0004Gg-Aw; Mon, 14 Sep 2026 04:40:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x62F9-0004G4-SB for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:40:51 -0400 Received: from mail-norwayeastazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c20f::7] helo=OSPPR02CU001.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 1x62F3-0005PZ-Td for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:40:50 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GVXPR08MB10916.eurprd08.prod.outlook.com (2603:10a6:150:1f7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7; Mon, 14 Sep 2026 08:40:25 +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.0428.004; Mon, 14 Sep 2026 08:40:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pJz0cDvazi0svL9pbBZIoFvMUdf9AJYbCZrzTYOWflwqg9gpBe8k522xSUwFmRYKwI8nUl0bQKvfzGPGHI4pjb+dCIZOUhDodsAdg21eIhNYZu/VTXSMxp7trYZ12fmxvzcA/FeQazIWST7aVTUoB2vZ6aVZSn1c4CA0WoNAxdtSSWxNBZyRKCwOl7TfzHe3agAMYgz8WXqdneUJWnOi+JfNTlcLyEWGNoGzp2WeXy/C7dEXU/kUhSfFImwERkyOR6i5YcQvaepJMb2G06SxWH03bHVie975NwvcIgvBBRTIy6su5n/IAjho+xuXvXO5LgvuKtVVRjTYmVFJ5YormQ== 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=42TxjWWVF52+WjX+vXTK/F5rsdLUfNrhRilXbJ+LOJc=; b=jQvCzo43f7sG3jB6wCDr6lKAidHtYdjwilix2LPEV4yfUSSZ42Woi++5XqvGeU4jiJNqL4BYc0URFt9Adv8Yj0ZlAYstRHN0O3R+psHqyE4mXTlh1tqhADXNDzitF+/lSHbVNU11rEFm/hd2xwoKWIwp6JUgrLr/CJL+KZD3WE5tpnzJzRJ+DhEeYAj1AdC7wXyuKlguTXIbdQe2J1Q4mBcsVnBm79xxSDX08/8MMqg8AjX0Z8qkGmGyfqaM7styg/pl3peS9NTXK9jhaWIenydYlntfh8mfkL4fq5DM6C6LY8+0jZOpsYdQQonvILDiIY9uTevLmtdXtXFPIGVCAw== 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=42TxjWWVF52+WjX+vXTK/F5rsdLUfNrhRilXbJ+LOJc=; b=PggUAOB1ah4RdVRMY0P3dLreUxoaD+7sGCDITnFAoB+6xSoPKkrh9xs11PJeMb1L/8ZlDS4+/xa5kV6I7RxY7e1Qpc+vzkEljcP2QC+4f/PEUrzWN+3vzOSHZBsB7+dnJ9LtWIlIZjl+qc2oVETwJlHv+/SRkf+8LMGAB2tnKorozXDLTAE1MCI5Wu+Xr4jLMt8joyUz/dn6AH6b8kJBqf6Lva7l6xuWigGSXeC+9MwBTjShV2S6iNDIgOqiqNiRnrcUXn54YIbOoMLJudPv3okoZXcJxrMopce2m3JEtrOjBGAqJO25I8GLmMOxGvTPx/O7gs52k6X8pNKIZTithw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev Date: Mon, 14 Sep 2026 11:37:36 +0300 Subject: [PATCH v5 05/14] vhost-vsock: block CPR migration modes Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-up-vsock-vhost-v5-v5-5-d17423589f48@virtuozzo.com> References: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> In-Reply-To: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> To: qemu-devel@nongnu.org Cc: mst@redhat.com, philmd@oss.qualcomm.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, farosas@suse.de, peterx@redhat.com, clg@redhat.com, andrey.drobyshev@virtuozzo.com, sgarzare@redhat.com, dongli.zhang@oracle.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIXP296CA0028.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:36e::13) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB10916:EE_ X-MS-Office365-Filtering-Correlation-Id: 33fc258c-e463-4af8-2231-08df123bd10f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|10067099003|22082099003|18002099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: R5KG8KKNASHZJ99rpx0j7TwiCgbc9oaCcxupxFVtEY0uOZ8RaDJ2eCSDiaCaNIUXAbLKNYXt5Hm4GLQu2P3kw0IUker08rUhn+uW+eIb25/fCatJ/Nd/kecwotY3XXul0/lcdGgfANZoyFC4j3oQCVOkAP0B5wWtj3cJZ7QLHovnZSdw2y0r1bqokay2xxh4+ISazRKHgJ8rfdxgsH1we9CRBSIkMaZzF0TpWAqMJ9+iZ1+5uGFuohKk61AYs35W3UvmrSuK8YvYnjYZGf62u7x7w/AEdO8rO8IzzNeoU2gSKji1dUpFVwU5vvChlvEaqbi1oSZNoaj0IqnEWQoXP3jyNgcYvnywexATwCJfqNhBQvCBespFAjbCpj2MpXzDZ2yinwYp48J49pqHLKMivk7lbX7AjpHJBKTJEpeF1sRMAhkToabuXlYjzDWc6/D8S4G1kC3TXpiww+QfM9tXG8loW15m4lkbah8DgMX2spKARjpToVSzjEhTZNecF7FbPvatL8e8jBACPsGsAZg/3bA/AAN/FoVMxddLW6i8Gr7Rr4RYVXSoFBsYN2LdF5LorHp4UwB9o3xuxLOrRxqR8c+JuFEoS8wGdwSiytJq3Xdr3C32h++QrHqu4jZH0uGz1+4myPkpAJiG8KT7+Q+O0Jz9yp8gHCFZGGWET4JhgLzYZGU041rmglR+0rTmsrI0VLrrrRLzjaANYXqxx9ZUOErvQ6e4RmyI51EOAOovY7Y= 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)(376014)(7416014)(52116014)(23010399003)(1800799024)(366016)(10067099003)(22082099003)(18002099003)(56012099006)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QlVYcXhsTXVlL2RMQ212ZHQrRjRadlEzTlE3NUZ6UUgzeFU1UnlwUFJYVlpB?= =?utf-8?B?UmhqZUhJaW5QLzdSeFE1dEVMWlBMRmZOQ3NZQjFlSXA1R0pDT0t2dnN3eUJr?= =?utf-8?B?Z3B6TjAzZW1OdGVMKzZMVUFncFZrTGRsTGhJV0ZsN0RnZGJMUkN4amxKVS9j?= =?utf-8?B?TXd1QktnS0wwamVUbWdXeXk2WmdWbzlMa0dTR0Z3bVFGT0RTQldOYjYzOGtq?= =?utf-8?B?NncxZ0ZpTnB5MTZBV0ZIZ0hoZ2hHVWpNY3c2RUFFYjNyZmxaQ1NVSGFweDda?= =?utf-8?B?TGRGQmtWNnN0bW9xbzE3ZTVmTGQvUVd3WWtRSFRPRkcyYm4zaVFZUGRCSVBH?= =?utf-8?B?dWlMVVEwTURLRVRKd2hsY3hJTTMxN0IvUHF3UGVvSU11eFYyRHFjRHFhSkNa?= =?utf-8?B?M2tKczIyQW1ORExwVGpvcjdiUUV4THRhVjJpZ2daZXlHb0lxaFhCNVN0RVFU?= =?utf-8?B?ODg1TVJheXgzUDBSdDMrYVlGeGxIdW9QWGZuZjNRaWxQLy84dUY2Wlh4NkdR?= =?utf-8?B?Mkxaa0NCbUZMalJDekRaSkJQRjZTOURCRW5md051VWRIUnMxNFJuNEhzaGNI?= =?utf-8?B?anJ6Z3BXYk1nUWE4eTlyZGZNM01DWXdLYkRmNFU0aEVXekxXVW5MQ0JwZ1Na?= =?utf-8?B?NC9rOGdDUklmeGJpdHBpVTFTQmVmZk9DT2ViNUdFM0JCY1QrV2xyTkh3K1dq?= =?utf-8?B?d2RiNzl6MDZzdkNpNTk4bUVLYURrN0RtbDRaU0dkVTdGQkdTeTlVYXB2RGo5?= =?utf-8?B?SU5qTkhlTVJVczB6VU5zWDM4Tlp6TUdUaXhES3BjMUgyVWR2OXlQOFRQQkJu?= =?utf-8?B?T2d5MUd5WDRHNHVCZVd5dXUvM2Q1MnQwQ3ZDWnZUYS8rVERsYWw5VUpEK1BP?= =?utf-8?B?RXp1MEVkMEppR2Z0WCtoNkg4OUFhRXNSaTM2Y0FGbEN6eTlWZGtIeVF4TmMr?= =?utf-8?B?S1Z6QTRnTGNuZEppZUhqbXV2WW9tY3hUQ2RqUzc0MFJoMkpRcTd3UUUrOS9Q?= =?utf-8?B?eERyYkJvbHd4ZTJsM1JhZ1NCWkYwbVNKNnAwczBPQ3hDbmpSU3Y2T3lYeVRO?= =?utf-8?B?eUpKQjFKMmZVZDdrMll0Q0tlWk9RSEQwQWZhQ291SFU2bzlhcEQrQkRiWkw3?= =?utf-8?B?SnJkdzJpN2ViRmVFWUZMZ0dWRmhYZFNyWWpXU04rV2VKWHBoN05tVmp2dGZP?= =?utf-8?B?OThZSzlIenZ6eC96L29PamR3VEQ4clFWaGpPSnQ3Y1dWQldCSjJ1dGxLTXpq?= =?utf-8?B?QTc1YjZKK09zbE5JSWY5c2pQZlhoTUlFYWtLWWFMQVdCMThnV0ZIKzFocCtx?= =?utf-8?B?K3JGd0pUMy9NbkxZVEJkSlhsdW9kc0RhK0RTWWlVNHZZaVgyejh1cjF5eU1w?= =?utf-8?B?RkNQWUdPOWZaTEU2L0pzOGs2aHU2RjRzQkNhUjFZM2luVk03UUdJM05hakdG?= =?utf-8?B?bmJmYnJhV1pZVnFzTFRpaUgrVFMyazI0eTRSVnNpRkxtVnUyUmhITXhRTlA1?= =?utf-8?B?VXEyTTI2M24rS3IxdDh2REFmVG0zRlNwVmFwcjlML3FoU2dBNG11bWd0SDlM?= =?utf-8?B?bnRYL0FwR1pWTmYvSWV2blVKelFucVNEaDQ1T1o1eGROcmhybUlsR1Vrbm5R?= =?utf-8?B?RkhzK3UzeEJmcmVSd25oTjJuNXZBcE9NKzBFSDY4VFpBT1hWSjFwcytra3RF?= =?utf-8?B?eGwzY3ZXRzFRUE1ZeWpNaWcyckRySEhVU3dpYmk4RWxqWWhwRm45Vk1HVGk3?= =?utf-8?B?MkpSY01xK0kzWTJQRVRITGtXMHRSQmQrejVvakxRb0owOTZZbkROUU51VElv?= =?utf-8?B?WlFZajR1aGUwZ2wwNlcrOWpaclV2K3huTjBRdHNjblZJM2ZTZmhXcmJ6WkJP?= =?utf-8?B?QWIrSTZiQjJ4L3h4OElJSmNXajVTQUZnZVZ4bERMdXNkT2xFdW03MERvc2d3?= =?utf-8?B?ck10RGZMT3hEMG1sdUZMMDhHY3M4STNUTHB4bnl5WURrY1J5TXNKcGlvZVlh?= =?utf-8?B?NVFzdkhwbEpQbDBGUWZ4Ykc5QnhmSjFYbjBrWTd6bW5FT1pnR3hPZ3EzenRo?= =?utf-8?B?eHNzeGs3YUFHWnZMbEluTmdrNEJZMks1aXQ2QmtvekRnOUcyenhmRjFBSVpN?= =?utf-8?B?SmtLRkVUelpCYXZrL0pVbklOQURXa0ZWb2xXYmpodG5YdnF0Q2NRUURXUlA4?= =?utf-8?B?MXR1MWJiS0U4blBYWVFTSmNqMjFpMkdFZ2hCc0Vsd3gwcjJlbm8rUXphWHF2?= =?utf-8?B?bEJldzJzMlR1RUN5aEE2cTVjNkNDSXpRbDJSREtzTnY2MEt5b2JtbkRlY1Vu?= =?utf-8?B?NGU5aW9pVVdray9aNXVieDJSeWEwMFpGdUVLRDVFb0dKUGordVhpaXZFaHF3?= =?utf-8?Q?wkP20xO9vL0wE/qE=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33fc258c-e463-4af8-2231-08df123bd10f X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2026 08:40:23.0626 (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: X57MKSF1DREvs6pdpRpJZwF+0y1UfKj8uTaTpZff59tkC0cwaZVlPcAnSgXcmRAy2jdGN1yXixAaWxjCBN++h80ReH9Tm3K6cTp5CcTpmlU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB10916 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a01:111:f403:c20f::7; envelope-from=andrey.drobyshev@virtuozzo.com; helo=OSPPR02CU001.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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: qemu development 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 @virtuozzo.com) X-ZM-MESSAGEID: 1789375271713158500 CPR migration with a vhost-vsock device currently crashes the target QEMU. The device ownership is not handed over, so while the source QEMU still holds the guest CID hashed in the kernel, the target's freshly opened vhost-vsock device fails to set the same CID in realize(): qemu-system-x86_64: -device vhost-vsock-pci,id=3Dvsock0,guest-cid=3D3: vhost-vsock: unable to set guest cid: Address already in use Add an unconditional migration blocker for the CPR modes, so that such a migration fails early and gracefully instead. The following patches implement the actual vhost-vsock CPR support, and the blocker is lifted once it's fully working. Signed-off-by: Andrey Drobyshev Acked-by: Stefano Garzarella --- hw/virtio/vhost-vsock.c | 27 +++++++++++++++++++++++---- include/hw/virtio/vhost-vsock.h | 1 + 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index da244eb1657..503d248a617 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -20,6 +20,8 @@ #include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-vsock.h" #include "monitor/monitor.h" +#include "migration/blocker.h" +#include "migration/misc.h" =20 static void vhost_vsock_get_config(VirtIODevice *vdev, uint8_t *config) { @@ -140,25 +142,38 @@ static void vhost_vsock_device_realize(DeviceState *d= ev, Error **errp) return; } =20 + /* + * CPR migration of a vhost-vsock device is not supported yet: the + * device ownership is not handed over, so the target fails to set + * up its device. Fail the migration early and gracefully instead. + */ + error_setg(&vsock->migration_blocker, + "vhost-vsock: CPR migration is not supported"); + if (migrate_add_blocker_modes(&vsock->migration_blocker, + BIT(MIG_MODE_CPR_TRANSFER) | + BIT(MIG_MODE_CPR_EXEC), errp) < 0) { + return; + } + if (vsock->conf.vhostfd) { vhostfd =3D monitor_fd_param(monitor_cur(), vsock->conf.vhostfd, e= rrp); if (vhostfd =3D=3D -1) { error_prepend(errp, "vhost-vsock: unable to parse vhostfd: "); - return; + goto err_blocker; } =20 if (!qemu_set_blocking(vhostfd, false, errp)) { - return; + goto err_blocker; } } else { vhostfd =3D open("/dev/vhost-vsock", O_RDWR); if (vhostfd < 0) { error_setg_file_open(errp, errno, "/dev/vhost-vsock"); - return; + goto err_blocker; } =20 if (!qemu_set_blocking(vhostfd, false, errp)) { - return; + goto err_blocker; } } =20 @@ -187,16 +202,20 @@ err_vhost_dev: vhost_dev_cleanup(&vvc->vhost_dev); err_virtio: vhost_vsock_common_unrealize(vdev); +err_blocker: + migrate_del_blocker(&vsock->migration_blocker); } =20 static void vhost_vsock_device_unrealize(DeviceState *dev) { VHostVSockCommon *vvc =3D VHOST_VSOCK_COMMON(dev); VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); + VHostVSock *vsock =3D VHOST_VSOCK(dev); =20 /* This will stop vhost backend if appropriate. */ vhost_vsock_set_status(vdev, 0); =20 + migrate_del_blocker(&vsock->migration_blocker); vhost_dev_cleanup(&vvc->vhost_dev); vhost_vsock_common_unrealize(vdev); } diff --git a/include/hw/virtio/vhost-vsock.h b/include/hw/virtio/vhost-vsoc= k.h index 84f4e727c70..a964d57e1bc 100644 --- a/include/hw/virtio/vhost-vsock.h +++ b/include/hw/virtio/vhost-vsock.h @@ -29,6 +29,7 @@ struct VHostVSock { /*< private >*/ VHostVSockCommon parent; VHostVSockConf conf; + Error *migration_blocker; /* CPR migration is not supported */ =20 /*< public >*/ }; --=20 2.47.1 From nobody Sat Sep 26 20:52:08 2026 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=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1789375302; cv=pass; d=zohomail.com; s=zohoarc; b=Ufv2tLcep1hZxuRCoU8g7ysV7/R1AVkB9ljJ4Eq82tajWEffwjIZ/tLFWjY1t+iH2+AOLLECgeyeJSGSXAUp0IZ8dsn1b7W1kfeR5c0U4Ay5q9P5Ph5POGP5ZMFMfVuug8yGCJxMbkHyBWcrUE/gRpd2uhEpABvHW4zxIHHTTHc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789375302; 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=5XkSxBHoCv7p59LbVsSrlCGFIdRh3oKtemL7pKK240s=; b=kN+VPOD4zHPcPgQnKt86+cmpVFaNaLBXx2Fv3pqxaar7hlIsD46D+VHqqnVMN5QKzsb7/rkvzLDpB22bcIER5f634BExd5uIOs58uzKk0FgCVpcex3e4c4M0OLifxsHqeACy5lzLeyHDyQYOZb6kL3l4hr2hPRwcgMV0vXIE6JU= 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=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789375302339575.6245859390601; Mon, 14 Sep 2026 01:41:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x62FJ-0004Ht-Bw; Mon, 14 Sep 2026 04:41:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x62FH-0004HS-Km for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:40:59 -0400 Received: from mail-norwayeastazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c20f::7] helo=OSPPR02CU001.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 1x62FC-0005PZ-Kq for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:40:56 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GVXPR08MB10916.eurprd08.prod.outlook.com (2603:10a6:150:1f7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7; Mon, 14 Sep 2026 08:40:26 +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.0428.004; Mon, 14 Sep 2026 08:40:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hlY31r6cHiXkQgARCUZ0h9YgkDXClUPu8/McAHWsRJKx2rn0uWgrjqo+WYBGcXNcqXAXj0CoS+ApCp3TtN5z/9enRDhaiMPPhG25Ihk5MprRkuwsgGN22a7lPgO0Yv4HnbipnzbiB4AeWGN8E0h6wqqCh2R2thU4teAi4W6W6cY5Hk+LM76WOfPNn3+Mk28V3Ny0Ya5a1KI8Y7YdFz2cVWv6K9CHuXHjyM/wCi7Q9YVZVBEMNFxJOOkbfxmufyEkeV+omogPAmDbEjcN9/4lF+jH7aVIlFeF8jyW2vf26383iy75oEwecaf1fDNMmyZR8JqbYYMQxvlEh6oBtcrrnA== 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=5XkSxBHoCv7p59LbVsSrlCGFIdRh3oKtemL7pKK240s=; b=Y+Mab3xPXge2+jLOsR6VOjHbAP8g2/kNJtuh/cmTR1gY5iWRd7PJ4pPVdgW4jl9A05PD5yBrgs1StZ69N9efGcCs5hbiSEcZPFN7EenL0xg1RUu9IfHt/FRIhbSWtA9GBWS02guwp1PnTQFGWnB/3ftfmVHANvi42EtRFaKZ0QlhRX90i2/DhaQmlPRlvPfcOa+nkw8K+bRjPr84pigj4rbiFre2ObpkI/r1rk92iWi4a6eTOCIfGSlqGeP2LCzCdkTg5WbWUrz1VjjJ6nN7cd0qmUWXvdxXUyAGIfaBTY6RiR80fEaIIrTeTJYXjNEcugufhaqghwc8vmwyEk0z7g== 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=5XkSxBHoCv7p59LbVsSrlCGFIdRh3oKtemL7pKK240s=; b=RJRsg0gFVC/UcEDUXIFOXI4IzVRZj30jObY5qg9tGfvl6qbwkXgY317HCtGr07DN9GaLwydJYMZzIdPkrPGKdy62i02Ndxjx8Tc760nPbupRfKedlrsiMRgnHFfphzgxsQtl7rww4NhGcXYqwznt5Ady8ThWmASEFpJSk8ZuKDemyiNC9wW1IdzzJKAGcvoxMv9Qb8UKbG79rrmPlF/Rdg2cdqsO6GS4Aj9q61tc5Q2U4dBtV3iAIo769J+xcbvKSIxsFNZtSkOXzmebMN4JzAOqRpxqXjXRIiJoZxa0lXu+Unld3PZ7I8NmU3qgzmjwO0FSYtv2T5uFOP8BpKFYcQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev Date: Mon, 14 Sep 2026 11:37:37 +0300 Subject: [PATCH v5 06/14] vhost: add vhost_reset_owner op Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-up-vsock-vhost-v5-v5-6-d17423589f48@virtuozzo.com> References: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> In-Reply-To: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> To: qemu-devel@nongnu.org Cc: mst@redhat.com, philmd@oss.qualcomm.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, farosas@suse.de, peterx@redhat.com, clg@redhat.com, andrey.drobyshev@virtuozzo.com, sgarzare@redhat.com, dongli.zhang@oracle.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIXP296CA0028.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:36e::13) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB10916:EE_ X-MS-Office365-Filtering-Correlation-Id: 0089a009-b14d-4dd4-3f09-08df123bd173 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|10067099003|22082099003|18002099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: hbxeaIoPq624ofDx+yx7TPhKeZ7Qfr+0tUn2w0XWiI5XEIAvMHlu0AtuOXgr3/O1jAGmPppNh6QWM2ObnDT7EncstECYyPAiakfYXTYHW3JLAQi4fUr18G10FPVQWINKDFMMqHzX4BPcbNs6Db7etnYFo9N8I1Wm1ySc1cSkorZO+3WzfvBRVLOr4GpBwnjVglZUVDAK1LwoiNkt1T7XcP6BZDXh+9OluAOk7U/dZ0FiH8EAB1GVPaVRg7DMw4t6rSr/Sop2NC17hGwa0AX4dS5tqfdVTU3dbizNA09nw/q+B7C96ynJSrjBTEPH+lsDRQeylqACzzVSCJsL7s38iy/O7d06EsLQhIWSDd9PpjVDwxgbbSB7fg5zQaS3s3tzLH1pyDp226QE2hYiQ8BbvwqPqR1av45QGsVyUzP2bgYtZ85bj6Kh5l8QJB7GWd5uShl0r6e270UeIajzkMtFJMZ9eYO04GilSKZloRwpK7K9ORmGGxLTy5PoMZnKXBO4UgCsI1+tpovwSx7wrcSJZ74/R1iAnj8TguwMrFfiDOStSRQQ6SGrJqaWibgdKlqZE7zYEv01twWhj5w8e6dxeCtsKbpIgXDwplgToEAzbNmi2QduDZhbIpGKRl7tiTLRqMF8Dfl98Cb3lygsi/6NqNGMhyTsVXXJt0B4grAzibd8euxuZOLrePS5nAbZgQNHfxYzzvru0lmzf/+1cqZyQA== 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)(376014)(7416014)(52116014)(23010399003)(1800799024)(366016)(10067099003)(22082099003)(18002099003)(56012099006)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aW9iRmJLSFIwNzlCbEtxcFdGSFhOSHJndm1tbnczb1FEbFRtbkt3NWx4NkJF?= =?utf-8?B?Mllsb0FpUEtzY3VGSFJYN3lzSldPOWx4Y0V6MjV5RnA0UDQ0ME5sWk1vczhC?= =?utf-8?B?MWtmUEhsZGdhVFZFd0xjNFowL2JaTlRUc3BmazZpay9qVDZhT1N0SG5reWFo?= =?utf-8?B?UXJvd3ljQ2VCZmpZRytmOEg0R1BpVDVlR05aSXJYVXJVWElvMzgrS0ZxSXVI?= =?utf-8?B?bE1FK0c0dUxteEV1cC8zcVNmOWYyTHdSNkZpTnVFallzL1VTNmUyQjRiRmZU?= =?utf-8?B?QVBDbHJtTWNtclU4TDZPbDVWc0ovM1lydTVQVkFkbm1rcElEQ01hWmEydVBQ?= =?utf-8?B?OEhPODdwUFdTdHFhVC9FSEJ6V2RIS09tM2FySDNGZVZWWFUrdlZVNmEwZnZs?= =?utf-8?B?N0RZcWk0aVR0a1BuZXYzWUF5Ri9mekRPUVk4c3VGSlpEaXBmTUcwNC81blE0?= =?utf-8?B?Qmtmb2pTTXJ6b2orZ29TMk9nYmh6dDZjVDhoT1l2aElWL2d5ajlQUXhCamhM?= =?utf-8?B?QU1yZHRpTkFZSXRxNWV2NmJuZ01lWVFRdHJkNmp3YzFDWm4vaWZoK3gybWt2?= =?utf-8?B?M2JQekp2OU9rTzFtSXpjRCtPTXdxNmVFM3FSWVUyRWhxWXVBTDZmNElaZU0y?= =?utf-8?B?akErTkFmUi83MDdWcEVzSnhEOXRVVnJ2dkxoSjNXUWx1amZlRm5MVXBtbk1v?= =?utf-8?B?SldiVU1PcG1YZWJuM3VNSlRkR0pkakJZMXFCR2tvK1FTRnFmeEdtaWo2bGht?= =?utf-8?B?ckQrN0VmZDRDaGlzQUhtWlpQUURFR0xYQU1RdGt4Q2RnNjJ6aFBUSWNFOHZW?= =?utf-8?B?UUpjemc4NmhYWVRNcjdXSUJONDZZbktnd1UyZkRhdmwzeUF6UjRJd1FiZ2VJ?= =?utf-8?B?c0VuWDh5ZXpxUE9pakdKaStvU0ZVeDM1dFNoWWlNd3NzMnNIakJEMEl6SjdK?= =?utf-8?B?SUtnajZXbTRHYkxkcmxZcDFOQndLSTJkTTNjN3ZkaHBHVi9Gcmk4UW5wamJX?= =?utf-8?B?OWFoejlRTm1Ma011ckRkODU0T0hnK2VSUjExcUFUajlJa1BSMG1XTmJ6TGFC?= =?utf-8?B?c3FCb1pubEhlYW8rMnBld1pLZUNxck5kL1ZHWmNadGZNQ0d6WEJCOWExa1Ji?= =?utf-8?B?cTlaYWJTR1lKQTVyZCt3d2kzNnNHTTE4Zy9HeVl2QmpNWHQ1aVRkVGpwQ3ox?= =?utf-8?B?cUJaWURtaXVWeHdHeHN3SE42eEVQem9lV3h4M21IVHNBKzdVTnY3UDFUVkI1?= =?utf-8?B?RFNZV1AxSUpHWjFXS3d1NjNWNHIvNjJsdlZzdm1vRmNrTEFQZjhMKzhtUnhh?= =?utf-8?B?Nk5SS1NtWDMxRE4yVncxSE81SkpqTTlLMjRtSm41MkNCMFFnT1lhS0dBUzFJ?= =?utf-8?B?NzkrL01yTFgrWmM3RXh0RklFNWMrdklaRjN4MjFubE52VWVIdEU3djJoc3JF?= =?utf-8?B?TUVVOVQza0x0NW9QSWs4VEFXQ1N3TGUzbjZ2c25nWjVPcWVzYTcxV25Cc3JO?= =?utf-8?B?b1A0Mk9WSlNqTWVYR2VpallXdTA4b1l0aG1PNHU3ZzM2VjRZZ3RSdE1JRi9z?= =?utf-8?B?aHI5aUthbDVJL25ReThJUmQ0dTErM1dnb0xpQWxQZS90eVQwQjBSQUV1eVMv?= =?utf-8?B?MWtvN280YWFjQk5leXJxT0diSXlSNURWK3ljb0wycEpuUklmSC9YM0pQLyt2?= =?utf-8?B?S3pSalkraVRkaUQ1NFhUQjZuN2U4bU9tTFE4N0x4cm16TXF4U09lKzd0bHVG?= =?utf-8?B?aEk2WTRwNGNzMU1CYk9iTUc0ekNqK1h3anlsWVRWTXVja2xVM3BWUmVHTEpv?= =?utf-8?B?SWkvb2NjZmV5cFFQdWhGN000QzI3a0lMWHZjUGNkUzNqQ3QyTjVBMHlJRzJz?= =?utf-8?B?V0U2MmY2d0ZFTHRvYWFBVmlwZy9pa2JCeDUzUUh4Z3kwUXU0cVNYT1JTQktE?= =?utf-8?B?Z0xvalUvaFh3cllnTTNWelZPR2p3UXR4eCtadDk5TXhDb0RiRVVwbG1wdGpH?= =?utf-8?B?Rm1yTjJpMFJQck93WGpxaCtTUDMrVENwTGM3bS9kek5mUkpROFNoempLMUZv?= =?utf-8?B?V3kvY3BjcXpxUUMrNUF2eE45cWgzTTRlcURYSFNrRHhHUUs1ckNzaEVvbjhL?= =?utf-8?B?Y3NFdFZ0QXhoaXhOcTl4Y0JqaEJhQWxTdjFKcUZDbEVNaGdYaWhLcmJtTVNH?= =?utf-8?B?Sm1RQmhzVkZ5UGFoMUJDVCtmb0VZdXRWVEFYTWZGTlM1UFFJQ3BvTUxYTUd1?= =?utf-8?B?V2UyaitsM1JSMFB4NDEza1VmK203UGRHUjJYTkxnNUFpenp4VGZpR0pEa2hW?= =?utf-8?B?a0RYbEJoWHk1RXhObVc1aVBuN3JoaXgwK2dHbmtoaXYzTGVacGloNEgrb2dR?= =?utf-8?Q?sdDzfQUk25f3W/qM=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0089a009-b14d-4dd4-3f09-08df123bd173 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2026 08:40:23.7554 (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: SxCCy8pSpT/ukmWn8cPZKQtBba5uKxwiWvyR2k4oFJaR0po7wQDws7FHnOr43/6OyCenryNo1fbXLHHwKEIj3Hgu/OnvCEz2RrhknsV0L4E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB10916 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a01:111:f403:c20f::7; envelope-from=andrey.drobyshev@virtuozzo.com; helo=OSPPR02CU001.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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: qemu development 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 @virtuozzo.com) X-ZM-MESSAGEID: 1789375303290158500 Add a VhostOps callback issuing VHOST_RESET_OWNER, wired up for the kernel backend. The CPR (checkpoint-restore) path uses it to release device ownership on the source so the destination can reclaim it later with VHOST_SET_OWNER. Originally-by: Mark Kanda Originally-by: Steve Sistare Originally-by: Ben Chaney Signed-off-by: Andrey Drobyshev Reviewed-by: Stefano Garzarella --- hw/virtio/vhost-kernel.c | 6 ++++++ include/hw/virtio/vhost-backend.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/hw/virtio/vhost-kernel.c b/hw/virtio/vhost-kernel.c index 3390b48c6f1..55d316b88e9 100644 --- a/hw/virtio/vhost-kernel.c +++ b/hw/virtio/vhost-kernel.c @@ -261,6 +261,11 @@ static int vhost_kernel_set_owner(struct vhost_dev *de= v) return vhost_kernel_call(dev, VHOST_SET_OWNER, NULL); } =20 +static int vhost_kernel_reset_owner(struct vhost_dev *dev) +{ + return vhost_kernel_call(dev, VHOST_RESET_OWNER, NULL); +} + static int vhost_kernel_get_vq_index(struct vhost_dev *dev, int idx) { assert(idx >=3D dev->vq_index && idx < dev->vq_index + dev->nvqs); @@ -385,6 +390,7 @@ const VhostOps kernel_ops =3D { .vhost_get_features_ex =3D vhost_kernel_get_features, .vhost_set_backend_cap =3D vhost_kernel_set_backend_cap, .vhost_set_owner =3D vhost_kernel_set_owner, + .vhost_reset_owner =3D vhost_kernel_reset_owner, .vhost_get_vq_index =3D vhost_kernel_get_vq_index, .vhost_vsock_set_guest_cid =3D vhost_kernel_vsock_set_guest_cid, .vhost_vsock_set_running =3D vhost_kernel_vsock_set_running, diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-ba= ckend.h index d878d7b733a..a8ec35f6263 100644 --- a/include/hw/virtio/vhost-backend.h +++ b/include/hw/virtio/vhost-backend.h @@ -104,6 +104,7 @@ typedef int (*vhost_get_features_op)(struct vhost_dev *= dev, uint64_t *features); typedef int (*vhost_set_backend_cap_op)(struct vhost_dev *dev); typedef int (*vhost_set_owner_op)(struct vhost_dev *dev); +typedef int (*vhost_reset_owner_op)(struct vhost_dev *dev); typedef int (*vhost_reset_device_op)(struct vhost_dev *dev); typedef int (*vhost_get_vq_index_op)(struct vhost_dev *dev, int idx); typedef int (*vhost_set_vring_enable_op)(struct vhost_dev *dev, @@ -204,6 +205,7 @@ typedef struct VhostOps { vhost_get_features_op vhost_get_features; vhost_set_backend_cap_op vhost_set_backend_cap; vhost_set_owner_op vhost_set_owner; + vhost_reset_owner_op vhost_reset_owner; vhost_reset_device_op vhost_reset_device; vhost_get_vq_index_op vhost_get_vq_index; vhost_set_vring_enable_op vhost_set_vring_enable; --=20 2.47.1 From nobody Sat Sep 26 20:52:08 2026 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=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1789375319; cv=pass; d=zohomail.com; s=zohoarc; b=Vzw4r4ckzwu1Btb3vzu9mYU4w901NDS6ThXC7MmxFXL5YAaP9VqMR0DvwWmrpVYrIil+b892y3p1PCW7wlc/nex7J2U94sN7Cm9dAli8+j7YpXUmlenAsnqLgpORAD9kKb3NZiFq0TZjoDn6iCsu1fMo103IkTHfbFZXzONq7YY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789375319; 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=I5ksPgqxpkvwMZR46juSzPb3Jx553hY74OuSgtWMf94=; b=SSCGoQ04b2soopZ93JHtc6m2xrTu24UfxT2StjU8TcK+FK/yYJf9wsz4H7ypMeTt+PfqzGGvsLrU1NorN2Ass0lS727LlPBQmdnwALdQ1hD9BVGHxeYTzfv7oa5pp7NGuRDOuE7ih2wI4FsnXJxEV/SyWAQvn94fCBMhfMEk/po= 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=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789375319427350.1122736895271; Mon, 14 Sep 2026 01:41:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x62FK-0004IE-KX; Mon, 14 Sep 2026 04:41:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x62FH-0004HT-R1 for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:41:00 -0400 Received: from mail-swedencentralazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c202::7] helo=GVXPR05CU001.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 1x62FE-0005Pw-V1 for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:40:59 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GVXPR08MB10916.eurprd08.prod.outlook.com (2603:10a6:150:1f7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7; Mon, 14 Sep 2026 08:40:27 +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.0428.004; Mon, 14 Sep 2026 08:40:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QcrvqeIvYePImg2Bwf6Athzn8GpCWcvn/SvsZWUa5GrRuaBjFQGNYuALOUi90+Ma+7ECoRex5MODFZeOh2Jad19Kxtv5TVpcCx61t7FjYFGQcYtttgoYxFNyDO6nGrh1afR7dPu01usW/fPBE9OQaubC1bVkmS5xg5ByAB02vvVIalzWS6Z3DlnFepiP5UaCFvWPX7fVeU51SplB0k/RaQYXhkQl5R5v14BcRfgoYH5n5w23ZVxcK1FpjJJwzye0qfldA+LQOST8037Os5RUwKGD0u9OhMH5c/x4qvX2MjGfK6yXU2MfSrwtHl5hrY24KJcsA4+QUmT7dicOsMF1Eg== 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=I5ksPgqxpkvwMZR46juSzPb3Jx553hY74OuSgtWMf94=; b=tZHfH2tCCDnZSFK+0dAxoNOZczTgVzaO2BIiU5bjirG9h0LjmhIBzISNTGWosk3mBq0dN0nWHozPRb/gcmU7YGW91mMnQ2ZVMlLxoqDSk9mbEgj3OnSxf3zEl4F4Z/95AdXlo6oRWCr3k0fVxTURxgslNbgFIur9HlD61bRivpIKnm38NFmFN5MW0dj4Y8k1jopJ6ip8KCUpFIydR5Zz1Uz9/OC1slbMerIo3DeuhvxxMnVTYIIWY9RpewzzAOwFVqBvAsbPjoHSZrGHReckM/lch/eJKB9n/exErl77+UflUGlM/fzb5BQTEcVfZAWDf3TLM/RLx2TG6b9hwquDFQ== 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=I5ksPgqxpkvwMZR46juSzPb3Jx553hY74OuSgtWMf94=; b=kqpwSv7xpzLl7LMHJQyrSEe5ZUPVmjmzM6Dwow3qny7vNsuyHZnF+nU8RafqQY10W8d60LORlBo42xlybP4tWpU0zLE+faelkW/jlsR17DudTGAVk8suwKzUhRDH1OqBGaOVW7HPoRYtdUo+m4nbFFfpK4VcbZSbD0I+GcEt9atf+AvPRzu10J1dEFhwPSETnAJKROpTP/YP4Dty4W2qbE6q7Iz+aDvHm+xq63BDzxcEx5Z1gknXiCNNUtEGSWJviQs3ohqwfNicIwTdoPhxRKqrbstkEfJ+ogKjpyKomfLTmITzhanjlFeXLHD4WqUs4hPvjqNHlvn2YkmvQim5WA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev Date: Mon, 14 Sep 2026 11:37:38 +0300 Subject: [PATCH v5 07/14] vhost-vsock: don't reset connections during CPR Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-up-vsock-vhost-v5-v5-7-d17423589f48@virtuozzo.com> References: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> In-Reply-To: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> To: qemu-devel@nongnu.org Cc: mst@redhat.com, philmd@oss.qualcomm.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, farosas@suse.de, peterx@redhat.com, clg@redhat.com, andrey.drobyshev@virtuozzo.com, sgarzare@redhat.com, dongli.zhang@oracle.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIXP296CA0028.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:36e::13) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB10916:EE_ X-MS-Office365-Filtering-Correlation-Id: b7481cc6-d33f-415a-0bb4-08df123bd1d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|10067099003|22082099003|18002099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: 2EVhLKmvIskgjoN1OgSyIRqoImxc9KRWB4W6zlWRqY9a4dNOQzpxC2Zw478JZCIULXsMlqwoVmJ/0uQDX33/yFPk/CMg+L45nQYPq66XdUNdp3IaQA94FGmD96TueL0LPCgiOb9ki0wyaXfdmbK6frNYzzUkprIAcIUUZ8yCMWOr7bn4Kurltv0RbOk5zH93Wb8QLE4cGMUwvDSREKwqfWukIWYdWn00tk+sX1GZmqZyVreWWc1gyc+g3G3r0ZtaJ5zTPE9HMuFltqiYKS4HegZ0xsx3noGQ0IGVuhkobNertNA+1A698eosdYLIfC1a6KQCd7/9GpqmXMFvMZIItBydBnwW+8Z4zCmbHoyZT/3vaFrHvu20lvCgjH1DUUHED62PNmA+xHpv3zl4zGBL99kFhguzgcN5T3WI/Jq7H72rVl1OiueZWffbNKChwn/H3WVCyseXLt7CyfWZQMy3Mah7A8IHRO8sD/Lx8iVnuYiqnvN4MJll2ZohM/h0GTSQHqdSPy1WiNKqoDRo4Xm8HGpTMY2nVO3rVRwkNEDcJAdQNkgIgzOZ7LBDR62suZ6w88mcFyG/6aIo8mAxI/tXp+8PgMa6hVg5gP+2PLWcYKgiL/f/unqLOCZLSQHpZq6Td+Vo7abMKwjdzVxldgzrOboXj9kbvCT8vY++18ZLNOeSGf8k7PdzqypYT0KgFm83fkmFWsfEiozrpCQiq6Hm8DmqmX/5sYL72hHZEtoLS/s= 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)(376014)(7416014)(52116014)(23010399003)(1800799024)(366016)(10067099003)(22082099003)(18002099003)(56012099006)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RE9FSHZCUExyN3FwSDJ0VWtXblpkaFlNRnBucitoM1V0N1IvMnlXcDJMdW9D?= =?utf-8?B?dHVTbjNZZ05kRS8rUUR0U2xwb1k1eDJLb2RLMG9SbzQwM1VNTEc0UWg4T3px?= =?utf-8?B?SFJpdEhOZzI5cDNkcTJnSVVQV3pQR3dQQStYTlhiUE1jcE11VEM0aGJNY3J2?= =?utf-8?B?YWlhRGZiNlI4VkRSRUlmZEk2SVhPb2hsdnYrWStwMVhna21PZE5obFNCNzNw?= =?utf-8?B?TGJja1hTOENzNm9MUUpEc3pQOEY5SHQxV09sQVZYa2ZnYUdWVnk3c2VxaWts?= =?utf-8?B?NGs5TGpVTm5jcTlOVlJFb1QyU0M5UG95bVRtU3BKb0pmTmRKWTRKSzcrZFN1?= =?utf-8?B?MGVSbURGc2lzQXJvM2JmZ2F4R2pGclhKTnpXQWY1YWlaM3hVeUVkWUdPOTh6?= =?utf-8?B?R0dQR28rWXpmUkZTNEM0TjNzNnk2ZEgralBzR0x2SzI1SzNXNy83RSt0Wk4y?= =?utf-8?B?QUdCdldzRzRJV3IvOXFEYlpJaTRPVkdydUdhOWdvTCtjWjdmNEJ1Umloby9z?= =?utf-8?B?Z0JHY0FXbUpKR1ViVmxTMitBRGRDSUphSks0ZXhKL3hMSTU4M3c0OFN0R01x?= =?utf-8?B?YTk5Y2t2MGoyZ0p5b3dmWnM2SHlQVWhiVGorekJLTUQ4b096eVZpZk5pRWhX?= =?utf-8?B?WlIxcTR6eTRRYVNOZGMvTFFsc1hTQVluL1pBYkt0dDlDVGpZUzhKTHllTHk0?= =?utf-8?B?SHFULzB2Vm5lVTMwR0hjcnNvUkdJNmZJUWQ5Zi92UCtuVkFJQkRHRGFWYjN3?= =?utf-8?B?aWNycUFZME5IQ0k4dUE3SlRUeHJhdDg4TW1pNTlRaGZqSmpWUWpEQ1gzdEsw?= =?utf-8?B?eVorMWR2c1FTSVdwRkkxcFdDNnAwMy9va3BmN3JaSjJsc043ZUtPZEdqa1l1?= =?utf-8?B?TmdNQmU3anI0d0xZUHF4ZURDMnBmK1QwZ29idVcydXhlcnpqa20yZitZdnli?= =?utf-8?B?eTB5TTczRDgrclE3RHJsTEZPUi80UFYvYmkyNE5mTHE5RVhmUDZCeEQ3eURG?= =?utf-8?B?RmVxN0lFWlFXeVdLbE9oMmU0dFhwOW5jVGpmMzF2NHFTM3I4eVhxL1ZHbVVk?= =?utf-8?B?SEt3NUUwdXdNeFBhRVRlOXNoUzVGTng4ZTQ1aHp4MjhBZml0dlljSzVMOURn?= =?utf-8?B?aHV1d3NqVWFFcnlja254TThhcmFweGovcWhxc1pNS0tZUHZlblNsWkZmK1hH?= =?utf-8?B?cXg5OTRHYkFIKzNHUVVrdXNPc0dzdmV2MmorQWE5V1hDbFVUM2JzMnJMOHRi?= =?utf-8?B?ZzVBT1JBNksyVDl5RGZ3d2JaTEpZOFNqZmpWOGRUZHJEV3pmeTY5YnFDWU5h?= =?utf-8?B?VUpnNEFLNkwrc2F6ZC8wRHp4VjdtaVEyc1oraGRybHdQZXUxVEdZUGVuNHVB?= =?utf-8?B?UzJuamRGTmovTEZoYWwxeTZsYnF4ZjhIbUltTU9WeHNkNEVKTC9TaVdKR0ht?= =?utf-8?B?RUl3bXNyeHZDWFNpNUJYR09kL09OS2htVWNranU3blhVK202VU14aGFUUkc5?= =?utf-8?B?M1Uzd0tIbWI0Ny9MdWhCNEtYNnNxandJaHU4T2dobFYvS0F5RU1IWGZmbWlH?= =?utf-8?B?eFcwTFhzc01KS1N2SXdWNno0RHNEUThBeE9IK1pPYWNkT0FNS09nRm01cVI3?= =?utf-8?B?TGVyb3FBMklrOE44QjRhTGdUTFFQeVFweHN2c0tEZUd4eWxZU0MvK3p6SlVs?= =?utf-8?B?MmIwUE1ycXpkOHAvQlYxcFJQaWxkY0VNNjZ2d1MyRFdxUENSclVEL2plSExu?= =?utf-8?B?NVNxMWFlME5xOWEvRlRrWFo1VXE5VWFmK25FWnZIc2Y5d0I3VVpBZXVaaGZ4?= =?utf-8?B?OUhibmV5M1VlUXhORUVRYS9ERElWY2lzekk0YUdla09MdEtPVDNqUTJ1RTZH?= =?utf-8?B?akpCb2NVQUZ5NHdPMnNkRTBHcE1sNk5ldHVQcVZIOTZmVEZ3R2NZUzVnaGpU?= =?utf-8?B?NUQxd28rc05JY05YVis2czczYmNSQm92aDlpaDNFbmJPdmtzUFdhN0VoY2tz?= =?utf-8?B?bngxeWkvNUM3ODRaQlk2UVZvUFFMR2E2dUtGTW1OTWxkQmZlT3NTb1VvVEo2?= =?utf-8?B?T1RVd2p5ak5nODNtcUlNcXZRblpUc21sSUtMdHpaWlN4NHBLY056TWlOcGdZ?= =?utf-8?B?WHdVaFNtSStORFhxcWxWc2FpYUxOTEptOVBpZGxneDltdGJBVm5sZU9JTFhl?= =?utf-8?B?djZ6eG9UK1huQnp2VEduL0ZaZE44eXJuMExDblptczdkOHRTRWxNZDM5MmNP?= =?utf-8?B?NmVJR1hETmtiSmFJUEFKdGxMaGp2QWhJM2IwcWlyM1VXOWR5UWJDN0thSFZz?= =?utf-8?B?WlQ3ZkgyUWtjQ2s2TTQ2a1AxNlZKdUNGRkliU1lXVG9zM3hJUVVqWjJ2MEp5?= =?utf-8?Q?t0NJwenKus24px+E=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7481cc6-d33f-415a-0bb4-08df123bd1d0 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2026 08:40:24.3452 (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: TQ7wAlJ2jxcoarBg0QmyL+XJZ2+mcnwYmoDlUSlfSnwof9flamzAbF/xqrdY/Dk9BbbWgBXrRrCIwfZEseE/aNQkvE8DwmXHVIDBoXAZHnA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB10916 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a01:111:f403:c202::7; envelope-from=andrey.drobyshev@virtuozzo.com; helo=GVXPR05CU001.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_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: qemu development 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 @virtuozzo.com) X-ZM-MESSAGEID: 1789375321330158500 Migration target with a vhost-vsock device in the .post_load() hook issues VIRTIO_VSOCK_EVENT_TRANSPORT_RESET event to the guest. This results into the guest tearing down all its vsock connections. That reset exists because after a normal migration the cid may change. However it's not true for CPR-style migration. In this case cid remains the same, and we want the connections to persist. Thus, let's customize the .post_load() hook to skip the common transport reset part in this case. Acked-by: Stefano Garzarella Signed-off-by: Andrey Drobyshev --- hw/virtio/vhost-vsock.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index 503d248a617..c582ac9fcc8 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -20,6 +20,7 @@ #include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-vsock.h" #include "monitor/monitor.h" +#include "migration/cpr.h" #include "migration/blocker.h" #include "migration/misc.h" =20 @@ -110,6 +111,20 @@ static uint64_t vhost_vsock_get_features(VirtIODevice = *vdev, return vhost_vsock_common_get_features(vdev, requested_features, errp); } =20 +static int vhost_vsock_post_load(void *opaque, int version_id) +{ + /* + * Only reset vsock connections for non-CPR migration. For CPR the + * guest cid is unchanged, and the cid-change reset would otherwise + * tear the vsock connections down. + */ + if (!cpr_is_incoming()) { + return vhost_vsock_common_post_load(opaque, version_id); + } + + return 0; +} + static const VMStateDescription vmstate_virtio_vhost_vsock =3D { .name =3D "virtio-vhost_vsock", .minimum_version_id =3D VHOST_VSOCK_SAVEVM_VERSION, @@ -119,7 +134,7 @@ static const VMStateDescription vmstate_virtio_vhost_vs= ock =3D { VMSTATE_END_OF_LIST() }, .pre_save =3D vhost_vsock_common_pre_save, - .post_load =3D vhost_vsock_common_post_load, + .post_load =3D vhost_vsock_post_load, }; =20 static void vhost_vsock_device_realize(DeviceState *dev, Error **errp) --=20 2.47.1 From nobody Sat Sep 26 20:52:08 2026 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=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1789375355; cv=pass; d=zohomail.com; s=zohoarc; b=LTJwdIrUNO5L/OOyqxcqUxXASq8R6jt4xx2kSmBq4nsmXWCUzXBs7K4K4hHQNAw7CvggvKJKBDN/Vpc99qpLbJHXK2mGAoQwpkigY0g2FXq8aoLbv0LuEpbd8Xrj1sbHlMLlJYZFFYW2bJupWqP/NXYLxcvyRWTDsIs8Puqixuo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789375355; 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=zFLHrTXYn30DKBGfZX9XawwQGNuxnOEL0tX4YglZD1Y=; b=B3DMNM55CXbujFFhQeuRJr23rv8N7soqN2Ftd80LUrUQDpSGGQCuw6eVJYzs+PLZOGyVWRoqV+pDM+Z5rtxSmS/K+RhZPSOuLxGTs+zuNw8lGyBfv7xG90mPXVvsQLCKwkvfVVwzgNuhgBiuZRKi1ZutQQsI/39/hSuMSDm4H20= 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=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789375355255482.8715722417236; Mon, 14 Sep 2026 01:42:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x62FQ-0004Ix-0p; Mon, 14 Sep 2026 04:41:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x62FN-0004IW-B7 for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:41:05 -0400 Received: from mail-norwayeastazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c20f::7] helo=OSPPR02CU001.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 1x62FK-0005PZ-7P for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:41:05 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GVXPR08MB10916.eurprd08.prod.outlook.com (2603:10a6:150:1f7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7; Mon, 14 Sep 2026 08:40:27 +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.0428.004; Mon, 14 Sep 2026 08:40:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kwJwcL6HRJ5eczJyPUUB7hlhHndC6uKxdUYrbk62qKiVYxLcsba71BJs6xiPnzyiWZijTkaPs9SHR/ZKUavG2lVzXXAAfYjxRwfV9uUDvHnawupBRmlFH+rmykWVEC6K5Av1PohRIbAnuGuhNWzKVfRc9vEZXp8Fy8t3Q1+AgceHRKVnNkbmsNoLVCupTVUOEgz42V2BW7evApEiQglBZtrl9+NGjimGgH8qkwmGWaf3CfZ0Bi0n+5C3U0lylcfAfVgGj/ukmaAwU6aqbfKfd3Aw63u/PFH6VapE0dZvfeL4ZSO1mNKzwgF2xqNVNEBhdYnQP3FF+lXJlW21Nixbmg== 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=zFLHrTXYn30DKBGfZX9XawwQGNuxnOEL0tX4YglZD1Y=; b=Twbg03Afq7nVSb74uHtuxtMg/DZXEYouJB7J1v31ofRNN3uvmD8OghuJW7ub3W6ufJC3/9aQBi329/5J1gkBgf5KhhrCeHO3/WM0XR6hKmUnL1swsLe79jgT1ASokJExzUr8Gk7wUvi7JmX/Nyx+NGPO818t+WcqAfRO2O3Tci+gghDcmWgsI8Whf0jGGNQgWhKflrKHquN5vZAToufXUA8/65SG+txebgwWwhhNzI4a1WqwXcmcZbl52xAG15gzvX9srvOTa8m/90IWM/VpJR2h9bnxe5x4O6odWZb5ZsbkQA3n3WR1hNzS8/jWCNBQ3aCCB76qJNnm6+0knIxmMQ== 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=zFLHrTXYn30DKBGfZX9XawwQGNuxnOEL0tX4YglZD1Y=; b=EQxe40ludbMRaPKEp+ft9jrfw6Qso21bUCnugRzmAyipfzhe3+avNuEBu9RbgKXpwhZHwyX7wKMpw2xOIhCxPv1MEHR9nZcFNbkFqogLmacX1Sqz/kfcfd3o5+CPvWExiSb8Cm1Izmg+yPHU+0vFZIrZD95GpHuy4/hfB1mPyxbkQS1XgkDzDL0UVC/kkLE9GkI1wLXlo1w6fU8sIh1ilpglDl7kj4UoWQbBgol0SlDLLa7+W9sVtgif9Rc1PPYzUrZ9tA+WvrXi0DPyac/o7rCGgxsAMlxoi8rgUUHUtArpIJYcdkSEoh6Vie1S0dx6T5/i+5lgDHPS07nmSm8maA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev Date: Mon, 14 Sep 2026 11:37:39 +0300 Subject: [PATCH v5 08/14] vhost-vsock: fix FD leak in realize() Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-up-vsock-vhost-v5-v5-8-d17423589f48@virtuozzo.com> References: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> In-Reply-To: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> To: qemu-devel@nongnu.org Cc: mst@redhat.com, philmd@oss.qualcomm.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, farosas@suse.de, peterx@redhat.com, clg@redhat.com, andrey.drobyshev@virtuozzo.com, sgarzare@redhat.com, dongli.zhang@oracle.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIXP296CA0028.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:36e::13) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB10916:EE_ X-MS-Office365-Filtering-Correlation-Id: b6d9b419-f102-4eca-8084-08df123bd22e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|10067099003|22082099003|18002099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: Zl7X53MDCC4NUjSZKnqzAmtrwvRxMyJJ/1kY9s5twITr7D5nc+XeAfbzFkaAe9Tcr/sR9VlV0kNLrhAlTbP3sYpr8vpmdlJ6U8YKUWFr5lARqovK2vuGSDwXsMW8yHjtGA09fJC178tqu7ZPQjIxtRhBpB/oL8GIYw1es5slSQSdwgShlzae6xj0/NzOvVBEed6QFIeaR4/Gyinq3VS3u3gozfiWKfJiE7eti8aU0EclRjXAGg6wQs4J536lOi7+EsFd9VYmR5n3CdveZ0VKLl3jrdNPnk0XWJIzP2N3Yg23lMa3ylw8yEtTLNsbbQHnQRI9BMOdqcv1PcsF5DoOPPiSzpBlRApoDDQIBnsyMrIQx3dRg858xRqYk5yoBG1unPMCcAX/WiL+5W5l63FupG9Q5Hfz4/VzsMJiP3crAFd+p+PcGbnaPy8u+6R7as9Y2lKk/XzyO2nE95RURB5fTllDXidB1R/xxKmBj17TkC+mEnCvyCaeI+rvWQfxHfqxC/CbO6T8CYLIcMRZWIAh6lbsY1UeD1qs7ve7AMxfEBs1z2RaLAFzgdFK1KPH4s6KaPp8+XHZGszDcqKweApaGxq7q72fvqISMBTf7jImVIbTgJNMV8EqYWN5CoerghQdU11qfY9UliouG93E4rjaRWQ7YgntJuhiL9sCGq0O9tNIYfYgDCoP339GMDPVzfBYo1AMI4O3ITBoTGTemX7ulkGtbLvU8JeCnhKhtAmXxTQ= 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)(376014)(7416014)(52116014)(23010399003)(1800799024)(366016)(10067099003)(22082099003)(18002099003)(56012099006)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YmswU2IxYnd4c1VxSkJPbnZaZ24wc0RvVHRvY0t3dmZRdXVWeDF5M0dKM0lL?= =?utf-8?B?WWp3dEdEbldZNHBiK09lOTJHT2U0Y0lRTExzV0JSaHdYRExOZ1hhL3RRTGs5?= =?utf-8?B?SkIrTXJ6WDc5RWFYYm11MzlCTURMaVdBNnFsTEZXN05scXIzNVVrOW5RZDRB?= =?utf-8?B?N24xbG9wb0YwOUVtSFdaRllrME1MalRwd0FoSmdzUU4rMGVpb25OdkVVNEs4?= =?utf-8?B?NEp1bkN2VjdpTVVydDFaNUlDaVMzVTZnY0Y3c2psUnZ6NUM4UjRSMWFnYlI1?= =?utf-8?B?a1Z2T2N0RE81RHRTbklBK3BCRk1KdlhudzRBQlZJS01NYmF6L0VZalR1clVj?= =?utf-8?B?M24rMmliSDZ2cmR1MXJ3UWNzTFozZGp0QW5hanp2Y2VEdVJ3c3EwU0JMVDI1?= =?utf-8?B?MXdRR2lXM1VyTjlpVVZjakhhakZQb0FUaFJNQWNZN3VXOVRGTE0rblpVdUc1?= =?utf-8?B?Ui82K0tCUmxVRTJWTmovb0tDYzQ2V3VDb1ZvaTRJWFpCYmt6OHVjb3RYSmtr?= =?utf-8?B?WUVPbzRaU2NWS2dJU2djU2FFSVNjREp2cGxWbGlSUmJXTWY3MWFFeVdJWjdq?= =?utf-8?B?OCtpUWsrQ3NpRW12THllRUVGdVJLekdMWDlEQjZ3K0k2QzVIRzhUcmZVcFY0?= =?utf-8?B?SnBUT05RQW5pbE1WcmFpOTRqUE01SEJ4aFFYdEZ1N2pZMU45dG0yZUhOMHY3?= =?utf-8?B?REwyR3NmVGhLazgxUkROM05WbVc5aGVwRHEzM3FWL3lUdmQ5dzFaeU1nWHNl?= =?utf-8?B?aEMyRHNocE4xbHlSKzU1MVhNUmNBZHU3aHVaNGdhYlZUVXNENXpkOG9ib1dY?= =?utf-8?B?NHJLci90ZGY1Zng4L2VoSWpQSjVuMmZ0NlR5cXNQUm5IUlFSK29Helc5Vis5?= =?utf-8?B?cC90VXdtK2kyZTFzWFUwUnY3dUJtSUZUZG5KRk9XZ3dHVGVkOXNhUm9MZTVP?= =?utf-8?B?V1ZPaEtGRytlc2haTzNmQ2FmWXdPNVVVWldGWmpuSlcyUjVoMC9NanBJOHVy?= =?utf-8?B?N2dINUZhem1NMjFwclYwUnJ0Tk0ySDlRVWNvSHhvaFBvdlV1UVVhY0FPb0hI?= =?utf-8?B?eTVOaTg5VXdLNnZ2UHYvbnJMMWF2TjFheGpVRVl0NCtKeTNVQ2EwMW5JakV1?= =?utf-8?B?MjBGL0hJUFhCb3UyVTd0TFpkTHJQWGEzLytjckhkUzVLb2J5WUxBQWt2YUwv?= =?utf-8?B?WktaTzRTbU9SQ3EyOTlOb3hLQ1ljanBjMDFteXF1ZHlHY1g2cTlSM0ZVRmJs?= =?utf-8?B?bFk4c3dnTmU5aEVUTm1KZE5aMW05UzJsMFZxODd2T2N5TE1NS1Y5RFpjSmo3?= =?utf-8?B?WTBOZldZaG5DMUpESWtETHZQY2NIUVllY0VVZThLRHlBVndSYkJmY3JzNXFo?= =?utf-8?B?R2pjaThyZU5mS3hST0paMWtSbDllTzRvSDZ1dWFPVkpTYWhsYTFZSjU1a00x?= =?utf-8?B?eGM4bGVnR1lmSWlCUmFYaWsxcUtON1NGY2p0VHZvUjQzNVVkMkVyTFlWeFhx?= =?utf-8?B?dmJ0RlVNUHpjT0lGYjNvZklLUk9ZM3BQc0Z5aVpLREVOdW42ZFV2T3doUHdZ?= =?utf-8?B?MjdDcFNySTBjN3pscU5BVGZTS0k2QXNzNnpSeDdMaUpYU1dLTmNVSmF2SjJQ?= =?utf-8?B?MmM5NlVKelJ6Y1lGcjVwMzh4QndVQ3RHUnY4M0RvSjZtb3dKWGR1dFlrYUEz?= =?utf-8?B?T2ZnYUtWZnJoNHRvSFhjUlptWWwySmt1djhNNmJuT2tqU0cwYnhWVFNLUkdh?= =?utf-8?B?RUw2NXY0T3c2RFh0U1FqOUpqZnA2a1BEMWprTmllV1dqZVVFVjRpdmtkZ0dL?= =?utf-8?B?NmRUUFJtRGo1OG1YZDRLMHdlNGljYXRMUVlsQ2dMNC9pK2p5VjFNYUZLWTdZ?= =?utf-8?B?UURGdThPMVBYZ1JCMGw4UXVHclJsOWdrejI1c2FLZ2k0WG5TNG5xYkRTUjFM?= =?utf-8?B?WlVjZ01XditTOEkwYVlZYTR2KzRjR3h2ZkNTRzA3SnZkMVNwN0s5T0xXRStn?= =?utf-8?B?WkZSVURiT1NZQzdGZ0crbVd5UGdPMFVxRlZFT0Fyak5QeGFldU5pUWJiNXdi?= =?utf-8?B?bWpGbXNXRWtFSVRzdmxJVXRVeHROV0MrNFYxcjBnNGNXaUtpSFZ4RFJjeXpP?= =?utf-8?B?KzZHNFl0ZUR0OUkyRnQ0c0lkNVJaK1VNQUN1YlFaRjRWQm9LcDJIazI1WmEy?= =?utf-8?B?SzRDb0Z3bDdCcEZ1TkNvcWVtNkNoLzVDOVdzV2hWOCtMM3FkdVZEY28zMDBp?= =?utf-8?B?Qmw0WTZIMzRBTU5oMWo4NFRSMXBZQ3dXWTdDYkthanA0Uk5TVlErb2Z6ZnhL?= =?utf-8?B?RnV0bm00aXlNQUVSbTEyNzZXM3YybndoSExzVG5CZ1hCa0hXcENOaVlPRGtO?= =?utf-8?Q?glhyV0tbAyaDqcnc=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6d9b419-f102-4eca-8084-08df123bd22e X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2026 08:40:24.9897 (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: WQDWfSYAneOfZGU4jj+9uW+dffs2/6kXrJcl0TOvpsRpFnncEatbOU3vPDH7BzQdBWNgt+UPOpXACFM3CRQgaVNJ7IATBZ4RtwnBt4hZJ2c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB10916 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a01:111:f403:c20f::7; envelope-from=andrey.drobyshev@virtuozzo.com; helo=OSPPR02CU001.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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: qemu development 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 @virtuozzo.com) X-ZM-MESSAGEID: 1789375355514158500 In vhost_vsock_device_realize(), after unsuccessful call to qemu_set_blocking(vhostfd, false), vhostfd gets leaked. Let's close it explicitly in this case. CPR-saved FDs don't get automatically closed, thus it is safe both for vhostfd obtained from cpr_find_fd() and from open(/dev/vhost-vsock). Fixes: 384c2561bddf ("vhost-vsock: set vhostfd to non-blocking mode") Fixes: 701544cfaf46 ("hw: replace qemu_set_nonblock()") Reviewed-by: Stefano Garzarella Signed-off-by: Andrey Drobyshev --- hw/virtio/vhost-vsock.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index c582ac9fcc8..3ec20d87606 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -176,20 +176,17 @@ static void vhost_vsock_device_realize(DeviceState *d= ev, Error **errp) error_prepend(errp, "vhost-vsock: unable to parse vhostfd: "); goto err_blocker; } - - if (!qemu_set_blocking(vhostfd, false, errp)) { - goto err_blocker; - } } else { vhostfd =3D open("/dev/vhost-vsock", O_RDWR); if (vhostfd < 0) { error_setg_file_open(errp, errno, "/dev/vhost-vsock"); goto err_blocker; } + } =20 - if (!qemu_set_blocking(vhostfd, false, errp)) { - goto err_blocker; - } + if (!qemu_set_blocking(vhostfd, false, errp)) { + close(vhostfd); + goto err_blocker; } =20 vhost_vsock_common_realize(vdev); --=20 2.47.1 From nobody Sat Sep 26 20:52:08 2026 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=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1789375310; cv=pass; d=zohomail.com; s=zohoarc; b=HdpbFn2UvivnLTUTES5SNwUB6+14vYT1X3gVgA9cz5R35+9nyWugyrwDQor/4XQhH9zl/TKeQVLLOEB3UrNA/eJqMPo2lK1XAl6oGGHjR04msSQSdNX07pbKV+cSb7nhFHMq+tn6aQd4hPhpug+fAqj8LNoQd3KtyzcK5STzmsQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789375310; 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=qN6MqyS9dUcEKpKXibgfiZXsMrHv5JELhuqBQdIXBDA=; b=JtgwRUlH+pg0T7wVdAKWSFaOfRsfi+AdfDEk/UBTQeXMflh7NwjGscT3fQvcjZ3ZpkU1fRv10tHif1iLzhAlIj61ovyENm1B2T/3MbveEKftlXMQWWvPPukR0lbft3VzH54AmUH2uZlWwgnk8f2tS81ojiPNvao70MhH+BayGGc= 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=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789375310617168.4538342969413; Mon, 14 Sep 2026 01:41:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x62FP-0004Ip-Vf; Mon, 14 Sep 2026 04:41:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x62FN-0004Id-O6 for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:41:05 -0400 Received: from mail-swedencentralazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c202::7] helo=GVXPR05CU001.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 1x62FK-0005Pw-Nm for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:41:05 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GVXPR08MB10916.eurprd08.prod.outlook.com (2603:10a6:150:1f7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7; Mon, 14 Sep 2026 08:40:27 +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.0428.004; Mon, 14 Sep 2026 08:40:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tGo+hy+iesOvDsXPsslb71nD0arTaJwy7KjKbH4L6RdEg31iT5QVMm3d6Xd05XsMS7bUDQli6WreraFnVybpkK7K0TNHeH2pXdYJwBpeWUXZYQCXe+jd57PWM1MJc66Rd4VCPRqfrcji4tfI4ap5kGmB+ukFtjKPTSWxHUrqetjp9WGV8ef9NuiDXPIlW1WAYZ7M7nSW3SdhSu8qDK90ARVyDIiQWdMRlrofksLl0Ub2lqj6VZjQNXCWb7hpAenqPOUr0OgxEKSPw9V72irSGPHBGQ2SGiCr8KlWNfjBYOlaBzYqYmV0tcqP8wOz3RSr5KbBf1B9Fmmid4WKNiWIvg== 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=qN6MqyS9dUcEKpKXibgfiZXsMrHv5JELhuqBQdIXBDA=; b=gY9QLB8QtUZ/7+g7F/ojZtzZ6ia3UHm8UvCrTLghlxZNYtGG49ATMpDmv7jsfeCMD7AavwQOf3n7lXH/9njxqYQuT3CPkL4ybtov8FgU44ySMktz3IA6/57s5SG56Swwky9400d2Rr215D3nAsClFXU7EHZLvKgFrT61DZQX5CeyfxNV6NcGNw4Lb1obkt5Kkl44UJRd63IZM+GqBiu9yFdsrTfwnu8HX+WYUpLNL7JIH7yAwiJhQB6R7hDfF+JyNukA/Gl7zHFAK4ooHACyc7LYFlrMa1c3Q/ROdUYSMt2CtruE2mIcpNshfqlMWez5phCx/z+1YAMDnFPtGB/oYw== 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=qN6MqyS9dUcEKpKXibgfiZXsMrHv5JELhuqBQdIXBDA=; b=j/rqigLmRSUsvCQM+X8BZUHu9qnHoWqGuxGNuDULpX4cMPJIc/lK18MlaeSfmRc/v+RoabXS79OXgyDCGk7n/KN0m1IVajqkvI242XFe3+kRtXk5kPaj1FLLbURknjAfsNSRuhKzYiIRgyVUhtMnBOwN3O65uJ6N9VlZ/RqkCZhkqEUZqYPLeUFIxRNpnSPPJ6QusIfj14m8YtzHR0shCFJUniSwlquoR1A8tNkABFxjc+BUXAlws8WkE8P+q6HmsJLWhzY17hO51/KM/wo09FpFpsKtKCPOT3In/dOhAsBMxurQf/gKyr3uE0H7WEF13a8EjKdzCTdCGT3jB7s4Lg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev Date: Mon, 14 Sep 2026 11:37:40 +0300 Subject: [PATCH v5 09/14] vhost-vsock: preserve vhost FD during CPR Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-up-vsock-vhost-v5-v5-9-d17423589f48@virtuozzo.com> References: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> In-Reply-To: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> To: qemu-devel@nongnu.org Cc: mst@redhat.com, philmd@oss.qualcomm.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, farosas@suse.de, peterx@redhat.com, clg@redhat.com, andrey.drobyshev@virtuozzo.com, sgarzare@redhat.com, dongli.zhang@oracle.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIXP296CA0028.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:36e::13) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB10916:EE_ X-MS-Office365-Filtering-Correlation-Id: fa08d2cd-6fb2-4b17-ecbc-08df123bd28f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|10067099003|22082099003|18002099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: i/yM15RanPkIu8lpCG6XNJJG+8lGHZXgj1kRqqCKxKSo3rkFNL8IDyFSHCMigo9F+6J5OR+OaEkXBRqKkKOOdASIi/H1W9b06CTo7XghZ9CbPyh614Zp06gd4ya+AYCKeJqIm9hr1DMukdkzJDoaTBxZz/MeLg3HCpxuhhr/cYKtXOcep+6PFtK+5S67rhcbQHSCyQHj4AXa5Wwea0RI+NAycLS/1BXm828NRsXQWdyleEQMp6E3Gnr69YdQDF71RPLz17Gf7SZMQ1R/6xG8ceSYymPIKnVV7IMxKtcIAWhQQ2KEAXjBZp7XVYuomccBWvxdS8bmbugRjrbtC7f08gOWvPeAY8/987ZEqB4XBkiJthS4U6WwnaFz0+eve73o+5rE8KmYB27Lru4Tez/xhLRC21jyHr/UQAj4Sn5TtZIwfsULDK2L6YQlAUtr7HFrmAN0A/i/9LqYWYR0dmiRaDsnlHbFPXKMtSv/qMHPH4ceKiPFRdag9MU05j4LUUeL13iWdWWj82QDGsfzkZHwrcCL+WXQNc76sEzr53Ku3aAUJV8NTEjTUZ8dzuP3RCu0mnmP2YbA+CFXHrKqVoC6tx2Q3xTdvjKdQFJIpxBfcL9BwWvUstpK+fDqe3CywvGEr//XKPy3CDNdO/lALTmWdNjENavHuP8rihr2QMjXjQFuWhWNYeeSn53UOAcU7FgV3U2074kKBIvxx5RcT0rvJ/blDbvJgYlonAoRjGMhkaY= 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)(376014)(7416014)(52116014)(23010399003)(1800799024)(366016)(10067099003)(22082099003)(18002099003)(56012099006)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bTBCdHZLMWpYb29DR3p1QWhNNUxXT1NFUXAyUC9tRUZMWEpQSWlYZFZaWFBo?= =?utf-8?B?V1l0OEtPQWxDbTNtZkJYQjg2WWhIdmpvaC9JVTg3dUZmaURjUVpsMFdkWWl6?= =?utf-8?B?bVdPeDdWdkR3MmFHMXFLZlkySyttNEUycGNYcWQrTUxLOGhJQithalA1cU5B?= =?utf-8?B?MlZUZnBqVTNlK0owMEpKdFhETXdOR3I1UStJL05kLzB5UGxDUGVVNnBoamhZ?= =?utf-8?B?bzBlM1lBOUE0TDlmZEh3UG1tMlZTOW1aNXdUbXQycWdPaUplOGI2cWxwRDJa?= =?utf-8?B?Yk9EUC9IYlQxWXNOZHVHVmdOaXVBa2I1aG9EQ2tHNHhHVUF5aXZ0cjJ0emxJ?= =?utf-8?B?cnFVb1pFNTVEWGszZDVXeHNWUnlOa2xLQXl4d1ArRkdmRU5aY3pzT2doTFlZ?= =?utf-8?B?eVdpM1F3UC93R09wTGF6OGJSQUxRdjVDVzBndHFSY0ozSk4zL21ZT2NVeXAr?= =?utf-8?B?cnQ3Z2M3ZUpvbVJyMEwwMk5DTGZPTGNITmY4R0l4NFJaWDFPY082RTExK3Z1?= =?utf-8?B?RTd0TXl6Mk8rUFFjcVVZZ0hEWWZlSUp3bXFaQ3U4S1NHT3poL0NLMERKVWtD?= =?utf-8?B?R2pmK0Jld2dzM2tNbUVXQ3BOdFZmUktqcHoyMTRiRlczMEZJb2EvQy9FR3dh?= =?utf-8?B?ZnV0SUlFOFlISThvY3hZejdka1NVa2JrMCtCazFaNGgyWXNzZlU0Qnp5YkpW?= =?utf-8?B?bVRraE8yM0hYSjlJV0krRER6d2hYeHMvcXczK0dqNW4xU0VwREVHeU1JYVpJ?= =?utf-8?B?eTlYendvZHlaTFc5UEowelh0K3dYckQwSDlxekFsbGpRV0VzaEhkUlBMbTBx?= =?utf-8?B?eVRVeGVoczFiaUNmQlMvNlFIaUpKNUpscC9SaTBxU3dUZHZtaEtWS2pvT3JH?= =?utf-8?B?VUZCNXIyVGhsNlcyUk92SmxDOGE2MGUyVFpzK2NWT2E4WXd0RE81ajB2azdO?= =?utf-8?B?S2ZaVm1WOHFyVjZwcXpHbFltY0FUTUd6U0g1VFZnWTh2ZWRaN0NJeHdTNDNS?= =?utf-8?B?VUpFSzR1OE4yZ1BOa2tiYkRvbTlJYWRucHRXT0YydXFqLzByQ2VuVHdmK1Zo?= =?utf-8?B?dWxsRVoxRS9UUHlObmw4aVdxMHQ1dlAyS1dyb2M5c05BZzhMblZURnFxam05?= =?utf-8?B?VDQ4bm9RUCt0MmUvOHJQYjA1K2hhTnFzUWo5ZUlob1oyUkVsV05VS3BYYjJx?= =?utf-8?B?N0J2RzRYVnBCRWM0NVNQZXBHZCtueHNRNFJqK3U3WFZRQkxhQ3B2cHFwUEdB?= =?utf-8?B?V1B1MzdzNlorSDR0citETU9KUDdHRmtNVHF1b3M4eVpQYlUwK2NEbHg2STg1?= =?utf-8?B?eURCNVA2WXBIT1Bjd3pBUDdUaUFSdnQ1NE5EbEp3amZ3SnU5MzBuNDByZ0hP?= =?utf-8?B?cjIxbHpzV1lIaWxWN1BqRm52b3NyRG1yaG1VVVF0UG9JWVgyaDhpRmVnK0VO?= =?utf-8?B?ZEd4SXVMNVBzcTVVNWpGTmZQdXdwWC94TjJDQmthNUpsSVBHTEFHVHJ3QjFS?= =?utf-8?B?Ynl6ZWt3djBjSHNQNDBVZUZWNTREZXVLa3MwTEN6UEQ2RFpKeVQ2NCtZWGxn?= =?utf-8?B?RjZJZnZITFpVUERjN2xvalNXR3VXYnFyYWZhRytMbGwxWlh6VWdYMXNyTWwv?= =?utf-8?B?eUdlalZnYTdzbHNlbzRsQzlWTDlQMEJOZW50VUZpNkNLZ3YzRE14eHhrMjhy?= =?utf-8?B?WVdEdFRKbzRnK2ZNZzJVb3EyZUYvNkVHcjEvNEg3Ni85V3ByNkJSZFFvWklQ?= =?utf-8?B?VnZZdWc4dXFiWEtOalY2NmViUXNjRFU3eTZrQ1F0Y2g3MnZtZno0RU5MMkV5?= =?utf-8?B?ZHZwNWlMTXRlQ1F1dng0M3c1VVV0OGNZUnE1UC85NzZ0YzBRYzg2V2hxdnBw?= =?utf-8?B?Zm9mTEw5Y1p3VTU2c0pnTzJKNTkrakZZNDdhcm9xTk1IdlhpWC9vQWFsV3hj?= =?utf-8?B?LzJzTGwvT2ZNdWZlcDZZNndnOTc0b3MyV0szVlNXU1BPQWlST2MzV1dmak1Z?= =?utf-8?B?Wmk1R0l6ZjJoN0RyUFlVc2VRVndPdkI4TDlkaXNwcjhiaERCUWt3TGtsR3B1?= =?utf-8?B?Tk12eSs5aEUyV3VuQkFTN09zOW1lbEpNeEtkTFFhc3BwNzZJbUdhd1R0ZkxV?= =?utf-8?B?M0pCdGFXc01lelZjeFNLZFhZRTN4emplVzNaWFk1ZXh6SS9BSW83bVB5WmZZ?= =?utf-8?B?OE85REV4djRpb2FWV1FpZjJYYTc4bDBNZytNWDlUTlVqaVl4OUR2c0JiNDJG?= =?utf-8?B?Yk8vRE4xRjU3WWZVMThyZDJFdjZRZ3dQSTYrdFpRQkwyL0lOZkM2bDljOU5L?= =?utf-8?B?Rm9IaGNodGluV2NhSDlrUUpyRWZqK2VXbHNvMEROK2VSSktyY1ZFdFNHNCsx?= =?utf-8?Q?dGUCYy5wMJJ96HK0=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa08d2cd-6fb2-4b17-ecbc-08df123bd28f X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2026 08:40:25.5885 (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: kG2t1hAUSPm3RcKZ+dRUV3j3+1xFjVoCy5T8W3gNP+ZGhmSirBXu5gFHDe0BZ83pD1Sr9ELCVt+R7jl6F1HSrawZTekawI2zS1D5TotFJg8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB10916 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a01:111:f403:c202::7; envelope-from=andrey.drobyshev@virtuozzo.com; helo=GVXPR05CU001.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_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: qemu development 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 @virtuozzo.com) X-ZM-MESSAGEID: 1789375311297158500 During CPR (checkpoint-restore) migration the guest keeps running on the same host, so instead of reopening /dev/vhost-vsock on the destination, we should reuse the FD from the source. The FD is saved in the CPR namespace (hash table) with cpr_save_fd() and then reclaimed on the target via cpr_find_fd(). Since the key in CPR hash table is the (prefixed) device ID, CPR needs a unique ID. Thus we only preserve the FD with cpr_{save,find} if this ID is present. In a following patch, when we lift the CPR migration blocker, we're going to condition it on the presence of ID. vhost_dev_init() (and thus VHOST_SET_OWNER) still runs in realize() here. Deferring the ownership handoff to pre_save/post_load is done in a following patch. Until then CPR remains blocked, so the restore path added here is not reachable yet. Signed-off-by: Andrey Drobyshev --- hw/virtio/vhost-vsock.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index 3ec20d87606..203055354ae 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -69,6 +69,10 @@ static int vhost_vsock_set_running(VirtIODevice *vdev, i= nt start) return 0; } =20 +static char *vhost_vsock_cpr_name(DeviceState *proxy) +{ + return proxy->id ? g_strdup_printf("vhost-vsock/%s", proxy->id) : NULL; +} =20 static int vhost_vsock_set_status(VirtIODevice *vdev, uint8_t status) { @@ -143,6 +147,8 @@ static void vhost_vsock_device_realize(DeviceState *dev= , Error **errp) VHostVSockCommon *vvc =3D VHOST_VSOCK_COMMON(dev); VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); VHostVSock *vsock =3D VHOST_VSOCK(dev); + DeviceState *proxy =3D qdev_get_parent_bus(DEVICE(vsock))->parent; + g_autofree char *cpr_name =3D vhost_vsock_cpr_name(proxy); int vhostfd; int ret; =20 @@ -170,7 +176,19 @@ static void vhost_vsock_device_realize(DeviceState *de= v, Error **errp) return; } =20 - if (vsock->conf.vhostfd) { + if (cpr_is_incoming()) { + /* Reuse the fd handed over from the source QEMU. */ + if (!proxy->id) { + error_setg(errp, "vhost-vsock: device ID is required for " + "CPR migration"); + goto err_blocker; + } + vhostfd =3D cpr_find_fd(cpr_name, 0); + if (vhostfd < 0) { + error_setg(errp, "vhost-vsock: could not find restored vhost F= D"); + goto err_blocker; + } + } else if (vsock->conf.vhostfd) { vhostfd =3D monitor_fd_param(monitor_cur(), vsock->conf.vhostfd, e= rrp); if (vhostfd =3D=3D -1) { error_prepend(errp, "vhost-vsock: unable to parse vhostfd: "); @@ -207,6 +225,11 @@ static void vhost_vsock_device_realize(DeviceState *de= v, Error **errp) goto err_vhost_dev; } =20 + /* Register the fd for a future CPR after a fully successful realize */ + if (cpr_name && !cpr_save_fd(cpr_name, 0, vhostfd, errp)) { + goto err_vhost_dev; + } + return; =20 err_vhost_dev: @@ -223,10 +246,15 @@ static void vhost_vsock_device_unrealize(DeviceState = *dev) VHostVSockCommon *vvc =3D VHOST_VSOCK_COMMON(dev); VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); VHostVSock *vsock =3D VHOST_VSOCK(dev); + DeviceState *proxy =3D qdev_get_parent_bus(dev)->parent; + g_autofree char *cpr_name =3D vhost_vsock_cpr_name(proxy); =20 /* This will stop vhost backend if appropriate. */ vhost_vsock_set_status(vdev, 0); =20 + if (cpr_name) { + cpr_delete_fd(cpr_name, 0); + } migrate_del_blocker(&vsock->migration_blocker); vhost_dev_cleanup(&vvc->vhost_dev); vhost_vsock_common_unrealize(vdev); --=20 2.47.1 From nobody Sat Sep 26 20:52:08 2026 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=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1789375334; cv=pass; d=zohomail.com; s=zohoarc; b=AgF889ZkpUoeVxqUu3IybD5U+l/b1gQjtxeWqbkSaqxLyP0wKprccJkIpmqFL5jxD9DvPkRZMgxsVlO35wqOx5BeKWdFLJPV9pnJQdQ0Pbf5XDKSiHFSGoRSSTN80gTM1i2OxuA3i5WzAdoHmEHrdD5YbjH+BWUf7sE+VU5ZgZA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789375334; 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=nLdfSSIjrjJ+y2ikvZT77FqSu+X8MFe2FtIwlmjzl4A=; b=WrCQlblExajmHm7Mo9WeFXuDdRlBlULbZJu8ieEKXNy61vnIyFCrWFW1os7CBR0q8cCgVJhncL/aObfBlAyhkR7VxGVOKsqNeC8JueAipUsFvf7Gbk+8VKTIoS7g6xHrhtECRSxVc/CZ/AewovVeBwQ0Q6kzEmow/Zb8zWMaI44= 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=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789375334557197.41860913959965; Mon, 14 Sep 2026 01:42:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x62FT-0004Pe-HC; Mon, 14 Sep 2026 04:41:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x62FQ-0004M9-T1 for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:41:08 -0400 Received: from mail-norwayeastazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c20f::7] helo=OSPPR02CU001.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 1x62FO-0005PZ-1x for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:41:08 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GVXPR08MB10916.eurprd08.prod.outlook.com (2603:10a6:150:1f7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7; Mon, 14 Sep 2026 08:40:29 +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.0428.004; Mon, 14 Sep 2026 08:40:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=waDjIZ6YPu2Dd7A9QdtuDEJ8DBE+3Ete9qQVtcoxlTi70r2XSR7BKSq0i/3L97H8dJ+4uUYT83hjUqDA4Be9ECeHAunZloqx92wAy7p6anwrA+R0yvAG5ugE1p8ZECOIw0LhTrnQ/6+cb8Y5ArHfcPWMAh71e+8LB8bQcz11y8ndyZmDKgZMp187pu3RcmgeGhIDMfZm/35060pji1F04JKaR0uhCEDcXY5SpGaS3R4lb4i8U41GP1wjEpP2G3q5v/eXaysqEZ64sn8vJi1QURcOhh5XJ3e5ZkJkS3tSTds5LXmAtezwFpXyXanMNaGP2g5VmX/Uoc8yRuqrfd6qSw== 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=nLdfSSIjrjJ+y2ikvZT77FqSu+X8MFe2FtIwlmjzl4A=; b=uyRvhnlb3LNV7ISFF1a8n7m+unXFIVRZlRpvhtW/Mk+72bOQTHCh6AaHc3e53nhMF5fx23AIP4+BP/fgyfGm+K+/9J56zLEtfO36PsmYsyssj7VLXhyTOmw3weqbpytTg+gxq0QuEN5T4zfEJUU8wEq0qTYJO9tIuAzvQSY+YOtYCpZEXpt8CiF9Q53WNTmVOizYP3abGiQnWbgciTvoNHOqbOQypafa3HK954KHXsX+d+z/4xcHVY1FfKS6mg02Tyd8QkEBB8whneqOHJAvqPq4YtV+sa8+cOxZ6MKv+Rhx2H8nigU4auLjaykoA9eJpO3Ay8jETSAqckJnsMw3fQ== 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=nLdfSSIjrjJ+y2ikvZT77FqSu+X8MFe2FtIwlmjzl4A=; b=FvhgL+9jQx8aqqjYWiXb9D0gjMkF5VQ/98O2UA5T9Bywox61Z0FHZQL8amBBDvi7W+F7TGCYZca/V4tQr/BHmLwQuRrpqJ+78c5Vv2aXUFHp6PIuNh5rhqTuQz3UrKkbQJhHAD7MSiTsfr0KTZaTuwY4/EullaGgDCv+yKlDcM/q0MwIsTuyCmEgnRRYfIXbXKtxoqB0E7cc5UDxvBFOGXIsvoQ68z/YE8BObEBbKSFFjNBanlZMY5EDb7XFfZaDP+x4bQMWpHYpFAJD8cmOB1SDxh/OkVmZfLpNDKv1eY8vWDbKZ4yoUHeJKIcGzwV685dKsRb7EVjwsqhpeSNn0w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev Date: Mon, 14 Sep 2026 11:37:41 +0300 Subject: [PATCH v5 10/14] vhost: factor out vhost_dev_init_backend() Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-up-vsock-vhost-v5-v5-10-d17423589f48@virtuozzo.com> References: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> In-Reply-To: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> To: qemu-devel@nongnu.org Cc: mst@redhat.com, philmd@oss.qualcomm.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, farosas@suse.de, peterx@redhat.com, clg@redhat.com, andrey.drobyshev@virtuozzo.com, sgarzare@redhat.com, dongli.zhang@oracle.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIXP296CA0028.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:36e::13) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB10916:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ce92157-4cf1-4210-878b-08df123bd2e6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|10067099003|22082099003|18002099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: ysC4kDEK2D+5Ifrq5vf4dude0YGKjkQZ3oC8gzHhPfFz1wegZVTamNhJC6eMk3B5k11dwHbyNVzX5w/f4T1B4jMnD8JdwrukKd9s5I7o5MnXnGo+SRN49puUIG4ZGbYIVp95gEKQVkOcaatN0hndkBFsSkw8rbtdzLLemrBNCk50rqkfH87u9pXcINxfA0hHqbnOEU2Db+TJBE52rSAfhGBB+TGenTE85Pls1he01uojFSBXc4SQMJhFr2CoGpDYz2kYy6rwHgh6yK5pxq6YgosVSkJOVAWLwljaqgDXSabqLftioU5+8gBoJSf+jnuzGGzBfRK5jmGn0gDygow63NhFtrQYhwm+tONCoMtP+xSbQ9PQK0uDpy9kC7FD9qf/n1J3KQTtMxssg47djdrzW268m+Y2Gk7KOz4309MFPhfQDb7sfddP0RQM33Fq4QjPBic69Wvl44yv6Nr9HFxQSI99ee/AZfZ+JMFOvrfiAry5B85dNDmUnjNfpkdtnVzgnGzq9iTCga/euu8jFVA0vNT2x/4Z8MUKJ9hE57yfgiOR2cPTRmOQFqY1eBiPK3SXqODozK5xyY+xL5VcJv/t1ObOAS9xkUDjidZ4gYraTLxpxx5FCsOCu7YISe5kcvkhQFrWgwqFwU/XoHPx7gFtoyovdfO9HtgH708eQxlymGYCPyTFaAj2L0/KcoPPiah6R87g3GaYE0GjaHYG/i0antBMhGmzZAmoftrTQfKFuOg= 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)(376014)(7416014)(52116014)(23010399003)(1800799024)(366016)(10067099003)(22082099003)(18002099003)(56012099006)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bjRHNUZEUTJUa1FIK3FuNU5WUUhSVGJEMkNXdG56VEVsZWc3L2I1dkNRMDBM?= =?utf-8?B?c1VqcDVYeXhpS2JvaVdlSldzRHc2aVlrTGEwSE9odHcvRFUxNjlzNWtGcjFm?= =?utf-8?B?VnltTXhuZGZOY084NnYzVHJwVUxTelM3QmYzaDBydTlBbCttMEllVU4yb29Z?= =?utf-8?B?cjd2TlFGS05tS1FYSmVWUVFnb3dvb2RkemxnSmxnYVdWb1p3ZXR5VVRWZXUw?= =?utf-8?B?azR1TjZMS2JFZ0t2U0NCZXlvcHFnRERuK3FWc2hYNnVtS3YwWUc3MlRRQWFm?= =?utf-8?B?YVVRYnh3cjdQTGc0QVFHRWQ1OWpFRStyZk04MVpNV0ExS2h6TjJpWmtzU2NF?= =?utf-8?B?QXBrQUxLVk9PV1J1QzJMVlc4UlNrNUlaNXFXRzM3NnF2SlV2eUZaTU8yNGZB?= =?utf-8?B?bjdGbG1nZm5IUUVRemJpNUl4a2hYbUlJeFEranhZODdzbEUvRVg2Rk03V2x4?= =?utf-8?B?SmpaQzlYWFlCZGRvenBFb0J3N1hIZEZrMzV1MzBOb3RWVXRxQzFaSkFQeEtp?= =?utf-8?B?aSt2R3FmbUpTclNQTTkyVXBKUFU5WjFUNUVyd3prYnhIRTV3WGw0eTNNZC9t?= =?utf-8?B?dXl2UHhwSmt6aUVEM21CbDFUaS9HMmFNdm1zT0tBQ3ZheU55RVZHMk1uZVNp?= =?utf-8?B?dUkyWHY5MTlINEQvMW5KbmtSMmZFRkdkSE5PS0t0Y0Jva1M1clNJcVhSby9S?= =?utf-8?B?Z3RiY0NJWEV0ZlpjVDI1NHRlTjJOSlFrdnlkY3lCS3VZNEpMcGlDM0RteHRj?= =?utf-8?B?SDhhMyt5dDEweFlRejdLQUZjZ0JBbFZ6WUNXdm1Rb21FaG1odUNFdDVFak9N?= =?utf-8?B?S0pUaW1ad3lBKzNVbGIrRk40TUh5bVdWUTVnT2Qxd1hkdWt4YUNmRDMwTkRF?= =?utf-8?B?T09ncE0zd21FYW10M0lyUXVHVy83RCtEU1RoR3dlWFp4bkFuR04zYlQvd1Nh?= =?utf-8?B?cnNsbWgrblZiWm9HSkJHVk1mbGltK29sa3VGZERhVkZzcVlKT3QvQURQZlVE?= =?utf-8?B?UUNWYzlaNlduc1N6ak9ZUDdIU3hGZ1JTNGtmYnl2Q1lGWlp3RWkvcTBoZGFU?= =?utf-8?B?RUNWYXFpZkNRVzNCSnd5aHNXenFxU0VtN083bnZ4c0xZL2lJRGswL3BTZ3Rj?= =?utf-8?B?bThqNHRTVkJMTlNvWVpuSGNTRlA2ZmgxZnE4a1RrdzQvelZTYkwzUndubUJi?= =?utf-8?B?aXdGdnVDclo3Nmg3TmZqNjVOa2hzYkhDQkRwRndsQnlZa0NSVnJVVHp1Tk9P?= =?utf-8?B?aWcxdEV4Z3loT2xmWkc3NHhTZGVYa0VBaUVLbDd0UU5DelVnOXBkYW54OG41?= =?utf-8?B?alc5SWo4eXMvWXdjR3J1em1RcUpreW1CcmFuSWZTNHIzVkJ5VDJ4UTl4WGIz?= =?utf-8?B?UExtMUhwTnRIM3praUtudTlPRXVhZkRzT0Z5c2owVURHMTVlZ2svQTd4dWhw?= =?utf-8?B?N2FUcCsyTWFJSFpSQzdyMjM2WmRrSFE2MEQxdXBJOHhHM0s2MVBYNm1DSCtk?= =?utf-8?B?Yi8xK01seCt0WW9rek9kWUIrNThlMXdxNnhjZnVRenppaTJnLzdPeUxuNXFI?= =?utf-8?B?K3hnNE0xY3Z1UG1CbGJlKzlxdVVBYXREN0Z6dzAvZFE4dHBVckJZaStuWllL?= =?utf-8?B?UkttNjBIL1ZoanlOWFN1Zm1kMDYrMWRQYUVCbXV5TXBzUSthMzhwWVNnZTFI?= =?utf-8?B?VWMyT0FwSklOalEybnpVT0pGQ2I2c00wc0JGRDZnK2xMdGRuMHUvVkZmcldN?= =?utf-8?B?WHN3UXdBNE9FbkVBMFR4MmFQV0pGdzZTSFp2bnNlQS9iYWFHTzRLeVhBVjRx?= =?utf-8?B?a054anN1bjJGbGtjTkxkS1BPaFcxaTVhQXp0Um1GWGJnNHA2ZWhHUTBIMklp?= =?utf-8?B?UW1lMDVQN29HWGN0YWkxeXR6a202a3NaNmkvWEtBSS91Y09jSlVsVVdZQVVa?= =?utf-8?B?UytCR2NSQUhFK0ZkRjhOMnZlckJmV1QzdDdrYWI2TkJPRnpsL0tUT3dWL25w?= =?utf-8?B?cGRCR3ZCVXNoa2hlS3ZxOVlkK2RnRHlwSDArTFFZdkd6MUtjVlU2TW1NSjhU?= =?utf-8?B?VzY2Z0FxMmJYZ1hEU3kvVXBUaVlpRkFmWUE0a3FKbW11VnVnZ0NYK3MxcnhG?= =?utf-8?B?bCtmV2NkbDZNS0sxc3N6Y0Rpd0xKc1dIVzQvN1E5QXNHQW5NVFRobG16MW1l?= =?utf-8?B?L2E5TlhpZkR6bTJ2MDJYdGFBdllKTXNNTVgvMVVXSW1JZ3RBcVpLMmpnTUM4?= =?utf-8?B?bmV6TndxSkpaYjhnbDJ3NmtMMFI0UG9HeUpOVHk4SEZWMjdTQlhpVS92bE0r?= =?utf-8?B?TDVselVpZ2RiZHlyaFMwYUVGYXQrTjdvM25OeWQvei9VQVFGZ1NmaWhvUER0?= =?utf-8?Q?9VmLP8GrwP+Jkz2w=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ce92157-4cf1-4210-878b-08df123bd2e6 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2026 08:40:26.1581 (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: yqUG4PX7LOKrkuPeGhRp2f7EZ/I6Td6B/VmNTo9pC78CjbZUrX5S3GAE1CKWCHifFFLWtSlXLz6IMy46TirMoD1lZ1WZXlgWi4H7Ghcnwhc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB10916 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a01:111:f403:c20f::7; envelope-from=andrey.drobyshev@virtuozzo.com; helo=OSPPR02CU001.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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: qemu development 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 @virtuozzo.com) X-ZM-MESSAGEID: 1789375335395158500 Split the first part of vhost_dev_init(): selecting the backend, calling its .vhost_init() and reading the supported features - into a new vhost_dev_init_backend() helper, and call it from vhost_dev_init(). This is in preparation for CPR restore of vhost-vsock, which needs to learn the backend's features at realize time to negotiate them when loading the incoming virtio state, but also must defer taking ownership of the device to post_load. vhost_dev_init_backend() does exactly the pre-ownership part. As a result VHOST_SET_OWNER now follows the feature query rather than precedes it. This should be safe, as no backend requires ownership before VHOST_GET_FEATURES - the kernel and vdpa backends do not check ownership for it, and vhost-user already does query features from its .vhost_init() before set_owner(). Reviewed-by: Stefano Garzarella Signed-off-by: Andrey Drobyshev --- hw/virtio/vhost.c | 33 +++++++++++++++++++++++---------- include/hw/virtio/vhost.h | 22 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 371dca17dd8..f9b54c46f93 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1668,6 +1668,28 @@ static int vhost_dev_init_features(struct vhost_dev = *hdev) return r; } =20 +int vhost_dev_init_backend(struct vhost_dev *hdev, void *opaque, + VhostBackendType backend_type, Error **errp) +{ + int r; + + r =3D vhost_set_backend_type(hdev, backend_type); + assert(r >=3D 0); + + r =3D hdev->vhost_ops->vhost_init(hdev, opaque, errp); + if (r < 0) { + return r; + } + + r =3D vhost_dev_init_features(hdev); + if (r < 0) { + error_setg_errno(errp, -r, "vhost_init_features failed"); + return r; + } + + return 0; +} + int vhost_dev_init(struct vhost_dev *hdev, void *opaque, VhostBackendType backend_type, uint32_t busyloop_timeou= t, Error **errp) @@ -1680,10 +1702,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opa= que, hdev->vdev =3D NULL; hdev->migration_blocker =3D NULL; =20 - r =3D vhost_set_backend_type(hdev, backend_type); - assert(r >=3D 0); - - r =3D hdev->vhost_ops->vhost_init(hdev, opaque, errp); + r =3D vhost_dev_init_backend(hdev, opaque, backend_type, errp); if (r < 0) { goto fail; } @@ -1694,12 +1713,6 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opa= que, goto fail; } =20 - r =3D vhost_dev_init_features(hdev); - if (r < 0) { - error_setg_errno(errp, -r, "vhost_init_features failed"); - goto fail; - } - limit =3D hdev->vhost_ops->vhost_memslots_limit(hdev); if (limit < MEMORY_DEVICES_SAFE_MAX_MEMSLOTS && memory_devices_memslot_auto_decision_active()) { diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h index 684bafcaadd..9b98d34dd04 100644 --- a/include/hw/virtio/vhost.h +++ b/include/hw/virtio/vhost.h @@ -156,6 +156,28 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaqu= e, VhostBackendType backend_type, uint32_t busyloop_timeout, Error **errp); =20 +/** + * vhost_dev_init_backend() - set up the backend and query its features + * @hdev: the common vhost_dev structure + * @opaque: opaque ptr passed to backend (vhost/vhost-user/vdpa) + * @backend_type: type of backend + * @errp: error handle + * + * Select the backend, initialise the backend instance and read its suppor= ted + * features into @hdev, without issuing VHOST_SET_OWNER, setting up the + * virtqueues or registering the memory listener. This is the part of + * vhost_dev_init() that precedes taking ownership; it can be used on its = own + * so feature negotiation can happen before ownership is acquired (e.g. by= CPR + * restore). + * + * On failure the backend may be left partially initialised; the caller mu= st + * still call vhost_dev_cleanup() to release it. + * + * Return: 0 on success, non-zero on error while setting errp. + */ +int vhost_dev_init_backend(struct vhost_dev *hdev, void *opaque, + VhostBackendType backend_type, Error **errp); + /** * vhost_dev_cleanup() - tear down and cleanup vhost interface * @hdev: the common vhost_dev structure --=20 2.47.1 From nobody Sat Sep 26 20:52:08 2026 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=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1789375337; cv=pass; d=zohomail.com; s=zohoarc; b=J3sPJsK5OMljogFolMxEdbcVIctC6RTvhdWN53hCRoB6S6SRyzA0pd/gLkRcZ93RVERWH3UoT0Ni5Q54snCpImLkAdHgSzhpdBGFe78C6XCg82YUSE2rnb/63AH2TPVEZFlZNWgJ7ivGEzlR0XzMi6ankg1tN25yMlA0fk362IM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789375337; 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=kh3+nr3NsnYKwwfIXzajeOgYUgt4kKJhQC2r2S3sh18=; b=XfhzNN/aXY41wIao4OXvjubJbwv8++rrM8Mh8NafkTXH0IMBZwCiU9dkUcd/w5hb8ke9IMf0M+PsxfN5xRl/LV0JGTb7pSUgQiMVJ1WAJ2ev+K5l5cdDhoMGH2QSqm1hQtGBL0NmOMOyUDShP6+5lQDKz0LFXdlxI0GbvbZjFhc= 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=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789375337801715.1811372457641; Mon, 14 Sep 2026 01:42:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x62FS-0004Oq-Gq; Mon, 14 Sep 2026 04:41:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x62FP-0004It-PI for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:41:07 -0400 Received: from mail-swedencentralazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c202::7] helo=GVXPR05CU001.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 1x62FO-0005Pw-33 for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:41:07 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GVXPR08MB10916.eurprd08.prod.outlook.com (2603:10a6:150:1f7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7; Mon, 14 Sep 2026 08:40:29 +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.0428.004; Mon, 14 Sep 2026 08:40:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Em85fz+jOsYDBMXJVyg48O5KRppLaiZXFKfuV65otsXG3TW7+My4m+DPjFoOnECoAIOt5bMeGEXD/fjVQhWYMEBvnAyJLm/rO8Ayoj8JGYc4Nx1bFshxxRXnaNUaUDfc7GZK3I5ma8CkconicaAi3SQKSkn4+jk6azgyNZNRLVPpjaSGkQNhnq7ht1n+aU6XZIX25DnzsSx1vUt7fzhJtngJAiUtd4eWca1LPYnF0059R+uCDhVcdTQ1n0xNnslp+zDiwyHPtPPdwP74dl/AVUjuwbnXw4y/bR8l5d5ku/27PasYrj7izFXQOYHs1j0kW0tQdekoWf46xd2lXVqJ7Q== 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=kh3+nr3NsnYKwwfIXzajeOgYUgt4kKJhQC2r2S3sh18=; b=ars0HNmHVlfaIw39P9AhbAkELDyyw0NExahGq6UCKV6ruKni2dvv4GCPw9OrRCQD0IrSEIl3Qrp/xR8DuTbjUyUm1iV9tNAzHMXVeLHq9qQNQVDB4DxwVqSaESlC+DXR8lYi04GU2/8TckSWZ0MV5MKmu229d8sb5/NUqT5cTvE/jZNOPjwDHJDx+eJGy5bvCLJdgZlPO9uIIAxFp/HtHJlQIvp7h8ASWxBWQRVG70PUDuHQSkvyHjd4sGxM7qKDRT8Ooi1Qr28rfa7Nfr47C9WAXBRCdbYWhSXKCbnnBTOIGJ6zOKTuOomTzc2+WHVtI245Qj/1eXvN8l/xREA4pw== 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=kh3+nr3NsnYKwwfIXzajeOgYUgt4kKJhQC2r2S3sh18=; b=if4OWFxFgE8ZAu+0RhjACX4lZyZ4kSb/fsWJi325UpoJmNnejbUNW0Jx9XBsCo7aO+5Za1jb4LS17YoLTzlHKhu5JNjLA0lRayMhlAhtAZd6hXc7rE9SGONZm+7Co3ZHz1+UmlknAuneQCot7+5DE3JkyS0oheVrsjs6p6BLjLHm1YVMyi+EcO+fLT0mM+hYnEQTxLzycJTdwOZqGq9ygjWHoCfsfP3C+uApG5bw3WqNNPNbuRykfJ7VkQA4gN+Q2DA80xG3OU/gozQBeSlCWIv21WuSQiBFw1OK4kXStDWBsRe53eSxSmZzp6FccesOXyW5XMXXbfi1wC8PqeARag== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev Date: Mon, 14 Sep 2026 11:37:42 +0300 Subject: [PATCH v5 11/14] vhost: make vhost_dev_cleanup() safe on a partially initialized device Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-up-vsock-vhost-v5-v5-11-d17423589f48@virtuozzo.com> References: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> In-Reply-To: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> To: qemu-devel@nongnu.org Cc: mst@redhat.com, philmd@oss.qualcomm.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, farosas@suse.de, peterx@redhat.com, clg@redhat.com, andrey.drobyshev@virtuozzo.com, sgarzare@redhat.com, dongli.zhang@oracle.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIXP296CA0028.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:36e::13) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB10916:EE_ X-MS-Office365-Filtering-Correlation-Id: 12b76ac3-bf0e-4ada-4cc1-08df123bd33d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|10067099003|22082099003|18002099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: uBxvWClXjSr87hG82Xb68gT0z8fXL7lpKNyT74UzajAXQiCCjRHz+8lCNC15NEmPPBcVwc2q/F2N2afWKPBf2q0oL1A/n2/dvbBLIqANG4sMJOtuwm8rgJ2MHoZDEn6IkMvN61PduMCZPC1uCeWt7TMdgklL2PLE3yQwSB2+SlftwMaOmqyvgqnu6MS5HHvovZcE7Z8PEnWe/RTd4XpH6dQ309+lYyUzR8l+gRWpzksM+JTYGvZkl7J8RUKp8dN1gKSQMyH7Ffc29ZQ5c/3Iwjr6t3a1r6CT5WPFNhlvJn07JqbSdlfmgcpiO7AAwO237k03c3wfFum+SjESHKkEEcDFE5S8Nw71GGqFUkBYnrORJ3G2dPJcuV7gNC8HjGKH+NTzGm+D3Iaz30I5MGdHcz6djGR8aeHfXIklCDiIToLV+zH8UjnjKcqplSvoGb9DhLUv0Q085uz+zrjUMI/2jk5VvxVQj58gO7zelaOrW052o0EM2/B1jRktowudfxmBThurlPk962h1sesPHigsxhC4UBzJcmvt3BoUNHHMMEqJL/+W0KKJSUU9So0DXiJR8ry1KWdrzUfMSj6wnqsQj2gmkTLS1YhX98KXQtQTsgxAM0Yw3JIoX74DqVdWV4lYbZQNVTnXpI8genJu9XPA5EvwGzLND3dJh42moEg0CrWJV/BxIg2rXp4Gv9QUr0ASjK2zveXIlHCAgecZS1qA/mfUzdOVdJcZl3t/IX0CFmU= 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)(376014)(7416014)(52116014)(23010399003)(1800799024)(366016)(10067099003)(22082099003)(18002099003)(56012099006)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?M1hGbUptMlk0SDRCcU10ZEU5SnRZaHVoYlU5N1JReGVlbjdDUzVseFNEQlFO?= =?utf-8?B?L0RDREFmMHhnd1lxdEdYUGZPa3pIMndhQTExOE9OY1F5dUw3bGdsK21WN25O?= =?utf-8?B?WjFPVXhlbWRLcWdGVmZybHZ3dlh6ZXgySXdaTFpsVUJyK0lkMXg0VXhSek9w?= =?utf-8?B?Y3lLcURtKzcxZTZSdlJTWkVYOHpkS3cvbHBnSkJZSUMybk9jdXN4dzd0ZmZq?= =?utf-8?B?bXAvbGFaTUtHblMzZmliakV1ZWNPbmZkWE9EQzl5SVRMckJkZWsxOHlNYjE0?= =?utf-8?B?Ry9QYTdjMk8xNHVDT3had2NPTldaT0g5N2tiTHVtdjFsMHNkd3FTbHZZWTNa?= =?utf-8?B?MWxmdlkyblU4ZjlkcTA3cTIwMEpxT1ZNQWlKN05zZFJxK0IrbVU2cEV3Mnp2?= =?utf-8?B?Nm1iaWxneFptUGtURHNMbFhVNUY0NFQzVFI2R1FXS1hpSVU1VlU5aUFqK29k?= =?utf-8?B?NEVBMkp1NGFpZ2FzdGlILzFMRHl2ZVZpWGNGMXBwVTVFT1VHRmltV2dCWXB6?= =?utf-8?B?Wmc5R3VrZENhdGdiVEI2MjNkVnE3Z082eFBmaWFIbi9PMStJbkI2TklZTUYz?= =?utf-8?B?NVhDUEc2WjlyNGdxcGd4bHZoUGhjd0NKekhwWUc4ZjNhRk5LMVV1Vm4yajRR?= =?utf-8?B?WjVYcXJ6UEVJMlVpYmJLODI5R0h5WTNRZ3p2NVNuc00ySnlrcXNoUm9WS3dZ?= =?utf-8?B?ZlVvZThzamxRQUE4cWEwQVVKUUJKSGE0SGJTeDBaNHNMOWo0SnJNeTRtcFc1?= =?utf-8?B?MVNYSm40SW9TQmFLSllRQXcvaFFHOEE4WGZZZkZHY2NKMDlIWlB6LzRKdDV5?= =?utf-8?B?S3JTbGs4aWlDNXRVSk1BVUcyMVA1WWxyL0FzWEhIamorb1BYWEM0Z0kvUks0?= =?utf-8?B?OGFacGFtMzNqTkQ4UFVMRWwxRVJHc29jb3VmTm4zN0lqUWVhdmoxNVN6UkM1?= =?utf-8?B?eDB6NEtuYmM5cDFDd2NKaDJNRmxPNGR2WEczL1dEaEx3YmVod1RST3ZRNWs5?= =?utf-8?B?OFVWTC8vaVhmajIxWm50Z1ZQNi9YOHR2Wk1jM1FTTEJQWGs1V2NSS3I2dURT?= =?utf-8?B?eUVMV2RrUUl5U1ZRVUVHRGMwZVdIclNHOFlCZ25tbXZEbi8vM1czMWVPaVZY?= =?utf-8?B?UHVuUkV6dDJZS3BrTHB2QmxSQnFMZldXN1V1VTBURVJTVzRJMXhTWi90SlBy?= =?utf-8?B?TlE0Y1Y2aXVHMThYQTZ1Z3RIQnRtRHBsb1Q1L1Q2K01ycC94TWF5NUJxaTJa?= =?utf-8?B?RVhnNjc5SHlzNEx2citDMGJJWmo3bFlITXRiZVpDZ1ZhemhXV0UrRjRSaFZl?= =?utf-8?B?eCtTRW5lTDFWdVoycjZyTHhDUmU1a29IaHcxZ1d3SXZRRkw3bUMxMDlNY2dK?= =?utf-8?B?TkRaSXRlaHRUZkxTUVZ0TTRvSEV5S3JhdWRrbVptSnlSQTEvRGJnYTQzM3dh?= =?utf-8?B?Q0RxWi81VVZuT0tNZXowcWtVSm1keEZkTnJYQ3oydWNlUGVVaGxkbGNKQlMw?= =?utf-8?B?MldLYjRpRHlEQk1tRnRYWHR2NW5uOW1aY0V3dU5UMW5NeXRZUFpRMzd5OUJC?= =?utf-8?B?dU56cFpJaDZJWVJzQUhQenNDY1RhVFpOK1VTQUxJejFlYlJFRzVMQzNySGFq?= =?utf-8?B?ZCtCc2hVRDNMNnhBTDB4YllHbCs1ZS9oSWhtMWZkRGh6VGY5b0QwVkkrUzIx?= =?utf-8?B?UzZXK3ZTYnUyWnpGQ2lZMnVBa010Z2oxejlKOVlNVkw4VHg4d1JSN2xzREda?= =?utf-8?B?S1FlRWkzWmlWajVWQ1BKV0pkMWJwU280ajdmZGx3Mzl6M0taRUpHbnB1Ykph?= =?utf-8?B?blVXVzBpbnNZN291R2p3SjBOemdUY2lEeUpZVkdMTnNzQXE4VzNkSVdYdWEv?= =?utf-8?B?NjNCaytsMW8xbUZYaGlKZnprVUJNWXJla2dhS2Y3blFLaWltam9nQTVyKzZj?= =?utf-8?B?WHB6Q2VrS01ZRGJKL1R3REkrNHNqblhuMjUxL29Hb3R3WVJPQUNtZkNsbzZW?= =?utf-8?B?UGJOa1JMSmdseEJJVkRDdDI1RUJzOTB1Z05Sd0MyaS9Jc0hxYzE0TW51OEg2?= =?utf-8?B?K2lzYnBpRXhhUVh3RDN5cnRyVGMwNmhZL0h4YVhrc1RQNnNGTW8vOHZkTzBw?= =?utf-8?B?U2txc2o5eXVUZCtlZkx4bU42cmVmUENOcks2UjN5WGQ3MjZiSkZ3aWJQNGVo?= =?utf-8?B?bWFNL0xxWFVieUZTQjhKZlA1OU05L0NvcW9sdU04cGdqbTlFeHNGMkI2NXZZ?= =?utf-8?B?Ri9kdnJBS2ZkSFN4alNJNlAzY3N6Y1pZOFVXbzczM1JPek9tSFo2enNERHZ6?= =?utf-8?B?Z1FuRnZnOVQrSjBqby9mR0NGaU9JN2ZHU1Vkd3JLdzBscStFeHY2Z2F5WW0x?= =?utf-8?Q?1zj1Gm22B0hiARJo=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 12b76ac3-bf0e-4ada-4cc1-08df123bd33d X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2026 08:40:26.7475 (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: pqYfOrqWIzevoyl1qWRREWbpPGKvKLj0bUNHWltKoOAmqE0a/HzlIu7M7kRXRzPkDDd4Sqfynp0PC9CzElFAhrfc8YDB//HELu0rrCVLd7w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB10916 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a01:111:f403:c202::7; envelope-from=andrey.drobyshev@virtuozzo.com; helo=GVXPR05CU001.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_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: qemu development 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 @virtuozzo.com) X-ZM-MESSAGEID: 1789375339476158500 A device which only went through vhost_dev_init_backend() has its VQs not yet initialized, so vq->dev is NULL and vhost_virtqueue_cleanup() would crash dereferencing it. Check vq->dev before use, so that vhost_dev_cleanup() can be called to release a device whose full vhost_dev_init() never ran or failed along the way. As of now, there's no way for the cleanup path to be reached with vq->dev uninitialized. However after a subsequent patch adding CPR support for vhost-vsock this'll become a possibility, so let's prevent such a crash beforehand. Signed-off-by: Andrey Drobyshev Reviewed-by: Stefano Garzarella --- hw/virtio/vhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index f9b54c46f93..2bb9a23fee4 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1648,7 +1648,7 @@ fail_call: static void vhost_virtqueue_cleanup(struct vhost_virtqueue *vq) { event_notifier_cleanup(&vq->masked_notifier); - if (vq->dev->vhost_ops->vhost_set_vring_err) { + if (vq->dev && vq->dev->vhost_ops->vhost_set_vring_err) { event_notifier_set_handler(&vq->error_notifier, NULL); event_notifier_cleanup(&vq->error_notifier); } --=20 2.47.1 From nobody Sat Sep 26 20:52:08 2026 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=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1789375331; cv=pass; d=zohomail.com; s=zohoarc; b=TXqTFaHgxzTqzjPnQUjc3gL/LkYGLmTJJ6loiKsBsfz8rq9FrL+ScwW9T9d0za8/40nQd3lTcIl/RizzElb3c0bxgx7FF78TiE8+1dv+9vCW6aw835OUOYDHXIf5DDTBtnyHc/5r/9/LdLIRab8flIAI2NJaex1QVLDf4PaZjEk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789375331; 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=/Qhx5YB+bipET/P1bDqTnBNWBwASq6LmhMuZ87nFNqs=; b=Mg0aCrnH8at5ZqBcP9bzhqT4GRTEYc9t2wmPKNZCtK98hMbh1nqt5DJ4gaiZrIRNmwIoA1r94hIdIDKZ7/zgy92j9B04F/gwBn13TkZlCWNvYFbhhqoKSD5VOWrypxL4/P8MqGMZ0++9qfYAR6K1E7y7zIfsX7IfxhMx/p4W4Sw= 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=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789375331900704.3863415248741; Mon, 14 Sep 2026 01:42:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x62FU-0004Py-2j; Mon, 14 Sep 2026 04:41:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x62FS-0004OK-0g for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:41:10 -0400 Received: from mail-swedencentralazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c202::7] helo=GVXPR05CU001.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 1x62FQ-0005Pw-3y for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:41:09 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GVXPR08MB10916.eurprd08.prod.outlook.com (2603:10a6:150:1f7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7; Mon, 14 Sep 2026 08:40:31 +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.0428.004; Mon, 14 Sep 2026 08:40:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RBKRLLVTZmugEVraYf44pz+vrBKmpmFZh5xtor5CXiSseeVvw67PmNiZpZoqht9KO2RO4YKGgTGM18DtFt0/POtvMBCAsJ+z1Rw4Db1HrIa3o+mwfwWKeKC4dQ8JpEwU4GMZZ1xZLJhw0HzKv3IS2RM+5wNr93bUrvmHcZWR4teszy1fCGghdDYCZs02KifahMh2jhE3RweUeXZ4YO7bjuLHI2NBuphiXiGd/WhOytpagYq64LQKr6MuqBQvAqJuF5ROxDHrJ9zZ8mpyR7dXfN7UQUekBNr9+FPSNSwtjKlJR6vbAuF+FEE0powBL5CHbB6dWZhddPtPZrdrQOf9EQ== 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=/Qhx5YB+bipET/P1bDqTnBNWBwASq6LmhMuZ87nFNqs=; b=jOjadzrkuqSbXf+RJNs4ThbokIt7nZ9qn824auVC6NLBRXK24LX81x2RjeUvqs8+62X4AcdOoBuc76VnODijCD0Fz3WaqBgjI+ZLVT1FFguggYgLuFFQZbXnhFN49IuK8KYAw8ujDiptdQgkTlj4JQyL8UEujokIWQ01c9lnjMmg+Z2m8OMZJJRKh2k2RBXOuBK1yy23DcDYB+Q1RDLOIj2vR/cgxGiNeNhJC+zo8sQiY+IeI6Wbl8aJJLMyYxS0eGms6Q4KgDbBYSiHu9KCf64ioFGa3VhQey89YJvqXviQ5tk5r1jhTX9+g106D0BaJI74Qm39z+EmZ3ip9i3Uwg== 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=/Qhx5YB+bipET/P1bDqTnBNWBwASq6LmhMuZ87nFNqs=; b=uPuFCm2r84jKqrK1avubC51PtNHEWG2kln0GKz3Gj0Yzqo0xxHDNFWL7tyOe2suDFyucX0zi9Z1M9nrgkbVZDxR/vvVjoiI23n7kLMVVJDpNJYDezCqc+OrNVNVP5/h19pEi6quCAH3z6enwTiZ5bDNutAPFsG4wtcZKP3kZeuho+Ih5uESzulhgtT2Pd5PyOXrOxxCvnsvuFdsEq2DrBDQ2EyEGO/OBgk+YA3Mfx9am3GkT+iaEibXwEnH+OYKsvRLMtVtectrmEWihdtjY4Py3YDqnzZouiMXnkX/FMy473segQx+xxkwS27DAXTXKHGugr9uzxH0+0q0Fn66pEA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev Date: Mon, 14 Sep 2026 11:37:43 +0300 Subject: [PATCH v5 12/14] vhost: add vhost_dev_set_owner() / vhost_dev_reset_owner() helpers Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-up-vsock-vhost-v5-v5-12-d17423589f48@virtuozzo.com> References: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> In-Reply-To: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> To: qemu-devel@nongnu.org Cc: mst@redhat.com, philmd@oss.qualcomm.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, farosas@suse.de, peterx@redhat.com, clg@redhat.com, andrey.drobyshev@virtuozzo.com, sgarzare@redhat.com, dongli.zhang@oracle.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIXP296CA0028.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:36e::13) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB10916:EE_ X-MS-Office365-Filtering-Correlation-Id: a83cc22b-c5d8-4763-88ea-08df123bd39a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|10067099003|22082099003|18002099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: dGJcEj/IFQYOVmW0L1mwGgU+fZOMVuKkMBqtfCkHDrLIwdUqIJGWwdLrXkUKdIhmaAb99gHrkxJaNp0qMPOZTbzW7rWFIAqkfSCbeKKLZN5d2TgImtOw5sImWkGHZDHrqmEZBfDAMtTUBREuEdKoUkSdOubEGr73K2BOmAN6NHLkgnA6Te28z97JffmxEqZrL+ZYv8i8sv+s97fpFWpUZFkBNz6EEUiY/fUCK72oh9Zpvtad/2dT5PiYjvi7PJxgePOKJXJewsfZGwrE69gnbarLF+9TSZ84DOIDNseELOgJXMgle1oI5ccfl5q/+2yc/9IFVzhDuMYC33vjDqkSrlq/NKXZrNKSGsgC38vG7qLnQHcLEw7sEBmOBtBvzSwIfu5WLXHPN/jo2EphzRHeREtnOdfB0e9zj2+qcUUJyh7f8RMUfqJ2iBM1P/j29x+DJTnGvrjNVBzmkrU/dDtwYzdNx/tqkEmDsbdaSpdJq7qHNe93+RN3kN2VXVfAetcoUotJiT5PA14vLAV5Of4nPU1z39vnsPd4/mDay+AuhlS7kTKjjbbzqlDA86dc7qnJWkdjQxJZ7EgsUm128kn1VD+oU+WXDWsFA4M4vFLloR+QUuAvqWNLZ9+OAfvMmP6uz58PqIP3EW/JWDm3ZA+u1GOHkiDCSUPDjYsqdnYatq3m9cjFYlOHCyndZ3s8x8zUlDWubtSxXxsi4Tqmo3E5Ji8yVNPKfscPrdnNrgo/+1U= 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)(376014)(7416014)(52116014)(23010399003)(1800799024)(366016)(10067099003)(22082099003)(18002099003)(56012099006)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?czhDZHIxb0RQVCtDeDk3a3BHU2ZVSzhLdHpzOStyYUdJVUJXR3NUY3BDQ2JS?= =?utf-8?B?dTRIMmwyL2NpcnVyTlYwQnFYcS93K0JHNlk2T3VKcnFvS2lEa0FSZVIvTG9n?= =?utf-8?B?cXlZN281blp1THkrSXF5SDZtaWZFTDJrVkE1aTRQb2lHV2RSY0ZobGlQSk5y?= =?utf-8?B?Zk9EeVlTcEhWeldhdkZoYXF1QlRlQnNTQXpuZ3FTS1lXa25uNEtGemNSV1NM?= =?utf-8?B?VXp0NWdKblVJc0xXL3VoUlkyeGIzbXlXYVBYVlRIdEtGZkRLcmtlS3FUenUx?= =?utf-8?B?VjJmb1ZrUDdkSWl1cTQwNjBKZXIrY3F0bUFGTGJMNTZhK1VqMnhVTGkrK1VK?= =?utf-8?B?YjNwak52aHdoZXkvcXdIWk56OTZtM3kvVXVuVldueXpNQkJyL1c4SWNmbFVn?= =?utf-8?B?V3VmeW0zaXRqeDBQOW9COTIvdXdGYlJwSHVSV0Z2T3lkNzdQVzZDSjlCMmV2?= =?utf-8?B?TmV1bzhLTmNMalcrdGs2OTU2aGE0dzB1dWtXQ3lBVnpQMkxMejFhM0VFRDZr?= =?utf-8?B?UGFyVSswNkc4RUdQUXluZ3BlK1NabjFlaEV5Q2dXSzhUK0F4VVV0ZFo2QWsv?= =?utf-8?B?RWxkRWdiN0ZRV3Y0SXZDT1BoMnd0Y1pXY2tsVjZsbGd3eXQ3RG9qTloydHNM?= =?utf-8?B?UWZVZThxNG1PV1owZ21PWDZ4R281czZiOVNoeFc5cXI2L1A1dUF4NDU4Z2JW?= =?utf-8?B?WUhsN3VkNFNNTDJRbFlpelZpV0xOS1g5QVZmY21Pam9MUFpjcEg0b3VMU29P?= =?utf-8?B?M0VxY1J2NVFvdndTcnptaWIvYXpmMEMzVTR5eHdVNDlwczJ2WFB2WjZRVDJt?= =?utf-8?B?K2hxalBLUHAvbFRNRHlWVXVFNDcvUktUeXlwYldpTS91dWR0MTB4K2grNkxR?= =?utf-8?B?cjZWMHpYRC92MzBNWDEySFUxL0VsUWtrUDBEZEc2NFlJb2dXK1VMTU1yMFBS?= =?utf-8?B?WFZrNy9zMDN0U24vOE1qYTNZdTFrQjMyTFlMcEM3VUVpbVQzT2t0ZGhZVHlv?= =?utf-8?B?SXU0UUdoR3BPM3ZkcTJqOEEzeGt6Wngvakowb1ZaVmlCNW03MmZDR2xNbXpo?= =?utf-8?B?ZVh0NEFmcHZFcUR0ZWNuZDFlTlNWTWhvOXIvM2c0ZXFTdHhuMEZqa2duamRv?= =?utf-8?B?a1VxdzBpZ1JLQzdrSWtXTFNmVm9xOFd4bjRWUFJrcnl3T1pSN3RIVXFic3ps?= =?utf-8?B?WkhET0gyZXhNZW4vSWpDbVF2MzUxTXpHQWdwNmJNRDRaZGlyNzQzVWxsVlMz?= =?utf-8?B?ZW9vYlQrKzV6VklGNWRTMmhPbnVlK1VDMzF4ZjV5YVg0R1ZNM3VpKzBYekxP?= =?utf-8?B?THZkQURIODZ6KzVXdmRWWWhWMW1oYmx3djFGczNjVnlHVXd1WnprdUgyMTBq?= =?utf-8?B?OVNiWUFUWHRwWm5pZmxpdG9UaFJIdWgrRGNGbkg2bDlPVEVnZ2JLa2FWaC9m?= =?utf-8?B?SU50Uk8rQStKdXI4MTE4TlhFaFlGZ1NZcVFuNVJPOXp6cjJzN2ZKc3htWVVl?= =?utf-8?B?RkxXYTlDNGRMZDhPNXkzNGJyNmVWKzRKWEFDS3Z1Y3lGcS9QbkJ0b091ZGs2?= =?utf-8?B?eDhaMkJZdisyWE8zenhWVXlyRE5VSG9kbEw2aERldy8xN2RMa2l1bURROG0z?= =?utf-8?B?N3ZPdUEvQUE1dWJDYis1NnR5ZGwwZUlKWTZPNnNFeUlQWDJJdUtUTHI2V0NB?= =?utf-8?B?b0U0WFdiVXlPdno3dUZHbVcyVnJXR2o4WDQ2c1E5cDFQb1E1WW5xL0RvUTRu?= =?utf-8?B?Wmp6bXVOeUswVmh4TFJyMENXU3NTZThMWno3ZllNNU8yekpUUTZtMlVseWlm?= =?utf-8?B?RmhudDNDTG0wNmFIdER2TlQ1cCt1NU1HdkNkZ3Fra0VObzZEUDFFaHM0WGxa?= =?utf-8?B?bDVYZUVHbW81cTQ4bWtySXgrTXdzU1JINFJocjNuRGswTHpTZ2RYOVJmcGlw?= =?utf-8?B?SmxrSUd0MitDcDMzeDUzK2JEU1EvRlJWeHpMQ3NEdGV5ejJlZGsrblZBallv?= =?utf-8?B?akN1bFVadm1oMlhpc0o3Z1FRZERqOHM3RzRSSmVJRnhaODd3czRpbEZ1ZXEr?= =?utf-8?B?Yk9MdzdIS2VxdDhzQUw1d3FYblVFRFA0Y2Y0K0g2TlRUdFA3NDROTzRvZFNH?= =?utf-8?B?T0hLS1RzL2pxVmcyR3BaazFHRlBJa0FmTlFEZndMQVRQZnpSaGU2SkppRmht?= =?utf-8?B?cnRKdzRtblg3c2ViVEx1NnpSRHdpWmxkUEd5ZFVVNlV3enRHMDJNdUhIVTlh?= =?utf-8?B?cHlYRUpLWEdQZGMybmhMSGFBNnFPd1ZFNGxXUHY3VzVoYU13RjJ6Q3kvWXFC?= =?utf-8?B?cEZkaFZPY2wwQ01YVUFGV3RoTmpwcytyallCY3ROZU1SMmtiZnk4MWZPcnMy?= =?utf-8?Q?6biTO1HjaJMY41Ss=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a83cc22b-c5d8-4763-88ea-08df123bd39a X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2026 08:40:27.3507 (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: dmsm64U5eLBb0T0ktmb801sgNfVuME9gEdr3muio9VOpAm2guqmMEnnQymuyep2R3jwzbmCrKvRNtLuw91OI3PEeQrHyLvCEWNKU74B2zeI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB10916 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a01:111:f403:c202::7; envelope-from=andrey.drobyshev@virtuozzo.com; helo=GVXPR05CU001.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_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: qemu development 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 @virtuozzo.com) X-ZM-MESSAGEID: 1789375333454158500 Wrap the set_owner/reset_owner backend ops in dev-level helpers, matching other vhost_dev_* wrappers, so device code can take or release ownership without reaching into vhost_ops directly. vhost_dev_init() now uses vhost_dev_set_owner(). Both return -ENOSYS if the backend has no such op. No functional change. These are used by the following vhost-vsock patch to hand a device between owners during CPR. Signed-off-by: Andrey Drobyshev Reviewed-by: Stefano Garzarella --- hw/virtio/vhost.c | 20 +++++++++++++++++++- include/hw/virtio/vhost.h | 25 +++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 2bb9a23fee4..ea17bf01080 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1690,6 +1690,24 @@ int vhost_dev_init_backend(struct vhost_dev *hdev, v= oid *opaque, return 0; } =20 +int vhost_dev_set_owner(struct vhost_dev *hdev) +{ + assert(hdev->vhost_ops); + if (!hdev->vhost_ops->vhost_set_owner) { + return -ENOSYS; + } + return hdev->vhost_ops->vhost_set_owner(hdev); +} + +int vhost_dev_reset_owner(struct vhost_dev *hdev) +{ + assert(hdev->vhost_ops); + if (!hdev->vhost_ops->vhost_reset_owner) { + return -ENOSYS; + } + return hdev->vhost_ops->vhost_reset_owner(hdev); +} + int vhost_dev_init(struct vhost_dev *hdev, void *opaque, VhostBackendType backend_type, uint32_t busyloop_timeou= t, Error **errp) @@ -1707,7 +1725,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaq= ue, goto fail; } =20 - r =3D hdev->vhost_ops->vhost_set_owner(hdev); + r =3D vhost_dev_set_owner(hdev); if (r < 0) { error_setg_errno(errp, -r, "vhost_set_owner failed"); goto fail; diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h index 9b98d34dd04..94cc52f870d 100644 --- a/include/hw/virtio/vhost.h +++ b/include/hw/virtio/vhost.h @@ -178,6 +178,31 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaqu= e, int vhost_dev_init_backend(struct vhost_dev *hdev, void *opaque, VhostBackendType backend_type, Error **errp); =20 +/** + * vhost_dev_set_owner() - take ownership of a vhost device + * @hdev: the common vhost_dev structure + * + * Issue VHOST_SET_OWNER on a device that has already been set up, e.g. to + * complete a CPR handoff on the destination, or to take the device back on + * the source after a failed CPR. + * + * Return: 0 on success, -ENOSYS if the backend has no such op, negative + * errno on failure. + */ +int vhost_dev_set_owner(struct vhost_dev *hdev); + +/** + * vhost_dev_reset_owner() - release ownership of a vhost device + * @hdev: the common vhost_dev structure + * + * Issue VHOST_RESET_OWNER so that another process can take the device over + * with vhost_dev_set_owner(), e.g. on the CPR source once the VM is stopp= ed. + * + * Return: 0 on success, -ENOSYS if the backend has no such op, negative + * errno on failure. + */ +int vhost_dev_reset_owner(struct vhost_dev *hdev); + /** * vhost_dev_cleanup() - tear down and cleanup vhost interface * @hdev: the common vhost_dev structure --=20 2.47.1 From nobody Sat Sep 26 20:52:09 2026 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=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1789375360; cv=pass; d=zohomail.com; s=zohoarc; b=Un803T8zjTjfar8Q77dD0nmHt12KfrhScH6Mu2+a4HWXNwQ0oZQ73lJBUOO7kbFJm20RK0Clp/uXr7KiDC2rpTUEVVHrGrxVzyPO8MJOq4THxe2PCIjB8Vu1c17/qCr2oi3d0iL7OrX+9qQhCahVBCbsLsTW/s+Oy/4My/ySEto= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789375360; 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=l9iW3avXufVWmYGC8C1uyWT8OqARai6s44TEZ4MTbfU=; b=Y/SorbU4QlKymGWEZglpCzDXuwaDGBxLB2n6a60JqO7HyEAAPI02KQMbdfyyo5a6VOKeDJWuKsoviEBEngh1Vhe9PAy6br2p0C7MASz00e1Fw7fEgCYMIUL62nBvjFMokaY+2wyeCPWMsyAzw8p0+tQrKjx4vN1hMSwVX7Hwp+E= 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=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789375360299397.30098710804225; Mon, 14 Sep 2026 01:42:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x62FV-0004QS-6s; Mon, 14 Sep 2026 04:41:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x62FS-0004P8-UO for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:41:10 -0400 Received: from mail-norwayeastazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c20f::7] helo=OSPPR02CU001.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 1x62FR-0005PZ-7p for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:41:10 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GVXPR08MB10916.eurprd08.prod.outlook.com (2603:10a6:150:1f7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7; Mon, 14 Sep 2026 08:40:31 +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.0428.004; Mon, 14 Sep 2026 08:40:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CrduYbOT6gJFqgnwc/VS8lD5ZuxsnV6/yzmszxwHY9rRhbBpR1tAzSYUZ1gK+KHKx95wj1zsHzX7M1gqQf8M/bb8KHMLwpxjiNrSIBynZnmTZH/nIslVeGh0SPwg8XMYecJyXElV+H6uW+WihOSlAOMWPBEokPaiswBkXLctt3Elzuy6ItrUdTGxYdDXsHYfV7ghrdmXpJf1GuY8SuiBQKGvy/ZbXk6BTUAVyTztbS1TTnsGi3R8GoPLFWgGl7BgtqsGBuXKH90kslyU3bKGADAelpRTME7VF4DxcS+YOTCRsb91S9MPJRKYExpb8L9qNZJwrpH/i2KNt3cjSH2GTA== 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=l9iW3avXufVWmYGC8C1uyWT8OqARai6s44TEZ4MTbfU=; b=whQ2X19FN5e96kg/AZsgpPVz3YMk4rpAFALtPc5BnDIhOwIaZU+s1/aHPcJJUBWSKjpewlGo3kM3CNevDw/QveQph5OwRRQRDt3rJ8Hb19EL+E3h47fB4vVEq/8TX7a3sOFA/QpXLEjheA8mPqQPA3BL89soK7b3gySmUmy173m62+IwseNPxhUn60U++QVInsNbWqi6ljyJopKQ5Ap+dOin9glLGb22ClSGI2I0DrDY6IMUOgY7RIpT4QZ8iyExJEj6J7e68BhuXabdi8Pt+Ry5l86Mh7mcp5587RedoDcQIaCrPwp8C0MEPDwd5lDdGIDLSvT7peBRrT333+0TPg== 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=l9iW3avXufVWmYGC8C1uyWT8OqARai6s44TEZ4MTbfU=; b=y/J9P1GcwMvy4OnDeH4d3LU99dmYejqyN+A6d0WyWfpxRV8tcYakJRcYi9kPt3kKbhkVbfuhaUm3pv7P9mhM+erL9NgLbygCgsRhwRGDX/1eNqBQTH1LXaeuhJ7AuL0oOAXO31JVZRH5UGNTB2OSs1JoR9kS51gNvOrfP+ogeNk24Ev2ZhXdPuylzOi3fLzDMOUmWdLhRhUVS7l931QKoa1LnL3xeMrCMQapD0/ZIbPlY+Nf9SIJEU/f3HL015yAQIge3e1Ja29TlyHy77g0R3UtdmXleuUvGuKjfTGb6ERgHyi4pZ9uwI673a/lM/W7U33gjU4TxKj4zq3NV9cJ9A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev Date: Mon, 14 Sep 2026 11:37:44 +0300 Subject: [PATCH v5 13/14] vhost: add vhost_dev_is_initialized() helper Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-up-vsock-vhost-v5-v5-13-d17423589f48@virtuozzo.com> References: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> In-Reply-To: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> To: qemu-devel@nongnu.org Cc: mst@redhat.com, philmd@oss.qualcomm.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, farosas@suse.de, peterx@redhat.com, clg@redhat.com, andrey.drobyshev@virtuozzo.com, sgarzare@redhat.com, dongli.zhang@oracle.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIXP296CA0028.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:36e::13) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB10916:EE_ X-MS-Office365-Filtering-Correlation-Id: ee8ee7be-45c1-4564-006e-08df123bd3f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|10067099003|22082099003|18002099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: 2bFWnDwjZ4XQWnB2PBIxsk+1lEFF32d1b71j6CCPDteL4Du3SNDOrncyZnfOSSf7f6lm/Fu9kq1QPijNsVNpGhW2lM9WrXLgk1Ky1ZO2Nt4of+8VJHeRlVy6BglnMnj9GU9/vovpkMNqNgYI0K9CoBqZ7fxLIsVetX5EhcXfTi3X++4nS5i8O/M2bVRHoFQnADRVnByCxR8+3oVXheEsqFGAN1JYEc1Cw0osgpyZ6WKkLOIfWipjHFkZBlA1B33pN7/ARuHhKxaulzlr84lS9CCZRG7oLHjWvOfRi6E1NuyDZYCNLBivW9FJwWuhoLuPDYJwAg8WNM+ikeiTmCE39FmWhVzmTpHSNrJoBs5sdyXFKrE/SNto0OGboOQCUht9fboHduv7R4lyXoruUU7jTGHXX8WPtoUAr4Ap18JH5Ta2oCZuB1mMq79q1/mJWUJCvLJk0q7PAaaqVmL0N5V79+qSp7Va37cxwrgQKfTFKFS2UahapXfvkxHCCScybiLF4D6V80dhOkUU0uAcxdXYEfsxNWlxxmxU01AzMcyof4S6iK0GYN26GFK+TH+efP7gP6jShNtJPUOkl/jZRc+urqweIx4caH9DKNqCqry33YHbPvBO7Hc+MoJpdSA9+bKXxi4nyOtO9ko6XUxM+sE6QYIOmaIvZBEv94kdsCdjaYVBbMYO/ihu/HVKhjgv9Ne/itsGqcmO8fkM1NZ1sikC8SjJ9WkPOEHZAmXgZLSvZFs= 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)(376014)(7416014)(52116014)(23010399003)(1800799024)(366016)(10067099003)(22082099003)(18002099003)(56012099006)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VVhSUm0yTXBYU0lYdDZGYy9PdDA5bUNpWFpuaXV2TnZoRm9UdGFFU3NHYlpZ?= =?utf-8?B?NXVnT2lnbW5sbEl2YjgzaVBOZDhYS3JwWFBaTG04V1V5bHlkakVMNGF6MzNh?= =?utf-8?B?cW9oaTJoOFIzSnIyTnMwYWRlSnNPbGF5VmhGcjlvS3o4SVUwMzUvSDVyaTMy?= =?utf-8?B?MHUzZE9meFpYREthWmc1OThZd3ZXb1B3Ymg0Z0VnWkRqSDNERnJqNWpWMVpP?= =?utf-8?B?MGV2ajJwZ0x4RXJBR2RCQWZtUEpvSGEwUlBxNjhmeVFJSUxrN040eU1Uc1hz?= =?utf-8?B?Umc0QUtxNXoyalN1V2NHa2VocFNRbm8rbVk1dGVmbzQvSWUxRlBHdFJ2NGJr?= =?utf-8?B?TkpUNWp5dWcvV3VhT0N5Si9pZzMwK1k2dVYzYjlBVU5JYThEaHJzdHVrSVBG?= =?utf-8?B?QXRlNGNkdHFvZFZ6WEVWZmRUWVBYSXlHNUg4RmovTHk2b1QxMzVCVTZWQXFY?= =?utf-8?B?d2pDblpXTWR3SzgrNW5FVmxoNFB2UFlHN3FpcXRRS3hCTzhOZkVQY1ZDUGdo?= =?utf-8?B?dklRU0VNY2dkVTV3NE12Q1JyaU9qd2JRcHdmdGdlQXpvMlFsSEFZRXNuemVI?= =?utf-8?B?WklMQXd2QnRXQ2tEZmJ1SWcwK3ZXRGR6OStrMVNIMm50WS9vb2xyWkNBVzVx?= =?utf-8?B?dklzYTY2NmpER01qUmczYXFJUkpsRUM5a0FDak52eWp4d0tpRWRvbnp5V1c4?= =?utf-8?B?d05wQm50dllJN0syZ2hVdHZGVlFMWW56UWIxTU9kNmxKL0QyanBab25SSmlT?= =?utf-8?B?dUkwKzlzcndoRnkzY3c3aFlFY1psd3hZcWZJNEdLRmQ2ZTlSRjJxYnRlWXQ3?= =?utf-8?B?Uy9YZndTaG1WaW1tOWxOUUZSVHd0cDhtRVNlbE1oYW1UTlMvSFpXVXVrSUtG?= =?utf-8?B?RzRlSE1RVUR4RnE4MFZtaVdKLyswcENyU3VaSjFybDVZVHV5YlhET2dQcWo0?= =?utf-8?B?RXJuTTFjenlsNENGeUNhdmhCcDQwVUFsa0xiSDFjTmJhbGtjTVdJS1Z6NXB4?= =?utf-8?B?Um5JTDM3MmM5UnF1aVFnVi96Y0o1UVNUZ20vWnBHOU9oZWZEdHhJTHJiSVBS?= =?utf-8?B?ZWIrVmptMFFEQkZjSFhuS0xGQS9vRnJiYi9lWmNMckx3Qm5CUmNNcWFRWmxC?= =?utf-8?B?c3kzUUloL3hCUFJJTG1ZNU0yUzNuSmNBQ20wLzU4YkFkMVZJdzNzWFVYd2x2?= =?utf-8?B?cG9jb01Dcmo4bWMxRlpkU0RYQTVrK3R3RWFkWXFFYVZDekRDbXEzVXJtejNw?= =?utf-8?B?RDZ6WW4rZmJmclNWclQzNllMQmpydHQzMVBBbi9TU2czek9TajZxNElnUHZq?= =?utf-8?B?Mi9UR3ZyUC9wQmxVZFNCbUxmVU1CYmMyYU5sckkvTVVIM3B1dktYOFdSTGpQ?= =?utf-8?B?MzhNV09xT2FST0dzbkY4UU1sQm1UbG45a0E0QnFwaGxTOGF2Sjh2RjVaQyti?= =?utf-8?B?UG9YUDU0YWdkWFdYQk9GcS9PRFgwK3dueTJveTI4T0VPdWczZWpQOXR2VUIz?= =?utf-8?B?ek40eXJDdlExMHJSa3FJbXJXYjN1cU9LRkVNTDhmQzNhbHlKdzByRXl6Qmhm?= =?utf-8?B?VlRsN1hTNnhGa1hubXFiVzVEU3RpcU43R3k0YXBrc1YwMWw2VUJCVkRvSVlX?= =?utf-8?B?OElua3dSQXF1Z1Mrdk9tU2FzQmxBQzBHWFpwdFlkaFZrUVN1NFNjd3dRTmpU?= =?utf-8?B?ay9ZaUw0ak1FUDU0R1liY3VOQkJmcmRwS0NVNGY2OVBvYXlZcDU1RGtwUEky?= =?utf-8?B?OVNKYTRIRnNhTEtISDhPTEs2VTVadFVDSTFnVVNRSU94SXoxWTJqRTV6eVgr?= =?utf-8?B?VUxrakUzWmxvSTAyQ3NOazY2Mys5dUZhMmVlRURodVhYL1h0ZmFVSUpLd3JY?= =?utf-8?B?R3VPQVAyU1VvS0xFdHo5SlBSZ0V0elZxa0VBd2lBeXZSWjVDdFBmYWhxSWdX?= =?utf-8?B?dmYyS051bWdsWWE2Tk8rdTlyZGw3WVU0dVB4emg0bXJoRHNPbzBkclVDVXZC?= =?utf-8?B?dE5oVTE3TkJUblV6YXNHakE0ZUVPcTRxNVRnVkViQ0gzOFZUL05ueE9KdWJP?= =?utf-8?B?aVFybVAwVDIycS9YdU85aFhyN2VXNjhseDBSOFdkOG5nQnRHZDNXeWZ5VWJJ?= =?utf-8?B?ZXJOa2xzYklxUXlRMFMyVVBrbmtrQ0I4ZEgyZVoxNnhhb3l1S0MrYlNCVWNr?= =?utf-8?B?S2wrM0VzQjB2bnpqemxiU3c0cENWRmdaV3piTGNodTFZYStPcUVBeUpXRUJR?= =?utf-8?B?QmNpMWJEYUVkQ1Zqa3FYejQvOWZHYlJDVkRaUG1haWV0V3ZRTXhrVVZwczV6?= =?utf-8?B?SmJoZ3ZVRHIrdEhlSXdSeFVjSjhzc0VCdU5lakh6UzlIenlWWm9XZC9yVnBn?= =?utf-8?Q?TjgFq1hk/sMFx7VE=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee8ee7be-45c1-4564-006e-08df123bd3f4 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2026 08:40:27.9400 (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: ym+yd2L6RazdCdl7B048s2xjQlIsQbUaEieV8wRWWSON9e4x/kOLxRENXg4GisfkTyYjRFSMuERNff0vxSF/eNvXhmjeMb/9hOUdZIGFidY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB10916 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a01:111:f403:c20f::7; envelope-from=andrey.drobyshev@virtuozzo.com; helo=OSPPR02CU001.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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: qemu development 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 @virtuozzo.com) X-ZM-MESSAGEID: 1789375361517158500 The upcoming CPR support for vhost-vsock defers the full vhost_dev_init() to .post_load(). On an incoming CPR .realize() only sets up the backend, so we need a way to tell a fully initialized vhost device from a partially initialized one. Add an explicit 'bool initialized' field, set once vhost_dev_init() succeeds, and cleared only in vhost_dev_cleanup() (by memset(0)). Also add a public vhost_dev_is_initialized() helper. Suggested-by: Stefano Garzarella Reviewed-by: Stefano Garzarella Signed-off-by: Andrey Drobyshev --- hw/virtio/vhost.c | 2 ++ include/hw/virtio/vhost.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index ea17bf01080..a81cd94f900 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1821,6 +1821,8 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaq= ue, goto fail; } =20 + hdev->initialized =3D true; + trace_vhost_dev_init_out(hdev); =20 return 0; diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h index 94cc52f870d..7fe1a79d5a7 100644 --- a/include/hw/virtio/vhost.h +++ b/include/hw/virtio/vhost.h @@ -109,6 +109,8 @@ struct vhost_dev { uint64_t backend_cap; /* @started: is the vhost device started? */ bool started; + /* @initialized: has the full vhost_dev_init() completed? */ + bool initialized; bool log_enabled; uint64_t log_size; Error *migration_blocker; @@ -248,6 +250,18 @@ static inline bool vhost_dev_is_started(struct vhost_d= ev *hdev) return hdev->started; } =20 +/** + * vhost_dev_is_initialized() - report init status of vhost device + * @hdev: common vhost_dev structure + * + * Return true if the full vhost_dev_init() has completed successfully + * (and vhost_dev_cleanup() has not run since). + */ +static inline bool vhost_dev_is_initialized(struct vhost_dev *hdev) +{ + return hdev->initialized; +} + static inline int vhost_dev_set_vring_enable(struct vhost_dev *hdev, int e= nable) { if (!hdev->vhost_ops->vhost_set_vring_enable) { --=20 2.47.1 From nobody Sat Sep 26 20:52:09 2026 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=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1789375325; cv=pass; d=zohomail.com; s=zohoarc; b=PA7V+Nc7twLJvU5lE57tAtzfzHjNLFbyfTe46c4F4nJ0Ch8XtCLp3Wc4xctVwVlY0F2cHDe1veS7AXR1duM4D8+QztwYZ1sHr35e7r4hcAU5eVkDHpGfC5O/zFnWuTy7JHmObgmPAxdVfLmO0k+qz3DX/2rwzp59i5us36ohgjE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789375325; 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=LeGC7CB74AEK/eiT/E8MvqfnL6jhZMK/55Vo5DN1ZtQ=; b=NZeot+bcoZnnORXFzU0wb9+4OiDm9vsFtyOnA5FaU4f4dkA5qbb4h6BPK00wfeCRMG4M9Ao5QFv6+MtsaAp4gtbT0u6tuJSestjWtf0VfVCqPQtmMRczfdK/YJrsAWEYIN6HswcFmpBDL2YhAjhoLaWF0v72YKui5ARWR/c9xxE= 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=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789375325216517.5415855287396; Mon, 14 Sep 2026 01:42:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x62FW-0004Qw-9d; Mon, 14 Sep 2026 04:41:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x62FU-0004Q8-LO for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:41:12 -0400 Received: from mail-swedencentralazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c202::7] helo=GVXPR05CU001.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 1x62FS-0005Pw-Dp for qemu-devel@nongnu.org; Mon, 14 Sep 2026 04:41:12 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GVXPR08MB10916.eurprd08.prod.outlook.com (2603:10a6:150:1f7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7; Mon, 14 Sep 2026 08:40:32 +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.0428.004; Mon, 14 Sep 2026 08:40:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pTSqAVf8RUvsB/eUI6/rSEjtk7OBnL5iey9kG4DtxiDVVK3t4iPmghp2SkQ4A2XeyNfpGSb3yFLaiMvs/pEMYtwl+0EqNEJrmEtlnYNAw1v7922UFrvsauzdC2yiifXiR+P6zs/GH09URvraPoARrdC8BwPK23OnysUleD5krRZl+iP94IeZXltiVoOw+vYmPfQDuLpx0CxZJT6gc2VbI1xnr46hyWC0o50V4c8FDkpo82l1RBWEwpnud02qaF5r61A3YiT+Ehu5j4d9CohoTDWUkh4GlzrjG8jgk8Rtq+v9d3FZcUE6FToP6KUGCv0DaaNJmELGCt5TMo771zUSPg== 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=LeGC7CB74AEK/eiT/E8MvqfnL6jhZMK/55Vo5DN1ZtQ=; b=ip5GuE9dmkM8fTqcshd4qM9s3M/3PCTC7CzDdKb2QVsnm2eWub6+qUT2CbRImTJTNjXnXNS1AvDM3+vmt71o6vgd3vldYGo98P5FYTDUzfo07rID+HaYH9thTh+NpHPhChUXAvg7+7/uUBWPxQrPtHcXUd82qBh5B1PcLZWbsWgwCJ7EetAL4GoGGNCA/y0ajUJZ/v925trim9SlF535jb805i/ljXesDVKnf5PsMzcyLKfvOnIYfqZFu/cYHIflfTsNXVPAt0IEa/fxsZEve6FOMLlgwMlNyl8h7rb5RTVFSMRHkYdYhpXZ/Hm2j4i5eJbMHVdS0EhmB8loqs5zQA== 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=LeGC7CB74AEK/eiT/E8MvqfnL6jhZMK/55Vo5DN1ZtQ=; b=XD4RG0bHdpYuC3f5LWBGf7AQ+0DwzarFmiCwQ0Kd007h8fvwqLSapEnwyUc/SZ+JpziH2hzemDlXZgDSexC3eLKwg6jtT79eE8Vx7jS702aYssXM199qvpKTl+JT3Ghr3Ym46pn3AlXzbY8lpZHE398d6GyAXCas4hde9dsIH2qa+QXD69HCJToj0KQuJY4yDRZZvvf8tMRh5QcD1It/botA5r6ZGrSCa6Nmi1lwEV/xWUc+Dxd34f09bauGlVYDaeZ9IvUBvIEQvlTKkywnCaLSvQDZb49l/Z9h9f2BcDEYV+0Ca6cS4Hi7Ww6mwK94o36cmTkJw1RfpwzWTM3WXw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev Date: Mon, 14 Sep 2026 11:37:45 +0300 Subject: [PATCH v5 14/14] vhost-vsock: hand off device ownership across CPR Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260914-up-vsock-vhost-v5-v5-14-d17423589f48@virtuozzo.com> References: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> In-Reply-To: <20260914-up-vsock-vhost-v5-v5-0-d17423589f48@virtuozzo.com> To: qemu-devel@nongnu.org Cc: mst@redhat.com, philmd@oss.qualcomm.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, farosas@suse.de, peterx@redhat.com, clg@redhat.com, andrey.drobyshev@virtuozzo.com, sgarzare@redhat.com, dongli.zhang@oracle.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIXP296CA0028.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:36e::13) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB10916:EE_ X-MS-Office365-Filtering-Correlation-Id: f6d9ab01-29b3-43f9-4695-08df123bd44f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|10067099003|6133799003|22082099003|18002099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: 0A5N9rtaHgWdO48Pa9aC2jmshN10c78248dgUKgpFdU+Q+r2mmuDrOciYv66Dec0zRG7IhUbs5KEsRppenrZcxwOYBa/Up8hoWM1HChFfTcOFUY8POyk56SWhTEzne+BR3sLRGM6q+jRvOsZ+8SFA8bEAJxlgwimlcc1KFN/YGmHfU0W4UPcczs+zwJVr7nRbVAr/MrVNoNKAkXeXAokWbYaERecupOq9KBGzTlDMnpFnMbJTDgHUvTtSOFCT3qf7JTijyGeIIvJp+OpFsfC2FACrrT4/rrpLOpmFGkRFKwKUyGPu8nTDo/XiAktsSGi94LN3lvLSJv+UcVPo1RgkfVIVTLwuZbW1UIHE5xO4fLPVQdA6Sj5vvxrUf0EHBI7ehA2/v6gkcG1m6UjCZaTndunIX9nhUH/zme0lNy1+LLaVlRWJ5/zYHASsWLS21JuZMjAPjUekV75EvOKe0VFUzbcxS/JNh+hRSzwv62BcTzDUjuOiho9+nz/mRK7gvJzU+NpnMnn4JfaB5pBcpTVaIPUTh3rXdIEGnSTg1ucy6udsaNLldiQikA2NY+boW8dBvsoUdOJZ8YS3T2AWLy9RrrEpEw6JIIDJEAaqSCVkThIbBCzDgfiQW9fmIHHJUaMtkxsGRI28/+q1KqwN797/tTULJ5+BFWsELdwPKFxxR+eMD5zlNhkS3UCSN6xIoCe9vXk/PQLsMMJ722N9xvOTBXPUfO/VLyU9yK8bAW9u4E= 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)(376014)(7416014)(52116014)(23010399003)(1800799024)(366016)(10067099003)(6133799003)(22082099003)(18002099003)(56012099006)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RGswbVdiT1c4SFBjdi9TaFYvTWJHcE5iTGdNclhMazBBK1h5MVhkU29QZE5v?= =?utf-8?B?L1V5V0MxeXhGZkFpYnpESUxWeUNXWWp6RGRud3VXdWIwVS9jNHVGbzlTU3Fv?= =?utf-8?B?MUtNZk5qZnpxUTBmUXg4MzBEVTVyNkd3ZlN4Rnp5S2JFVkd5aDZOTUQ4dmlM?= =?utf-8?B?czhWQXgzZm5nZ0ZMMy9mcHJGQ1VIelQ0RjdpN0hFdHZoaHl0OHJDSzltV3di?= =?utf-8?B?SGs4NW1UbmxvRW5UdGthL3c2dndzbnkyaHVmYVJMU3RkQzZyNGZLNUhyL1dF?= =?utf-8?B?YTFkdVJwS0Y1T04yMmR1N1plcTVTSXUrdm5EbFpJZmdvd2NRT0MvWURQbWRJ?= =?utf-8?B?V0kwUVJzRFpzS1RTckVsTXh0aFZUQXh6Z1FSSTc2WjlFelBPejNoamkyTVlm?= =?utf-8?B?Rm1NRDV0SW9FZTNuVTNyRWdzWkFqK1ZZdmpBS05oRVpkL2QyaWkranV5c3Y1?= =?utf-8?B?ZDNOUDdraSs3dkdPL2N3Sno0SUJwRFlNZXVHM3d6OXpnazNXVE5pemU1aUU3?= =?utf-8?B?VGxDQnBLYm5SdFR5bUZsWnRLRTdNc0g0WEF0T1FNM3dhQ0dHNkxLSDRvRlRk?= =?utf-8?B?cGJsUVhtUE9SbW41YzR4cFVoK1p2N3N1ZmlNUjlWWVpxaWNNQzI3RUx2cEhp?= =?utf-8?B?TE1qMGZvOWlTaGhXeDU3alZ4TjJTTVQ2UkdMWTBvRUNqbjAvQVlyby9XTnA2?= =?utf-8?B?UWRqZzNHcklOV0RDRGhqWGd3RkE0RFBubURmdmhvVEdkWVpQYVFpZnJJWENK?= =?utf-8?B?eTRxY0NJemdsWjVIcUEvOVIwSGQ1M2JZNi9IajNVbVlJWjNwTk5rVVY1amNz?= =?utf-8?B?L2lPTUFNVUg0a0RFOXh2dEIxN0pUd0JSRjRhR0xoN1BSWmlKTlhxdThXL3hN?= =?utf-8?B?aFR4T0hqTTJPNDc1WGhMNTljWTlsYThRajRHVTViaXNwNTk2ckN2MnB2TUlP?= =?utf-8?B?RFMrckxObGpuSXNGZnpYZmh2dWh1MjU2anNqS2p0dkNSbWhHbCtzTFlkbi9t?= =?utf-8?B?enNTeU11Tm1sT3RQZkdxZllmYnhjUVJqTWhBWEZRUWZHeGNHR0tRZjRxMkFn?= =?utf-8?B?OUx0aFRzd1BFQXdiZ3JhY0x5UUV0NDgrYjNIcmo1WkJJelpXUzRhNGZOcUFS?= =?utf-8?B?UXRsaERuc29ZWUZHOWd0S1dXakJSVXRUblNVWVEvQzBWYnA5Q3pwSEZJcWpO?= =?utf-8?B?akpxWHZlWGVWQTNhR3dCU0k4QzJWQU5wdDhzSkJMY0picFJIdkZiUnlWS0hu?= =?utf-8?B?czRWY0xLdVdjbGFCaEFRR3g0RHNIK2FtYk1xVEoxZWFLWVV4MDRXN05VVVpa?= =?utf-8?B?Ni9JbXVqVk9laStPWmJZeGZybXM4Y3JlWDFTMVVTdWN4REcxODBRMlUyNm1O?= =?utf-8?B?OXZLODVJS2VzTWI0TzFIWlRrRWE1TmR3TTMvWTI4QWgzT09oRURPZHJnVTZE?= =?utf-8?B?Y0hTU09SdjVTOWJBWTVSNklhTkkyeFhGd0JxaW1HMjNCU2NOdFJMRExjM1BJ?= =?utf-8?B?LzF0bGZ2dW5pUlRzYkdHeTJ3a3ZGQ1FqM2tYcm05Sy9MazV4MGN3cjRRcC9a?= =?utf-8?B?WS92RTRkR3plODk0ZFBSS1oxR3cyaVlWN1ZxNFM0UlNJek54OXpLSE8rTStk?= =?utf-8?B?RldSWlZMZDVSa3k2a1lGWVhVT2Z4SXBVUHhRZXNvMThrSEtvbG1nbTJYeUV4?= =?utf-8?B?Mk0xYXlFSEJrMXYwdGVkNWpOUllSUFAvcDFubWFKWVRpd0REZHJocGpPNG5t?= =?utf-8?B?OEpQbzRNUjNGakU4dHJkaXpZWEJCOVoxcjJEemZ1elB2WGxSWkxUNlpSai9L?= =?utf-8?B?ZGhxWkE1Kzc0U3N0c1ZCM29ud01nUFN1bEpNNlNkRFNRckhKZ2U0TEV0YTli?= =?utf-8?B?YlR5OEI1U09SeVliNFd3TlpNUzJmOFYza3RGaXpHNlNnNVRGUUxMQzJoWGll?= =?utf-8?B?NWJmNlNPSmxicFkzZVUvWHljMW1nT21DT0J3cFFYVlBOY1ZKdE9tK0h3VHR6?= =?utf-8?B?V1UwTEgzSWloSklSeEFnaTRhMTJJTW9jNDVaRVZYeWkrOEJkRFRJZmxmMVdX?= =?utf-8?B?ZlFHbXdCSzlaY05iQmtCNFB6VXQwdDFVUklWVkMvYVg2K3F6cjZBNHhDNzVB?= =?utf-8?B?QVFHcE1KTnBHa1ZYcnUvWWlzeUp5cVkwc0VMTm5MazEvRC9BMGlSZks0Y2cv?= =?utf-8?B?Z1pEZ1N6dlgrS0xYaWpaRjJpNVdjZkpvaGpjMTU0OXY2THZNR2VWSlFpMmFS?= =?utf-8?B?RXoxaXZVMTJqakEwWWZHKzVnbkI1TjFnY0xCZWhOSHNZaFBoYmxSWm5pMUhI?= =?utf-8?B?dFhuVHFyb09PM0VJMnNQS3lYbDhsYVhaVm4xQ1FhU3pKbVJRUHRxUkJ4OXBE?= =?utf-8?Q?aw5SaV4KgRwYkOaQ=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6d9ab01-29b3-43f9-4695-08df123bd44f X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2026 08:40:28.6378 (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: GNk0y4yv+5eC0TFe+0zUF6hC+/juSfmbCpAdYHVsGingtSgr+90V+B77Jj5tr7JJbEd7fuVsNez2KCntaXyCR30Mt3wHNSxoPvNPbc7LX9M= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB10916 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a01:111:f403:c202::7; envelope-from=andrey.drobyshev@virtuozzo.com; helo=GVXPR05CU001.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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_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: qemu development 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 @virtuozzo.com) X-ZM-MESSAGEID: 1789375327400158500 The previous patches reuse the source vhost FD on the destination, however both source and target still call vhost_dev_init() (VHOST_SET_OWNER) in realize(). For cpr-transfer the destination realizes while the source still owns the shared FD, so its SET_OWNER would fail - ownership has to be handed over explicitly. Do this through the device's CPR vmstate hooks. Namely, release device ownership in pre_save, reclaim in post_load, re-acquire on restart: - .pre_save() releases ownership on the source (VHOST_RESET_OWNER) once the VM is stopped, for the FD-preserving CPR modes (cpr-transfer and cpr-exec). - .realize(), for an incoming CPR, only sets up the virtio device and queries the backend features by calling vhost_dev_init_backend(). It doesn't take device ownership and doesn't touch the VQs which still-running source might use. The full init is deferred to .post_load(). - .post_load() reclaims it on the destination: the full vhost_dev_init() (VHOST_SET_OWNER) on the preserved FD, plus sets the guest cid, before the device is started at vm_start. - .set_status() refuses to start a device whose init hasn't completed yet (incoming CPR before post_load). - .set_status() re-acquires ownership before starting the device if pre_save released it and this QEMU is about to run the guest again: the migration failed, or it completed and the management resumed the source (e.g. cpr-transfer target died). With the handoff in place, lift the CPR blocker: only ID-less devices, which can't preserve their FDs, remain blocked. Note: this requires kernel side support of VHOST_RESET_OWNER operation for vhost-vsock. Otherwise CPR attempt fails in .pre_save(). Suggested-by: Dongli Zhang Signed-off-by: Andrey Drobyshev --- hw/virtio/vhost-vsock.c | 159 +++++++++++++++++++++++++++++++++++-= ---- include/hw/virtio/vhost-vsock.h | 3 +- 2 files changed, 144 insertions(+), 18 deletions(-) diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index 203055354ae..e3d83815ed3 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -77,14 +77,46 @@ static char *vhost_vsock_cpr_name(DeviceState *proxy) static int vhost_vsock_set_status(VirtIODevice *vdev, uint8_t status) { VHostVSockCommon *vvc =3D VHOST_VSOCK_COMMON(vdev); + VHostVSock *vsock =3D VHOST_VSOCK(vdev); bool should_start =3D virtio_device_should_start(vdev, status); int ret; =20 + /* + * During CPR, on target the full vhost_dev_init() is deferred to + * post_load. Refuse to start a half-initialised device rather than + * issue vhost ioctls on it. + */ + if (should_start && !vhost_dev_is_initialized(&vvc->vhost_dev)) { + error_report("vhost-vsock: refusing to start, device init incomple= te"); + return 0; + } + if (vhost_dev_is_started(&vvc->vhost_dev) =3D=3D should_start) { return 0; } =20 if (should_start) { + /* + * vsock->owner_reset is only set in .pre_save() on CPR migration + * source, after a successful RESET_OWNER op. If we end up here + * with this flag set - that means that either CPR migration faile= d, + * or we got 'cont' cmd from the management (e.g. cpr-transfer + * target died). In either case, we need to re-acquire device + * ownership. + * + * On failure leave the device stopped. The next start attempt + * (guest driver reset, VM stop/cont) retries. + */ + if (vsock->owner_reset) { + ret =3D vhost_dev_set_owner(&vvc->vhost_dev); + if (ret < 0) { + error_report("vhost-vsock: cannot re-acquire device " + "ownership: %s", strerror(-ret)); + return 0; + } + vsock->owner_reset =3D false; + } + ret =3D vhost_vsock_common_start(vdev); if (ret < 0) { return 0; @@ -115,8 +147,44 @@ static uint64_t vhost_vsock_get_features(VirtIODevice = *vdev, return vhost_vsock_common_get_features(vdev, requested_features, errp); } =20 +static int vhost_vsock_pre_save(void *opaque) +{ + VHostVSockCommon *vvc =3D VHOST_VSOCK_COMMON(opaque); + VHostVSock *vsock =3D VHOST_VSOCK(opaque); + int ret; + + ret =3D vhost_vsock_common_pre_save(opaque); + if (ret) { + return ret; + } + + /* + * Release the device ownership now for CPR migration. The device is + * already stopped at pre_save, and destination reclaims it by calling + * VHOST_SET_OWNER in post_load. + */ + if (cpr_incoming_needed(NULL) && migration_is_running()) { + ret =3D vhost_dev_reset_owner(&vvc->vhost_dev); + if (ret < 0) { + error_report("vhost-vsock: vhost_reset_owner failed: %s", + strerror(-ret)); + return ret; + } + vsock->owner_reset =3D true; + } + + return 0; +} + static int vhost_vsock_post_load(void *opaque, int version_id) { + VHostVSockCommon *vvc =3D VHOST_VSOCK_COMMON(opaque); + VirtIODevice *vdev =3D VIRTIO_DEVICE(opaque); + DeviceState *proxy =3D qdev_get_parent_bus(DEVICE(vdev))->parent; + g_autofree char *cpr_name =3D vhost_vsock_cpr_name(proxy); + Error *local_err =3D NULL; + int vhostfd, ret; + /* * Only reset vsock connections for non-CPR migration. For CPR the * guest cid is unchanged, and the cid-change reset would otherwise @@ -126,6 +194,35 @@ static int vhost_vsock_post_load(void *opaque, int ver= sion_id) return vhost_vsock_common_post_load(opaque, version_id); } =20 + /* + * CPR restore case. The source released device ownership in its + * pre_save. Complete the handoff here, before the device is started + * at vm_start. Init vhost device on preserved FD, issue + * VHOST_SET_OWNER on it, and restore the guest cid. + */ + vhostfd =3D cpr_find_fd(cpr_name, 0); + if (vhostfd < 0) { + error_report("vhost-vsock: could not find restored vhost FD"); + return -1; + } + + ret =3D vhost_dev_init(&vvc->vhost_dev, (void *)(uintptr_t)vhostfd, + VHOST_BACKEND_TYPE_KERNEL, 0, &local_err); + if (ret < 0) { + error_report_err(local_err); + cpr_delete_fd(cpr_name, 0); + return ret; + } + + ret =3D vhost_vsock_set_guest_cid(vdev); + if (ret < 0) { + error_report("vhost-vsock: unable to set guest cid: %s", + strerror(-ret)); + vhost_dev_cleanup(&vvc->vhost_dev); + cpr_delete_fd(cpr_name, 0); + return ret; + } + return 0; } =20 @@ -137,7 +234,7 @@ static const VMStateDescription vmstate_virtio_vhost_vs= ock =3D { VMSTATE_VIRTIO_DEVICE, VMSTATE_END_OF_LIST() }, - .pre_save =3D vhost_vsock_common_pre_save, + .pre_save =3D vhost_vsock_pre_save, .post_load =3D vhost_vsock_post_load, }; =20 @@ -149,6 +246,7 @@ static void vhost_vsock_device_realize(DeviceState *dev= , Error **errp) VHostVSock *vsock =3D VHOST_VSOCK(dev); DeviceState *proxy =3D qdev_get_parent_bus(DEVICE(vsock))->parent; g_autofree char *cpr_name =3D vhost_vsock_cpr_name(proxy); + bool cpr_incoming =3D cpr_is_incoming(); int vhostfd; int ret; =20 @@ -164,19 +262,21 @@ static void vhost_vsock_device_realize(DeviceState *d= ev, Error **errp) } =20 /* - * CPR migration of a vhost-vsock device is not supported yet: the - * device ownership is not handed over, so the target fails to set - * up its device. Fail the migration early and gracefully instead. + * With the ownership handoff in place CPR migration is now supported. + * Having a unique ID is mandatory for FD preservation during it, thus + * we only keep the migration blocker for the ID-less case. */ - error_setg(&vsock->migration_blocker, - "vhost-vsock: CPR migration is not supported"); - if (migrate_add_blocker_modes(&vsock->migration_blocker, - BIT(MIG_MODE_CPR_TRANSFER) | - BIT(MIG_MODE_CPR_EXEC), errp) < 0) { - return; + if (!proxy->id) { + error_setg(&vsock->migration_blocker, + "vhost-vsock: device ID is required for CPR migration"); + if (migrate_add_blocker_modes(&vsock->migration_blocker, + BIT(MIG_MODE_CPR_TRANSFER) | + BIT(MIG_MODE_CPR_EXEC), errp) < 0) { + return; + } } =20 - if (cpr_is_incoming()) { + if (cpr_incoming) { /* Reuse the fd handed over from the source QEMU. */ if (!proxy->id) { error_setg(errp, "vhost-vsock: device ID is required for " @@ -204,19 +304,40 @@ static void vhost_vsock_device_realize(DeviceState *d= ev, Error **errp) =20 if (!qemu_set_blocking(vhostfd, false, errp)) { close(vhostfd); + if (cpr_incoming) { + cpr_delete_fd(cpr_name, 0); + } goto err_blocker; } =20 vhost_vsock_common_realize(vdev); =20 - ret =3D vhost_dev_init(&vvc->vhost_dev, (void *)(uintptr_t)vhostfd, - VHOST_BACKEND_TYPE_KERNEL, 0, errp); - if (ret < 0) { + if (!cpr_incoming) { + ret =3D vhost_dev_init(&vvc->vhost_dev, (void *)(uintptr_t)vhostfd, + VHOST_BACKEND_TYPE_KERNEL, 0, errp); + if (ret < 0) { + /* + * vhostfd is closed by vhost_dev_cleanup, which is called + * by vhost_dev_init on initialization error. + */ + goto err_virtio; + } + } else { /* - * vhostfd is closed by vhost_dev_cleanup, which is called - * by vhost_dev_init on initialization error. + * CPR restore case: only learn the backend feature set now, but + * defer taking ownership or touching VQs (the still-running source + * might be using them). The full vhost_dev_init()/VHOST_SET_OWNER + * is done later in post_load. */ - goto err_virtio; + ret =3D vhost_dev_init_backend(&vvc->vhost_dev, + (void *)(uintptr_t)vhostfd, + VHOST_BACKEND_TYPE_KERNEL, errp); + if (ret < 0) { + /* vhost_dev_init_backend() does not close the fd on error */ + goto err_vhost_dev; + } + + return; } =20 ret =3D vhost_vsock_set_guest_cid(vdev); @@ -235,6 +356,10 @@ static void vhost_vsock_device_realize(DeviceState *de= v, Error **errp) err_vhost_dev: /* vhost_dev_cleanup() closes the vhostfd passed to vhost_dev_init() */ vhost_dev_cleanup(&vvc->vhost_dev); + if (cpr_incoming) { + /* The fd came from cpr_find_fd() and is closed now, drop the entr= y */ + cpr_delete_fd(cpr_name, 0); + } err_virtio: vhost_vsock_common_unrealize(vdev); err_blocker: diff --git a/include/hw/virtio/vhost-vsock.h b/include/hw/virtio/vhost-vsoc= k.h index a964d57e1bc..c5b9a488f3b 100644 --- a/include/hw/virtio/vhost-vsock.h +++ b/include/hw/virtio/vhost-vsock.h @@ -29,7 +29,8 @@ struct VHostVSock { /*< private >*/ VHostVSockCommon parent; VHostVSockConf conf; - Error *migration_blocker; /* CPR migration is not supported */ + Error *migration_blocker; /* set when the device has no ID */ + bool owner_reset; /* CPR released ownership; needs re-acquir= e */ =20 /*< public >*/ }; --=20 2.47.1