{"id":2225812,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2225812/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260421161132.99878-8-kwolf@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260421161132.99878-8-kwolf@redhat.com>","list_archive_url":null,"date":"2026-04-21T16:11:32","name":"[7/7] ide-test: Test reset during TRIM","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"187661fbcca17c863f760dba3f8c1a450c131a5e","submitter":{"id":2714,"url":"http://patchwork.ozlabs.org/api/1.2/people/2714/?format=json","name":"Kevin Wolf","email":"kwolf@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260421161132.99878-8-kwolf@redhat.com/mbox/","series":[{"id":500847,"url":"http://patchwork.ozlabs.org/api/1.2/series/500847/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=500847","date":"2026-04-21T16:11:27","name":"ide: Fix deadlock between TRIM and drain","version":1,"mbox":"http://patchwork.ozlabs.org/series/500847/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2225812/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225812/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=AD2FbuEg;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g0S8F0s6cz1yJG\n\tfor ; Wed, 22 Apr 2026 02:13:33 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wFDiW-0001c0-Dr; Tue, 21 Apr 2026 12:12:52 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1wFDi5-0001QN-26\n for qemu-devel@nongnu.org; Tue, 21 Apr 2026 12:12:26 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.133.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1wFDi2-0000KQ-Cc\n for qemu-devel@nongnu.org; Tue, 21 Apr 2026 12:12:24 -0400","from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-470-SQ7jkUo9PACq2rGa0FJTqg-1; Tue,\n 21 Apr 2026 12:12:18 -0400","from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 4152C1800605; Tue, 21 Apr 2026 16:12:17 +0000 (UTC)","from merkur.fritz.box (unknown [10.44.49.173])\n by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id 743561800351; Tue, 21 Apr 2026 16:12:15 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1776787941;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=dKypboLdCRAggBQbHJnEX0z4rr1+fj30DugdG4Qnd/w=;\n b=AD2FbuEghgNWvMTEjgcd+6gBc5sFSKYktNzhwKh/+yXiRzsBPb4dZon+Kf4eIQnhEO0WIi\n yfP7F4YSlu0gwxNKX5VHW9ADlL7SwS4scil/z+XkaH6D6yijottxCo+di//+S8CaHXzLQk\n 9OfTHL6WOYk4KJRp58YtMoZkz6sllEA=","X-MC-Unique":"SQ7jkUo9PACq2rGa0FJTqg-1","X-Mimecast-MFC-AGG-ID":"SQ7jkUo9PACq2rGa0FJTqg_1776787937","From":"Kevin Wolf ","To":"qemu-block@nongnu.org","Cc":"kwolf@redhat.com, hreitz@redhat.com, jsnow@redhat.com,\n qemu-devel@nongnu.org, qemu-stable@nongnu.org","Subject":"[PATCH 7/7] ide-test: Test reset during TRIM","Date":"Tue, 21 Apr 2026 18:11:32 +0200","Message-ID":"<20260421161132.99878-8-kwolf@redhat.com>","In-Reply-To":"<20260421161132.99878-1-kwolf@redhat.com>","References":"<20260421161132.99878-1-kwolf@redhat.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.111","Received-SPF":"pass client-ip=170.10.133.124; envelope-from=kwolf@redhat.com;\n helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001,\n SPF_PASS=-0.001 autolearn=unavailable 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"This is a regression test for the bug fixed in the previous commits, a\ndeadlock between the drain issued by an IDE reset and the TRIM state\nmachine.\n\nSigned-off-by: Kevin Wolf \n---\n tests/qtest/ide-test.c | 95 ++++++++++++++++++++++++++++++++++++++----\n 1 file changed, 87 insertions(+), 8 deletions(-)","diff":"diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c\nindex c6dcb2c0745..721e78170bc 100644\n--- a/tests/qtest/ide-test.c\n+++ b/tests/qtest/ide-test.c\n@@ -41,8 +41,11 @@\n #define IDE_PCI_FUNC 1\n \n #define IDE_BASE 0x1f0\n+#define IDE_BASE2 0x3f6\n #define IDE_PRIMARY_IRQ 14\n \n+#define IDE_CTRL_RESET 0x04\n+\n #define ATAPI_BLOCK_SIZE 2048\n \n /* How many bytes to receive via ATAPI PIO at one time.\n@@ -99,6 +102,7 @@ enum {\n \n CMDF_ABORT = 0x100,\n CMDF_NO_BM = 0x200,\n+ CMDF_NO_WAIT = 0x400,\n };\n \n enum {\n@@ -228,21 +232,21 @@ static uint8_t wait_dma_completion(QTestState *qts, QPCIDevice *dev,\n return status;\n }\n \n-static int send_dma_request(QTestState *qts, int cmd, uint64_t sector,\n- int nb_sectors, PrdtEntry *prdt, int prdt_entries,\n- void(*post_exec)(QPCIDevice *dev, QPCIBar ide_bar,\n- uint64_t sector, int nb_sectors))\n+static int send_dma_request_dev(QTestState *qts, QPCIDevice *dev,\n+ QPCIBar bmdma_bar, QPCIBar ide_bar, int cmd,\n+ uint64_t sector, int nb_sectors,\n+ PrdtEntry *prdt, int prdt_entries,\n+ void(*post_exec)(QPCIDevice *dev,\n+ QPCIBar ide_bar,\n+ uint64_t sector,\n+ int nb_sectors))\n {\n- QPCIDevice *dev;\n- QPCIBar bmdma_bar, ide_bar;\n uintptr_t guest_prdt;\n size_t len;\n bool from_dev;\n uint8_t status;\n int flags;\n \n- dev = get_pci_device(qts, &bmdma_bar, &ide_bar);\n-\n flags = cmd & ~0xff;\n cmd &= 0xff;\n \n@@ -308,8 +312,28 @@ static int send_dma_request(QTestState *qts, int cmd, uint64_t sector,\n qpci_io_writeb(dev, bmdma_bar, bmreg_cmd, 0);\n }\n \n+ if (flags & CMDF_NO_WAIT) {\n+ return 0;\n+ }\n+\n status = wait_dma_completion(qts, dev, bmdma_bar, ide_bar);\n \n+ return status;\n+}\n+\n+static int send_dma_request(QTestState *qts, int cmd, uint64_t sector,\n+ int nb_sectors, PrdtEntry *prdt, int prdt_entries,\n+ void(*post_exec)(QPCIDevice *dev, QPCIBar ide_bar,\n+ uint64_t sector, int nb_sectors))\n+{\n+ QPCIDevice *dev;\n+ QPCIBar bmdma_bar, ide_bar;\n+ uint8_t status;\n+\n+ dev = get_pci_device(qts, &bmdma_bar, &ide_bar);\n+ status = send_dma_request_dev(qts, dev, bmdma_bar, ide_bar,\n+ cmd, sector, nb_sectors, prdt, prdt_entries,\n+ post_exec);\n free_pci_device(dev);\n \n return status;\n@@ -457,6 +481,60 @@ static void test_bmdma_trim(void)\n test_bmdma_teardown(qts);\n }\n \n+static void test_bmdma_trim_reset(void)\n+{\n+ QTestState *qts;\n+ QPCIDevice *dev;\n+ QPCIBar bmdma_bar, ide_bar, ide_bar2;\n+ uint8_t status;\n+ const uint64_t trim_range[] = {\n+ trim_range_le(0, 2),\n+ trim_range_le(6, 8),\n+ };\n+ size_t len = 512;\n+ uint8_t *buf;\n+ uintptr_t guest_buf;\n+ PrdtEntry prdt[1];\n+\n+ qts = ide_test_start(\n+ \"-blockdev file,filename=%s,node-name=img \"\n+ \"-blockdev blkdebug,image=img,node-name=dbg,discard=unmap,\"\n+ \"inject-error.0.event=none,inject-error.0.iotype=discard,\"\n+ \"inject-error.0.errno=0,inject-error.0.delay-ns=1000000 \"\n+ \"-device ide-hd,drive=dbg,bus=ide.0\",\n+ tmp_path[0]);\n+ qtest_irq_intercept_in(qts, \"ioapic\");\n+\n+ guest_buf = guest_alloc(&guest_malloc, len);\n+ prdt[0].addr = cpu_to_le32(guest_buf),\n+ prdt[0].size = cpu_to_le32(len | PRDT_EOT),\n+\n+ dev = get_pci_device(qts, &bmdma_bar, &ide_bar);\n+ ide_bar2 = qpci_legacy_iomap(dev, IDE_BASE2);\n+\n+ buf = g_malloc(len);\n+\n+ /* TRIM request with two segments */\n+ *((uint64_t *)buf) = trim_range[0];\n+ *((uint64_t *)buf + 1) = trim_range[1];\n+\n+ qtest_memwrite(qts, guest_buf, buf, 2 * sizeof(uint64_t));\n+\n+ send_dma_request_dev(qts, dev, bmdma_bar, ide_bar, CMD_DSM | CMDF_NO_WAIT, 0, 1, prdt,\n+ ARRAY_SIZE(prdt), NULL);\n+\n+ /* Reset the device while the first segment is in flight */\n+ qpci_io_writeb(dev, ide_bar2, 0, IDE_CTRL_RESET);\n+\n+ status = wait_dma_completion(qts, dev, bmdma_bar, ide_bar);\n+ g_assert_cmphex(status, ==, BM_STS_INTR);\n+ assert_bit_clear(qpci_io_readb(dev, ide_bar, reg_status), DF | ERR);\n+\n+ free_pci_device(dev);\n+ g_free(buf);\n+ test_bmdma_teardown(qts);\n+}\n+\n /*\n * This test is developed according to the Programming Interface for\n * Bus Master IDE Controller (Revision 1.0 5/16/94)\n@@ -1138,6 +1216,7 @@ int main(int argc, char **argv)\n \n qtest_add_func(\"/ide/bmdma/simple_rw\", test_bmdma_simple_rw);\n qtest_add_func(\"/ide/bmdma/trim\", test_bmdma_trim);\n+ qtest_add_func(\"/ide/bmdma/trim_reset\", test_bmdma_trim_reset);\n qtest_add_func(\"/ide/bmdma/various_prdts\", test_bmdma_various_prdts);\n qtest_add_func(\"/ide/bmdma/no_busmaster\", test_bmdma_no_busmaster);\n \n","prefixes":["7/7"]}