From nobody Tue Apr 7 21:45:14 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-Seal: i=1; a=rsa-sha256; t=1773242801; cv=none; d=zohomail.com; s=zohoarc; b=aBAnu/oIW4QZWXQKIGeBa4n79F2Abg2hzQtE5iEKgVyyl7eAmFtMORBsgCBkOosmKiRTLx3T1vGo7+3dL9kvUZCVkety6Jr+tOLol4t0uuI+itACeQdwnHkn0jV40Tl+EkLD+Qc+hbO+UC3IF9QJkRrSuS4j1G8n1Uz9Rxn28wo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773242801; h=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=pwJTzTWJX3UNt9rfXRjBC+5tjiNHSAtUoDAzKN1sZ9g=; b=DhBQl100LneojKEqUB6BKWSvds92UVLMHh1Ob1XMMT6z1BmOs4mh+5WhTtkCTbI7HVP/JiM0aRnbqs5eHaRKAJRp4xFNkNEVRxpu3ZyaYskJtPGWIyDH7/VXG3kryKEArSBTOq6/scdYeDtFXjDgUkBr71xOpNnox6RE5s2Al9E= ARC-Authentication-Results: i=1; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773242801672195.30585667870082; Wed, 11 Mar 2026 08:26:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0LEN-0007cA-0f; Wed, 11 Mar 2026 11:12:15 -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 1w0LCD-0002cL-NJ; Wed, 11 Mar 2026 11:10:01 -0400 Received: from isrv.corpit.ru ([212.248.84.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0LCA-0005pK-Ef; Wed, 11 Mar 2026 11:10:00 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 632AD191EA4; Wed, 11 Mar 2026 18:04:43 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 50D8F37C2E5; Wed, 11 Mar 2026 18:05:21 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773241483; bh=1+0w7xRv/DZ7PGz4an+pI/7zGWxeu5zPdwS/hJ4BtIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=p5+KyAX0dPMMbr8mdemDZegCGJcuhr+3hKdYcIaB5GnnwijRoYgc0FE4vYoEi8CdF gtj4Pzk6I37xgNNd8oOc5EYZJ/kuVjG8X1hA1B0bTOs9XVdwdECD01kpwD2SPDC8ca EOhNgp+6MyhGZhYTZ6JtvjSSYkqut5hSWPEmMZ32JneYTp9YNggcQo1Kp95bWWyxRV DtcsUEDSfaWRDW+/0EKlR6dOn1HQEV3+JR1mQl3vuWz2WCfbOIUmmcItlPshRykYvZ +bN8FHrKqDu5wfKN2JpAdM0z6HLqL8Np6soBTC5Zx3n5vxnK5Z3cYixw7VMoGvm43x Qb8+xL7Mk6hiA== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Antoine Damhet , Kevin Wolf , Michael Tokarev Subject: [Stable-10.1.5 33/46] block/curl: fix concurrent completion handling Date: Wed, 11 Mar 2026 18:03:09 +0300 Message-ID: <20260311150327.1084669-33-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=lists.gnu.org; Received-SPF: pass client-ip=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 @tls.msk.ru) X-ZM-MESSAGEID: 1773242803129158500 Content-Type: text/plain; charset="utf-8" From: Antoine Damhet curl_multi_check_completion would bail upon the first completed transfer even if more completion messages were available thus leaving some in flight IOs stuck. Rework a bit the loop to make the iterations clearer and drop the breaks. The original hang can be somewhat reproduced with the following command: $ qemu-img convert -p -m 16 -O qcow2 -c --image-opts \ 'file.driver=3Dhttps,file.url=3Dhttps://scaleway.testdebit.info/10G.iso,f= ile.readahead=3D1M' \ /tmp/test.qcow2 Fixes: 1f2cead32443 ("curl: Ensure all informationals are checked for compl= etion") Cc: qemu-stable@nongnu.org Signed-off-by: Antoine Damhet Message-ID: <20260212162730.440855-2-adamhet@scaleway.com> Signed-off-by: Kevin Wolf (cherry picked from commit 6f7b0a23a6ea0cc72ad222ab37936248d99d4256) Signed-off-by: Michael Tokarev diff --git a/block/curl.c b/block/curl.c index 96498aac1d..dabd2a905e 100644 --- a/block/curl.c +++ b/block/curl.c @@ -324,17 +324,11 @@ curl_find_buf(BDRVCURLState *s, uint64_t start, uint6= 4_t len, CURLAIOCB *acb) static void curl_multi_check_completion(BDRVCURLState *s) { int msgs_in_queue; + CURLMsg *msg; =20 /* Try to find done transfers, so we can free the easy * handle again. */ - for (;;) { - CURLMsg *msg; - msg =3D curl_multi_info_read(s->multi, &msgs_in_queue); - - /* Quit when there are no more completions */ - if (!msg) - break; - + while ((msg =3D curl_multi_info_read(s->multi, &msgs_in_queue))) { if (msg->msg =3D=3D CURLMSG_DONE) { int i; CURLState *state =3D NULL; @@ -397,7 +391,6 @@ static void curl_multi_check_completion(BDRVCURLState *= s) } =20 curl_clean_state(state); - break; } } } --=20 2.47.3