From nobody Fri Aug 21 21:27: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=1787226069; cv=pass; d=zohomail.com; s=zohoarc; b=YajIdN0LNFpH0hps6s618W/0pc9KH7owTunl5tqceTMI4BvqPNm1m5hRILRlQijoQEh3Zw0FW0P9i/Z5DG+DCvK4vgqLdrYybahJawBQ60nLIgqmntR2/A4QWyus3FwoGrEzrZjFTdDob+wg1rGvIQG/lZtC/vjKX3zz1wwrPrI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787226069; 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=vYmC7sNrXNkqTVZh2OoUnq1ub59oVvPZrx7QwCf1rfw=; b=iZsqJ76+311qpKBWURQtx3Nass8W8fM7r3LPq666/8gPIAvH5c+aSSSErdCPazEWm5ug8BDoud6AbAgTbCjDm8C0n+DHsoDhCo5lN9hhUrYxTY8CCOmFFB8UQSzRPJ9E2RWe44q4x2rZ8BrjzcfrOKhC3BtjnbAE04mEU/HQJUc= 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 1787226069307948.4261348569834; Thu, 20 Aug 2026 04: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 1wx182-00016i-TN; Thu, 20 Aug 2026 07:40: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 1wx180-00015r-GO for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40: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 1wx17y-0002G4-SI for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:12 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GV2PR08MB8413.eurprd08.prod.outlook.com (2603:10a6:150:c3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.8; Thu, 20 Aug 2026 11:40:04 +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.0339.007; Thu, 20 Aug 2026 11:40:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iuVpHiD/MgmWT74gizyXrW3U3L9amRmAPgCLOltRsfp0cl40XPGhcAYp2KSzedEvO4ibSiqDNC7jxIWRPwU+uaDz8HoxBt8UJNR4i97kvtpV871p0OBa6nmX3Q2ivd82ZaOG/Yb3LNOtMKnjPdd3Obnf0XMnyKJz9R6m0ko29jYh04qyWoCl6c74CCFsHIXJqImEYrCUmGir4pKBGwLuOfZ/woC+KtUJlsuhv6HXISsqPgVLQPAKm+SlYRosoBDSxbEQow1paD/4XMAC8sn+0P3vZTW1CSSjzBi5b/uSSTLsIfVutUL/EXOkdFx14SLiuFtawefLpapvRvA3is60/w== 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=vYmC7sNrXNkqTVZh2OoUnq1ub59oVvPZrx7QwCf1rfw=; b=AkAcJXE/g5hwYgpoYgtOFviSCuBOuNrblh8QYr9WErgHIFcPG2cilFpuCkN9r5MgzHqRWqkD5mW5Ql0KZjaMddxXktA/IN6+RL3EzIXT1jAZbLwQTrV/acwcsJqO5S3Gd8oqsK0e+/l03+sjj/z4+QGKhODwUA4K6SDF4kOQqv1/HS8v3O+7jtrTR0GzdLa4GlmDlh24iRMQYf+xbUYm7uW5QlNF01P38p5/S79ekJH4ViXillrHO/IjNwOJbCiwO2xCiS2EWKfj2lPiGh9abRBvmwz9JM3TbA0WxowQX9WBOHCENLYDZBv+6Mk7W3Auri2LzhxQLlz9ntjeJeiCLw== 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=vYmC7sNrXNkqTVZh2OoUnq1ub59oVvPZrx7QwCf1rfw=; b=mBIiqQnbLmUy0rHuphkiM8bTbzkFNVG44HNDCnIjhR87r2q3G+KINPma+NM7FVO+VZaPlMF14GqMVFmyHrT/xALVI43J014e44xzhGhEBa/b7v6jayQd9ivbpp9UZUWkzXCNBz9s9bYNhZRkFcvknd+M6RuDxhys0i24cRXjviHpluXPQd4cviAPLn49TkR04V9va8fEm19BhjYRFzkPqWd8viZ+teODu/LCB464fj5BVpD2Av3L7jjBvRkxIf42JfMBzUOHQc+9XL+qCqu5yYhYniCYr4PPaSOU+KSz99KhN76BIocbtBfzmJFpvDA7z2BHUsvYMxVBYndFqyy16w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev To: qemu-devel@nongnu.org Cc: mst@redhat.com, sgarzare@redhat.com, farosas@suse.de, peterx@redhat.com, dongli.zhang@oracle.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, andrey.drobyshev@virtuozzo.com Subject: [PATCH v4 01/10] vhost-vsock: block CPR migration modes Date: Thu, 20 Aug 2026 14:39:46 +0300 Message-ID: <20260820113955.509478-2-andrey.drobyshev@virtuozzo.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> References: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: VI1PR06CA0102.eurprd06.prod.outlook.com (2603:10a6:803:8c::31) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GV2PR08MB8413:EE_ X-MS-Office365-Filtering-Correlation-Id: cfa85aca-7ae9-4e11-ed55-08defeafc696 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|38350700014|56012099006|10067099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: 2sfe5i0WdM4MCTx4/iFCMygNcAMaiew8ZN3BQWi6Bk4h0b+9Q4URisU4GeLyPFuRSohmrj7CZQEVoXzZFRUCw7C4SKCHKvcEsvNcxI3T4ggRLaqh0G5/xbblFbMGSso1rb3ugjm2XGb7QHrL3Vac+7frMFLNYDh/92GcMd16/XH9yPUp2Hj7dS5eshw1LBVYlEYJH6HB3n+Tbdm9IOi4wM5TUGqdgYZEFxAUlr5F7/E2Frv6UeZTxrsViQI4X/0xtKyzREeLqmJ7WCoh0DFfZlsklz+f8ZEdasOKjiplFnMROn74V284dkRguGiReaMIIhmUFy6DsNP/ubRukdft/ZdBkLepWZuKcvfIKq0/Fr95xTKpH8r9HNNjjZx/n0KBjNa+MElLkqpNswktmpb41JZTzt0YSK8QVAlGGc8RuU3SWQVQKF7FdiaKgMlvzhhRDm9QqMNlyHp79vf0YaUu/7ZYszD/yBepIUH1gQZZ6h0qOYczyKVTmLtz2/VjoYXkSjZPNukBHRHd1IwKPoUDOxFVXbIrFyXoxvNACLnTvlRQ99pbdJvsb4Q0qjjbbH1ESzXWJWPyyVdx+zF03jHh8AaiaeuxxFNe06AvyKLSRHWhcbkePufnnxIlnjwo90Bsyxon621cK5uXwjC1SVuIuCNreGaO7sIzuVq37GqPM+M9NfeTtNCbhvXfShgpWwT/2K6PPfGmCFxRUYEtjxmDs2s3RKPQ5qJwk4bojwwpWpM= 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)(38350700014)(56012099006)(10067099003)(22082099003)(18002099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SDM8WXu6cOXmb5Ew0EFc/Q4QUZymDxuai6YZD+sheua1FOnzSSL8HsyvkB7c?= =?us-ascii?Q?X6tnH6N5dswArOnFVf+1/xvUljSQI7qm06ZHhVeLjxXqMP+NzHk0dr/uujkc?= =?us-ascii?Q?U62S5mFUDk2G4WGyQSGEI/OPoKWFM4IFtOPZbGo1STOU72LH1rSR6Yv09tzr?= =?us-ascii?Q?uBshQgNbtRY3CuLTGV7avH26RRRGuR6qrEzw3dXeR/8QLnGnMVEjJSDC/hnr?= =?us-ascii?Q?rNXqyuHXVkDdmXvpg0MvCw8NsWH+/XB2mVenf9tOgGHhaCY8H0LuqhFMMSQ+?= =?us-ascii?Q?8yXwQciXleG0si4l86NJrObG9QpVhwmqHPDQPBYQzu1abbPmzyMv6nGkO33G?= =?us-ascii?Q?3iOV3xLsRRzi5vKZv9iPOI3Ih+hEPktTnTw+WnB2wvCjrKhgFwMJMSwwLDiZ?= =?us-ascii?Q?LOVozUdlFyaLVMQH/F3MBgtkB8f8koy8O3ri3gJ3dJdPA8ENqQ//PXRVeh/O?= =?us-ascii?Q?BxpnAnn0aJHQ25wNdcB6S+Wo8uOKO6N/QHC9z9HmAShApHzJ3/a5u3V+YEb5?= =?us-ascii?Q?j2IqaV/j72MFO4z6dUyNeTJcq29EqYDiAwCLnGOKYZ2vPUT8sURIGUGQnOiu?= =?us-ascii?Q?h+cnRAK24Do7tbY9jhW5xJ3u0p7xXx+jaGXXnTqR8gHB50i7DGr3ZsAnK1+x?= =?us-ascii?Q?EBVULF6MGZEFFrg3KkSp6oWf45XDQfWG8lcvFc0TKmcBSuXo0Bywt7fSDwKP?= =?us-ascii?Q?deksj+a4jG0K/DEb9mh821GYz69TCHyA/bnu7OoATLq8ChbD3VbAJaLH6d2y?= =?us-ascii?Q?2dxI9iSGgRCt57RbygLeCsoSpiLHRnQAvbI4+ENIc7wSSEBcMoUxQE35tlHu?= =?us-ascii?Q?6IYWm0p2AFjOC73f5w9CPnPuRw07ZXruoy+f7lWEd33NXaYkn0sqs+cHCEb7?= =?us-ascii?Q?xGiF8r8zDaZGm43soyWqHEn0rpTDlnvh3sumW+lhzjw3KoSWsrRlh3Vizl7t?= =?us-ascii?Q?Q11+bUmdShJSTrJzaEexHSqidehpbUyKzJ8zz1/7L5IQSA9j50ZxSKYgmt9P?= =?us-ascii?Q?oQYwn5xYqqik/3WZuGxV94z5Ar9NFIQg5YlrdaxAF3JxBTAQs93jxtyZDq1K?= =?us-ascii?Q?oV/dTich5yjCfnSTrYFg62CRIg1Wf9p/ar4QizdDJESXCzAEMll9FSH4EFgG?= =?us-ascii?Q?SX9aOwXTiV2PvfCDGzGKd+y3ZsFDrWohFaMRKdxysyywr1bWue3XzGk3mSZT?= =?us-ascii?Q?Qccpe0U8ZIXslzuHqEvyRYdwqk1T/GY3BPO4BJEKzJOzyURgSaYjXpQaAYc0?= =?us-ascii?Q?mc83HJ3zE6kz0dr0Fot8p41UJiUgNcrpA7f1xmuwNvxizGBZZjQqtFOEFjcJ?= =?us-ascii?Q?jZAgZbF12HUJ84+/WXr3KwBLKZrH0LnVHBt3sRpELTPjlHQ1XfKlawwpROyN?= =?us-ascii?Q?cMq5xexDKE9Qs8XqJo9D7p64zIYncR9azagmR4pKBilJD6Iod64h3YVKqon4?= =?us-ascii?Q?6tW9qjRYtXpS50jPjhT9XsjoEhCP3s/jpNGjyz3ZBoAOQjSbcgw0Rl56NX82?= =?us-ascii?Q?NRZBPccj0gMVOQsAEymCWWw8u0h/0t1FGSvYKPsPGfSRFaDQbPoEhq6ueo9p?= =?us-ascii?Q?GWoyq0J52BuFVpqH9WtjKIJNmM1gzB5zHR/9nRwOWQ3uKbIKZFmIS5rj64Y5?= =?us-ascii?Q?baVLHVR18v8r27iVSo9tkKO0erlSX5AGhPddraI0eGxJAWuSwBa8Psb2DSTT?= =?us-ascii?Q?gXiEDP1TqOBkbNsmQO0K83tebCI0W5BonYtdIu3xJDGUFwcIauc8m3T/yKwN?= =?us-ascii?Q?gB8yviArUcawd1+YjspGcPUDG+sEzF4=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: cfa85aca-7ae9-4e11-ed55-08defeafc696 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2026 11:40:03.8719 (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: CaKGh5e3s/PS4y3qNlK8hp8Az5BLczMhlK9JwJTQ+9NHwtnnWfeJ41QCBoJX9ZGJlU9d1bff4w8UNikVW0kzl/M0Uywc+ptT+PpI452LxIE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR08MB8413 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: 1787226070825158500 Content-Type: text/plain; charset="utf-8" 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 --- 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 Fri Aug 21 21:27: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=1787226100; cv=pass; d=zohomail.com; s=zohoarc; b=IVTn4gh6WkdP7uARJTlaoYvXxoEWMm24jFlyfJ5tx7I6yTXYW+aCinsgpxMEPdue1ubKdu8qPxS2cHSWpcvw9l/wW02b6P0UkfJwMx/UNsxHdkdgEMGLyGISSfvMKxWyr98RHjzqspu7YvuFeLevv4CsI2h0wVvu9mf+59+4Adc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787226100; 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=npRP9gTgJjV9KV93DFJ3LdmwFuvgUWpk6hh4lgfcpQ0=; b=VB+T59V2kmUD9iM249r/MjOufsCwA3gv6kEHPw4lUKMMqthKeDJYaOHip5C79F+C+qIuBTNaib5x4j4nawqYrZPhjBDqgOrFJjGUEaZD4icid8dQMxx5zhlQUuAr1NFJGF+/JQZfqEqrpckZYo8gJXToMPEg+gyqM+C/zCkwTns= 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 1787226100041519.9790586227734; Thu, 20 Aug 2026 04:41:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wx188-00018t-05; Thu, 20 Aug 2026 07:40:20 -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 1wx185-00017c-Bd for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:17 -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 1wx182-0002G4-MS for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:17 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GV2PR08MB8413.eurprd08.prod.outlook.com (2603:10a6:150:c3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.8; Thu, 20 Aug 2026 11:40:04 +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.0339.007; Thu, 20 Aug 2026 11:40:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=g9GT65aKcTPimSFurMG6lCI/N+Z+GaBgkbQBYxxmC2+F4k9ZJN6knyH25eCgcss/f718JKgx4ShZagDdS0FrGc6IZrKCMbVMPbDaftekPG5s7+uWe1oD1s7+nN0Af4RNMd8EGYlZn69nysZvWmIYtYaW4rCESaXfR5FVtSpSLxfUXqZSsYoYIh6ifaD58m8dx2eEHczYSOnZnXsdb/ebu1PIlO/YcooQ4rX3jyUrGckdSwf0ELFu3HNUP2NaCMuE4R2infHUiziiTPC7Sda0aOXqZRJJozbyGVOJlKa5eLCsDh3PuNF05DS06Zeru+Bh/lYAEY7L3rS3U7mI+H10UA== 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=npRP9gTgJjV9KV93DFJ3LdmwFuvgUWpk6hh4lgfcpQ0=; b=azjbR4lbeYgjnfUkbof3SmoTR2bTNYTZC20iVa72owRiAIK59eRW3sHWfOvnbnM1di02dmnakj3xeWkl7+PdV16hJEIRih4U5p8rA/a70YPmmpqdl251Z3+FYmtx6lRNrcjj3lcWcHFWRWoGE69Tg3Q9keW06Eak12iqBj6l7yy9hoc/Oxi7kFIHL1TXsM9Lg4PCSG0NGD7zS3m1NAgZmJEzRCMLQbdX3OzULO5lrYDhN5BG09ZzscgTvuVHMIgJOfzu/DOlg6A6SR2n61nvyYpEFIBD0p9rxx/adHmDdMqhwh+8cFsbQtQbSt3gR8wLJebt8KtUK33GUX2+x4KLFw== 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=npRP9gTgJjV9KV93DFJ3LdmwFuvgUWpk6hh4lgfcpQ0=; b=Y6FGx18UMpK9E1C1f3B6UUT7DSyDtJa0IERwLSMdBN7Tmit1d/4WokYEeoArZyYhmzvGp+fsk/JpTLunDUDXzM3NPsunvCd4M7zStzb7LzY19ZD4vzcSY+Osg8tJo7nBU0n9/tWemN21Vscl6UeSB/tRyPYLe7+H3Rwbq8GoU8RN7bPZpuH7fLEssAtrOwaS3aF0rFgaHZPaGmvqmdzm6rSEGNn0QvNxYiSejN+iJyfPpttDkFrV7tEhr57JFxN33rBMlIuWg2iyAwrPXzdY0OnS2qT+82qZK8t/oFZV25Ro+530bbYg07Dg2dUiP8KejulE4vUYBuu2hTFFGikTGQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev To: qemu-devel@nongnu.org Cc: mst@redhat.com, sgarzare@redhat.com, farosas@suse.de, peterx@redhat.com, dongli.zhang@oracle.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, andrey.drobyshev@virtuozzo.com Subject: [PATCH v4 02/10] vhost: add vhost_reset_owner op Date: Thu, 20 Aug 2026 14:39:47 +0300 Message-ID: <20260820113955.509478-3-andrey.drobyshev@virtuozzo.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> References: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: VI1PR06CA0102.eurprd06.prod.outlook.com (2603:10a6:803:8c::31) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GV2PR08MB8413:EE_ X-MS-Office365-Filtering-Correlation-Id: 01235e91-7317-47fd-da9e-08defeafc6ea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|38350700014|56012099006|10067099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: He/MEXkLfMq90R6id01AwXb4aPbd8NncdL6cCvB0sQWCuvMYpWbJ629wVPGcS8dym+P3TdU7KSil94pGsouqACb64Zdk9hCMW6VA3rupaveSNWF6oXhHQbLBEHFdRqp9AJiJOA6nu+qVIL281A0TgSRDwldHFHD4X+/UIZ1DUCUPyc92nFOHmiUkobbTuCnh7N4qxHRAwNYbowOdkt6HJ3keQYx2h8X3r2TLk3hmfMdGVWLqbgCvOqjCyAdyl8EW1oZoV7OnBnmEj/kE1NGyobLZaQAENgiKNutkGWRiT8jPCV12ap/ZW6kOag5NU0RPU3OGaYRVQ74lAixBlVN84UW/qfaJZs2oPbaf672iV5S0gV4hzhV1xKAKjtOZAW0iCgD/UBNhheTRNTQ2ZV9wpTobacp9KqqWN/zlrf6QUKWHWuOBI2sHDwOjb7q1bhF4zpKILqoDAw9qAmK0tnPV6MQplXd4evNOM762Oi3Fknbh3q7XxxE/8m7ZPfJqzoVGTMZRYLmDStSsF7yW/h8zdZD26UUeVNbwOSlyn+ieYoxGvheZDaV/odipvP3o7+xMQuXGQExY/CYs1h03uhS7XRccgNrb8VoUYrwAOAy+KwRI82N+/mH36N5xucrElHdsxe0s9bG7JWss6iZ5e5YFoY+/rrGd2SgYvDT1S3oK/L+RSXK8z4dGAlu+scwJSlB5fgvxf449YTekw745xH7Nqg== 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)(38350700014)(56012099006)(10067099003)(22082099003)(18002099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5LsjB2r9+NH60+6yjiZTQ0GNbAg4wpWZbLutSinJnHcOJOH8sxDNmnlAoRq0?= =?us-ascii?Q?fSzWTtatUxxZZVwM0jn6733xCKWaLIHmY8pYgq1AiDaFSw6NRNYLZTqiXQ3R?= =?us-ascii?Q?sKCXVZoN11Teco1Z5/iSoR7klYBgatiOCnJ3PX1uxdIyLWvVrZFcqfAm8AzG?= =?us-ascii?Q?rMcoa27u5eVzlaAct3adi1WGi1AbIgsCdKpcKWhffCWyXlRM4IkBBX/nAolG?= =?us-ascii?Q?IT9VARipfSYRoBVY048BjDSMj1BxpSBJHJCjoIFWqqalEqPG0Am0jdxm5Lrk?= =?us-ascii?Q?5oR8AoG+5HJKgdtRi/g3E5qt8jXyXADu3i1fcv/9HmitJlj5I61YLr9YLF/R?= =?us-ascii?Q?9I31wT3aSWxH4529dG5bmZ/LB68AwHSzvg4xVXR+s2tL8GVs11iZKlP7IdLL?= =?us-ascii?Q?B3ZXPWNzv+NJflhGSE2U3M2Q2joZAhUU7kG8r4hkP/LNwmLC/s0tZ1Iwug3L?= =?us-ascii?Q?P5NYjlHxL5FUMDEF5kZzy/q7ZYyMeICJGeMldp060sck3vF/bL+blWoDWBj4?= =?us-ascii?Q?ORz87BipVEPsv1XGGDu9HF7Fd9dsD7huJbNV12TlR14bkvPf9n9xKJs5Hzor?= =?us-ascii?Q?FS4z1Mh8SmP7GGaS+Z4Ga6L4a2G42oEdLKU39dDN+vDASvcb0stp8Cq3ciFS?= =?us-ascii?Q?FnZKdHPyt2lqVyrmSo51DQZnNw4YzvCnzbrYsSXoVuPMNsYeEhXqgI8olvjr?= =?us-ascii?Q?pvMGdZ4zctYU4TYkrNvg2qOv5wI3z/KCxu/XYxgvYmcHpr+mmQ0ttuP/E4vM?= =?us-ascii?Q?MFw9uQKL+KZvgy1WGv1eDgY3ly/cY/FaKX/DN+w+4gqHz3nq2TQpU5VHdcG4?= =?us-ascii?Q?Ra5z6wCLIHkRq+93sBaijnv3q9j47AIg0Ue3b773q4ufnG2Md4GemCg3O1Wc?= =?us-ascii?Q?qbASMNRes81IyImpPr/PyTJPc7QBH4/GZDRoUSqYVi3qbrGg7laPajGb0PsA?= =?us-ascii?Q?FUTKG5CmxD7vjSR1mswAcySBR8v4n1R28K+S42nWVVmwzzu8mPLxFnNJw+nI?= =?us-ascii?Q?oi44prWfhZj94anPQoNMSSe2NDJowo2K/jXd0gs9f34BAkZ0p4l7ouyW4RvH?= =?us-ascii?Q?STltew806jooWYflZblrNgDYd0jywzRkUuDkErWyZgRLIWn4JazCl4JYXCpy?= =?us-ascii?Q?XNDG5YA1Dqw0gPNkpU4KZcrxY5lDGIMYqa9oYE8P/QCa0Y9oI/eSFi0nt85h?= =?us-ascii?Q?1EzM/hWeCCLfcqzY+6Gwskxk+la4xRjtQgq/lfGUHOVDOZuFgS8YaFCcIRz6?= =?us-ascii?Q?oVgaji6w5OBuDKh7w07TR4cluSvUnHtDWN0LsceQFr15MblipQ8F+m1KdOn3?= =?us-ascii?Q?EfXe75gXuIWPtD+aqiVgc9URDsb1PgO8fxA6RDdd3AtBBcfdXU3w4K6Ff/dF?= =?us-ascii?Q?00HogP0kwOVLgoBErpTgsczR7jFUzTgogVGTU7Y86H+tyIjhqjFIsrLNOy/5?= =?us-ascii?Q?31gorFDjJtMhFaM8G/Kn0Q6wfw8PQWZwFYbrZTkXusUJani3ka6ttpzK5dWk?= =?us-ascii?Q?L1aOucyv+ZGD+sCXs7bYqN5EzRvT3g8FP032J87S/e4OgeMU5vbn16ReGFQJ?= =?us-ascii?Q?IdInpQSur78fqD+sgo6dYxTXGRvwZWHrksauM0xR7KMvmv+HUnCILuLJ90cH?= =?us-ascii?Q?sL5poX/7XqUwjUdfVgGWOT/Efvro+gs5Y4A59H+Jwj7gLlzHsteG7mXsgWTP?= =?us-ascii?Q?LvlgMPjVCN/iag/R1kV6nfCuKYFIDpO8mntR+H9BuYfkZ6WMztwnx+tfuiQ1?= =?us-ascii?Q?Gu/f6T9nFfIUj28phVlUmF87vetadm4=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01235e91-7317-47fd-da9e-08defeafc6ea X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2026 11:40:04.4530 (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: 4ZAO7EiGuvExD2g0xqr5yU7oYWp8RD7YFGTVjK6xo+lwhA2xrI2zXNI3P4ySbG7ptPK5r7ANX5Ox6Bb/EaPK34de8rUq9Th0LiZ4NnvnSfk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR08MB8413 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: 1787226100459158500 Content-Type: text/plain; charset="utf-8" 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 --- hw/virtio/vhost-kernel.c | 6 ++++++ include/hw/virtio/vhost-backend.h | 1 + 2 files changed, 7 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..6c949e6a38d 100644 --- a/include/hw/virtio/vhost-backend.h +++ b/include/hw/virtio/vhost-backend.h @@ -204,6 +204,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_set_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 Fri Aug 21 21:27: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=1787226088; cv=pass; d=zohomail.com; s=zohoarc; b=Wk8ASNVuS6AoW0SVu470J9k0jAE1QpeBnqqeqvMkjh9P7WzQEocbMp5U1fjMVhN/JqfkAg3lDcne+1DHS+o3FG9c5Z2AlOg6rNZFrn4/s6c0kZygmLxOnlgo/ZjP2sJV/v7/jSbbkX+v3N3kjBlGiMJ13gUKtHyKEakJ7o7pafA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787226088; 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=feSLFjcyhNYicHXyJ4AYIZH5dIsttQkJ/aCkSXDuqxs=; b=nRzRgdLpO0IpnXWvQGyQkNJCl5WWy/1jtcr3IKlFaoUu7FT52SOmF9mK0OlzIm7dzDsSrNZwxjkX/3otYym8so+zL4vrqxboybXT4bCHCqkU1JMTZUclHNd2tPrdOqUetso/Sodygk1gZTprsrkWHCNGsDgTkYebWg2tjjwrs9g= 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 1787226088201285.7852118785303; Thu, 20 Aug 2026 04:41:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wx18B-00019r-6Y; Thu, 20 Aug 2026 07:40:23 -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 1wx187-00018k-GP for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:19 -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 1wx185-0002G4-M0 for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:19 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by GV2PR08MB8413.eurprd08.prod.outlook.com (2603:10a6:150:c3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.8; Thu, 20 Aug 2026 11:40:05 +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.0339.007; Thu, 20 Aug 2026 11:40:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=S59rv20dds9sTQDPhVc9f/2f8uDQRHX7+PSXOrHzhMk0TYQoXn2jF/I9CkNEnYjTBwaikNv5N3K09subK0SFkyJOPiAeSigmWANBFHmr6zmoaSbAY/ahpOF1lgHtUs4GscjnfXte62XhW1pr4v2ENGBguamuzp3+8fdASPsbeGOcFHj7pvIou/ykCWmt9Wsn7bJTqpvXMaNaYa38nfV0zYmANTZadmg4/iWlTdiwieBzd5hGbA8pxoo2UPX5iT1Sbp2PdLQenJU5tzlLnvj59JycxHPpEpEgRaBhBJwumHRZddGrxolkLbRrRTjgeA6iXSGng4aY0g/3HEqeuk+cPQ== 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=feSLFjcyhNYicHXyJ4AYIZH5dIsttQkJ/aCkSXDuqxs=; b=rWWLp8boIBSnk75+BK4+ZYZGyhl1ModsEHZBxpmoZuVItsrHy+2T6nYIiTlDXDjaPzxxJTY3ddyej3+OPNjeRElg4JjAZObsP13zASL5ejaeqQWbfVGdH0vYvcHXrxzIFH7EJat7ozENUUn08guJMny0rE8CJPpechEl9Bc92zTUxUhCNvXDMMZjLgIiJ67uOeBp44ukLuw6zvMqjRLeNxyzjCacuNWvZTXRIsBsKOf71cN45JJ84bBcpRxf1ooXlvw7f2XouN4ypof16/7JrYY+WkcTSWDS9+A7ZfdyTCrK3cHI8hvOa+CRZXqNPoAKXhXmI4oevXebQMQAuO3m2g== 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=feSLFjcyhNYicHXyJ4AYIZH5dIsttQkJ/aCkSXDuqxs=; b=hU1+f61mNHJI0+mT6kgMBBDDLuSpgvfHX4vY+HBD7N/CBKHZ/aGD0K2KtoTqTT8VvO82JELGq9TcUDtJokV0m5fnakOkFlPJ5NRP50Hkcmff31ehqD4W+xGFHgoyXK8E6tUhcrtTGapomHuPPl16dSATk0VEjQUfiEWOHbT6eik7IwhYa4nkjg0R5ItSsZxwJ+erg0DGpEAQf9Ieh3Ti4Rx2iHFaM85Lq9uqD2bjd90ZkAQxwMB7sCDvdLnZR9voFT+jFMYbyJdvQgBxNdH0tkLejCZxZa+hb10OFx1pKswXTmHwv50rKYMZUyz/pIma0YpXNmPET1BIwxlyhPNriQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev To: qemu-devel@nongnu.org Cc: mst@redhat.com, sgarzare@redhat.com, farosas@suse.de, peterx@redhat.com, dongli.zhang@oracle.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, andrey.drobyshev@virtuozzo.com Subject: [PATCH v4 03/10] vhost-vsock: don't reset connections during CPR Date: Thu, 20 Aug 2026 14:39:48 +0300 Message-ID: <20260820113955.509478-4-andrey.drobyshev@virtuozzo.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> References: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: VI1PR06CA0102.eurprd06.prod.outlook.com (2603:10a6:803:8c::31) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GV2PR08MB8413:EE_ X-MS-Office365-Filtering-Correlation-Id: de04da54-0acf-45da-b28b-08defeafc73f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|23010399003|1800799024|366016|38350700014|56012099006|10067099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: vKawE24AMO+nX4BsZYJ8W4f50CZRvEJNsrwobqWoB4Q/4i81ZDG2W+OgRiU0pHy8FM36SO7HqmUzwvcSuRRM6XZCxE8r/SZJM3vmXs6QivhPz75Z+IgMOGR7EG7JmaVCJSW9PODOFkMFu4bpu9s6tq4dIyn3usvgArF7HeiNQE+6W/bsZ6mz4EMynnMVGmTZ3ye/ZS/wgAWIg5WayDGe4zwsGGXH0JVLqc7wedBWguHqIaKafmofft0PiTpyoP73ywykfNKBNRFAyJm1EtYxBqiDq0yvIh5KRN37awIO7zNl/oXTLLbLE8NYmSCk4S+bbLc+ZXKK5Lev+WTpORok1RRg2+Vmz2XklbnrDFsjW8mAQqSOq05a9GVbCTaTGPlb3jJp5u4WM1ICVc3hGbHzXJPEBXOHtPSgaqD0Ux821no82iCfic6BY02d8FX9GlH/Tg4Z3WhX935+svah4xLrjgCKcXe5H3Vbw4qlO3TxazxnnYl1PDZHnqC9nyHu8KDiYbtw/HWrXM7ly3/yd9EIwLrJ4PJX4taWdZn6vejS6lUGsNgW8jxqjf4jzQ33GlVkhwMvHv6+lWds5QarKxSubC2qcx7k8Ax9uJnWS35E3GU8Ak4KJlz5xLqm+Zsr/4PRh64kgQzOJDqr0O8rbEgECNgqoAXdvTkY8t4VnLTyrAmScRIUHXd/97IueoGXUIHkoyWJ889OC2oAgi2FUDW/9wThCMNcLptr8GJza6opLAw= 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)(38350700014)(56012099006)(10067099003)(22082099003)(18002099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?u0pjIj0IIeBfqcjQltsXDmpCP2Uv358l8xbHBOSaKjrCaSN7mlOcvxta98Zr?= =?us-ascii?Q?o6PS8zyxz59NJuY4MsHTZAR72eb+YQWotAmY75TeTcCipPELpsxnrwJkqYs5?= =?us-ascii?Q?/ShYDLKGQk1IgnEefTz5IOuWhaZff79UjmvLqNX66sBbRfOR4ma1FpJrTHHb?= =?us-ascii?Q?9SoXAPNTAtHf5eDxuJSZK9AtsUxxRavM2d2rnDtqXGva7VsKqFiLxrRDgldm?= =?us-ascii?Q?T1to+jUCQ8SKQpuGirQEVyAgzCoCVxQxTYdrV51Jr+FIUkO5IEWir3sFFsDr?= =?us-ascii?Q?Xi5WBwBiyFtQBN6G4zn8j/u7gsfE+ei0NihLWalGaWB3zY42STACWOk2xAMu?= =?us-ascii?Q?nuXDAgPkNaNeV7H2BZQnGK8zAPlFiI9gWV2GPhjMMM56A6LJl+2RDAnpQTFA?= =?us-ascii?Q?FHX0SG9ryFCZz25NVwbxBm1gsuLDF0XmlH3byuXImrDaoUTY7YlJoV/zdqH0?= =?us-ascii?Q?EEh7D5lMAO+MdnWsoH9fNaNqTG6MSH+Y3BmK85H/9JisDOZULfKhZV9d/1UX?= =?us-ascii?Q?DnvZ/vtUMR1RDdDqWIb1cGgDzYmD/XQjBriMIdcIDUr+mpP4bf2zvA49het+?= =?us-ascii?Q?CPdK8MRJ2dWkTYmC1HwqGxwMhkqkADl7ALM+k7jeOvzXRG7eWO64z1RuiBgg?= =?us-ascii?Q?8+1NQZipaHotDMtzZClVbwHnQs60wGT1GgIlhXQRPOggWs00J75hzJbPdEzA?= =?us-ascii?Q?3Ej4OCUrNhdJTBfSUt6O+2dsWg2sfit1uPtsLe9xkMdMDeI/u4uDQ9UZmjlr?= =?us-ascii?Q?nn0wVS3aJ/YUu+jyucQIemP1/OoPe08bOQg00tnDB6YNcKn1P5KotYkw0S+Q?= =?us-ascii?Q?48UaPcrTG3pkCV3oHHSZug+VUogH7bP0UEw5ggSSZ9U3xEnZnaLszir+yRuf?= =?us-ascii?Q?TQld3ZPa9B65LlJzv2blkYeWgFukqWlowWRPvjqTkMmasgtaT88zfBTKyram?= =?us-ascii?Q?x4eyxMFKml+OXx+QbsTUSaHO/RUZ2Z/MyNJwAZwt3N03A/DXlJrYkzgyAxGQ?= =?us-ascii?Q?QfCGSjQQnSpc5YydB9JQEFlN57RZM1Us41gFOGU+xSokfWCph/ICNPT3lzqU?= =?us-ascii?Q?RJ2Jsf4u1WomtExw/7yTFV6ij73vB/tWerJdZl9p2B9/txhfa5K+y/52NulU?= =?us-ascii?Q?WBYzV44J1E365Sk5kU094QHUxfUr1NG8CmgzaQYA/AGhLV6st30e9Hofyc5I?= =?us-ascii?Q?czf49sv/KR1KGor8I99LubpqDHODKkhnDskiUhW9Gy4b7KPo9dkbK81PF++j?= =?us-ascii?Q?ufcNEpmaS4WXOrygWrAs0eCWTqRbjDhOnKOZpC/yJYTWggS9bQ20vtVqIwIC?= =?us-ascii?Q?0OE/nCGY8BBLikPVz67/7hQzZQ3K71g+nx6uiGBYyyYBCjgMRlu/r1VYQD/w?= =?us-ascii?Q?N80is9gzP48XStxKj0MYVbmiRZeh1lHUpDp5RcoLmz6L3IiUXEOFxbeAUzGU?= =?us-ascii?Q?n5qFECjfreyqevtfCdVpWxE3lMNYG04cPv7d4BnRYMzG9rgTTwbDk4txMPos?= =?us-ascii?Q?RB/832YVOpaA1bQFnK2yoUSQbUyoHgqBr+ZAdliRaDY/rcK2zY1TMsERq55x?= =?us-ascii?Q?Ok1WEfxCYpO493H59chLz/LBNfqDXM7xkM0m/uvaM6C8rPEn/rsnZ+rAW15O?= =?us-ascii?Q?zNybbknqB3XUVKBzAUdId4L9tc6qaO1JvIVmkY12+kqAs4BntMBNC0re0amu?= =?us-ascii?Q?Ka9dabDZBVBOx5JTJIxrmFAPNUHVNQXjH4D+PZS9hcDpmFmltC9VKvlLAQst?= =?us-ascii?Q?phYb/a5Fy1SjeC8dCYVIaPiEyj8I/yc=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: de04da54-0acf-45da-b28b-08defeafc73f X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2026 11:40:04.9941 (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: Q4AmxNhYahDxbcq32beJPxAtW1pXmoXX6KwAzA8t8nvHnvaKbE38enCl3sZFyAebNvBOmhI/MN1j2Gh0MwaDH3bFjwk06WA5mMdXCMUbIUM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR08MB8413 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: 1787226088584158500 Content-Type: text/plain; charset="utf-8" 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. 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 Fri Aug 21 21:27: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=1787226052; cv=pass; d=zohomail.com; s=zohoarc; b=mD9xyHDUSmRbnbv2rn3Dvx3wJ8tV1Frl6LChSp60r63ktJmbRb6XXiNfSYuPwQaw5/Swew/Q+vipBAUDus0l0e7RNvC0TSRYc+qajTJ7enHs7LOLpRZmkjGY6HaOyFSQmFWI+BcIjpHYKB0vERpaeZJk46/nWYkwK3AHev1pFFU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787226052; 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=bRQp4SJ1CFZGQ8N8POMcsM93ey3nagvDuHLCAtHM6nM=; b=QDHj6cP1mjU8nYSaeauNq2TPokKTq1nhzLIKlorNT68/6yqjDOUh0dLvUZz6ImjgsMTinbAj0rwAvoxEMiJ+fRmQGHEBG66+VlII/E40Jkd5EXlHajbMvBKEJ1UIC/z5QoeDyEzryGb97ZTGlKjJy+o7b/PBMjUJcSyf/j0v8P0= 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 1787226052845763.0876520277759; Thu, 20 Aug 2026 04:40:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wx181-00015z-3J; Thu, 20 Aug 2026 07:40: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 1wx180-00015i-3H for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:12 -0400 Received: from mail-westeuropeazlp170110003.outbound.protection.outlook.com ([2a01:111:f403:c201::3] helo=AS8PR04CU009.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 1wx17y-0002GQ-BC for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:11 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by MI9PR08MB975321.eurprd08.prod.outlook.com (2603:10a6:290:c1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.8; Thu, 20 Aug 2026 11:40:05 +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.0339.007; Thu, 20 Aug 2026 11:40:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CJfBDR8tQyfm8Fcr0Cbt2fAAJ9OH1dqX8ARh7PE2owbIAEUSPxmbdc1NAkqrwhWbtifQYe7enVR9i+dj9orSAWudfE6nnMJatAFUfvwiEh+Nk1v9Bm+Ca4I+XjbEsprQhkRkJszdSvnqVbkT3hmvtjicR7btyr7SpG+9KHAcZcL68roi0vJqjpXr3fKBqXcYshifZfLXEuRersAVIsd1KWQjSBwlFLEyp9yXVAiFOsIBikQTnPr7ekWapiCYa0RN8wzES32qE6mEE/LEWONCycFweEV363Nit1s4Wgj/3nxMaXzqneJhZLg6kRXuvV8AjROeFIDSE557v458mCfZGQ== 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=bRQp4SJ1CFZGQ8N8POMcsM93ey3nagvDuHLCAtHM6nM=; b=auo4ty0UFHlwT/qImsdk6pj2P41sauVdn4F9jeSEUFdX/+d9dpzlBu002PNZsTYsuUoYysE9NEaLnF6UQ7ru8ur993KFjTgw8N89S7GK6/RVtoRm6ofBVHDXRTTZY2+bGHSIwM4HxtFxZwp8PvtUZgy/xjSoeJVeNkqYN3nZQcbC9oUr6ULsDM1qorc+ECNfvsMogUHoKAVi0tt9SGuJjG+rgmdy61wvSagZPmdyYi54nr+fIG16wVRNxGutiKQJex+XCRMQT1KAjnLmsE98o4UK9XvjRIQHkN19PzF9Gl8aC2HfVaASJJv7tI/7JHM7XbnEaY8oPTXy/c85w7IV1Q== 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=bRQp4SJ1CFZGQ8N8POMcsM93ey3nagvDuHLCAtHM6nM=; b=bHA+m+mV95LSB7Y50Emh2Z83PPBJLjwdSf8U10PUhUdASz4liDz1qPNxJFCWyYVwqKjJRdhoRRUPjRIURUnZ5/HT9x9BKOeB5szIFNCflPfRYwgGIUeRSWIdFEUp3lycNSNtnOV8V4qPVgazwvLrEwzvrUM17Ym34J4vx+MFrFqlSl8UyTblGJQOVSlfxRz3SKNd45pp1/kt/LXrKcI7mKvLGBumLDkeXzMfopYShYhfp67Yh3n5pdfQ7BGUKr5g7ngcPUc1HhG/s7/qN1unAkuCnvT4nIDQCkXcogHEPO12uGaUwXuOjfqezqU1ENOXyKk0s1yqcmqcagHBQb9CIQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev To: qemu-devel@nongnu.org Cc: mst@redhat.com, sgarzare@redhat.com, farosas@suse.de, peterx@redhat.com, dongli.zhang@oracle.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, andrey.drobyshev@virtuozzo.com Subject: [PATCH v4 04/10] vhost-vsock: fix FD leak in realize() Date: Thu, 20 Aug 2026 14:39:49 +0300 Message-ID: <20260820113955.509478-5-andrey.drobyshev@virtuozzo.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> References: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: VI1PR06CA0102.eurprd06.prod.outlook.com (2603:10a6:803:8c::31) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|MI9PR08MB975321:EE_ X-MS-Office365-Filtering-Correlation-Id: 69b9d791-4ffc-4594-df59-08defeafc794 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|23010399003|376014|7416014|1800799024|366016|38350700014|10067099003|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: W0SY++ej5tDXOXlPL4bTQt9DXN9njBRWHcV9X0B7Nda7bnwuMXTWaMNEvd3LyKdAM09XLPzllDXbVm3+VejOFoK8CA9/+Dcnk5nMSwa0NI4ydAJ9jIRToPJDOBq/BM7u47/lQ9zvTGhK51icU0yB8iAzP5qsyuLsbIN8zACXtONQ5qJbP8LGr11LjEXJ72guZZAxMPQygDQIdtj4EUgCHeyeU+hhe8Q3tFRuFKkSQWuGDLTj4hzHmTihCeb+iP/LEkgA5PQFCcnyxfBu0wYnRAbjF+2Tvkd0PyYswgeT3QJfRjsuwXlDY6mC6x6o4mBzBACRi0DZtNSpmmuaM8fIwHNHof+EINrzovGryA0uj+t4V8wsJkjkJCpx17sAD9WWPcP/FzAcsbgTUsGPq9vn9YykmcWtUJKCPvmx6jtjLE+ES7/Y83BOxBtTAX0qefNwP8OGkICAp/po105JhvRaTd1bXuGB6xU5eLA+HevTK4/+1ys1CucYHa5PMI729fxMX1gwdJ9bXtaCVV6uW939U1aSN++sMHjwjcrUYRFwgxev211PP5Yq77UVx47If2SFQFMD8Klv7I8CKa+lHR04Z4VpP7jK80l88Dz44r/aN3rrkAES6CKdOdXlLz8EFI5LcV/ou5JBbM1HHSv7zq9zdMTH/9ftyMI2Uu0pptd2ZPbw0/lOWKjEka6JvbxMAQhMWrdZDQl1FPX+/G7X/6o+quEBgXLFim+34rejS/CgtFQ= 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)(52116014)(23010399003)(376014)(7416014)(1800799024)(366016)(38350700014)(10067099003)(56012099006)(22082099003)(18002099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2wBYvh9TH0loy8oyafPTG3AexdDTgq//NZ/r1mgvlCsztqguTrdKtumoJzmR?= =?us-ascii?Q?yIm6uEmebRE0PGNA04Gnwo3fZyha9l5xnmQEfjWzLeNytP0FAqlhUO/82quA?= =?us-ascii?Q?Al8/H1j6Ieh6Sd0I8mOOJQ6gaD3l0BkKd0faHkDbY9slg73aXAFbDcnAYV/m?= =?us-ascii?Q?RkuDF2Ub91ZnVNRr/G4+KYTlxzrBddNqrael1z2Zvdoz/BhEIqMFSHn3Aitp?= =?us-ascii?Q?MJRqf6nUdYZoqtCx6ieHNLewjkRcmU+lQfxXoY7CVa7a9+rdj67xRCiLm4NL?= =?us-ascii?Q?6Au1U101vgxr8VGrxugVnu9LRMePejnWGQT/h6BBLYwxVXt89YZMZ58aw73D?= =?us-ascii?Q?TBFKw6fyLczuVVvoyjGI5RISlHZIPHXarxFtoMxkhzISqN4dW35cSQPDJZ1V?= =?us-ascii?Q?nS8F3OYtGn6onblWVDdmcS70BMWabIQgGUfzHbQ5Z85yKrym0tq7Pjcpkt0Q?= =?us-ascii?Q?fHgwzNMo13/0S60FsK5sKOdXEZcwOEhLx28h46M9YXFEFVusH5C4NTDuhLYt?= =?us-ascii?Q?OoQWsc/Mwyc/96VfNnSHIU+BUEtTv5EKN0qCW9POReTnHWzZDb77PfNZQWTm?= =?us-ascii?Q?mEBv8NdFQCGOcUkt4gS45pQGiid9yuBlZCZR4c8WKRUTdHHtxoEyxDXFPQKU?= =?us-ascii?Q?KULiJ2YsyWcUboW3P4EFm7aWAToPxXavM5qmCNGID5a5UOn9DF6Fy2EtwC1U?= =?us-ascii?Q?T4VhjPUAUTfcCD1olf4SJeMg630ApQEweJEF14PEDTFRz6XM/XuuYwRo9JlH?= =?us-ascii?Q?Y7HZgexnm4jdg1WmDszfyzvEvb6RfmZ3ky0+hdQ+M8vQLLQRMiSQ53xgBeIf?= =?us-ascii?Q?qqgXbmLm8SmrbatgWFueziBTRHG+qN9EAc1L0OIYjWPp7D9StnDiG1f0XQKe?= =?us-ascii?Q?W/hl/Tiuxns58QV1bCuXPO9dcC8m5w+30kNCg2V+yq1jCY7YUVFOv5dphEiq?= =?us-ascii?Q?X+TcL85D+5YCC43B4A1kBKXhlk+CfeQA2aT4/m0Vu8hmphkvolf++8ayRP9+?= =?us-ascii?Q?jdwcrMQoh27qkGFUKmvVuQaMW66UeqfFy6W+XoGnfr2AZiC0rWo9g1TNbh2o?= =?us-ascii?Q?/02gOacXvrqwev2oxqGPwztB0UdoBG7A8Jr9FD7pzSgOxTH4EAgDVwXXcJU2?= =?us-ascii?Q?jYMnk1pI9OcnTlLE0JPuKpVpbDSXrGNgdH9iq8QLolaCoH4F1V1PacvmOoes?= =?us-ascii?Q?sDJcXjAgY2UOVM8pTsLjjTAAnUv+lkcYLoQTGd9rRBwYN+tQxCwuXFOzHEf7?= =?us-ascii?Q?pClwQWvOGXb1BRNTFkOdQM3H5KswMIbwN4UF9yUh7VD78nkztY3hKkNvDhtp?= =?us-ascii?Q?gURexSDgehT+kBOZZxXLMhHNCfuI7/lm1em+47ObAzfpfm/z7JkcxjFHyjt5?= =?us-ascii?Q?Y3A0JfaJO0VsfgchHZRBb38F3d2dpu8YGZk/cNgpWPO+gE0uO0uNBgUzX6cF?= =?us-ascii?Q?iAQ73AyRHxTq1XBODVy2HAeTibmiVVW0I5kKlBZyj1gc7nSC8r+UrSIyl4V9?= =?us-ascii?Q?DCZuPMNkspwJaZYuuIgM0wgBQ0HWPN3ZwHzfbAb183Cc8zqQYw1Rwmynsk0F?= =?us-ascii?Q?f74HSx8IC/Wp6wXfLS3oJsr8MNrlqiSumginx9EwL57Ar92BY6jwxnoutU3+?= =?us-ascii?Q?ndpa5D/ZQqbdSJBKiUfA1h86LZCvLtQ4rRuXTSSU38pFY/+Ld/Az7XrSIUYy?= =?us-ascii?Q?omVbBvoEwMrUXBENQVCWl1RuWRJOugSlAx5WMmBJ3+llb1TfsE3c/DibHjoG?= =?us-ascii?Q?RuYQAjyIAjc2O59PQaTx9Yp2JMYiLD0=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69b9d791-4ffc-4594-df59-08defeafc794 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2026 11:40:05.5513 (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: LLqn7NqZKEgMMn6sMOIhEKjFFBF00vQG6PfNgeAzCqWPTHybcn0MaqOmUeYigIA1+XAv2DlkMiaQtSSpORTZcnaamj+Gze2xCNvcNJm6Eio= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MI9PR08MB975321 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:c201::3; envelope-from=andrey.drobyshev@virtuozzo.com; helo=AS8PR04CU009.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: 1787226054996158500 Content-Type: text/plain; charset="utf-8" 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). 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 Fri Aug 21 21:27: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=1787226085; cv=pass; d=zohomail.com; s=zohoarc; b=UH7eT3OHAKN/T91MgXIHY0fwP8p++V/pOGrtkvUup00/BEhTafydU2QwFQ6cj5TlpgNI3PBXU5qTmR3sYVDSd3tPTUmeAuZR+6KeEq3+bt6emtvDuNwBbqixBUtHxyEtoKHv9MjyKFMO4IjX5/tQ8mwaLWtlJX3Lx1Wdx218UXU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787226085; 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=O6978tR5YK/wrUofvEQwbSzK+G5kIDNHkjdbfiZUSls=; b=Ga9R9pxkve865Z1piQVmsh8CQ6NXCe8AK97iUsgbqXoHW7EcjzGb85vlmKj+/C+HO5tUCM7zzj97+mtMfMs1JebcfgfU02ea4lB0h30//4iwA7ZgDDeSWxb9vWjP+FTwfGZ4Anx1DUcGmP3d0ggXZTThaCK3BjcbxKPppRN3jPY= 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 1787226085069910.8943689101586; Thu, 20 Aug 2026 04:41:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wx185-00017e-E1; Thu, 20 Aug 2026 07:40:17 -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 1wx184-00016w-5L for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:16 -0400 Received: from mail-northeuropeazlp170120005.outbound.protection.outlook.com ([2a01:111:f403:c200::5] helo=DUZPR83CU001.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 1wx182-0002Jh-EM for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:15 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by MI9PR08MB975321.eurprd08.prod.outlook.com (2603:10a6:290:c1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.8; Thu, 20 Aug 2026 11:40:06 +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.0339.007; Thu, 20 Aug 2026 11:40:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SYk6RT3YzEIfxC8HC1r4UFbx/xdl9j2lu7wBQ6p1TPLkx0mbi3K9wxvCumK4FUCfg+JaSmEtINIS7vgM81SpFoOmCPmlrC5VF3N0ZBZnC2GhI2AGboVwsYt5rgFks7eAwjK2h6Ig3k/jvyrcL7wtQWEni8pQUyeUSGYEeTJEPcpXb8AEYx7clPiDWLCwAgDTHOxNcQjOjUCeEsiDqBqmUhnSU8Hr7xTKo0sYtmwIHk6Kx5wMdPSgg9lKu7P6Ht2CZ5LIUbtJpcYht5AiOfu1nzCdXifSLE0DhJn2RGPbs7vkbI/yX4/d44zigxiNCG/K3h1eK+nahSyKEnXmkJYOpg== 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=O6978tR5YK/wrUofvEQwbSzK+G5kIDNHkjdbfiZUSls=; b=iLpazfJS398BjTWqJaqyahvx6WzwZ9iMdbjq7jQ4XFbjPFiYyzNT8ODmVFJ86uT5h3hvwYOQ0U6L/3wgWlC9qJ/YKRT/hKxKx5i0t4tekT/k14xLw7TUityG19UTOb85ue7A1tVClcLuK4lLQO52tHQup2c4dRGu6KCi0rdU7PXl+TD481YPQ2rQ13QQkn/n9RENR+k+jnNR0i6UICXAvpu5CnbDPNt5/S/tDAs6OF/jPIhJIEDDLTtp9rcdMu3FvJRFQIG4k97lTXNAmc0OmAQKetQxJQyViVN48emRSI2EmVByuZMAq345MCxbjymkXSDk+07b6P7lajOyBcNVhg== 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=O6978tR5YK/wrUofvEQwbSzK+G5kIDNHkjdbfiZUSls=; b=CPsk1LuyP633NYlHEeujadKGPL1lXBTXS2Ii6lzsKIu8UMXMKynMBv1XTZuKudj/2BwUf8amut0JfZUao+BJf0LjJf97lJGP3cB+Cspklc6cUypsJbXbTdExJOmA9OPu8MXCOZAcXrAjJk8c0Q7wrJwLKI/1bK/bEmG9+85r/GzANk4FKFWFU1BYVudDpjeq4dh0zOzLrOUOWfsfRAKzvU8JA18FdHts3Xb2zk+XJbQgpZ+IOt2yIJXXYaTs32t4Zo157o937T+Mw0aRy0P+6d2tysPYHplT3wH93FIVaiACl783FMoeW3K9rJojuBcZj0Aod2zehUUPhmzbBZFSMw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev To: qemu-devel@nongnu.org Cc: mst@redhat.com, sgarzare@redhat.com, farosas@suse.de, peterx@redhat.com, dongli.zhang@oracle.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, andrey.drobyshev@virtuozzo.com Subject: [PATCH v4 05/10] vhost-vsock: preserve vhost FD during CPR Date: Thu, 20 Aug 2026 14:39:50 +0300 Message-ID: <20260820113955.509478-6-andrey.drobyshev@virtuozzo.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> References: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: VI1PR06CA0102.eurprd06.prod.outlook.com (2603:10a6:803:8c::31) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|MI9PR08MB975321:EE_ X-MS-Office365-Filtering-Correlation-Id: 155dffb0-8e71-4984-de56-08defeafc7ec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|23010399003|376014|7416014|1800799024|366016|38350700014|10067099003|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: ncqJQLBkDVcamsRE0I0u3+PNNVpZSjoqu6JDoomQETd/7ml3/lYan1BYgm9zY0WGInqWtqbBFQSzlmoiPaMvEGOn+iwxYovUBlt6Y4wJQykS/ttynmGytknUZy/iP+B0puokyQoIlwg0HjpU/W4Qa40AsD554FSeY8cnjpx/j0O3Fq8GZh8uEEHbTvyc77iveTwltkvZAWGsIlqFZEEH0gdQUXbShx2hV/lCrDd+IkcRNsNv0hY5tChp3C4C4n3I/BPYbb2RQMKK9XIerFpBP9jSZcAmmcYDQ2+YEGhRnmEusYoeOiqaz5C7AHgYFN4ZDrhy5KgJ/oVo0cN0Pbu5pvGObriBlc4kp3S9pS2xNCdxzz4pl49n1o2QqFndn1Oi1wdYA7gpGW3Q+2/jjVt9Ibs/ZjjRSy4LTb5fgoohWjnLC35/hjq4ojGPGSAkS+al2+fIdjdT7V5HE/Ax7Y2Im76fRGZKcnrVfqz9jRNyS/EEVCswpRLbSD+aw0NACvuDjz+wGqyv75HIVIRMGwkDnk+lZlR7x6nF9vH5dYDS1xzHSqXXTrPilRm7DDbUT06Is+bZdlA1YicGBzofPfn8zRyAMoX6bZfKUWPoYgErY1QGUU06ujhKEBQVEwROXQXh+w8C2zmUmaDS4CgP5p51d5P1616L8Gdsn37cQDkHjnlYRFd/shKfo6lE+krNg2hK7u78bxMDhaD/FfmZ6VWMUcHNfaqsN+NjbnjqM9mmEBE= 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)(52116014)(23010399003)(376014)(7416014)(1800799024)(366016)(38350700014)(10067099003)(56012099006)(22082099003)(18002099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kqjw7Q1IGbNnrjNQ9NRWMXOW9aMzGexUD9Mzpq1wwo17Is8zllzTDqSa3MuD?= =?us-ascii?Q?0vZxmcSqd++puj/oc9RHFGifngPSQAdbM9wYF7Ivz5kYTu5GwyC2JOG/N2GR?= =?us-ascii?Q?C3RGeueT59wRA1XQTp8C5lU2zzSHeIQ9sEb/daMf6pyWVDgkpcSoAJjVGx3L?= =?us-ascii?Q?vHBvaG+sr2EvqKyGbj8unjfTsi3shs0x5ZrExdCNyLVltTQGN2a6UhHZe0ce?= =?us-ascii?Q?MFmwR0SRUDdTAR9EEbOPaIg58uAs9xNRCWDhzuok0FEfYWE6+Un+du4Lwrpk?= =?us-ascii?Q?+mmjKIsmy/FBFThEWFVuk5AshWU2YJNBHVvyaEcLu01IqJQAyEmnNxbt+b92?= =?us-ascii?Q?EYJ7Raz89zxmBY6uSG33fhFS511UHU0PljzOmmZlW65H47HADVjPcWiK0o8P?= =?us-ascii?Q?ts+J00ggcWk4xa6m4KV0vnbpnLNo2i4W7JSk4phfWVB58uk6Cd5ls9ch3umo?= =?us-ascii?Q?WvOKoLrKjGTURCWi/Vjcnrf1aHuwH1k4pZaUsmU6LphCF/hOoLEyJwqhndKy?= =?us-ascii?Q?GvJm2QobPUZP8OQMBHN5flhjNLX6VtgtCWFtUUnTh6PMZL9fJ9/PUd0ifj16?= =?us-ascii?Q?T24R5GgHs71kVUHvqy8Cuf4/QYto1CGIJ5WLdh2vPgyyjO3QdlQKjI8unzh1?= =?us-ascii?Q?O/lTTxFHKOz1U0oOnCnWX1N2ED0PECI2rJNn3jR3sCUfuci7AJN5yakfiTI0?= =?us-ascii?Q?RPZC/mQ2OXNvQYe1Ibg0PrUqNR1s8Lng/+rs9jzsj07PJPsg5kDak3YZ/FPo?= =?us-ascii?Q?qthzTOdDyqkJxlR97rQY4gYjwTxI6d3gnlZNwClRWkzbBY4K8WTB7fZmpX9Q?= =?us-ascii?Q?+AA+nJfz1PHLEFPqZRUHm8/ytZW50iZ7ZVrY7Dkrcp2GcZ0pEao0mvCpBEM1?= =?us-ascii?Q?aGamE6jbZOFKJGQZgcJa/8rRcP07GJaunBXd+qfr55jyiZvtDpC9wBzY0K1W?= =?us-ascii?Q?/bvgqkCdIff+KaiS13uMOGtqb51D1lAt4yRx4PzOBI0BI+1GZviG+BfjaBxX?= =?us-ascii?Q?TibZXNaAlXeayj+AqtmQ0vpJLHv2RiFxI2//aBlFJIE+DH+dX+yjtWa44h21?= =?us-ascii?Q?YdBCd4+KzSVZvoflWbb8XuEbcIElvBLbFP/HgB7xUVZr2mtNMxSvRvnkuaju?= =?us-ascii?Q?M0JERVOQjYE5uTJr6r/lhiq3SmqAxcO1HYeVbw8yWTdD5bmzW2cKXiiWVR2Z?= =?us-ascii?Q?S6JnuWfA1Rg0hDNcC37z4AQaZBMHitATvBDaeK4ZYczJ6k1f/uv0j9JpSy/W?= =?us-ascii?Q?hDlTv2b27HM0taLP3SN7LutMMYRzRUN/5u4Y6BB/26jaQ28dqjPkqOAj4URD?= =?us-ascii?Q?x/yfdc4twf3CjSqs6hmR3HXjhLF7QfXoAiuZjKRD4pB/BfF6M7yLpGdHXcej?= =?us-ascii?Q?gRy/OadSw1uFAkCpowFMt9I0uo9BjsAbTHbp53QpU3dIBeJRTqZorv3GH82d?= =?us-ascii?Q?jWi675UgmPuN9Rq2kYoOxp6RRvOzHqR+JJuEEa4eojbHXhGguL98Y0x9cqXy?= =?us-ascii?Q?y5Vc2DY2L4ZCKVIONC3JTBZP0M8+LnXbrOv9EGWlCZQW7xNheryMgz7zjZYC?= =?us-ascii?Q?2VaS29xuVGEYtDuw99x5CBw6XFz79wYs1KLT7G8YX/GmT38XLa5GLMmYJP6Z?= =?us-ascii?Q?2+AJac35g41IrD5vxg3c9D3TX2RyNch7HJiR44UyTVFOGFFasqlKzSqFk7N/?= =?us-ascii?Q?lHcuB24QbJh0V72TyOSNxiN1apVYMhj6Zx9Vu4MOKyE13A4Ks26GI3oi+BhK?= =?us-ascii?Q?dFv/S8KxkuMUiDOPmSBW3d85rWs9We8=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 155dffb0-8e71-4984-de56-08defeafc7ec X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2026 11:40:06.1383 (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: d8OIH7b05Vw3RkgQm0kYjO0DfYlTqGgje5zzXjJlklzzBSx9X9/pQ3xD8qktKyoUA+1/hC9rqvUeIbGdJBZZMk7jQ67D4NFAD/e2NaG3x/w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MI9PR08MB975321 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:c200::5; envelope-from=andrey.drobyshev@virtuozzo.com; helo=DUZPR83CU001.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: 1787226086406158500 Content-Type: text/plain; charset="utf-8" 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 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 | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index 3ec20d87606..cec2c31f0ca 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -143,6 +143,7 @@ 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; int vhostfd; int ret; =20 @@ -170,7 +171,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(proxy->id, 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 +220,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 (proxy->id) { + cpr_save_fd(proxy->id, 0, vhostfd); + } + return; =20 err_vhost_dev: @@ -223,10 +241,14 @@ 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; =20 /* This will stop vhost backend if appropriate. */ vhost_vsock_set_status(vdev, 0); =20 + if (proxy->id) { + cpr_delete_fd(proxy->id, 0); + } migrate_del_blocker(&vsock->migration_blocker); vhost_dev_cleanup(&vvc->vhost_dev); vhost_vsock_common_unrealize(vdev); --=20 2.47.1 From nobody Fri Aug 21 21:27: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=1787226096; cv=pass; d=zohomail.com; s=zohoarc; b=Q9rvCSsBOwH/TKvNbLtGfE/35O8ds38x1+28KPGCZGFimGCkfyFV9e6ugSwSuk1FQIGyXsh8T/s4iqfgPGJ3f9/WHr3IPBDTriTyOsEZRbKRP8FAgBHsXHdqKhZaYpYNWpZexID8I96wk40ONUFs4gDQTgJ3XrXryP/SRD4NhHE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787226096; 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=n1SFlbrWFCylYpeCssgpjN6cpp3BoeUvAOLQpT3PxRc=; b=F7pwtfqdEWiEFjeWFKl/D+mCCka2QXC0Vlybz0cUG9bIZdAetl/5p9LDEDx/haLL6McJR+AaE0FNWP2XTJ2BNXpJc/ON3kLG2G+L/QMC/+Qix8LcVFy+SHD7Bd2COUI5YsndgLs78Musdx99+4hxnLZCHseXU7iH0DNO60JZwNE= 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 1787226096778227.31390090294042; Thu, 20 Aug 2026 04:41:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wx183-00016l-Hr; Thu, 20 Aug 2026 07:40:15 -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 1wx182-00016F-6k for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:14 -0400 Received: from mail-westeuropeazlp170110003.outbound.protection.outlook.com ([2a01:111:f403:c201::3] helo=AS8PR04CU009.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 1wx180-0002GQ-E0 for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:13 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by MI9PR08MB975321.eurprd08.prod.outlook.com (2603:10a6:290:c1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.8; Thu, 20 Aug 2026 11:40:06 +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.0339.007; Thu, 20 Aug 2026 11:40:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Gdqs6jSEtM8NXK8NrHwiLirrVqmY2vP6JkAX6wryTmUghC1uqzvRCs3eMhZe10dTy/cWN4vvBSzDGCu9s+Ceb/Ncog+806bxonb0w+t3zq9rnbaFOD9EWkr5t0iMcLxIWAuCpyRccRtqVsMKTdqU/JjVUK4MuFN1D0BBrj/sWM0D6yVGB00ipQv7VodkXs2mYvjRd8y8CgD0PRQ8KAdkomwIFAHtQ7obrl4h9czgWUzhbnJ556cBGLZdrHZu80xNwtdBcozqGUPwD/A/vsXUS4i8zQd3N1F/oGzXGPloCvkzjAjws7Ol9Hbl3EVIVNGogWuxo440Y/mOxnimRFemAQ== 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=n1SFlbrWFCylYpeCssgpjN6cpp3BoeUvAOLQpT3PxRc=; b=wJXZdgCFZNYTRIadg6DeeBGbrRI6/PB5hEVgdUO9HjznWtK4bazSXxRuYnLeFbMG+sl81FFPx3OQzsNb08WMERb4mGPEDhNhpjtazbsy1GpRqkgjGqvOpOJG6T+irxejx0+SACwjt78XUp2FIe4on/J0OsRZz/r1ZJy8h4mI300oY962Xj3V9rgSFkWUb9HmzwJnb9DmgZ0gOPgE5HqzQvHhlkTjdP3FT8GaPj9+PXa+BfsumJnXwb/HJ7r5lc3eGfKBB29+WmHjxy1FyaGZQFUFekca09vArHCdNeSFHL8U423+MPxgIBXxkA3HEMyHrXYhwlBi1jlG3Inww8BFBg== 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=n1SFlbrWFCylYpeCssgpjN6cpp3BoeUvAOLQpT3PxRc=; b=gP0wEVZAU18boQb5DKJeu1DKyiB/LR8XRXsnfaduhhsUWiUlGB/+DPqao8VsqSo02K/CWWdu7f4y2U9PtyoagX3S3Gi9qw78rVwUFlwBkuBCD58zysDpx1Q+d09QuII4c+MVds9RZ8vl2PfMlaClSIzfW683ORcUoow0fReMPr9WipOOXIZIrkW36t/b+GbJZPFfuM565TI0vi/0YDXEeW5xxCSlRT/ERJnO6zEibW5tEhVDSIviQu3TNJMqcD8Pt5zV/m7IrZbO8lvXwi03XR4QBCyPdNjSnueaOi57Gp45bekXt/dJ6uqSJOSz3xAA8f0AJgtZ/Ji/d69BtIlyrg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev To: qemu-devel@nongnu.org Cc: mst@redhat.com, sgarzare@redhat.com, farosas@suse.de, peterx@redhat.com, dongli.zhang@oracle.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, andrey.drobyshev@virtuozzo.com Subject: [PATCH v4 06/10] vhost: factor out vhost_dev_init_backend() Date: Thu, 20 Aug 2026 14:39:51 +0300 Message-ID: <20260820113955.509478-7-andrey.drobyshev@virtuozzo.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> References: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: VI1PR06CA0102.eurprd06.prod.outlook.com (2603:10a6:803:8c::31) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|MI9PR08MB975321:EE_ X-MS-Office365-Filtering-Correlation-Id: 32b0528d-3a17-4b11-3455-08defeafc84f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|23010399003|376014|7416014|1800799024|366016|38350700014|10067099003|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: u6ku2oexPeJky6xLwxEBRDFXA9we3CfgNUsB+BnhH02JvPeNvdVSS62yHJEkkVxrC1KzsTIxvCM8TNbr0xILIqsVJ3wTQGbT4NOEiNqT8/4hnSqz8mDq+FTOtIb/DYZozQd0Xp2d7TXE0/ji7GJPl8VurMh19mwFPqfiVJlsXtwZjgVs9duZjjS+lJoXYewNLI9pmO7y/FSdS2nEvvBQ8TtbAzKyI6wpZYRLZ1uiAtnp1Y+xeu/39iQTRb83WZO1DFGK4O9QWgiBtSAuFgDUq0s2AHp5Ao1Yz0VYcbeZdBBlZRx5dfvlNKpb+dKj2ymMU3IysM1hhnhgRfJr4JUfsR1mK9x+ZjHtjOShyxLmOLaAak+dYInYD+xSmuteEGKc2D3HnB2AdvWUyX6cz9qcZVU1lHnARAMCwBUn0pOr/CNCScl/DtP4Is3QJRsNQk//qFZOIg2heh3UVp/kGkeO8WBtONUAgf2cfagu6DvSRqpesYOb2AO97Ust0yuJJgXZ4TBzTiVyGNXCj11s08c+OKizwLZB2qRwaHr4OxSkYz+wEZPDV2CBollEHTUbEep5yKSBXU6J3TERvkXSx+VhnfQyyxHpWlCuJfZRnqPPM7cTi/WVrMxHWJwjW84qi0iZKCuDfkEz5XU1csZq09NDmCgSDuDwKB8MhrxCxrCKQqWGjf+ZBvC3E9awcrNB3U3eXxwnyqOB3PIzCGXcCYoSV46i6863h1yBQP8iiwfOQTc= 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)(52116014)(23010399003)(376014)(7416014)(1800799024)(366016)(38350700014)(10067099003)(56012099006)(22082099003)(18002099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?I0VMQsTFAVgvjCiVgpLjaUYynG561sswZF8UzVmOb5UnDlCk0b0avHRO4eXn?= =?us-ascii?Q?FZmpgDZjmd7rV0UrQkZv5NHCUHmI5IvwuVMxHirsdtFQrQDCIdATx7eY395t?= =?us-ascii?Q?jDq+0PsMr8x2oZxBn0qQinvAtK80Kdi989IFKUgVqFLx8xCjMtE9BQddjHnS?= =?us-ascii?Q?c6UbI2kQjmtD3aCdKOHQT498kFPA0OknrSzw6en/fypxDeLmxQP781hFBxV0?= =?us-ascii?Q?kM3ejO81K2Scmh4PoUSjWmF3A1WL9GLRciuwYXNj3dDuBZlDC9qac85pUHtu?= =?us-ascii?Q?0ExabVCBKOzg9eTOSuGQMAFp28F2ttEkK28ky4AIlNEHHj927NseXg2x/2xU?= =?us-ascii?Q?pNfPaYRfbpcS+75x8fBb+v3s4gkmrBUMczRhRjbQZAGDWpVRa27doUiJ8lsl?= =?us-ascii?Q?1sGkBHgs4BBg0mcWq5uPPe+ngbrAwFEBeIsc2NfTeur8msILmHcmWHmHjHtk?= =?us-ascii?Q?IkNQENd+X/8XL4s6IrZrm9v8BR2sV0+sR+Jw05k6sD0oYMmnwWCB4nww2lSX?= =?us-ascii?Q?FrUsOROJrh9RxagRxCKEdM8v1+JfeJQReZ/VZuIj9UZsXodGtY6D6G/SvGGK?= =?us-ascii?Q?aAI2g0Q2NiwnMMeLfq5/y7b7gVy5B54dzn9/k/VPmnxv8ahftO2x3ib3dW0w?= =?us-ascii?Q?9m9TPKnR0GchlAWuMIzW0sZbp5kue41SYfeUhpKY5w4eb4+JXv2rprVi9mlv?= =?us-ascii?Q?LNwt27jcOpBxH5z6IeZfcwNcqa+xsaBVOFFBqCEJKpeNEXpt1Dc/UpMtRGC+?= =?us-ascii?Q?ecaInPNfZ0G0zqAVLmBYlDwvxZziYva+XZIYB21IfeayTSf4y0ZERREFhM0x?= =?us-ascii?Q?evn5ib1tkrfaeh7IZ+D7Aj3iL9S+xEnn6UyV/vZUqfTXzrTBT8GiKl3PpA8i?= =?us-ascii?Q?a+LK0V8nwP1VB9hwNGSRdE0B1ZXwTJfE5speK/YqGNnRRZsxeNxk0FJxxMgG?= =?us-ascii?Q?yQVAczQOns/SHw9Dt+j5CVPJTb2VGWSrHr4r0xp/2BeBI77hNXOnPeJCTmYj?= =?us-ascii?Q?95hOIHONfvJYi8F9NayjdwE919P9Pib/+QA/J6fwWapZ5dSlC/am5xWNKuJa?= =?us-ascii?Q?BgUUmx2UejbCXDGW67VwAw60s8AS9P+Qrj1zTw0TNQZo7MlTjQleBnrknO8r?= =?us-ascii?Q?hYbPEaHozVK7M4qoJpnMzchVQXZ5AVXS+n+yTyYwkSYS08JqFIwmg54E9gq6?= =?us-ascii?Q?P8WSA2/03bHzurPe8sCYgWkQ+J11r0cQbR10GQqGlztGIs/9BBoOrefdtsvN?= =?us-ascii?Q?MIXNlQGtOjd/OP+vJ7/iucZhrRWRU17Sj4TfmPNivK6maudsTpje01J9tJVO?= =?us-ascii?Q?iZtNMHB/nQ4M+bWTIFKo/LMl45u0IUIimDneNsUzWafJqbZ6npWH/CPA8nAX?= =?us-ascii?Q?svdeRFEeXOwmO8Oc8xhYZhIA82ORTm6U+9AN56G1GDPfeQeiYeKOmtGW7JUF?= =?us-ascii?Q?ylpaTYkYsiBDhf3YEYkdNjxVUWtVh7d0RnN5sZMpaduK2DheHEyNI+/YMMD1?= =?us-ascii?Q?oqm4DbW9tyeXg4+1OffU1oX1hkv0y7EQYaXTt9I3cPAtCj5tshUxeJmkVAc2?= =?us-ascii?Q?5gSLCJhwaTc4ldHXMvmc5Qw3WeXIeJ33x+985HNTnQHlmeX4347UqeqHO7mD?= =?us-ascii?Q?sqQ8+5Vfsw8ZHBRCg8/NS+PMLfX8Q8fXOJHhyVI5Ow+mUObnp22SA/DIDBVa?= =?us-ascii?Q?Iv8+X2PFb1qTxdTj029JR+hbBKF5zoeVblagmQlPUXyq4Gt7LUG158/evRHs?= =?us-ascii?Q?8dIw7QgrWm9M07DCHwLccUosBnOMryg=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32b0528d-3a17-4b11-3455-08defeafc84f X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2026 11:40:06.7460 (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: 3PaCizshEGhPFIBauFLohL7e5fzihUQOWF1Z0SLCt3M6ZpOlGWiyh8+SmteMI5aIeBjw1vMGDm6SleTMvvncT61Qrjicpe77gB4EgxSSK4A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MI9PR08MB975321 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:c201::3; envelope-from=andrey.drobyshev@virtuozzo.com; helo=AS8PR04CU009.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: 1787226098642158500 Content-Type: text/plain; charset="utf-8" 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(). 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 Fri Aug 21 21:27: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=1787226093; cv=pass; d=zohomail.com; s=zohoarc; b=VogMKoDgfYElzc0R+LdEe8eSoV3cUPFPkYHFlXj+JqCR0r8ZMWscmo0FO57X0NytdklV0NDdOJwnjljLhelGuFNojgcJhAuiGo5SNsv52n3fwQEWJkxD+kmzZ7xPBbJEhD3fbtr44k5N7/xi4jnxstUCBJC6l8FKfQ2zCNYMTRE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787226093; 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=2aqx2CN3HNGVxIPYDIBmNrs8d4cZWFdlEQO4/aTfspA=; b=Jv+xhgl6Fi+U42HgK84ZG9H1Q96zHo5s9O5/89EiMQOjs1PR7W0jWAvPnpRqi9MRmsBUAGcpkUz6pE9sYrD8dHNcqEg95VFOEmXj5NTdyTGOoKYUZR9Vku+OQI0b+5Br39okCpUkn9R9bR+bTq0L3OBeFovxEL9srPffYMl4HnY= 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 1787226093037816.3051561881109; Thu, 20 Aug 2026 04:41:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wx185-000180-VS; Thu, 20 Aug 2026 07:40:17 -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 1wx184-00016q-0n for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:16 -0400 Received: from mail-westeuropeazlp170110003.outbound.protection.outlook.com ([2a01:111:f403:c201::3] helo=AS8PR04CU009.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 1wx182-0002GQ-GT for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:15 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by MI9PR08MB975321.eurprd08.prod.outlook.com (2603:10a6:290:c1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.8; Thu, 20 Aug 2026 11:40:07 +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.0339.007; Thu, 20 Aug 2026 11:40:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dbUus8yiTUSDSwWWS1BR6GKd57sGmrpkCvgwfU+cPBW3cdBqWv8y3hYZof8pQk9rNuFHWBIBV/IXv/KADRnAzzcTMCgGIg2xiz7rwhVyS7m9QEwkyJVI0x9miJFyP+hAXk5E3Suz1Geb8BDY2sJr4C0GmrURO4Yl/Zro1RPCzD3FSCgZIRfpnV7U4jO8kza1zij0gt6dwQorgwqd/Ug4ZIJ0408nt8vQQTCN2excL2mYhNKnkR2dty2+RYh/Oq5CqaJbp6loLhHUGw6hhvZ6qxJ3THXYYT1CzPlrbdySv+RBzeqngj5TahlrlyffeL+SWFJyj7GLFKkp1DwJCRD1kg== 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=2aqx2CN3HNGVxIPYDIBmNrs8d4cZWFdlEQO4/aTfspA=; b=oIuHzNJMk/6FjtHZoOlMb4Sy7zKqmofHfgpLvvWCfXZPgqTWC1KrYryZ75PTbKSfi5M/q0vSOVkou9ChNdNfjevniT5SyI3jwmVn8PuorAgm83vH7noxrVt1yUFSUH2SgzRUXaWldLE052Ts1yXrfVLfYJP0++gzyfQ6ReyZJpe42bwCFoZ7f4mVYQD1RhMKTJuPl7DUeSpuqUjCwi0NsCto1lcOg7GyESNiSkjl0nIFtGDDLZWck7X3i5XA/kE63RvglozVRQxQyzO7jk4yqWQvgW5KfClMCgMVh2pFEF4IWHDZO68+2F/zkTvH4lBfFLzTN3VKh4V8fXuVcl2n5g== 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=2aqx2CN3HNGVxIPYDIBmNrs8d4cZWFdlEQO4/aTfspA=; b=iF2hVrD6oSVNubTr44tlgrUrKUfhSXe5iTcUAk8BBk3uPAThbdGX4xW9nLEaRYitqdGCX8PC9cKVXgJHmsxDjaqom/QC34UHOAlhU3/+ARwuRJAntEodkm9fDnF+h76X1P5EEwidfvA0p2/7ZKvbwr/xo1f3tXr2uQ3AgamCX+v1SnQiRHbV+w07ucKm6Olt9+hXKqd+4jhT8smKtwSfr33k0tCx/ioAEx9LOnzZJ1Sc000dm/NnA4mz0Zrlmo5bTh+T5pGRn3hzMjhn/+wd4tEzVzSugII30uuseVDM3+Z8P21elpQeK6e+m8a8RBFisJHxnAx90zhu3MHWjiXYLQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev To: qemu-devel@nongnu.org Cc: mst@redhat.com, sgarzare@redhat.com, farosas@suse.de, peterx@redhat.com, dongli.zhang@oracle.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, andrey.drobyshev@virtuozzo.com Subject: [PATCH v4 07/10] vhost: make vhost_dev_cleanup() safe on a partially initialized device Date: Thu, 20 Aug 2026 14:39:52 +0300 Message-ID: <20260820113955.509478-8-andrey.drobyshev@virtuozzo.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> References: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: VI1PR06CA0102.eurprd06.prod.outlook.com (2603:10a6:803:8c::31) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|MI9PR08MB975321:EE_ X-MS-Office365-Filtering-Correlation-Id: 21a9d995-9949-4a1c-ddd6-08defeafc8b7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|23010399003|376014|7416014|1800799024|366016|38350700014|10067099003|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: p6FBCiLRGS2Mz4WZTSOTn8iwvtcM6dUN7FH/zuIMQTpOPjG9wl8qB0UBG5BD3nzBO5+MQuDoK6mCoHrnxg+s5ooLy91JzIhY2ZJOB7+a0mH4XIaoWyWPQx6z5ohVoVJFJS3QcNa1oeG2PsBOn+nmZRkSBW69EY3b93MmqvKLb5xfuBhEtXCfLj1U4lIv/mbLesg5/a2CmHBnoWk4hpPXkPdlv3yxvzoM2E2Kb6itihGbx0WVTael8Jaj2YA4LbzmM9zI0SZwjaBnVffJ6hQmGizAtuW7k4CeP+PDezFb40FF+eEuBGVn67kyfXh7dSg05ThPodSblV8gCIz5khXX6N0dshrBZFTQtpCZJg1fBAcx7OUYBewiDZJWzEqWWCPig/VRp9A6gkYmVFMusBdxRV7epfGUHrALFhfrCS4KXxunbIpg47fsFhuBVRBd+f80q6iYVp3399e6eHmStvvPUlZ5QrRS7UdIK0d/WPbJsQIt+RaBdQM6tKTcFu/SqLfOEsH3y1joboo3muhAFd3G8NV4VoQ9k6RdOJx3HUE10oKtwWRquZ6Q/PlVymhBuKzCVENTtrLpOBs9J9vvHcCPq0VboHWvPuAAOlYrkkEnYQZ2NRgrNZaP/Z+xiHybe7reqm+MAjZCe8DYBvwi9D6f3lyzZwurGzyAzgA3bP9cmWV6fcSDv/RgwJelWIwb9cEhJkTq+D+00HYyOZdpJyfA7NL2EuF2cJ+dZ63v2mIrvw4= 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)(52116014)(23010399003)(376014)(7416014)(1800799024)(366016)(38350700014)(10067099003)(56012099006)(22082099003)(18002099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?p8AF1PMv2OzVjlxbTvdjh6ZUVZHjk2knONGs1GsRLlZdzz/7N/DfICetjCOR?= =?us-ascii?Q?twm2uJysE5Ppo4j8F1mbXzgHqu0393eMXmTM5R10A6QrBYeRUVUmxo1v4/0k?= =?us-ascii?Q?4JDIRMmsfvZ4b6lM8Fbs+/Kh+hCZT0h3gw5FiONPmTqcqkbJIoLLc6tAJz+8?= =?us-ascii?Q?aFtIgz0iSQ0SKB0KVCwpLmkRngjghxghJLzRobfTmrRQJWmxW6YYVDxmA218?= =?us-ascii?Q?7PhS5nf0pVuOjA36AmqkxI0isWbAhZMMyT8sm60JfY8E/HOsZ/k4W95P4HrA?= =?us-ascii?Q?n/JdbyvXdSLsQTwXRYfPj/Qp+b5rdsHxlaLpSjVdZAEXK9NWtzM81WEUiC+j?= =?us-ascii?Q?EjE0x3exoHpMrae94n9dRf4dzFPnwqe2m1u+Pmwi5UnbNouZ0wqnEQknhnA+?= =?us-ascii?Q?JD0Un8IgXFPn4PaXRFaCDCDEP274A/qNsVZr54wpS/8iJoAeen98PeZrhYgB?= =?us-ascii?Q?XxYDTQG1qU0UOohMDNGLBH2NujFMFyRKhpOUhXJ+qXvUGly1Cd3DR/te2RMZ?= =?us-ascii?Q?nr4t+8ar+mCm59MF7MkH81R0CAfkfI0CuY67HBkIELBqmuJmn96v98dz02wy?= =?us-ascii?Q?nVkwuZXL367X/BVOP4UzM4fuefZgoXK9CqbhU/5dXvj9r4xM4rpJft3vTY45?= =?us-ascii?Q?+1widUv7laAA5ZWM5VCuuT0qjSkn+1PoESer8ICcrg3RlKnN5+PpobfP+eXG?= =?us-ascii?Q?rDhRM+86Q+hKEr6vdJ02ko4XWlC1Xh1FpC6Jp9Dq+mGrVR6Jbac2TeTx1Kim?= =?us-ascii?Q?l+fLsurC/EAdnAbTYS3Phpp2DPOCWK5awmOXcFAlFSQAB8fC5P6cnZAWiAWL?= =?us-ascii?Q?cii/pn76OAF+elKkMvAq9uUhqC9RikFJVnXGrXql3AFBAs0g6M46JIe21glx?= =?us-ascii?Q?6yxSyxPAiSRPEbhPLLA6AjNEyacSJ5f/IYUf2SzcNStX44cGBebHkk46/wgQ?= =?us-ascii?Q?BEFIARU0aJfAJf4kEYtrQm+lPI35yZoUakG3ev5e5zM5mUTYstsYgXgz54lH?= =?us-ascii?Q?QrsCrKSz5iN1vBCjoIlV6s429ZVJtG3GDFsjqh1DIWzUDzwKp7p7XIQTO5Gh?= =?us-ascii?Q?Sp8oILMiv/Q9KsJ1UU6E2LZqmJ8XRY5qaDKToNiLE2s2yM9M2OF7xKaVkifZ?= =?us-ascii?Q?bHBeiZzf9Uud6ku1j+WZc27bVFcN/XIuMT4bYk5GSfz7cSpgCHc851STK7EW?= =?us-ascii?Q?hJleSsO6GZYkW0gScaUbCYakdZQVnQr2y89jNBPHW+bZRD5bKvzbA1pMDEfa?= =?us-ascii?Q?Iwa/qDs4QlrLuwD9S50N+vV1zH0vAgzNHz5FimJT8QmHJ6LLJrccK5+pv6zj?= =?us-ascii?Q?Pjl/PBUQyqsKXNagmtGF0jewV8rotHuFmAyvrGlNOcGSaSBr8kVDpxomc6UV?= =?us-ascii?Q?4QMsWnh9c4ZJKZ+H7r1tFQ+0iZcimm68JtQe/I6stXtsKalYfx0Gyrg6BAHE?= =?us-ascii?Q?aAeeGo2x2bGudmf7p4p69qpxR5Nn4tXdnzcZ3s9otl0ZWQwoEweQbTbT7dp4?= =?us-ascii?Q?oC3QHPY3GX3fSeKpWTQG2IriXTvkS6ThHr2Hgdp86nvM2Rb2YRl1d4OgGtGP?= =?us-ascii?Q?dLSwyuTDc0CLYkrkTxRRpzRgH1XbYJZN/dCsW4E7wpCMlbpvfCQxQp7Il8XY?= =?us-ascii?Q?e9ORSojxM6+dUNpfHzfddNaYopCFKFrUiuW8oOK337AaOdEgeNlKpYt3t6xp?= =?us-ascii?Q?xJVCeSJ4EzOlnV90V6UvIxfh203V9mTMbQdnoPWgb7BFgy4ZdgT6p0MgFSHD?= =?us-ascii?Q?1g+unDenXlBKbwdbZxmvVRqil1YJO+w=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21a9d995-9949-4a1c-ddd6-08defeafc8b7 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2026 11:40:07.4689 (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: HwLn/9IAW/dFbNnTs0eWc7UYevyaopLkaIkYfdRkxyhWlwR04WSE1WVWiaL7Am6qhbsyxIcVhIxxQH9Szkv1sYNVeXEAqaSzHX56zuFP6LU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MI9PR08MB975321 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:c201::3; envelope-from=andrey.drobyshev@virtuozzo.com; helo=AS8PR04CU009.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: 1787226094661158500 Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Andrey Drobyshev --- 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 Fri Aug 21 21:27: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=1787226128; cv=pass; d=zohomail.com; s=zohoarc; b=KE4odn+2B+nZghchfKF2dn9yWaY8LoJu5izzRIX908oOGv9Pj0L4OIH4F/Zf+Vvu/QDBRMWdAWGMZLYvJwg8kCZLgch5S983B75ToDlPqhLMVFJDRgOtOt28QEbB0PAUey14XhOT4TBbbB8MP4uEP2XfyykeZkec6ul3i9JkcNs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787226128; 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=Ms//rT4K2mvNuRn3eWSKsDJV7oObkOq2kSzrOIGkDUI=; b=lhPqOHa256bIjkWFObrnjXkCrUR1ZMXHgMRr224UtilpqJg0C+wANgcldJFNmtwB2S03bD3XQBXVTKGj5+chsZeOIGKW3TLdK++qm9US1pNVppjH3mLLKXQCChSz0y25UY2nFDsrQyvfcZ+9Pp5FSyaYv4GwrVk0/dU7bhghfaU= 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 1787226128539286.3360481914094; Thu, 20 Aug 2026 04:42:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wx18A-00019n-Pc; Thu, 20 Aug 2026 07:40:22 -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 1wx185-000181-Ve for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:18 -0400 Received: from mail-westeuropeazlp170110003.outbound.protection.outlook.com ([2a01:111:f403:c201::3] helo=AS8PR04CU009.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 1wx184-0002GQ-B2 for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:17 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by MI9PR08MB975321.eurprd08.prod.outlook.com (2603:10a6:290:c1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.8; Thu, 20 Aug 2026 11:40:08 +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.0339.007; Thu, 20 Aug 2026 11:40:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BuQ4vgD/OGzEVi6il3xKcoWFKsZVZFnLrsCxdhp2JbsFAHZOjjNbIMvuSZdIXCcvyoRWHQV1UB4JxgF3z386FM587T53E9TeNAyxf2VEaj+Z5/e/WxMVAT0yy5Vsuv/ACkMnrncMbIEQCHM0tCeiilvuRuMbgz2bN3tVCjSaHaBZumTlmoZlZEpvakjjqWWZ+x5Kym3n5Y62VbiComOsKgyBmz6FrfaMCxFmaC/vbQC4mGk1sY4EHch5Lo4r4ES9b+2p2Z+d0xbQIONnHD9MlUsBiFjOolBu7tJ3LBqjOchfnVYrG4djDUFXg3VtT6Qci4IiDanJtg/s9RinuYbztA== 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=Ms//rT4K2mvNuRn3eWSKsDJV7oObkOq2kSzrOIGkDUI=; b=cT/iUr5fgOjC07ClkozaXTp5WTmZs0phwQwW+IPl085umLWmUbq6LYlOoHxNCMQI0aTay4oxzf6yFahRstqiKM21dAPLdCEf6KC1g7Xi7XHkSUWRGAGPC4CSlny0Ndwsl2nDwyUPbCt37WTwCb81nJnBXwK1Zonco5JAx8267li7JXyqN66DXC1opAVAqUzONZCNDWS4VOmaZMxDxa3r9OvR7BM1CCmd9x9EBzCtKIkTQpKtBJtu1SR0NqrOMSJzxicujbJd+z6oGx/7q8uMO9E2anotXLhIn8s9HINn6/I6XaY4kCLRG8tpfqMp1KlRAWywDVmOD5Vf4pt6YmXzYg== 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=Ms//rT4K2mvNuRn3eWSKsDJV7oObkOq2kSzrOIGkDUI=; b=IRglAHeidYF5YFh6v5DaH3TacSDnBp9Jm1PNpNt/fGAiHNP7JAC+Y/0U/fpKySGYhV6ZsseSqsisgI/zixBStJMATX1uVCzMiHmq9tLPdyMRGRxT3IbwgHqfMqSR42VP6UnTCLN1SstymQy0X9iVdv7++IXjoN7LI90Fzb1gL/sc0zjSI5nDZWItvNoGjVC13xSeYU1tfMclkVJ6lqaMdU2Vxg9+XRYXLEw4Dz57plnFw+ENX7lCkKJyfAlSrEkouPgkJNwb8aNdpezl5rKSUNaKqSRsteapDtBHhjAuPzQ3WKb7YDpINU5gdt0U+TgKlp+XWjgo4/mNXBUlC0PVWQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev To: qemu-devel@nongnu.org Cc: mst@redhat.com, sgarzare@redhat.com, farosas@suse.de, peterx@redhat.com, dongli.zhang@oracle.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, andrey.drobyshev@virtuozzo.com Subject: [PATCH v4 08/10] vhost: add vhost_dev_set_owner() / vhost_dev_reset_owner() helpers Date: Thu, 20 Aug 2026 14:39:53 +0300 Message-ID: <20260820113955.509478-9-andrey.drobyshev@virtuozzo.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> References: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: VI1PR06CA0102.eurprd06.prod.outlook.com (2603:10a6:803:8c::31) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|MI9PR08MB975321:EE_ X-MS-Office365-Filtering-Correlation-Id: c9ca42ed-6ee4-4121-3444-08defeafc913 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|23010399003|376014|7416014|1800799024|366016|38350700014|10067099003|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: bh9xQBeWR96lh3Y56R4E1922RwM2/JEbSUZ4P9WcknyRsSu7rgnXxb9ld5jcmAnRmySSUo9xeqTkokjFOzaP1BlpF8Il3g3SmICA9ldzRJgIwBZbvfwQHvjBvrQAJdblxZLr91KqQTGn43TtjAJvUXCjbHzGI21Ntjwc+lo4J6B8A97gXNJxUMjLU/XYfC913blUeIxt67gdmtnJ091tmpsEoSx2Xo/n4T0WueMTTmGqJ4WmugiKCEgoJ2PtAaSQI3ZzxTjIujiNM+10TZYL1aD0DWQ3/d3z1fEEUPsBsLX2rcsD+ArqHpCNgd1+krbeOpIbi3PfntqDeQXXaRY6ojQECn7nsHSQiYoOGLcHR4GHbMahGNREwUCqt2xdUrnp0CB+ed+q9E8IJDmo3HbnejOCks1CuUfCZm0T3ue6flJzSLFT1jzM2m/wvqyF3Pi503c7rpJil6YIwX+bF3eQBfFgqmtaYYjgEVwJcjO5+Usir9b8AoPXsNxl46vhnFd9PbG901aa2uLv3guux+F2C/FNYlDKeWUlERYXLKKsroZ9laa1OChxxrPfr5S+to4/es+3z49L3tiQVH/ERdq02Hy2T98nBRygPvshpyvOr4sH4FRCHIbIl9lEb4IieaPy3o8MhZuH7WRhlpAOJhujMsFo14MrdCvmrgRDrnoD60DYQVlYJDdJXLJyZrBlg4dGLe5fFNI8pK4AUPqcKPDoyNEIUAB+0B2uZl6x0pOi41k= 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)(52116014)(23010399003)(376014)(7416014)(1800799024)(366016)(38350700014)(10067099003)(56012099006)(22082099003)(18002099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7JD0+2vqj/50+3fqp+gDI/DIoxQ6g5MkbLuvrd1F4DVz3O1TCWkSUfYCXk12?= =?us-ascii?Q?Hr8i1vsJhnaG08OZvjnqgY98cgyIGXFkLicueFlkmUCvnSvyMkB3ybYyvzYr?= =?us-ascii?Q?C1usW9nyRM77hqgb1mZo74fUwgUKMWi9GV7Ix7d/oW1+geqJiJbpQNiHIelg?= =?us-ascii?Q?IS8E047pGyetd2a0rZgXQgHnq3Txoe1RWNEIho7YUmt6c58wE+dlFSWAu7Om?= =?us-ascii?Q?uKZ/wX79/WbQ+zrJqNGKHVPAHWsHwMr+dSQ5Ss4witAKQnsPD0dof+RGvdgm?= =?us-ascii?Q?3CEVnLzIxvPA0gPAP1BfMHh4270k1xAuF5FbJ5IWgmnqNxVa7vfCb42sln3q?= =?us-ascii?Q?KIGZkAEwp0MrbMiWN1C0jtRuzfZ0CVJk3IRLcYgDIXmgtyrisKN/9BKKJgvv?= =?us-ascii?Q?VY6HkTYzRprxcunPl1sLwi9mYylTQdLvKSzeOHR8lrkveRIRhqsFpoM/fFPz?= =?us-ascii?Q?FdKQQwHAoqXRC8iRV0lsr5X1R45gm45eiP1pD3px1gi66thyRmJDJlnrXlT4?= =?us-ascii?Q?lkCLHbg9UdBzBuTBWEMF7a+lASd3lzTwvWuLV9YjrTuoe6rGEdrMOzV/X2MN?= =?us-ascii?Q?1opum6k9M6BOnlDJWcws0M/vBOjpD739BVCRhnf7/f+G4Ja8BthzOo+4QgBQ?= =?us-ascii?Q?/4dy7zeaQjf8mo8eEVFC0VqGeTeTtWjyDfNt2M1zop+aNn9MEzPAL+ep6QuX?= =?us-ascii?Q?q4lN0c/QTPGDAD2AfhGk3RPnDgKXuYz82s3Xmdl98iX7H/RLb021U4r8+NHO?= =?us-ascii?Q?Q7/k36C1Z0ur6zQ2vrsMVBShr8px+/Etzd3jkV/YTxCq1mN2uR+VVO4dIohR?= =?us-ascii?Q?O41hL/sUQxhXLrhOnJutKfnWiz3YvAbicHQnD5u/rnCYNKp27P238rIDgLd2?= =?us-ascii?Q?KZuSIpwx/wVqxE0+UTXLwc+Omd4H4xiCFzsifZeryF+rJgEbSGXg6h4+R4PI?= =?us-ascii?Q?dK1Uc6ROdAdJ3DkydaoEjXGt9QQ0VDybQcOt1avm/SwsyOXb6kHwqNDIFyeU?= =?us-ascii?Q?8Pf+CU+kJf5JCuWngFbUTlkTjCEaEW/+5aREZJpddFzBPgTlZiXwioaixNz0?= =?us-ascii?Q?AgJ0Mik4VuOb9XRS8nedteK3z4NsPDBjMrxx8fUUT8tzgfMjOYJiW7cahNpM?= =?us-ascii?Q?p/mRcQyc7BKJJ+JTxSDp5W9I4ze9bttKho6+mw4WXkeQCyI9DUXixAbxg9/l?= =?us-ascii?Q?OdwEZdldx6fKo+ZsyJNsFYTLy+td30Kc7pAicovb79kHDhhK/9fQdYWvscSn?= =?us-ascii?Q?BXVnR0b/qYS8EdT5zbSGSOx8I38uxauQDN56t0zJo/dyyRkCzlPOLgeuJHsb?= =?us-ascii?Q?i0ZPz79hwG4Gba4EPybk7gOSaIuqzpQNrNPb2o7TAuef7h3Vu2zvGa7s3te/?= =?us-ascii?Q?SJPxq0JcQB8hSB6GH2OfpPesLSdsF0QUbO0de/0FypXQTU/LPhZvFb5xaoE/?= =?us-ascii?Q?2BK8/Yg2t0VKdY0YsFemZqdFV4rQqje3xqxul8Jtz0pZ12Zgqa4auB43bl0i?= =?us-ascii?Q?DdwE74t9ihlje2yUhFnuRg1/I92/wEy7CpSYTQWom111YqYSxhVa2DGck1qO?= =?us-ascii?Q?YqtwON7YoNdUaUtzALleQEOcF05hmPc0pkQnQ3Y7zzuY8OcSXy2HzfhMPLgS?= =?us-ascii?Q?GKyN4ztoseTXW3m+Jc6NoVV7oc3VdZ580Dui+Zw0FQtxpGmXr3oZxxs98KY3?= =?us-ascii?Q?RvlM1rsmUzaGVdPl1n+gD8QgupYHKArKo6w6OYyNEgrxeLmx8lck+77C8Jyt?= =?us-ascii?Q?IM4FqYw5A3zCP0STIJKBdgVxbgIDswQ=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9ca42ed-6ee4-4121-3444-08defeafc913 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2026 11:40:08.0719 (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: bg+J/0SUvhfot7YCX3lB2lTIBHs3BNbzdaGz+RNysy3xAKh1Owzpb5EUXXR0PI0gZ/2E+kQ99Ey7tInUZqLlBe+AF9QwfAwOhi0FHvXp8og= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MI9PR08MB975321 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:c201::3; envelope-from=andrey.drobyshev@virtuozzo.com; helo=AS8PR04CU009.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: 1787226130655158500 Content-Type: text/plain; charset="utf-8" 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 --- hw/virtio/vhost.c | 20 +++++++++++++++++++- include/hw/virtio/vhost.h | 13 +++++++++++++ 2 files changed, 32 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..44e65968d9b 100644 --- a/include/hw/virtio/vhost.h +++ b/include/hw/virtio/vhost.h @@ -178,6 +178,19 @@ 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() / vhost_dev_reset_owner() - take / release owners= hip + * @hdev: the common vhost_dev structure + * + * Take (VHOST_SET_OWNER) or release (VHOST_RESET_OWNER) ownership of a + * device that has already been set up. Used to hand a device over during + * CPR. Returns -ENOSYS if the backend has no such op. + * + * Return: 0 on success, negative errno on failure. + */ +int vhost_dev_set_owner(struct vhost_dev *hdev); +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 Fri Aug 21 21:27: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=1787226088; cv=pass; d=zohomail.com; s=zohoarc; b=a6eK8eyfm5RRaauiNQSqb3aTYgUTZLP4wWEclsg8LFmZt466rkE0SeWgKbUYkAvnHwCkJ8tVg0gAEeQghLqtGLcjNvIXG5/vQ78T7SLqxb8Y//yDbpu8Ds+5aOk3ohmqTKDWux6T+pFTlDB0nAMrCeY6u9KaFqHcMzdf7j8+8GQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787226088; 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=1j7rXaZ+Kq3OHqbfkyD7nprRUvo/ITxJD8She5NHJ5g=; b=ZY1tho5DPQfJc4HWlwooiG9Qsvp8ANXVIdzaOonmUYBVnYaKmufwPb7gW2fchd3RalqfBySmMLyIsEqn8SdPqCJ2awox+DCpf2bRE1wjcX3j7Ed0TzcpYzh1ujkNEtCT0gRNwncLX8kO0WerknfG/PNc7u6GEYTypge7qP9zq5M= 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 1787226088091711.3460709431512; Thu, 20 Aug 2026 04:41:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wx188-00018v-Nj; Thu, 20 Aug 2026 07:40:20 -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 1wx186-00018S-Rc for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:18 -0400 Received: from mail-northeuropeazlp170120005.outbound.protection.outlook.com ([2a01:111:f403:c200::5] helo=DUZPR83CU001.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 1wx184-0002Jh-FM for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:18 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by MI9PR08MB975321.eurprd08.prod.outlook.com (2603:10a6:290:c1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.8; Thu, 20 Aug 2026 11:40:08 +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.0339.007; Thu, 20 Aug 2026 11:40:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aeoIukb/mJQ4pHxsS4PpkIorH2Ri0kimZAOuw3sZdqt6iI78ywtHKX9rzBMhuc8xJJ1mkGJ3BlW+nkTtrr+l0tFKvo43f0CdclFiSivMCsmHwv2/WEUCMRxH0Z9PM3LETXrVm7kL3EDAasduBBStLTPsWrWpSb6hbaYdhhIUtptqkQjFq4Q+7Xwd+5PFYdcJrz6seHf4EaOjG0TtZu06QaeoTYQYCQ/h1bYHzYzIVOVC5cKx8aNWAU7TimpAkKx2sfjQN5vaMernFl5P77dloNevSeYnztaq48lo+tdsE96OZli2QDpEtjSEBWSyLUGd1ns5B6kK6OTTDa7+RYUCrg== 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=1j7rXaZ+Kq3OHqbfkyD7nprRUvo/ITxJD8She5NHJ5g=; b=Fh2235s0NJ+ytdx9hm1LI9dVqmt8j6KaUb0tmy3MsLd+MkUjldQG0I/+mm7uwlD3cbTzY4tkxEDgQBglsjeOFlj0KVfPB0XQXZUlpqWcezqDOpb2nQs2Df+B3YxQaADdBqEHwBSOscPx/mkLLMbK2Ts8Lx/myEDepEybuDWXcYTcAg7Y7gsrQfascsE1Q//V0/lXaKFw07ZnUfk/QUejr2WEGg52kyEG40Au1llOc97daTFgsg82YOSIRBaYGEitLkamej+Az+yJEqSxgTOY+zkjdyKr/vwCncqk51+SEzs+l608L+zjldPuW8eYhkizgK18d8Ango7KbgrRoyK7vQ== 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=1j7rXaZ+Kq3OHqbfkyD7nprRUvo/ITxJD8She5NHJ5g=; b=dN8H6UYJI3aRgQ962M9n/adssd955J6zvNYIKraS++xgBEu02qGXQasNYNHw3EUyNxRLIzphTIs5U3f2dc5ePuB8508jEqHbp3PpY00a2gw+VtLDivDjvXSdAkzLnnqz4RTHNFYqVrDjnvn93Hb/eDXT1jsjMGsAhz4qL3F3l16L5i40+zzYfdxzzB/c5Nvt4kw6vpWH1vsdKBgYa8BC4U9j4Rtn2AIw1NuOUkpJxcqbbxn4hcwuRMTZYVV4D4WUMTs1VcWA/ksDTMQr+HY6w8QxEORyjEoL3tvIxXKWatmWC5FC5L3mTXaUfVo7TbQbJeWyd+vPfEzmyIkZcuUJ8g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev To: qemu-devel@nongnu.org Cc: mst@redhat.com, sgarzare@redhat.com, farosas@suse.de, peterx@redhat.com, dongli.zhang@oracle.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, andrey.drobyshev@virtuozzo.com Subject: [PATCH v4 09/10] vhost: add vhost_dev_is_initialized() helper Date: Thu, 20 Aug 2026 14:39:54 +0300 Message-ID: <20260820113955.509478-10-andrey.drobyshev@virtuozzo.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> References: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: VI1PR06CA0102.eurprd06.prod.outlook.com (2603:10a6:803:8c::31) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|MI9PR08MB975321:EE_ X-MS-Office365-Filtering-Correlation-Id: 022520c1-fc7d-4a81-224b-08defeafc979 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|23010399003|376014|7416014|1800799024|366016|38350700014|10067099003|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: eUWjiYRcgja7GsAjWt+Zu9HEoIOHGimAsky/4r/CSIPX/lDpQ1qMB+5uKF5WxTVMXTFx0FzfehlGEYHFxchWZi9iE3OFPTWx7MRCJ0MI+zADvODds9fSASjyjCoBGuBHR5G3aU08YUOnBlERCzREUCNix9NW/ylNURh/SHm4gtfwQo7qS9vEfIhxRgZ50w1YK/qh9jB4qfEIdk55mgqByPpv10F615bToMPXKlzjJLZNBoFbnNqWs67xKamIRtAekDQXGeGQ3ZyZT/UxUb259CU1IlY/nr7+xma5yzY0Jm3VvDwInmXIlcbrYaJVcZdm27xgxSz751twV20zLuRypL2obj/URoD0rlUMtDWwTZCnoLzSzu05XCyyf22223CS3IyNrkD8P1KLoxVNwZjb5oCBfm1tQ/+mTh7lJDiPIaaQ3j8SeQTCLsUQuwv1A9urm3DIvbGWAW4SXqiAYLz8NPug8EJt8LoobXqSNIXc9JYsI9Tr0FYVJ+iMqQBopk5PcgCWn2jkjAuQvDhCfGv0wEwEls88TmIsnvF54NyE/sbL+TiEh0j6Eskwy3+PCGN2Ipo6eMV7NrCwfN/1dzAlvC/j7cf7lzrC8mclr5DVGuuk2hL0ev/GUqT7xGHy4mkE4NQMgjjJvfljsHyqTwxjRFnsk7WFDO6eRWJENPU4Wub5n544ZTgzZV05Nw3wfng/l4saPBsIUBftNpkJdq+jn/BoJyZ1E7GwVTfyPwvMCaw= 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)(52116014)(23010399003)(376014)(7416014)(1800799024)(366016)(38350700014)(10067099003)(56012099006)(22082099003)(18002099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?J0KhC72py1qiBmQhKMWZbPk6cYPLHR11qMeBRZQi5793Lsk1wnbepFruWGbF?= =?us-ascii?Q?O51mjvkyk/BNimvdxmwVqBOgFpebZt1jApBMk9ZpWAc5Zdv0c8Txv+7pdQDM?= =?us-ascii?Q?7iAhSyBkytCGldvfSZYwiRe2tT/ZfeWj8F2ZmdtvWb4v9ju8QNMJbVVGt7Zv?= =?us-ascii?Q?ugfL3L3GX0QTuUVES5C/FgXynj58IKJcA/pWxRtQ/xh9K613Ah9P7NezXKtl?= =?us-ascii?Q?vRAtub7WaVMfN5t2NzCNnoKqvsOy99WpRnd6HJ5jW3K7usL8IA6psEvudEn3?= =?us-ascii?Q?Z+7Ya5kKO1w/wFabpXHcJpOkYlraz6Di9I0iJS+yboFlYsuWlZFlJNl9wp4z?= =?us-ascii?Q?Asdehz1eeWoQBXKVz8XMZOPF7DJ0WXPfdTFsL9WQ4N2yLS0AzUDVp5oYavRv?= =?us-ascii?Q?jcBMBkutvBp9iXGVpsRc+UbqzfCVtPMJTzzzeCKjXpf55VRsWXBXbojGWLdt?= =?us-ascii?Q?gtkvGhYTOpwxuTJ9ZkBT+KuMu7diRyxnDzsZ1v5uhluvNMC5Sr8nrjWxmaR0?= =?us-ascii?Q?j2jwODs+izFtlM/9LmzyxpSkeBi3HdEHEqSVJZVfl2CBzvQke94VVIbXowgA?= =?us-ascii?Q?pvAOw7ZhhNmsJ30P74409t5+bf5EWzlCm0Jb3cpKH6lLH6rczjsnP8yTu9f0?= =?us-ascii?Q?mMtpQyQEgiizjTghKYaxImC5CAqx+7hXKiUhg0rvmfDYPu4pV5h/uuUAc8kC?= =?us-ascii?Q?Kb9Flsq+w8xDiOoLzMEuJpb8Ids4tbsQhOL4rX69560Di/gffCtTy46vtCEI?= =?us-ascii?Q?+xRt29/fHBhC4vODrqgCtC4jBVHXhwlXhjum56Uc72qfFc3dqhVq8HM8Iudn?= =?us-ascii?Q?q39SVhFJHEzFLf4KHRoP58dClR3at8T8Ht0CSjaVFCFlvHxZazQunKNGIXmc?= =?us-ascii?Q?sFZEkfsskSJ3k5CspsSJ7YmlGptGIA9+vmqVzSjL4Xb6EYPfziYdleqR6D+Q?= =?us-ascii?Q?w0LXGOrOYNmjUf5+AgGLYwbodVx3G+Mhxc2tZbPqTtvFFj+dMFgC4qG0FMk6?= =?us-ascii?Q?RyprDa5lx8kx1hnT72s3uR1W+7BZr3beTuMg4iChUhPtoEelV9WjoNivE6XM?= =?us-ascii?Q?X//wG5rBwTdIIUl4koNRoPPy55sswNW5eNEiH0zVvfqRpoHedJGReRvW4DH0?= =?us-ascii?Q?zYbnCIjSE/jwRCYSGOZYjvu7uVl5eOMnZPHG2/Uxh8GRoaGbhqGDB918rnd2?= =?us-ascii?Q?hxGp/Ei1IQHwo2JkA8Hgrq4p7LJe5TfT348ldKVgP/+K+w+d53aw+6pYiQ1U?= =?us-ascii?Q?SyZdjwW0ktXMSoWURLJl4wszFyjfpGPrzpa8PfLiF+dTJNUcS8nUcVn7CijT?= =?us-ascii?Q?TbpMAhZnSbk3r6Cj+2sXO+AyQF+/cLOg8/sxU3Hi41/x19HlsLe09xDBRbtk?= =?us-ascii?Q?Cn+iQ33fr+mPzspe9/ojyNW0NfnBU0QLM9pDrQTbjFptio1k6+O6CviJDFWV?= =?us-ascii?Q?VdGtgYHVr6xZxeeY8GnWepEh0JvCvJqYNGAxfliWAYXTa1VMsshzHRNBnrpB?= =?us-ascii?Q?wcdAbG8LOGULSTlY9HuBGO7RQZf7hKwHolIp7caOEob8VapTfzXq8IP+DQAi?= =?us-ascii?Q?QQE3Z0qyo0SbJAPoypGBLZuS93Wf4AShEKdvP94jgUuuYLT3Ec1PMWvK0hHS?= =?us-ascii?Q?glBJMJtZx2j44Un9T0aPOpPLzc/OEnNiZq9QNzblDQOQD8rNewCJOwIhDZMe?= =?us-ascii?Q?21VxGhP00UxO5x2cS5HmR92PozDR+xwy8EWS92354XiBrVRsGRnFDxJboAsv?= =?us-ascii?Q?brhaWwC4fKV8RrFerJ4UkHi8MZHKsfo=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 022520c1-fc7d-4a81-224b-08defeafc979 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2026 11:40:08.7587 (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: U4dXyGLErS+oY0EX4Y/Qb34x+3gYA/tzSv8fyh9QIjiZ4j7/NJ0jo9YMqkaROwaD27xhR2jnbkYWPySF9xzlc6GuvIwGvHk3oby3TKyqPtQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MI9PR08MB975321 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:c200::5; envelope-from=andrey.drobyshev@virtuozzo.com; helo=DUZPR83CU001.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: 1787226088589158500 Content-Type: text/plain; charset="utf-8" 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 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 44e65968d9b..7c4f032996c 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; @@ -236,6 +238,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 Fri Aug 21 21:27: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=1787226083; cv=pass; d=zohomail.com; s=zohoarc; b=PtwE9kcG+8JaCOwzChWIlbp30m/vEeWtbGfgBIASAI5cjYn8hee6SYRmrgw71bN/KLn7h2ugCZ8HJmhNYpHoFvfEiLOmPcn3lbMjqz2W+1OtM/uPyrquxfWOw6edmjvucXRfonLU569mkb7JRVqhbJkSgAxvqwHRb393Jf2Br9Y= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787226083; 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=zhLjHgfdhFzk2/hTj+Mps2PFi6GOBAm7+WSoM/o1ChY=; b=QIN2EEDdiEMCdrKSzQ6NTIFJ8NSVtJydTqAqW0tyCTGhIWLAyli9WYN04/ilZC8uEzDf37ojusEVWs3OdWJUz3PKYUQo5ZiChA0e9xqvmO8wFaQtv2EZ1cKidDcdUF0qK7F3xbpjeqAdeXl9qPQU8cDNbDwtVi3Ll5L4iP99kMo= 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 1787226083639628.4119530441225; Thu, 20 Aug 2026 04:41:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wx18A-00019f-8r; Thu, 20 Aug 2026 07:40:22 -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 1wx188-00018x-KW for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:20 -0400 Received: from mail-westeuropeazlp170110003.outbound.protection.outlook.com ([2a01:111:f403:c201::3] helo=AS8PR04CU009.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 1wx186-0002GQ-9g for qemu-devel@nongnu.org; Thu, 20 Aug 2026 07:40:20 -0400 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by MI9PR08MB975321.eurprd08.prod.outlook.com (2603:10a6:290:c1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.8; Thu, 20 Aug 2026 11:40:09 +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.0339.007; Thu, 20 Aug 2026 11:40:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DJ82INaFQKBpWWyB6TzfL3thSE2sNZ0VvcPMtHe+Am4Ifpv2eF5dIntVqbBOP5C5PuJYopNKUKum37oblfSjE7v4Edoh2ishLOUDAXOH0WlWJ6jVZq1FRMPyUsnPgRUWq7CHh2nMeCtLX16YU98y9RdvjOBLreE2DmPiFIra8yhp/gkFuOhwSF96ys/kGQypT5BC7+3V0sAuilPugOfFaJ8mCRwsfZzT8xgowtn5ueU1n46ZJ3ZQUo3RixzI7pbG3ef/Ck+KH4o1gDb/h959CSs1k0sP0R1LXcsJQ0V9lBt3rtctO8NOGL4MgerTkeOC9cszZtlcFjchGNW32aesAQ== 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=zhLjHgfdhFzk2/hTj+Mps2PFi6GOBAm7+WSoM/o1ChY=; b=VcJIus+gHaMUfkgqNG4h2xGSY9adW7bhohvGQxK06M27HATsfFLoc153qA1d+LPZY/zMb9XR+b4nD9oaEolm7g7B+sZ6UK6ccw5TS45cMRelSRaGa8x/2GgZmnvYeVKPFwoZYmk9w2/MdWA0wf6ZYiLBu8jzLWQ4XY7mL0Uf50NX385O/WyZrCCp8J+cZlzFuxCEBZa8z7F+M6Hf8pn7KZHo02pwtw/HnlYZF+8P4vxq341OcgP9UxqK2QpNuLB2C3UYjCK2udAOK9TxyuUG0wYVOuhWfZxbat6fDqCFw8cJFLeA5FK/c127tRBenTT/G5SS1/tp9ezDCMJ0TfNmBQ== 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=zhLjHgfdhFzk2/hTj+Mps2PFi6GOBAm7+WSoM/o1ChY=; b=AZFtLNaGrBGKsfdbD0CFPI0JXLozMW6+A3eiA11R/BdbrNtueu2tn+UsZsT+L57PnGbwLOfHhs09tC2DFSGZdsiNWdxJKu4Ph2DBS0A/hpHha/DtmCXCjMvCqpv9EIYP7aAea8VaqI8SCWzwShpvJ9NcFESM5POBjgRIywmEsjlKUNU7x+T73vc0I9c5cmdRLEL8QxBf2Mw0IH25Pa4BoGYtgXSctdqCxmLqaafsJlexi2Gu5XI3fiSi2UXG6599i8loelbtChgFvG8KHmcu4hpPEIKAU++l9qCWDodNSSF6yWJlTZVaVCzFFVO89XQgnd3vDgSSKVJO5P7BZDEZvQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; From: Andrey Drobyshev To: qemu-devel@nongnu.org Cc: mst@redhat.com, sgarzare@redhat.com, farosas@suse.de, peterx@redhat.com, dongli.zhang@oracle.com, maciej.szmigiero@oracle.com, bchaney@akamai.com, mark.kanda@oracle.com, den@openvz.org, andrey.drobyshev@virtuozzo.com Subject: [PATCH v4 10/10] vhost-vsock: hand off device ownership across CPR Date: Thu, 20 Aug 2026 14:39:55 +0300 Message-ID: <20260820113955.509478-11-andrey.drobyshev@virtuozzo.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> References: <20260820113955.509478-1-andrey.drobyshev@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: VI1PR06CA0102.eurprd06.prod.outlook.com (2603:10a6:803:8c::31) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|MI9PR08MB975321:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ffb7f12-8c81-48d4-b2cc-08defeafc9e1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|23010399003|376014|7416014|1800799024|366016|38350700014|6133799003|10067099003|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: p+G9W9uTUfxUrdzpRk8/vX7S69HHnwH25gQLuuuqdCwqLXDDWgQC234NLSSSzR27HWQADjL7KBlZrEe/9tl+4m4mlT5t1mMH6eVbAK+WeL0AekO9URqXzHb7c/cCGuChG7GoFWvyYx/29DfCs7ukdoZ6zYvyqRoUu58+tHlENqhBQplPAdUagD25lN+HAUe9FczXjZGZAwhNQdUPadSWaFWNLjS0LYuG24SdFxd7iAV/ZdowkehF2jm3AcNv3FvMiOkLD8FWTPzWP41XAm3ZiXRiTsWXgtFQNzR253Sv1TGKNLRo0oU8GWj3oON7hjzg6Qkv3zGEBP/xDWceoGxZINLjFLaS4xSyfiqwmdj8FrCyVNmBplM0LusCuuUR/X+AJDTjrgFbaAl3PUYNE4WLrnLPqH0MCMvmzeYu8L50VsigACNEzlfV/Tc4Oje5gIKqK6wkgr1T2zYPmSuRbvuwmdKecbzT+M8fKS2YSgffCZG1GZPKnzQotgQ2h5jzfFo7R+T9+z7eiRv1GvTU6JkpJ8jM0+UqE1kdhaHLChJ/comggRM2yHYyEFojXwk0qHwheGIWbGsiErQNcrSjlqy4ckiIbbaY9tAkqvx0p4uucwe2PICSOkvD6behpBXamwiwm48ngs677UoHYlXyulUg57Vek/yMLmt3Wh1s45KaITrjhQLujhjaLVFh7jioR2M7MBNe1kC7bexu63+ehXYMQTtifFsF+gDzD39B2+h5Dxs= 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)(52116014)(23010399003)(376014)(7416014)(1800799024)(366016)(38350700014)(6133799003)(10067099003)(56012099006)(22082099003)(18002099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EEuoqY4fD9oOrqWL8XbIbFd8b5WE8i2YG/KjYIyktVGImHF7sTwcmTMukuuG?= =?us-ascii?Q?OyUbikNyBUf6Rdhl3I9OwJ80Dlx7DphTPyJfgBBAMK3EmJnEjq9uVwtYmIx4?= =?us-ascii?Q?Oa2M7vFypyYSVJ7MTL/pUwztX5qyRmx37c1MHKID3vPM85yrV6jANdpqVAZE?= =?us-ascii?Q?aVb+2/9X473ryxVyY6hLwgZVodBt3LOW9VFV71JGbXZE6sHvE++oHN2t4P33?= =?us-ascii?Q?tI+NCD3ceG6LhFy1dRzVo5jZQv9f8GdK9SDDcI/NY9fhX9g98+mgdLqUus4m?= =?us-ascii?Q?REhtYef9aaNkOi5fd+GLb4yWcdq6CeErwN0cvWdaTMgJsKvTL2EQK/PlKnku?= =?us-ascii?Q?/pAuIGZNJwQUCPHMDFfQRirmSdSnj7gZZHAmHE1o+LftfxBicaEcHEzUrbjH?= =?us-ascii?Q?hCZEHpKyUN0VJhhPwwotCAUialVc895wWuBrkrl0rPBFe4ZIBWps4IQW5HoD?= =?us-ascii?Q?pF7Ayz0QmTlRpDPsV3m4JOAzak9uaimjTQTHwbB+mTLxBk3JOZPW9ocC282o?= =?us-ascii?Q?tLhsY9+CbAP7ViNFxJW1sSOLVwc/oZ8cCSX1G2gHqz/yv5UAmLpCTu/Ucn6M?= =?us-ascii?Q?EUTPCps0g9Sh4dV7QjQcA0CxyGoOjhyEAiyG42qQhE2gAmmLhNR2NT8lCITU?= =?us-ascii?Q?3y4Z/YI6drt8tkgJpXKBOsFcfR0s4/S4FaeXs9Fenuz5K69rVvL0XtJH/GPF?= =?us-ascii?Q?299IlzEJcUxVy9udR+4zO1bg3yAApU77d9PTRPf/kXH8phhwBpoEW7pq3jVy?= =?us-ascii?Q?B5RrpIzgbDBNVzduN2Ngd845UAGjGxKmK8t00f/u4HIzpfLvGe/jjV+iv8+9?= =?us-ascii?Q?WhyeCnbtyNv2Xk3ey2tFHSSZdVVGu5PGc35lCAnkkEMHjXIDFkVgSv1zW8pg?= =?us-ascii?Q?xBBNJli6/0gOZU0qoteDPofAglXz2Q8Ff3iJVg9xeSNoHCxCr94DVM4Ex5SU?= =?us-ascii?Q?r+aCU1qcphOehflqi6mzI+ZhBfTi94KDzLgGhZ3LPOH6VdRABsg6n2bPvnky?= =?us-ascii?Q?8YMAsKJt8SJgK3jFGNiwn0bSmi2L8s83KsW/R9V00QXhY5W97572TtP86mcy?= =?us-ascii?Q?tvUnSnEr7XrxBYWhtqcOYP5z+H0gsQfzhKnlayzhyboE9ley9D9AOaPEWJ7K?= =?us-ascii?Q?YBwXDti0qyKIPkafwzjQ/JG0oSWDB4QmiRHTuXgqW1z9Q23JJot2UDBCA+sM?= =?us-ascii?Q?dMXs9dBeY0kq9Z1HHdpZXWa9/VGGjOR5BqCXTdEG5GiQ34qky9UVWUUYmlio?= =?us-ascii?Q?915cHFxbF2emxlNw8qaic4shyWJLdcSs1RiIaa6Ro0jJg+bRgdi1GjNUx7xq?= =?us-ascii?Q?0eo/twYlpOZ95VNPbtOW1kGz+9H9mMq8QnzyLOE2uRalVUZH8e/ZaOE9m+CH?= =?us-ascii?Q?uzyliEDlmUNRH1NytevQJL1h1JLAIJYrsY2Z71xc5mWMDS/3ZxlXBQ629YbD?= =?us-ascii?Q?/ljgyxbZHHqpTmCqPow4EU1XbMmDIZZTDAEn730jx6GicbuCb1bpaKu85kIZ?= =?us-ascii?Q?z9vmSmwuUz4U8VZZRosS3jHECTccJ9Dgl0w3ADx8yGq+3BGzF6uQWa8MtG2L?= =?us-ascii?Q?HNYiQlDun+U3a/9qDySFZtzEnOV0mU5hFyR/8EEd81+pZRtPeNwooGEo1UUw?= =?us-ascii?Q?cZ3WCraY9mthA/xy+4HUyzteXyZDjHtQawrC8fpfi5FiEYvDKk7MVJUmSTjN?= =?us-ascii?Q?QWKNr8VjToVM+cWlaQbUmhcpjrTzLX3sgVQG0UJK5S2mg9+OxVxHlDYkzUUK?= =?us-ascii?Q?2ok3bBs1CgQVPj92/rXXuGOunt28C1o=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ffb7f12-8c81-48d4-b2cc-08defeafc9e1 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2026 11:40:09.4723 (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: XvIpe/oHqlYzICPIq8cTgghjTvcVWuT9ks/988Ad5fqff0BKID/9k+DGjDLFWZcpBeJ4NX+FvNAd8J8dEVQqb3rIchC9xncPbTe/SnpHGL8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MI9PR08MB975321 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:c201::3; envelope-from=andrey.drobyshev@virtuozzo.com; helo=AS8PR04CU009.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: 1787226084474158500 Content-Type: text/plain; charset="utf-8" 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 failure: - .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. - A MIG_EVENT_FAILED notifier re-acquires ownership if the migration fails after pre_save released it and the source VM is resumed. - .set_status() refuses to start a device whose handoff hasn't completed: not fully initialized yet, or left ownerless after a failed CPR. With the handoff in place, lift the CPR blocker: only ID-less devices, which can't preserve their FDs, remain blocked. Suggested-by: Dongli Zhang Signed-off-by: Andrey Drobyshev --- hw/virtio/vhost-vsock.c | 165 ++++++++++++++++++++++++++++---- include/hw/virtio/vhost-vsock.h | 5 +- 2 files changed, 152 insertions(+), 18 deletions(-) diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index cec2c31f0ca..e25e5350905 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -73,9 +73,23 @@ static int vhost_vsock_set_running(VirtIODevice *vdev, i= nt start) 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); + bool initialized =3D vhost_dev_is_initialized(&vvc->vhost_dev); int ret; =20 + /* + * During CPR, on target the full vhost_dev_init() is deferred to + * post_load. On source the device is left without an owner if a + * failed CPR couldn't re-acquire it. Refuse to start in both cases + * rather than issue vhost ioctls on a half-initialised or ownerless + * device. + */ + if (should_start && (!initialized || vsock->owner_reset)) { + 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; } @@ -111,8 +125,67 @@ static uint64_t vhost_vsock_get_features(VirtIODevice = *vdev, return vhost_vsock_common_get_features(vdev, requested_features, errp); } =20 +/* + * Re-acquire device ownership if a CPR migration that released it (in + * vhost_vsock_pre_save()) failed and the source VM is about to resume. + * This runs before vm_start(), so the device is owned again before it is + * restarted. + */ +static int vhost_vsock_cpr_notifier(NotifierWithReturn *notifier, + MigrationEvent *e, Error **errp) +{ + VHostVSock *vsock =3D container_of(notifier, VHostVSock, cpr_notifier); + VHostVSockCommon *vvc =3D VHOST_VSOCK_COMMON(vsock); + int ret; + + if (e->type =3D=3D MIG_EVENT_FAILED && vsock->owner_reset) { + ret =3D vhost_dev_set_owner(&vvc->vhost_dev); + if (ret < 0) { + error_report("vhost-vsock: failed to re-acquire owner: %d", re= t); + } else { + vsock->owner_reset =3D false; + } + } + + return 0; +} + +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)) { + ret =3D vhost_dev_reset_owner(&vvc->vhost_dev); + if (ret < 0) { + error_report("vhost-vsock: vhost_reset_owner failed: %d", 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; + 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 @@ -122,6 +195,32 @@ 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(proxy->id, 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); + return ret; + } + + ret =3D vhost_vsock_set_guest_cid(vdev); + if (ret < 0) { + error_report("vhost-vsock: unable to set guest cid: %d", ret); + vhost_dev_cleanup(&vvc->vhost_dev); + return ret; + } + return 0; } =20 @@ -133,7 +232,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 @@ -144,6 +243,7 @@ static void vhost_vsock_device_realize(DeviceState *dev= , Error **errp) VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); VHostVSock *vsock =3D VHOST_VSOCK(dev); DeviceState *proxy =3D qdev_get_parent_bus(DEVICE(vsock))->parent; + bool cpr_incoming =3D cpr_is_incoming(); int vhostfd; int ret; =20 @@ -159,19 +259,30 @@ 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()) { + /* + * Re-acquire ownership if a CPR migration releases it (in pre_save) b= ut + * then fails. + */ + migration_add_notifier_modes(&vsock->cpr_notifier, + vhost_vsock_cpr_notifier, + BIT(MIG_MODE_CPR_TRANSFER) | + BIT(MIG_MODE_CPR_EXEC)); + + 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,14 +315,32 @@ static void vhost_vsock_device_realize(DeviceState *d= ev, Error **errp) =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); @@ -233,6 +362,7 @@ err_vhost_dev: err_virtio: vhost_vsock_common_unrealize(vdev); err_blocker: + migration_remove_notifier(&vsock->cpr_notifier); migrate_del_blocker(&vsock->migration_blocker); } =20 @@ -249,6 +379,7 @@ static void vhost_vsock_device_unrealize(DeviceState *d= ev) if (proxy->id) { cpr_delete_fd(proxy->id, 0); } + migration_remove_notifier(&vsock->cpr_notifier); 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 a964d57e1bc..6d0cff4fb93 100644 --- a/include/hw/virtio/vhost-vsock.h +++ b/include/hw/virtio/vhost-vsock.h @@ -15,6 +15,7 @@ #define QEMU_VHOST_VSOCK_H =20 #include "hw/virtio/vhost-vsock-common.h" +#include "qemu/notify.h" #include "qom/object.h" =20 #define TYPE_VHOST_VSOCK "vhost-vsock-device" @@ -29,7 +30,9 @@ 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 */ + NotifierWithReturn cpr_notifier; /* re-acquires ownership if CPR fai= ls */ =20 /*< public >*/ }; --=20 2.47.1