From patchwork Wed Apr 3 10:21:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yong Huang X-Patchwork-Id: 13615703 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6A3CCCD128A for ; Wed, 3 Apr 2024 10:23:01 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrxkW-0003Y3-Am; Wed, 03 Apr 2024 06:21:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rrxkI-0002SG-PC for qemu-devel@nongnu.org; Wed, 03 Apr 2024 06:21:33 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rrxkG-0000tM-8a for qemu-devel@nongnu.org; Wed, 03 Apr 2024 06:21:30 -0400 Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-5e8470c1cb7so3958817a12.2 for ; Wed, 03 Apr 2024 03:21:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smartx-com.20230601.gappssmtp.com; s=20230601; t=1712139682; x=1712744482; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RAKn+HK/aO2kUntmx7L4AWae45qjf7S1vOzU9qUnU98=; b=lVZF1pIPag7vEVspYgber63I0V9R+0If/VFlPQ21R20RgJupunXIn2Q85BRx4p0EK6 5eNtxHddxF34bTki8xK5UJkZGv8Sqp3FoJ5/dzFpHEVEnEjWr4FA4zpnHb+cF6cLUpSF YVzImjIIixjkoUZ7BVoWkWWuSzJQp4D4HacWNzdKvRctTzsYN6Z8yMwuuqGaZReo6nyE yOLeuMUz8+fiGXY1nJV3WJQOKFKSb3EEwXmBhLOgF14do8i7YXfS7IzNGvX6MZfPpxWy k2XemlbkQhe37f69VMN+TSOb1qY3ElCb6GX8jE9cuB5v6CDvJ2/bRoeuuZ/PD58/GE0+ oyCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712139682; x=1712744482; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RAKn+HK/aO2kUntmx7L4AWae45qjf7S1vOzU9qUnU98=; b=ew7HL+nT+sKsBxeSZuoKzIcLXNIztA377uVRWXrpDdwXRWifXzd86Q7+5hEYbCXeGb fEhhQDyiS/uykZ9GSX8lkeVDpWKphOfGM+HsLBNmClFfyXBGRwz9+DxsCA3EVZR5XLnY QRRdze2+RoSCNTSkPaiSCfUhus9ivauYDubulrLHSt1p4pTLwXbUsFTr2GNu9ZPqcz6X MYFDf57Gfidz3giFD54h8FDkK7hQTyeVWq5N9vNJn6RN9jxJ6DHRtj0pu+pITfz33wox IZHeGb8Wkb2Os+FNc/trFALWCB+HqrLrhFG2nc/48G5TO4diB2BbNcKgH6TCA/yvvd6N 96yQ== X-Gm-Message-State: AOJu0YzGT3LBXh28KvB39FBktxGlqv26XPamPhFCVEo8j0vwIw3gSS9n yPtxBJ7dKR5mRFNaHEj6Nakdw88o+HukLqmUNVTvoGng0cSd4bsMlWM5OhWz+32kDa6M8zgddNg nTiwHoG6V X-Google-Smtp-Source: AGHT+IGKo/6U0Q21WXxcUP/9oyTrxEzM8ctimogvqGSRbflwklzaSWRDQYGyjHmMF2bEl6vR0AmHcQ== X-Received: by 2002:a05:6a20:ce4d:b0:1a3:68bb:89d3 with SMTP id id13-20020a056a20ce4d00b001a368bb89d3mr15164646pzb.17.1712139681523; Wed, 03 Apr 2024 03:21:21 -0700 (PDT) Received: from anolis-dev.zelin.local ([221.122.98.162]) by smtp.gmail.com with ESMTPSA id x8-20020aa79188000000b006e795082439sm11382261pfa.25.2024.04.03.03.21.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 03:21:21 -0700 (PDT) From: Hyman Huang To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Fam Zheng , yong.huang@smartx.com Subject: [PATCH 1/2] scsi-disk: Introduce the migrate_emulate_scsi_request field Date: Wed, 3 Apr 2024 18:21:15 +0800 Message-Id: <4ed86afd109e3084f68c51e036884192ef535107.1712139560.git.yong.huang@smartx.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::532; envelope-from=yong.huang@smartx.com; helo=mail-pg1-x532.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org To indicate to the destination whether or not emulational SCSI requests are sent, introduce the migrate_emulate_scsi_request in struct SCSIDiskState. It seeks to achieve migration backend compatibility. This commit sets the stage for the next one, which addresses the crash of a VM configured with a CDROM during live migration. Signed-off-by: Hyman Huang --- hw/scsi/scsi-disk.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 4bd7af9d0c..0985676f73 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -111,6 +111,7 @@ struct SCSIDiskState { * 0xffff - reserved */ uint16_t rotation_rate; + bool migrate_emulate_scsi_request; }; static void scsi_free_request(SCSIRequest *req) @@ -3133,11 +3134,21 @@ static Property scsi_hd_properties[] = { DEFINE_PROP_END_OF_LIST(), }; +static int scsi_disk_pre_save(void *opaque) +{ + SCSIDiskState *dev = opaque; + dev->migrate_emulate_scsi_request = false; + + return 0; +} + static const VMStateDescription vmstate_scsi_disk_state = { .name = "scsi-disk", - .version_id = 1, + .version_id = 2, .minimum_version_id = 1, + .pre_save = scsi_disk_pre_save, .fields = (const VMStateField[]) { + VMSTATE_BOOL_V(migrate_emulate_scsi_request, SCSIDiskState, 2), VMSTATE_SCSI_DEVICE(qdev, SCSIDiskState), VMSTATE_BOOL(media_changed, SCSIDiskState), VMSTATE_BOOL(media_event, SCSIDiskState), From patchwork Wed Apr 3 10:21:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yong Huang X-Patchwork-Id: 13615701 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4B3F7CD1288 for ; Wed, 3 Apr 2024 10:22:54 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrxkT-0002tp-Uc; Wed, 03 Apr 2024 06:21:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rrxkJ-0002hi-93 for qemu-devel@nongnu.org; Wed, 03 Apr 2024 06:21:33 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rrxkG-0000tT-8Z for qemu-devel@nongnu.org; Wed, 03 Apr 2024 06:21:30 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-6ecbe6dc8c6so2028712b3a.1 for ; Wed, 03 Apr 2024 03:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smartx-com.20230601.gappssmtp.com; s=20230601; t=1712139683; x=1712744483; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=su3JXcVewNLndT6lYI2i/gAjWAva3xX2Ao5dVp2OUNc=; b=s+gaAnklqJVeTdkXTREC/yhJbiB6sSDNgXhqocTx+HbNZ4PIs4bmrkpnvVA8E2IMZ1 0YWLEg3TCseK38IUuMIqRDg1P80tMqLiGfv/SW5rkRIHzGwA8qe26YOBEvs9UJTWyfUa 9iJTv+sqjt/gQ6SkFkG7RukKIrjAyyUtyjH+Nb8xJp31l9a3dezdCaCPRFwHQMemchsn cbowJilbobb/EvbxZd67GXiaTaSR2jWFC9T4T54zczuK/XT5oNRrN0K7K9yR94P3zHZd wbUSWdm9ilSr2O1JcKpm4EaoDkGM0b2by+qXqZOMhJVfykrt5CGgu7Q9QuhLK5dD965V GZIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712139683; x=1712744483; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=su3JXcVewNLndT6lYI2i/gAjWAva3xX2Ao5dVp2OUNc=; b=QOZ/Qp22LZg1HAO1KsxXEsEaKjgr5sqYgsDHLmsOdfr58SO4ddPYyIvMIPotqWXrA0 coUZGsiIKTwDFEJYlmp6nL/NcbO0gCERTHmvUyVNyQYaFj+MlugARUWrbOnFWLX2Dl4h nsYpd7cfI4QsqzXwO7AIWljdDVf3xGFahkPpZmeBgJb+qg/vg8aQo0lO3zz7PwfDebwW YvotF/8qxLEXBqQyGosemPAIkS2/PJi9kW+NfpdrVLbZGSUFmBd4Hsac/kzpQc1XaSuC wwIjSVcks/YzhpLiFj2Chs2UaLQf8HaO1dtDqUEndGJjfkHnxOFjvwc1NL6AsOXyMM6E LOyw== X-Gm-Message-State: AOJu0YwA5rUnIT1Ri4klxGGvvl+DtNZ/Wamce1/o4jMCUh+uFCfF19/4 eCsICfat06ONQX9izyijXfrTmWK9nJ7mBxIvJUov5nEbP+S6ou0IUBO2n6LcYeRtOPptUjeFxwo qElKurO1X X-Google-Smtp-Source: AGHT+IH22nycC0Vd0P5SRODLkSPA6zYBT4X0MdqUfMO6O40IiqdlmYnVpOlTOpdXcQbGBBHZ9OsX8Q== X-Received: by 2002:a05:6a20:918b:b0:1a7:23ae:74e9 with SMTP id v11-20020a056a20918b00b001a723ae74e9mr4093654pzd.13.1712139683365; Wed, 03 Apr 2024 03:21:23 -0700 (PDT) Received: from anolis-dev.zelin.local ([221.122.98.162]) by smtp.gmail.com with ESMTPSA id x8-20020aa79188000000b006e795082439sm11382261pfa.25.2024.04.03.03.21.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 03:21:23 -0700 (PDT) From: Hyman Huang To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Fam Zheng , yong.huang@smartx.com Subject: [PATCH 2/2] scsi-disk: Fix the migration crash of the CDROM device with USB bus Date: Wed, 3 Apr 2024 18:21:16 +0800 Message-Id: <44af98e57635a1fe1fbda802bf56061c4c2b26b4.1712139560.git.yong.huang@smartx.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <4ed86afd109e3084f68c51e036884192ef535107.1712139560.git.yong.huang@smartx.com> References: <4ed86afd109e3084f68c51e036884192ef535107.1712139560.git.yong.huang@smartx.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::42c; envelope-from=yong.huang@smartx.com; helo=mail-pf1-x42c.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org When configuring VMs with the CDROM device using the USB bus in Libvirt, do as follows:
The destination Qemu process crashed, causing the VM migration to fail; the backtrace reveals the following: Program terminated with signal SIGSEGV, Segmentation fault. 0 __memmove_sse2_unaligned_erms () at ../sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S:312 312 movq -8(%rsi,%rdx), %rcx [Current thread is 1 (Thread 0x7f0a9025fc00 (LWP 3286206))] (gdb) bt 0 __memmove_sse2_unaligned_erms () at ../sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S:312 1 memcpy (__len=8, __src=, __dest=) at /usr/include/bits/string_fortified.h:34 2 iov_from_buf_full (iov=, iov_cnt=, offset=, buf=0x0, bytes=bytes@entry=8) at ../util/iov.c:33 3 iov_from_buf (bytes=8, buf=, offset=, iov_cnt=, iov=) at /usr/src/debug/qemu-6-6.2.0-75.7.oe1.smartx.git.40.x86_64/include/qemu/iov.h:49 4 usb_packet_copy (p=p@entry=0x56066b2fb5a0, ptr=, bytes=bytes@entry=8) at ../hw/usb/core.c:636 5 usb_msd_copy_data (s=s@entry=0x56066c62c770, p=p@entry=0x56066b2fb5a0) at ../hw/usb/dev-storage.c:186 6 usb_msd_handle_data (dev=0x56066c62c770, p=0x56066b2fb5a0) at ../hw/usb/dev-storage.c:496 7 usb_handle_packet (dev=0x56066c62c770, p=p@entry=0x56066b2fb5a0) at ../hw/usb/core.c:455 8 uhci_handle_td (s=s@entry=0x56066bd5f210, q=0x56066bb7fbd0, q@entry=0x0, qh_addr=qh_addr@entry=902518530, td=td@entry=0x7fffe6e788f0, td_addr=, int_mask=int_mask@entry=0x7fffe6e788e4) at ../hw/usb/hcd-uhci.c:885 9 uhci_process_frame (s=s@entry=0x56066bd5f210) at ../hw/usb/hcd-uhci.c:1061 10 uhci_frame_timer (opaque=opaque@entry=0x56066bd5f210) at ../hw/usb/hcd-uhci.c:1159 11 timerlist_run_timers (timer_list=0x56066af26bd0) at ../util/qemu-timer.c:642 12 qemu_clock_run_timers (type=QEMU_CLOCK_VIRTUAL) at ../util/qemu-timer.c:656 13 qemu_clock_run_all_timers () at ../util/qemu-timer.c:738 14 main_loop_wait (nonblocking=nonblocking@entry=0) at ../util/main-loop.c:542 15 qemu_main_loop () at ../softmmu/runstate.c:739 16 main (argc=, argv=, envp=) at ../softmmu/main.c:52 (gdb) frame 5 (gdb) p ((SCSIDiskReq *)s->req)->iov $1 = {iov_base = 0x0, iov_len = 0} (gdb) p/x s->req->tag $2 = 0x472 The scsi commands that the CDROM issued are wrapped as the payload of the USB protocol in Qemu's implementation of a USB mass storage device, which is used to implement a CDROM device that uses a USB bus. In general, the USB controller processes SCSI commands in two phases. Sending the OUT USB package that encapsulates the SCSI command is the first stage; scsi-disk would handle this by emulating the SCSI operation. Receiving the IN USB package containing the SCSI operation's output is the second stage. Additionally, the SCSI request tag tracks the request during the procedure. Since QEMU did not migrate the flying SCSI request, the output of the SCSI may be lost if the live migration is initiated between the two previously mentioned steps. In our scenario, the SCSI command is GET_EVENT_STATUS_NOTIFICATION, the QEMU log information below demonstrates how the SCSI command is being handled (first step) on the source: usb_packet_state_change bus 0, port 2, ep 2, packet 0x559f9ba14b00, state undef -> setup usb_msd_cmd_submit lun 0, tag 0x472, flags 0x00000080, len 10, data-len 8 After migration, the VM crashed as soon as the destination's UHCI controller began processing the remaining portion of the SCSI request (second step)! Here is how the QEMU logged out: usb_packet_state_change bus 0, port 2, ep 1, packet 0x56066b2fb5a0, state undef -> setup usb_msd_data_in 8/8 (scsi 8) shutting down, reason=crashed To summarize, the missing scsi request during a live migration may cause a VM configured with a CDROM to crash. Migrating the SCSI request that the scsi-disk is handling is the simple approach, assuming that it actually exists. Signed-off-by: Hyman Huang --- hw/scsi/scsi-disk.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 0985676f73..d6e9d9e8d4 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -160,6 +160,16 @@ static void scsi_disk_save_request(QEMUFile *f, SCSIRequest *req) } } +static void scsi_disk_emulate_save_request(QEMUFile *f, SCSIRequest *req) +{ + SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req); + SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); + + if (s->migrate_emulate_scsi_request) { + scsi_disk_save_request(f, req); + } +} + static void scsi_disk_load_request(QEMUFile *f, SCSIRequest *req) { SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req); @@ -183,6 +193,16 @@ static void scsi_disk_load_request(QEMUFile *f, SCSIRequest *req) qemu_iovec_init_external(&r->qiov, &r->iov, 1); } +static void scsi_disk_emulate_load_request(QEMUFile *f, SCSIRequest *req) +{ + SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req); + SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); + + if (s->migrate_emulate_scsi_request) { + scsi_disk_load_request(f, req); + } +} + /* * scsi_handle_rw_error has two return values. False means that the error * must be ignored, true means that the error has been processed and the @@ -2593,6 +2613,8 @@ static const SCSIReqOps scsi_disk_emulate_reqops = { .read_data = scsi_disk_emulate_read_data, .write_data = scsi_disk_emulate_write_data, .get_buf = scsi_get_buf, + .load_request = scsi_disk_emulate_load_request, + .save_request = scsi_disk_emulate_save_request, }; static const SCSIReqOps scsi_disk_dma_reqops = { @@ -3137,7 +3159,7 @@ static Property scsi_hd_properties[] = { static int scsi_disk_pre_save(void *opaque) { SCSIDiskState *dev = opaque; - dev->migrate_emulate_scsi_request = false; + dev->migrate_emulate_scsi_request = true; return 0; }