{"id":2225813,"url":"http://patchwork.ozlabs.org/api/patches/2225813/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260421161132.99878-6-kwolf@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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-6-kwolf@redhat.com>","list_archive_url":null,"date":"2026-04-21T16:11:30","name":"[5/7] ide: Clean up ide_trim_co_entry() to be idiomatic coroutine code","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f96ed5719b426908f4ab84d293c7627a3e608cb4","submitter":{"id":2714,"url":"http://patchwork.ozlabs.org/api/people/2714/?format=json","name":"Kevin Wolf","email":"kwolf@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260421161132.99878-6-kwolf@redhat.com/mbox/","series":[{"id":500847,"url":"http://patchwork.ozlabs.org/api/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/2225813/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225813/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=Ff+Fik/0;\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 4g0S8V0XjRz1yCv\n\tfor ; Wed, 22 Apr 2026 02:13:46 +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 1wFDiV-0001a0-9D; Tue, 21 Apr 2026 12:12:51 -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 1wFDi4-0001PZ-80\n for qemu-devel@nongnu.org; Tue, 21 Apr 2026 12:12:24 -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 1wFDi1-0000Jn-5a\n for qemu-devel@nongnu.org; Tue, 21 Apr 2026 12:12:23 -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-424-owI0DaL8O9yGDJy5QFwhYA-1; Tue,\n 21 Apr 2026 12:12:15 -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 CD9301800473; Tue, 21 Apr 2026 16:12:12 +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 0A0211800351; Tue, 21 Apr 2026 16:12:10 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1776787940;\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=A4dsw4jNX6Z6/lLNoJG/cG5lUqCzWJZiyxEpvX7UznA=;\n b=Ff+Fik/0YGPrpTxaqOJFnb8nrbjrvwx0fHcapBWoZwnd3mYknjIYFA/G+fiMokDu5l4FbG\n irkwdLkNS4cVGYE1kGE1d1mcmwgatm8htETLrM6ax8+aTeeoSo/xwD5L4h/dT+vrqXox89\n vUXLMehYO6jhyUbLJqsgC6d1A+QIKAA=","X-MC-Unique":"owI0DaL8O9yGDJy5QFwhYA-1","X-Mimecast-MFC-AGG-ID":"owI0DaL8O9yGDJy5QFwhYA_1776787934","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 5/7] ide: Clean up ide_trim_co_entry() to be idiomatic\n coroutine code","Date":"Tue, 21 Apr 2026 18:11:30 +0200","Message-ID":"<20260421161132.99878-6-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":"The previous commit did a minimal conversion of the callback based state\nmachine for TRIM to a coroutine in order to fix a bug. Refactor it to\nactually look like normal coroutine based code, which improves its\nreadability.\n\nSigned-off-by: Kevin Wolf \n---\n hw/ide/core.c | 87 +++++++++++++++++++++++----------------------------\n 1 file changed, 39 insertions(+), 48 deletions(-)","diff":"diff --git a/hw/ide/core.c b/hw/ide/core.c\nindex 48359c934c1..f78b00220b8 100644\n--- a/hw/ide/core.c\n+++ b/hw/ide/core.c\n@@ -420,18 +420,15 @@ typedef struct TrimAIOCB {\n QEMUBH *bh;\n int ret;\n QEMUIOVector *qiov;\n- int i, j;\n+ bool canceled;\n } TrimAIOCB;\n \n static void trim_aio_cancel(BlockAIOCB *acb)\n {\n TrimAIOCB *iocb = container_of(acb, TrimAIOCB, common);\n \n- /* Exit the loop so ide_issue_trim_cb will not continue */\n- iocb->j = iocb->qiov->niov - 1;\n- iocb->i = (iocb->qiov->iov[iocb->j].iov_len / 8) - 1;\n-\n- iocb->ret = -ECANCELED;\n+ /* Exit the loop so ide_trim_co_entry will not continue */\n+ iocb->canceled = true;\n }\n \n static const AIOCBInfo trim_aiocb_info = {\n@@ -458,60 +455,55 @@ static void coroutine_fn ide_trim_co_entry(void *opaque)\n {\n TrimAIOCB *iocb = opaque;\n IDEState *s = iocb->s;\n- int ret = 0;\n+ int i, j;\n+ int ret;\n \n /* Paired with blk_end_request in ide_trim_bh_cb() */\n blk_co_start_request(s->blk);\n \n-loop:\n- if (iocb->i >= 0) {\n- if (ret >= 0) {\n- block_acct_done(blk_get_stats(s->blk), &s->acct);\n- } else {\n- block_acct_failed(blk_get_stats(s->blk), &s->acct);\n- }\n- }\n+ for (j = 0; j < iocb->qiov->niov; j++) {\n+ for (i = 0; i < iocb->qiov->iov[j].iov_len / 8; i++) {\n+ uint64_t *buffer = iocb->qiov->iov[j].iov_base;\n \n- if (ret >= 0) {\n- while (iocb->j < iocb->qiov->niov) {\n- int j = iocb->j;\n- while (++iocb->i < iocb->qiov->iov[j].iov_len / 8) {\n- int i = iocb->i;\n- uint64_t *buffer = iocb->qiov->iov[j].iov_base;\n+ /* 6-byte LBA + 2-byte range per entry */\n+ uint64_t entry = le64_to_cpu(buffer[i]);\n+ uint64_t sector = entry & 0x0000ffffffffffffULL;\n+ uint16_t count = entry >> 48;\n \n- /* 6-byte LBA + 2-byte range per entry */\n- uint64_t entry = le64_to_cpu(buffer[i]);\n- uint64_t sector = entry & 0x0000ffffffffffffULL;\n- uint16_t count = entry >> 48;\n+ if (count == 0) {\n+ continue;\n+ }\n \n- if (count == 0) {\n- continue;\n- }\n+ if (iocb->canceled) {\n+ iocb->ret = -ECANCELED;\n+ goto done;\n+ }\n \n- if (!ide_sect_range_ok(s, sector, count)) {\n- block_acct_invalid(blk_get_stats(s->blk), BLOCK_ACCT_UNMAP);\n- iocb->ret = -EINVAL;\n- goto done;\n- }\n+ if (!ide_sect_range_ok(s, sector, count)) {\n+ block_acct_invalid(blk_get_stats(s->blk), BLOCK_ACCT_UNMAP);\n+ iocb->ret = -EINVAL;\n+ goto done;\n+ }\n \n- block_acct_start(blk_get_stats(s->blk), &s->acct,\n- count << BDRV_SECTOR_BITS, BLOCK_ACCT_UNMAP);\n+ block_acct_start(blk_get_stats(s->blk), &s->acct,\n+ count << BDRV_SECTOR_BITS, BLOCK_ACCT_UNMAP);\n \n- /* Got an entry! Submit and exit. */\n- ret = blk_co_pdiscard(s->blk,\n- sector << BDRV_SECTOR_BITS,\n- count << BDRV_SECTOR_BITS,\n- BDRV_REQ_NO_QUEUE);\n- goto loop;\n+ /* Got an entry! Submit and exit. */\n+ ret = blk_co_pdiscard(s->blk,\n+ sector << BDRV_SECTOR_BITS,\n+ count << BDRV_SECTOR_BITS,\n+ BDRV_REQ_NO_QUEUE);\n+ if (ret >= 0) {\n+ block_acct_done(blk_get_stats(s->blk), &s->acct);\n+ } else {\n+ iocb->ret = ret;\n+ block_acct_failed(blk_get_stats(s->blk), &s->acct);\n+ goto done;\n }\n-\n- iocb->j++;\n- iocb->i = -1;\n }\n- } else {\n- iocb->ret = ret;\n }\n \n+ iocb->ret = 0;\n done:\n if (iocb->bh) {\n replay_bh_schedule_event(iocb->bh);\n@@ -533,8 +525,7 @@ BlockAIOCB *ide_issue_trim(\n &DEVICE(dev)->mem_reentrancy_guard);\n iocb->ret = 0;\n iocb->qiov = qiov;\n- iocb->i = -1;\n- iocb->j = 0;\n+ iocb->canceled = false;\n \n co = qemu_coroutine_create(ide_trim_co_entry, iocb);\n aio_co_enter(qemu_get_current_aio_context(), co);\n","prefixes":["5/7"]}