From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from AM0PR02CU008.outbound.protection.outlook.com (mail-westeuropeazon11023125.outbound.protection.outlook.com [52.101.72.125]) by lore.virtuozzo.com (Postfix) with ESMTPS id B4529802A5 for ; Thu, 24 Sep 2026 16:41:39 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ucaWRLnPyo9XAls3R/NqfMX3Q5spFM01SGDKeTdpdtceBSKy3y0gSyvfcCyFF4D3OJspD5R7pvOlfCgUHRqVymcdwr5b++xrmIGbtW/3srj19J6ksEA8R0H6lQc8myo3/UJluv5EbMcBkB1KlI0vGB8LPCQiFHa5gs6+5yKtUOLNCtWBJh4nZYJ37EKQaNZNRGLi8kWFaab+w9634/UotpJGgzD1bSjquLFSNF/grwhGyx2OEhfV9/yy1cYutwUXxp8e2eyvpIwT7FUiHPkx9UYflVIlNo80tSRkdsY6mRRP+wdas4kM6bgACfY+dCze6qt4tEFWH+bmMSGtfT259A== 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=2i1PM2YXazj9yTny+BEiBtA4iCHfw2vSSiQbtjrZyks=; b=DNKQHaTbYIOLSuqjzznMZjupE8bzGrtjK6+qTpoVlTP5zKiSOlJfYDnZGYpHTY8dFMWvvemD5BEMOhdn5NMvdPGQTSbeVed/9IzBPOJqpxLmE0mIKvUemEFGZ4myrrbsyG9vxtDNwxQHvSIpHY315+j6rAR2fg3lmlNBtIEqouTI5mE5mIdZYXynqaauiJtOXV03L/WdqyM0UKWxz/v8w+r76FvGDSkoq6SKdLycATEy+qCp2TEonOjvpbSy2gkGlW4/mX/RCM4S/rRRRSdgCtmAKfIEhLnuehI3YugWZoej0Jg8ZcEVf6Fb5fMQ1wIyfcEuYgeydqwHBU+04GtKdw== 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=2i1PM2YXazj9yTny+BEiBtA4iCHfw2vSSiQbtjrZyks=; b=MeEb9y5EzeNKows4lmSsPHSTEfj1QzV37z+UvNosbUhTHdUbGidSm8K81dT2Wa5MH3ySF9UZ7gJb8yIrotO8grepe4wIc6tflxLTO2v8QA1dt8YIZahPFVSCiZzjOM1nk5MuEZCIUujEL0kp7lq3IkVB6vl1/A8wmtvC9OmXHLVBSq2kISw96kR9v9S20itTf4EBN1dCYqWq5Pu8ZB+nPZZeFn92GnXHtIwul6g8iFuDGM6KFl7DGw4HdW2UXwnJkr0WaubFXax+V7hwy8zZm693AibASEYi+a3wuJg+exYIV2PzDt4W9tIZlIsZJ4TKL2JYLwxcIn/Vu5EEdNt39A== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by BR0PR08MB151385.eurprd08.prod.outlook.com (2603:10a6:2c8:30::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.18; Thu, 24 Sep 2026 16:41:38 +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.0451.014; Thu, 24 Sep 2026 16:41:38 +0000 From: Andrey Drobyshev Date: Thu, 24 Sep 2026 19:41:28 +0300 Subject: [PATCH QEMU HCI-8.0 v4 05/12] usb-host: drain in-flight URBs across CPR #VSTOR-137800 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260924-usb-host_v3-v4-5-1cc48bf630e7@virtuozzo.com> References: <20260924-usb-host_v3-v4-0-1cc48bf630e7@virtuozzo.com> In-Reply-To: <20260924-usb-host_v3-v4-0-1cc48bf630e7@virtuozzo.com> To: svt-core@virtuozzo.com Cc: Andrey Drobyshev , den@openvz.org X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIVP296CA0030.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:356::12) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|BR0PR08MB151385:EE_ X-MS-Office365-Filtering-Correlation-Id: d9d74dcf-8b3f-43be-281f-08df1a5ab415 X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr List-Id: svt-core@virtuozzo.com X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|52116014|376014|1800799024|366016|10067099003|5113699003|6133799003|18002099003|22082099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: 32fO7dGZRHNLrVR6jWwmQAjkC/fY6CRLb9ED4tC9e5tk3G7UEheO12zTAoDUCbn2nUdTtYOr1bCnZKJHwWpYamZ8zY9u42LxhY4+4T9nbAU3IHBRT05QwhzzSIalLJ0t8HVQTrycZPrWuywNqzLUl1YPSNTSwXa2JK84OZlPh5RqOse1vXTjNdnhsmItlQQ9CKx4Kpjc0haHVOu4EMos7DNw9pDgM9B6dwER88pTFZTShN5yt78MApVBLQvMIE4kSXlteVE3qRZjhXBS85/SCds83myOaSn+rc+p87VDodTd2+BXxx1cWQrJqb3AArrDB86XlUSXFNU4CVEH5u2UE6aKN4cqjHdgCAyh37q4R1TmIbGI7QV9GF+4Fi1g4Wuh0iXSwF7qdVer2lqj4+cdlvk4oJTMnjhD4umezx8X4APUSpXktMxlZI5WcH6W+4zRVhF1Z86y6gBp6byHlGiH3d+MjyKUBOAGNE59+sBSbyLzohoZ5ic2eXTjeX4BdjFCpuyEQm8K1Cyjp2EjjYkR14F+AMXW2fhhoHJ4zBFCefQlu4+zU9pRWHp5G7/XgFBdOcfyLiG611PqtxWYCJkKLFd9zb+XEBGv6ZS6xbirYtmx4wKIl14wREZw6QNkqCct78L6Anjzu5rWzixMLseYT+SbP8Z6dcbReDemRWH29AviWjW+07fMb0u6B51Wx6PbrRSGq5UPpNfpBu3DElnCyI7JPpZhKlSx+ls/5AWid4M= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI0PR08MB10656.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(52116014)(376014)(1800799024)(366016)(10067099003)(5113699003)(6133799003)(18002099003)(22082099003)(56012099006)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RWdsbDJoQUQxUCt5WWs1V1p2cTljU3RValFBOGNaVFBUUkVYdXVJMzFkZ2tF?= =?utf-8?B?bld1WStlRHRnZkhSdzlKYjJrVjN4ekFOUlNOVkpTUFBnWkwwdXdvb2R3ZXRq?= =?utf-8?B?ZUYreEJBNjI3WkZsRzVHQ05PNFBVYkhYTUsrQzNIWUR6K2ptbERNWTVvRUNx?= =?utf-8?B?d09BdWdGQXloUUpPSXVuWXZjYUVZVzdBU1A2TTNlWjFwTVplTm9vbWl2MVFY?= =?utf-8?B?alVFc0Y0RDAzYTNFMXY1SmRlSmdaeTRRMmd0VjJJdUgvVmN1dWVraCtnNjhY?= =?utf-8?B?YU5TdXdUSmEvc0diMzJhTGpMWHdiTXZtYll1Q3BkVUkyYkxRWUhNWVRkZXl6?= =?utf-8?B?cmJ1cDB0d01xYWFqM0Iva0d6S2cwMTBQNWEyVFlTMGZ5Q0JIWno1NWh0Y1hx?= =?utf-8?B?NjdOZzF2cWRST04rNWNHRUxGc3FOTy9aSUROd2NGWlBab1paZnBhQmNZWndS?= =?utf-8?B?VFYrMmJidjBjbTNGWmNySnN4bllvdDNBcDFXNFBZWWoyQ0NxQXhveWhtSGlv?= =?utf-8?B?NG5oZEtGTHI4N2I0d2tWRUxlSTMvc0R2aHNNVDJHVzJ1QTMvaFI0bkh5Qldo?= =?utf-8?B?TWg4dXZOdjhrV0FacmJ3K2dUc2pONjN1bHdkY3ltRVhlMlc1N3MrOUxqdU85?= =?utf-8?B?L0hiUW9Pam5jVnpNaEhROHhvandtSEdiSXdDS09BZUk5QTlsOVNOdFd0TWgw?= =?utf-8?B?b3lIVEtHc2wxUFBCVGdLWDRkQWV6R21DMVBMVG5BZlorR00vTE9LVFFaTjE0?= =?utf-8?B?MmpsV2FJMnU0cW55dWlXRXlFa2NEWkpUYzVacTF0TjBLWG5FYkJJaXRyKzBZ?= =?utf-8?B?SHN1VG53NG1ZYU8xZmJ4dk9tSzAxV29NMm5ERXZUWTF1S0wvUHpQZ2l5a3lE?= =?utf-8?B?OXBMWHZvSEZlbFZ6ZS9wc1Y1Z09tTExzRGpLZWt4cjN5YlRxVjFRZFJtTGEy?= =?utf-8?B?SU5YV1lNeDhQY0N6NFBsY3I4WU1NTWIyQmdsVnk4ZWV0QUJ5MzJzK084cHZ4?= =?utf-8?B?cTVKZ01lZHlOYTFWTWk4a0tlakl0VldvZUJ6TXdjcW1zTnUvNFBvOWNGTHNE?= =?utf-8?B?T3Q5eU1UVnNkUEVieUhMNElWMk95QkkwNGVBS3lKZlFZTUlObk5mVkMzelpp?= =?utf-8?B?anpraXpNbWJxRklSVFBHNmtkc3FVQUlyMlhqVXkxVFRoRFVja1BvRjBKN2Nk?= =?utf-8?B?VURtVzBBbGdVdFBnZXRpRVh4ZUJFVjlnRldoQWdDd0djanB6d2svY3VXQ3Rh?= =?utf-8?B?akllRUxTbmxMd2dUU1IzZVJpYTlGV3NxZWVHU2tlanl3dGVLeTErUmRPUHVB?= =?utf-8?B?S2hhS3BlQ2Z2eUlzRkpkWXZCUXMwT0RXRzAyaGQvaHUvU1I2L3NrZGFPOU4y?= =?utf-8?B?dE1JZVFwajNodXhib1hCY3gxcGlENkpEeXFwMVRRQlYrcEs0SkxtdlFsRlZW?= =?utf-8?B?aWRlWk1rY0s4WDNKRkFLR3RzcU9hUW5BL212OCtzZWVoYitBZHVPN1gwc2pI?= =?utf-8?B?TnVnbGphUHBURkQ0dURwUFhvdHkzdXVsTkxNYm01L3BDV3JaaTJCUzhwZzZN?= =?utf-8?B?WUFBZm9uQTFiYU82Wlpwa2ozY09zS29NSkt6YlZhSDJCcDV3SGxnWm83V203?= =?utf-8?B?VFlCbjV6cDhLbm5ublMrcUdKWkFJdlpMa3RrUXRnVlp6TDVjdlc0MlExVmI5?= =?utf-8?B?bC9JY2srcFFIVi9ZbE0ySkhTUG9iWndDcUNaL1V4eU8zTTZZMldlTVp0Vnp2?= =?utf-8?B?MWZQUFNTQlh0Mk14WmVyejNTbENPZjZWSUdOR0RkMVFlT3JwZGxyUmRZN3N2?= =?utf-8?B?aHZSblF0MEFjNmRmb1lETDVxbjJSRmtiaHhFdkpDaG1lL2xMUEY0dEs2a05E?= =?utf-8?B?M0UwOC95Z0dSTWhRdGxzSm9EVGpmSVhKdEFrTUNCcGVzUDRGMFYxTzZRTjJw?= =?utf-8?B?S3B5a1AvQlkwQVVKUG16N2IveGdwUkVNT3BTOTNWR0Q3eitrdmNmbDRNUnFq?= =?utf-8?B?MHNoOFZFQ0FraHJtSTVxSTk5d3RnUi82b1pRZGxvNzRFY0VSUUZRUUlXWjFU?= =?utf-8?B?WGpyVlN1WmsxR0Q2dnJnNDFLVHprSkFYYmVXNjY1aEtmOWhKN0Jjc0hsNC9U?= =?utf-8?B?bVA0cXZwZ2VweTkrT1lSNXFaNlB1TVN4bjJQK3RhcXNJYWJaeVMrUWdLM1Zs?= =?utf-8?B?MFRCOWNUbXhyVExDTm54KzZsTlFnbnV2eVBWRk9zclIvQllXVFdWTXcxV012?= =?utf-8?B?WHpzRnVlMWNQT2FwYzN6aXd3c3VvNUcycnVuL3FlODJTWHVGemhPbVdDaGxX?= =?utf-8?B?WlYzQ3FjOTY4RXhBdFRNTzM0RVVUUkk5QndJa2pEK2FtUEwvV2ZWcGlXTXV1?= =?utf-8?Q?5dg+eLR75DIHepKU=3D?= X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9d74dcf-8b3f-43be-281f-08df1a5ab415 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2026 16:41:38.4312 (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: ilaq6SW4PjRpwnp2DtNs6RGBIpPpvh9yLZa7qcVvEdgj4oo6J7WGTXQkjMrvsoz7eMTgBqoKrCeNCQCJ0jlif027w6B8WrG2B4VMrIZXjc0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BR0PR08MB151385 URBs submitted by the old QEMU must not outlive it across the switchover: the kernel would complete them into buffers of an address space which is gone after exec, and the new libusb context would reap URB pointers it never submitted. So, in .pre_save() for the CPR modes, cancel and reap every pending transfer, without completing its packet. The packets stay ASYNC and their TDs remain on the transfer rings, so the target re-executes them when usb_xhci_post_load() kicks the endpoints - the same in-flight replay as on regular live migration. A partially executed transfer is simply re-run from the start of the TD. Isochronous URBs are not on the request list but on their own rings, and freeing them while in-flight would leave them queued on the preserved FD. Cancel them so they are unlinked and reaped: an iso URB in flight when the guest stops may never complete on its own. The target reconstructs the iso stream from the guest's transfer ring. Signed-off-by: Andrey Drobyshev --- hw/usb/host-libusb.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 94 insertions(+), 3 deletions(-) diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 9b70d6deef9..4ea469de2d9 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -48,6 +48,7 @@ #include "qapi/error.h" #include "migration/blocker.h" #include "migration/cpr.h" +#include "migration/misc.h" #include "migration/vmstate.h" #include "monitor/monitor.h" #include "qemu/error-report.h" @@ -403,7 +404,10 @@ static void usb_host_req_free(USBHostRequest *r) #ifdef CONFIG_WIN32 request_count--; #endif - QTAILQ_REMOVE(&r->host->requests, r, next); + /* Skip if a timed-out reap already unlinked it (avoid a double remove) */ + if (QTAILQ_IN_USE(r, next)) { + QTAILQ_REMOVE(&r->host->requests, r, next); + } libusb_free_transfer(r->xfer); g_free(r->buffer); g_free(r); @@ -1096,7 +1100,7 @@ fail: return -1; } -static void usb_host_reap_xfers(USBHostDevice *s) +static bool usb_host_reap_xfers(USBHostDevice *s) { USBHostRequest *r, *rtmp; int limit = 100; @@ -1117,9 +1121,10 @@ static void usb_host_reap_xfers(USBHostDevice *s) QTAILQ_FOREACH_SAFE(r, &s->requests, next, rtmp) { QTAILQ_REMOVE(&s->requests, r, next); } - return; + return false; } } + return true; } static void usb_host_abort_xfers(USBHostDevice *s) @@ -1132,6 +1137,76 @@ static void usb_host_abort_xfers(USBHostDevice *s) usb_host_reap_xfers(s); } +static bool usb_host_iso_inflight(USBHostDevice *s) +{ + USBHostIsoRing *ring; + + QTAILQ_FOREACH(ring, &s->isorings, next) { + if (!QTAILQ_EMPTY(&ring->inflight)) { + return true; + } + } + return false; +} + +/* + * Quiesce the device for a CPR switchover. Cancel and reap all URBs, + * so that no URB submitted by this process can outlive it. + */ +static int usb_host_cpr_drain_xfers(USBHostDevice *s) +{ + USBHostRequest *r, *rtmp; + USBHostIsoRing *ring; + USBHostIsoXfer *xfer; + int limit; + + QTAILQ_FOREACH_SAFE(r, &s->requests, next, rtmp) { + if (r->p) { + /* + * Clear r->p so the reap callback early-outs on it: the + * callback must still run (it frees the request), but it + * must not complete the packet. + */ + r->p = NULL; + } + libusb_cancel_transfer(r->xfer); + } + + if (!usb_host_reap_xfers(s)) { + /* + * No URB can be left live on the FD across CPR migration. If + * we can't reap them -> abort the migration. + */ + return -1; + } + + /* + * Iso URBs are on the rings, not s->requests. Cancel them: one in + * flight when the guest stops may never complete on its own, and none + * may be left on the preserved fd. The target replays from the ring. + */ + QTAILQ_FOREACH(ring, &s->isorings, next) { + QTAILQ_FOREACH(xfer, &ring->inflight, next) { + libusb_cancel_transfer(xfer->xfer); + } + } + + /* + * Cap the reap at 2x a full ring: + * iso_urb_count URBs x iso_urb_frames packets each + */ + limit = 2 * s->iso_urb_count * s->iso_urb_frames; + while (usb_host_iso_inflight(s)) { + struct timeval tv = { .tv_usec = 1000 }; + libusb_handle_events_timeout(ctx, &tv); + if (limit-- == 0) { + return -1; + } + } + usb_host_iso_free_all(s); + return 0; +} + static int usb_host_close(USBHostDevice *s) { USBDevice *udev = USB_DEVICE(s); @@ -1807,10 +1882,26 @@ static int usb_host_post_load(void *opaque, int version_id) return 0; } +static int usb_host_pre_save(void *opaque) +{ + USBHostDevice *s = opaque; + MigMode mode = migrate_mode(); + + /* URBs submitted by this process must not outlive CPR migration */ + if ((mode == MIG_MODE_CPR_EXEC || mode == MIG_MODE_CPR_TRANSFER) && + s->dh) { + if (usb_host_cpr_drain_xfers(s) < 0) { + return -1; + } + } + return 0; +} + static const VMStateDescription vmstate_usb_host = { .name = "usb-host", .version_id = 1, .minimum_version_id = 1, + .pre_save = usb_host_pre_save, .post_load = usb_host_post_load, .fields = (const VMStateField[]) { VMSTATE_USB_DEVICE(parent_obj, USBHostDevice), -- 2.47.1