From nobody Mon Apr 29 01:51:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494842576961929.5742988597195; Mon, 15 May 2017 03:02:56 -0700 (PDT) Received: from localhost ([::1]:35750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dACq6-0001dV-I0 for importer@patchew.org; Mon, 15 May 2017 06:02:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dACoQ-0000RD-LK for qemu-devel@nongnu.org; Mon, 15 May 2017 06:01:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dACoP-0005qm-Or for qemu-devel@nongnu.org; Mon, 15 May 2017 06:01:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38312) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dACoK-0005od-OD; Mon, 15 May 2017 06:01:04 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ADF6B6AF4; Mon, 15 May 2017 10:01:03 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-116-102.ams2.redhat.com [10.36.116.102]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v4FA10Ai004293; Mon, 15 May 2017 06:01:02 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com ADF6B6AF4 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=pbonzini@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com ADF6B6AF4 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 15 May 2017 12:00:53 +0200 Message-Id: <20170515100059.15795-2-pbonzini@redhat.com> In-Reply-To: <20170515100059.15795-1-pbonzini@redhat.com> References: <20170515100059.15795-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 15 May 2017 10:01:03 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 1/7] curl: strengthen assertion in curl_clean_state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jcody@redhat.com, rjones@redhat.com, qemu-block@nongnu.org, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" curl_clean_state should only be called after all AIOCBs have been completed. This is not so obvious for the call from curl_detach_aio_contex= t, so assert that. Cc: qemu-stable@nongnu.org Reviewed-by: Jeff Cody Signed-off-by: Paolo Bonzini Reviewed-by: Max Reitz --- block/curl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/curl.c b/block/curl.c index aa6e8cc0e5..010b0604c5 100644 --- a/block/curl.c +++ b/block/curl.c @@ -532,6 +532,11 @@ static CURLState *curl_init_state(BlockDriverState *bs= , BDRVCURLState *s) =20 static void curl_clean_state(CURLState *s) { + int j; + for (j=3D0; j < CURL_NUM_ACB; j++) { + assert(!s->acb[j]); + } + if (s->s->multi) curl_multi_remove_handle(s->s->multi, s->curl); =20 --=20 2.12.2 From nobody Mon Apr 29 01:51:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494842724526776.333001751634; Mon, 15 May 2017 03:05:24 -0700 (PDT) Received: from localhost ([::1]:35760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dACsS-0003dc-9B for importer@patchew.org; Mon, 15 May 2017 06:05:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dACoW-0000Xr-IY for qemu-devel@nongnu.org; Mon, 15 May 2017 06:01:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dACoV-0005tf-7x for qemu-devel@nongnu.org; Mon, 15 May 2017 06:01:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53928) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dACoM-0005os-Fv; Mon, 15 May 2017 06:01:06 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 438C3C049D57; Mon, 15 May 2017 10:01:05 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-116-102.ams2.redhat.com [10.36.116.102]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v4FA10Aj004293; Mon, 15 May 2017 06:01:03 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 438C3C049D57 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=pbonzini@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 438C3C049D57 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 15 May 2017 12:00:54 +0200 Message-Id: <20170515100059.15795-3-pbonzini@redhat.com> In-Reply-To: <20170515100059.15795-1-pbonzini@redhat.com> References: <20170515100059.15795-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 15 May 2017 10:01:05 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 2/7] curl: never invoke callbacks with s->mutex held X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jcody@redhat.com, rjones@redhat.com, qemu-block@nongnu.org, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" All curl callbacks go through curl_multi_do, and hence are called with s->mutex held. Note that with comments, and make curl_read_cb drop the lock before invoking the callback. Likewise for curl_find_buf, where the callback can be invoked by the caller. Cc: qemu-stable@nongnu.org Reviewed-by: Jeff Cody Signed-off-by: Paolo Bonzini Reviewed-by: Max Reitz --- block/curl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/block/curl.c b/block/curl.c index 010b0604c5..924c2a2088 100644 --- a/block/curl.c +++ b/block/curl.c @@ -147,6 +147,7 @@ static void curl_multi_do(void *arg); static void curl_multi_read(void *arg); =20 #ifdef NEED_CURL_TIMER_CALLBACK +/* Called from curl_multi_do_locked, with s->mutex held. */ static int curl_timer_cb(CURLM *multi, long timeout_ms, void *opaque) { BDRVCURLState *s =3D opaque; @@ -163,6 +164,7 @@ static int curl_timer_cb(CURLM *multi, long timeout_ms,= void *opaque) } #endif =20 +/* Called from curl_multi_do_locked, with s->mutex held. */ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action, void *userp, void *sp) { @@ -212,6 +214,7 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, i= nt action, return 0; } =20 +/* Called from curl_multi_do_locked, with s->mutex held. */ static size_t curl_header_cb(void *ptr, size_t size, size_t nmemb, void *o= paque) { BDRVCURLState *s =3D opaque; @@ -226,6 +229,7 @@ static size_t curl_header_cb(void *ptr, size_t size, si= ze_t nmemb, void *opaque) return realsize; } =20 +/* Called from curl_multi_do_locked, with s->mutex held. */ static size_t curl_read_cb(void *ptr, size_t size, size_t nmemb, void *opa= que) { CURLState *s =3D ((CURLState*)opaque); @@ -264,7 +268,9 @@ static size_t curl_read_cb(void *ptr, size_t size, size= _t nmemb, void *opaque) request_length - offset); } =20 + qemu_mutex_unlock(&s->s->mutex); acb->common.cb(acb->common.opaque, 0); + qemu_mutex_lock(&s->s->mutex); qemu_aio_unref(acb); s->acb[i] =3D NULL; } @@ -305,8 +311,6 @@ static int curl_find_buf(BDRVCURLState *s, size_t start= , size_t len, if (clamped_len < len) { qemu_iovec_memset(acb->qiov, clamped_len, 0, len - clamped= _len); } - acb->common.cb(acb->common.opaque, 0); - return FIND_RET_OK; } =20 @@ -832,8 +836,8 @@ static void curl_readv_bh_cb(void *p) // we can just call the callback and be done. switch (curl_find_buf(s, start, acb->nb_sectors * BDRV_SECTOR_SIZE, ac= b)) { case FIND_RET_OK: - qemu_aio_unref(acb); - // fall through + ret =3D 0; + goto out; case FIND_RET_WAIT: goto out; default: --=20 2.12.2 From nobody Mon Apr 29 01:51:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494842603968906.4578489917236; Mon, 15 May 2017 03:03:23 -0700 (PDT) Received: from localhost ([::1]:35752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dACqY-0001yV-Ix for importer@patchew.org; Mon, 15 May 2017 06:03:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dACoZ-0000ax-Eq for qemu-devel@nongnu.org; Mon, 15 May 2017 06:01:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dACoU-0005tH-K1 for qemu-devel@nongnu.org; Mon, 15 May 2017 06:01:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38422) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dACoN-0005pM-Vh; Mon, 15 May 2017 06:01:08 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C9C87CA1C4; Mon, 15 May 2017 10:01:06 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-116-102.ams2.redhat.com [10.36.116.102]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v4FA10Ak004293; Mon, 15 May 2017 06:01:05 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C9C87CA1C4 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=pbonzini@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C9C87CA1C4 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 15 May 2017 12:00:55 +0200 Message-Id: <20170515100059.15795-4-pbonzini@redhat.com> In-Reply-To: <20170515100059.15795-1-pbonzini@redhat.com> References: <20170515100059.15795-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 15 May 2017 10:01:07 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 3/7] curl: avoid recursive locking of BDRVCURLState mutex X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jcody@redhat.com, rjones@redhat.com, qemu-block@nongnu.org, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The curl driver has a ugly hack where, if it cannot find an empty CURLState, it just uses aio_poll to wait for one to be empty. This is probably buggy when used together with dataplane, and the simplest way to fix it is to use coroutines instead. A more immediate effect of the bug however is that it can cause a recursive call to curl_readv_bh_cb and recursively taking the BDRVCURLState mutex. This causes a deadlock. The fix is to unlock the mutex around aio_poll, but for cleanliness we should also take the mutex around all calls to curl_init_state, even if reaching the unlock/lock pair is impossible. The same is true for curl_clean_state. Reported-by: Kun Wei Tested-by: Richard W.M. Jones Cc: qemu-stable@nongnu.org Cc: Jeff Cody Signed-off-by: Paolo Bonzini Reviewed-by: Max Reitz --- v2->v3: add missing qemu_mutex_destroy on failure case block/curl.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/block/curl.c b/block/curl.c index 924c2a2088..5e6ddf3a34 100644 --- a/block/curl.c +++ b/block/curl.c @@ -281,6 +281,7 @@ read_end: return size * nmemb; } =20 +/* Called with s->mutex held. */ static int curl_find_buf(BDRVCURLState *s, size_t start, size_t len, CURLAIOCB *acb) { @@ -453,6 +454,7 @@ static void curl_multi_timeout_do(void *arg) #endif } =20 +/* Called with s->mutex held. */ static CURLState *curl_init_state(BlockDriverState *bs, BDRVCURLState *s) { CURLState *state =3D NULL; @@ -471,7 +473,9 @@ static CURLState *curl_init_state(BlockDriverState *bs,= BDRVCURLState *s) break; } if (!state) { + qemu_mutex_unlock(&s->mutex); aio_poll(bdrv_get_aio_context(bs), true); + qemu_mutex_lock(&s->mutex); } } while(!state); =20 @@ -534,6 +538,7 @@ static CURLState *curl_init_state(BlockDriverState *bs,= BDRVCURLState *s) return state; } =20 +/* Called with s->mutex held. */ static void curl_clean_state(CURLState *s) { int j; @@ -565,6 +570,7 @@ static void curl_detach_aio_context(BlockDriverState *b= s) BDRVCURLState *s =3D bs->opaque; int i; =20 + qemu_mutex_lock(&s->mutex); for (i =3D 0; i < CURL_NUM_STATES; i++) { if (s->states[i].in_use) { curl_clean_state(&s->states[i]); @@ -580,6 +586,7 @@ static void curl_detach_aio_context(BlockDriverState *b= s) curl_multi_cleanup(s->multi); s->multi =3D NULL; } + qemu_mutex_unlock(&s->mutex); =20 timer_del(&s->timer); } @@ -677,6 +684,7 @@ static int curl_open(BlockDriverState *bs, QDict *optio= ns, int flags, return -EROFS; } =20 + qemu_mutex_init(&s->mutex); opts =3D qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); qemu_opts_absorb_qdict(opts, options, &local_err); if (local_err) { @@ -747,7 +755,9 @@ static int curl_open(BlockDriverState *bs, QDict *optio= ns, int flags, DPRINTF("CURL: Opening %s\n", file); s->aio_context =3D bdrv_get_aio_context(bs); s->url =3D g_strdup(file); + qemu_mutex_lock(&s->mutex); state =3D curl_init_state(bs, s); + qemu_mutex_unlock(&s->mutex); if (!state) goto out_noclean; =20 @@ -791,11 +801,12 @@ static int curl_open(BlockDriverState *bs, QDict *opt= ions, int flags, } DPRINTF("CURL: Size =3D %zd\n", s->len); =20 + qemu_mutex_lock(&s->mutex); curl_clean_state(state); + qemu_mutex_unlock(&s->mutex); curl_easy_cleanup(state->curl); state->curl =3D NULL; =20 - qemu_mutex_init(&s->mutex); curl_attach_aio_context(bs, bdrv_get_aio_context(bs)); =20 qemu_opts_del(opts); @@ -806,6 +817,7 @@ out: curl_easy_cleanup(state->curl); state->curl =3D NULL; out_noclean: + qemu_mutex_destroy(&s->mutex); g_free(s->cookie); g_free(s->url); qemu_opts_del(opts); --=20 2.12.2 From nobody Mon Apr 29 01:51:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494842709898609.4696139528686; Mon, 15 May 2017 03:05:09 -0700 (PDT) Received: from localhost ([::1]:35759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dACsG-0003TX-LK for importer@patchew.org; Mon, 15 May 2017 06:05:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dACoV-0000W1-1W for qemu-devel@nongnu.org; Mon, 15 May 2017 06:01:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dACoR-0005s8-Vr for qemu-devel@nongnu.org; Mon, 15 May 2017 06:01:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61019) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dACoP-0005po-5z; Mon, 15 May 2017 06:01:09 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 334887F6C7; Mon, 15 May 2017 10:01:08 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-116-102.ams2.redhat.com [10.36.116.102]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v4FA10Al004293; Mon, 15 May 2017 06:01:07 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 334887F6C7 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=pbonzini@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 334887F6C7 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 15 May 2017 12:00:56 +0200 Message-Id: <20170515100059.15795-5-pbonzini@redhat.com> In-Reply-To: <20170515100059.15795-1-pbonzini@redhat.com> References: <20170515100059.15795-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 15 May 2017 10:01:08 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 4/7] curl: split curl_find_state/curl_init_state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jcody@redhat.com, rjones@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If curl_easy_init fails, a CURLState is left with s->in_use =3D 1. Split curl_init_state in two, so that we can distinguish the two failures and call curl_clean_state if needed. While at it, simplify curl_find_state, removing a dummy loop. The aio_poll loop is moved to the sole caller that needs it. Reviewed-by: Jeff Cody Signed-off-by: Paolo Bonzini Reviewed-by: Max Reitz --- block/curl.c | 52 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/block/curl.c b/block/curl.c index 5e6ddf3a34..29132ab835 100644 --- a/block/curl.c +++ b/block/curl.c @@ -455,34 +455,27 @@ static void curl_multi_timeout_do(void *arg) } =20 /* Called with s->mutex held. */ -static CURLState *curl_init_state(BlockDriverState *bs, BDRVCURLState *s) +static CURLState *curl_find_state(BDRVCURLState *s) { CURLState *state =3D NULL; - int i, j; - - do { - for (i=3D0; istates[i].acb[j]) - continue; - if (s->states[i].in_use) - continue; + int i; =20 + for (i=3D0; i < CURL_NUM_STATES; i++) { + if (!s->states[i].in_use) { state =3D &s->states[i]; state->in_use =3D 1; break; } - if (!state) { - qemu_mutex_unlock(&s->mutex); - aio_poll(bdrv_get_aio_context(bs), true); - qemu_mutex_lock(&s->mutex); - } - } while(!state); + } + return state; +} =20 +static int curl_init_state(BDRVCURLState *s, CURLState *state) +{ if (!state->curl) { state->curl =3D curl_easy_init(); if (!state->curl) { - return NULL; + return -EIO; } curl_easy_setopt(state->curl, CURLOPT_URL, s->url); curl_easy_setopt(state->curl, CURLOPT_SSL_VERIFYPEER, @@ -535,7 +528,7 @@ static CURLState *curl_init_state(BlockDriverState *bs,= BDRVCURLState *s) QLIST_INIT(&state->sockets); state->s =3D s; =20 - return state; + return 0; } =20 /* Called with s->mutex held. */ @@ -756,13 +749,18 @@ static int curl_open(BlockDriverState *bs, QDict *opt= ions, int flags, s->aio_context =3D bdrv_get_aio_context(bs); s->url =3D g_strdup(file); qemu_mutex_lock(&s->mutex); - state =3D curl_init_state(bs, s); + state =3D curl_find_state(s); qemu_mutex_unlock(&s->mutex); - if (!state) + if (!state) { goto out_noclean; + } =20 // Get file size =20 + if (curl_init_state(s, state) < 0) { + goto out; + } + s->accept_range =3D false; curl_easy_setopt(state->curl, CURLOPT_NOBODY, 1); curl_easy_setopt(state->curl, CURLOPT_HEADERFUNCTION, @@ -857,8 +855,18 @@ static void curl_readv_bh_cb(void *p) } =20 // No cache found, so let's start a new request - state =3D curl_init_state(acb->common.bs, s); - if (!state) { + for (;;) { + state =3D curl_find_state(s); + if (state) { + break; + } + qemu_mutex_unlock(&s->mutex); + aio_poll(bdrv_get_aio_context(bs), true); + qemu_mutex_lock(&s->mutex); + } + + if (curl_init_state(s, state) < 0) { + curl_clean_state(state); ret =3D -EIO; goto out; } --=20 2.12.2 From nobody Mon Apr 29 01:51:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494842857020922.711130052351; Mon, 15 May 2017 03:07:37 -0700 (PDT) Received: from localhost ([::1]:35780 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dACud-0005Sf-Jr for importer@patchew.org; Mon, 15 May 2017 06:07:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dACoW-0000YE-Ql for qemu-devel@nongnu.org; Mon, 15 May 2017 06:01:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dACoV-0005tm-8v for qemu-devel@nongnu.org; Mon, 15 May 2017 06:01:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47970) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dACoQ-0005qs-Nz; Mon, 15 May 2017 06:01:10 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 98EE1BDD0; Mon, 15 May 2017 10:01:09 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-116-102.ams2.redhat.com [10.36.116.102]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v4FA10Am004293; Mon, 15 May 2017 06:01:08 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 98EE1BDD0 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=pbonzini@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 98EE1BDD0 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 15 May 2017 12:00:57 +0200 Message-Id: <20170515100059.15795-6-pbonzini@redhat.com> In-Reply-To: <20170515100059.15795-1-pbonzini@redhat.com> References: <20170515100059.15795-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 15 May 2017 10:01:09 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 5/7] curl: convert CURLAIOCB to byte values X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jcody@redhat.com, rjones@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is in preparation for the conversion from bdrv_aio_readv to bdrv_co_preadv, and it also requires changing some of the size_t values to uint64_t. This was broken before for disks > 2TB, but now it would break at 4GB. Reviewed-by: Jeff Cody Signed-off-by: Paolo Bonzini Reviewed-by: Max Reitz --- block/curl.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/block/curl.c b/block/curl.c index 29132ab835..401a1b1015 100644 --- a/block/curl.c +++ b/block/curl.c @@ -96,8 +96,8 @@ typedef struct CURLAIOCB { BlockAIOCB common; QEMUIOVector *qiov; =20 - int64_t sector_num; - int nb_sectors; + uint64_t offset; + uint64_t bytes; =20 size_t start; size_t end; @@ -115,7 +115,7 @@ typedef struct CURLState CURL *curl; QLIST_HEAD(, CURLSocket) sockets; char *orig_buf; - size_t buf_start; + uint64_t buf_start; size_t buf_off; size_t buf_len; char range[128]; @@ -126,7 +126,7 @@ typedef struct CURLState typedef struct BDRVCURLState { CURLM *multi; QEMUTimer timer; - size_t len; + uint64_t len; CURLState states[CURL_NUM_STATES]; char *url; size_t readahead_size; @@ -257,7 +257,7 @@ static size_t curl_read_cb(void *ptr, size_t size, size= _t nmemb, void *opaque) continue; =20 if ((s->buf_off >=3D acb->end)) { - size_t request_length =3D acb->nb_sectors * BDRV_SECTOR_SIZE; + size_t request_length =3D acb->bytes; =20 qemu_iovec_from_buf(acb->qiov, 0, s->orig_buf + acb->start, acb->end - acb->start); @@ -282,18 +282,18 @@ read_end: } =20 /* Called with s->mutex held. */ -static int curl_find_buf(BDRVCURLState *s, size_t start, size_t len, +static int curl_find_buf(BDRVCURLState *s, uint64_t start, uint64_t len, CURLAIOCB *acb) { int i; - size_t end =3D start + len; - size_t clamped_end =3D MIN(end, s->len); - size_t clamped_len =3D clamped_end - start; + uint64_t end =3D start + len; + uint64_t clamped_end =3D MIN(end, s->len); + uint64_t clamped_len =3D clamped_end - start; =20 for (i=3D0; istates[i]; - size_t buf_end =3D (state->buf_start + state->buf_off); - size_t buf_fend =3D (state->buf_start + state->buf_len); + uint64_t buf_end =3D (state->buf_start + state->buf_off); + uint64_t buf_fend =3D (state->buf_start + state->buf_len); =20 if (!state->orig_buf) continue; @@ -788,7 +788,7 @@ static int curl_open(BlockDriverState *bs, QDict *optio= ns, int flags, } #endif =20 - s->len =3D (size_t)d; + s->len =3D d; =20 if ((!strncasecmp(s->url, "http://", strlen("http://")) || !strncasecmp(s->url, "https://", strlen("https://"))) @@ -797,7 +797,7 @@ static int curl_open(BlockDriverState *bs, QDict *optio= ns, int flags, "Server does not support 'range' (byte ranges)."); goto out; } - DPRINTF("CURL: Size =3D %zd\n", s->len); + DPRINTF("CURL: Size =3D %" PRIu64 "\n", s->len); =20 qemu_mutex_lock(&s->mutex); curl_clean_state(state); @@ -837,14 +837,14 @@ static void curl_readv_bh_cb(void *p) BlockDriverState *bs =3D acb->common.bs; BDRVCURLState *s =3D bs->opaque; =20 - size_t start =3D acb->sector_num * BDRV_SECTOR_SIZE; - size_t end; + uint64_t start =3D acb->offset; + uint64_t end; =20 qemu_mutex_lock(&s->mutex); =20 // In case we have the requested data already (e.g. read-ahead), // we can just call the callback and be done. - switch (curl_find_buf(s, start, acb->nb_sectors * BDRV_SECTOR_SIZE, ac= b)) { + switch (curl_find_buf(s, start, acb->bytes, acb)) { case FIND_RET_OK: ret =3D 0; goto out; @@ -872,7 +872,7 @@ static void curl_readv_bh_cb(void *p) } =20 acb->start =3D 0; - acb->end =3D MIN(acb->nb_sectors * BDRV_SECTOR_SIZE, s->len - start); + acb->end =3D MIN(acb->bytes, s->len - start); =20 state->buf_off =3D 0; g_free(state->orig_buf); @@ -887,9 +887,9 @@ static void curl_readv_bh_cb(void *p) } state->acb[0] =3D acb; =20 - snprintf(state->range, 127, "%zd-%zd", start, end); - DPRINTF("CURL (AIO): Reading %llu at %zd (%s)\n", - (acb->nb_sectors * BDRV_SECTOR_SIZE), start, state->range); + snprintf(state->range, 127, "%" PRIu64 "-%" PRIu64, start, end); + DPRINTF("CURL (AIO): Reading %" PRIu64 " at %" PRIu64 " (%s)\n", + acb->bytes, start, state->range); curl_easy_setopt(state->curl, CURLOPT_RANGE, state->range); =20 curl_multi_add_handle(s->multi, state->curl); @@ -914,8 +914,8 @@ static BlockAIOCB *curl_aio_readv(BlockDriverState *bs, acb =3D qemu_aio_get(&curl_aiocb_info, bs, cb, opaque); =20 acb->qiov =3D qiov; - acb->sector_num =3D sector_num; - acb->nb_sectors =3D nb_sectors; + acb->offset =3D sector_num * BDRV_SECTOR_SIZE; + acb->bytes =3D nb_sectors * BDRV_SECTOR_SIZE; =20 aio_bh_schedule_oneshot(bdrv_get_aio_context(bs), curl_readv_bh_cb, ac= b); return &acb->common; --=20 2.12.2 From nobody Mon Apr 29 01:51:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149484273474988.31690728189892; Mon, 15 May 2017 03:05:34 -0700 (PDT) Received: from localhost ([::1]:35766 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dACsf-0003qw-9g for importer@patchew.org; Mon, 15 May 2017 06:05:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dACob-0000cr-3K for qemu-devel@nongnu.org; Mon, 15 May 2017 06:01:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dACoZ-0005v5-W6 for qemu-devel@nongnu.org; Mon, 15 May 2017 06:01:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47934) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dACoS-0005rq-31; Mon, 15 May 2017 06:01:12 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EAD7F7AE8C; Mon, 15 May 2017 10:01:10 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-116-102.ams2.redhat.com [10.36.116.102]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v4FA10An004293; Mon, 15 May 2017 06:01:09 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EAD7F7AE8C Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=pbonzini@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com EAD7F7AE8C From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 15 May 2017 12:00:58 +0200 Message-Id: <20170515100059.15795-7-pbonzini@redhat.com> In-Reply-To: <20170515100059.15795-1-pbonzini@redhat.com> References: <20170515100059.15795-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 15 May 2017 10:01:11 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 6/7] curl: convert readv to coroutines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jcody@redhat.com, rjones@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is pretty simple. The bottom half goes away because, unlike bdrv_aio_readv, coroutine-based read can return immediately without yielding. However, for simplicity I kept the former bottom half handler in a separate function. Reviewed-by: Jeff Cody Signed-off-by: Paolo Bonzini Reviewed-by: Max Reitz --- block/curl.c | 94 ++++++++++++++++++++++++--------------------------------= ---- 1 file changed, 38 insertions(+), 56 deletions(-) diff --git a/block/curl.c b/block/curl.c index 401a1b1015..86a4a73834 100644 --- a/block/curl.c +++ b/block/curl.c @@ -76,10 +76,6 @@ static CURLMcode __curl_multi_socket_action(CURLM *multi= _handle, #define CURL_TIMEOUT_DEFAULT 5 #define CURL_TIMEOUT_MAX 10000 =20 -#define FIND_RET_NONE 0 -#define FIND_RET_OK 1 -#define FIND_RET_WAIT 2 - #define CURL_BLOCK_OPT_URL "url" #define CURL_BLOCK_OPT_READAHEAD "readahead" #define CURL_BLOCK_OPT_SSLVERIFY "sslverify" @@ -93,11 +89,12 @@ static CURLMcode __curl_multi_socket_action(CURLM *mult= i_handle, struct BDRVCURLState; =20 typedef struct CURLAIOCB { - BlockAIOCB common; + Coroutine *co; QEMUIOVector *qiov; =20 uint64_t offset; uint64_t bytes; + int ret; =20 size_t start; size_t end; @@ -268,11 +265,11 @@ static size_t curl_read_cb(void *ptr, size_t size, si= ze_t nmemb, void *opaque) request_length - offset); } =20 + acb->ret =3D 0; + s->acb[i] =3D NULL; qemu_mutex_unlock(&s->s->mutex); - acb->common.cb(acb->common.opaque, 0); + aio_co_wake(acb->co); qemu_mutex_lock(&s->s->mutex); - qemu_aio_unref(acb); - s->acb[i] =3D NULL; } } =20 @@ -282,8 +279,8 @@ read_end: } =20 /* Called with s->mutex held. */ -static int curl_find_buf(BDRVCURLState *s, uint64_t start, uint64_t len, - CURLAIOCB *acb) +static bool curl_find_buf(BDRVCURLState *s, uint64_t start, uint64_t len, + CURLAIOCB *acb) { int i; uint64_t end =3D start + len; @@ -312,7 +309,8 @@ static int curl_find_buf(BDRVCURLState *s, uint64_t sta= rt, uint64_t len, if (clamped_len < len) { qemu_iovec_memset(acb->qiov, clamped_len, 0, len - clamped= _len); } - return FIND_RET_OK; + acb->ret =3D 0; + return true; } =20 // Wait for unfinished chunks @@ -330,13 +328,13 @@ static int curl_find_buf(BDRVCURLState *s, uint64_t s= tart, uint64_t len, for (j=3D0; jacb[j]) { state->acb[j] =3D acb; - return FIND_RET_WAIT; + return true; } } } } =20 - return FIND_RET_NONE; + return false; } =20 /* Called with s->mutex held. */ @@ -381,11 +379,11 @@ static void curl_multi_check_completion(BDRVCURLState= *s) continue; } =20 + acb->ret =3D -EIO; + state->acb[i] =3D NULL; qemu_mutex_unlock(&s->mutex); - acb->common.cb(acb->common.opaque, -EIO); + aio_co_wake(acb->co); qemu_mutex_lock(&s->mutex); - qemu_aio_unref(acb); - state->acb[i] =3D NULL; } } =20 @@ -822,19 +820,11 @@ out_noclean: return -EINVAL; } =20 -static const AIOCBInfo curl_aiocb_info =3D { - .aiocb_size =3D sizeof(CURLAIOCB), -}; - - -static void curl_readv_bh_cb(void *p) +static void curl_setup_preadv(BlockDriverState *bs, CURLAIOCB *acb) { CURLState *state; int running; - int ret =3D -EINPROGRESS; =20 - CURLAIOCB *acb =3D p; - BlockDriverState *bs =3D acb->common.bs; BDRVCURLState *s =3D bs->opaque; =20 uint64_t start =3D acb->offset; @@ -844,14 +834,8 @@ static void curl_readv_bh_cb(void *p) =20 // In case we have the requested data already (e.g. read-ahead), // we can just call the callback and be done. - switch (curl_find_buf(s, start, acb->bytes, acb)) { - case FIND_RET_OK: - ret =3D 0; - goto out; - case FIND_RET_WAIT: - goto out; - default: - break; + if (curl_find_buf(s, start, acb->bytes, acb)) { + goto out; } =20 // No cache found, so let's start a new request @@ -867,7 +851,7 @@ static void curl_readv_bh_cb(void *p) =20 if (curl_init_state(s, state) < 0) { curl_clean_state(state); - ret =3D -EIO; + acb->ret =3D -EIO; goto out; } =20 @@ -882,7 +866,7 @@ static void curl_readv_bh_cb(void *p) state->orig_buf =3D g_try_malloc(state->buf_len); if (state->buf_len && state->orig_buf =3D=3D NULL) { curl_clean_state(state); - ret =3D -ENOMEM; + acb->ret =3D -ENOMEM; goto out; } state->acb[0] =3D acb; @@ -899,26 +883,24 @@ static void curl_readv_bh_cb(void *p) =20 out: qemu_mutex_unlock(&s->mutex); - if (ret !=3D -EINPROGRESS) { - acb->common.cb(acb->common.opaque, ret); - qemu_aio_unref(acb); - } } =20 -static BlockAIOCB *curl_aio_readv(BlockDriverState *bs, - int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockCompletionFunc *cb, void *opaque) +static int coroutine_fn curl_co_preadv(BlockDriverState *bs, + uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags) { - CURLAIOCB *acb; - - acb =3D qemu_aio_get(&curl_aiocb_info, bs, cb, opaque); - - acb->qiov =3D qiov; - acb->offset =3D sector_num * BDRV_SECTOR_SIZE; - acb->bytes =3D nb_sectors * BDRV_SECTOR_SIZE; - - aio_bh_schedule_oneshot(bdrv_get_aio_context(bs), curl_readv_bh_cb, ac= b); - return &acb->common; + CURLAIOCB acb =3D { + .co =3D qemu_coroutine_self(), + .ret =3D -EINPROGRESS, + .qiov =3D qiov, + .offset =3D offset, + .bytes =3D bytes + }; + + curl_setup_preadv(bs, &acb); + while (acb.ret =3D=3D -EINPROGRESS) { + qemu_coroutine_yield(); + } + return acb.ret; } =20 static void curl_close(BlockDriverState *bs) @@ -949,7 +931,7 @@ static BlockDriver bdrv_http =3D { .bdrv_close =3D curl_close, .bdrv_getlength =3D curl_getlength, =20 - .bdrv_aio_readv =3D curl_aio_readv, + .bdrv_co_preadv =3D curl_co_preadv, =20 .bdrv_detach_aio_context =3D curl_detach_aio_context, .bdrv_attach_aio_context =3D curl_attach_aio_context, @@ -965,7 +947,7 @@ static BlockDriver bdrv_https =3D { .bdrv_close =3D curl_close, .bdrv_getlength =3D curl_getlength, =20 - .bdrv_aio_readv =3D curl_aio_readv, + .bdrv_co_preadv =3D curl_co_preadv, =20 .bdrv_detach_aio_context =3D curl_detach_aio_context, .bdrv_attach_aio_context =3D curl_attach_aio_context, @@ -981,7 +963,7 @@ static BlockDriver bdrv_ftp =3D { .bdrv_close =3D curl_close, .bdrv_getlength =3D curl_getlength, =20 - .bdrv_aio_readv =3D curl_aio_readv, + .bdrv_co_preadv =3D curl_co_preadv, =20 .bdrv_detach_aio_context =3D curl_detach_aio_context, .bdrv_attach_aio_context =3D curl_attach_aio_context, @@ -997,7 +979,7 @@ static BlockDriver bdrv_ftps =3D { .bdrv_close =3D curl_close, .bdrv_getlength =3D curl_getlength, =20 - .bdrv_aio_readv =3D curl_aio_readv, + .bdrv_co_preadv =3D curl_co_preadv, =20 .bdrv_detach_aio_context =3D curl_detach_aio_context, .bdrv_attach_aio_context =3D curl_attach_aio_context, --=20 2.12.2 From nobody Mon Apr 29 01:51:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494843013399591.0977774293041; Mon, 15 May 2017 03:10:13 -0700 (PDT) Received: from localhost ([::1]:35802 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dACx9-0007i2-3g for importer@patchew.org; Mon, 15 May 2017 06:10:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49575) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dACoa-0000c1-FH for qemu-devel@nongnu.org; Mon, 15 May 2017 06:01:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dACoZ-0005un-Hg for qemu-devel@nongnu.org; Mon, 15 May 2017 06:01:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44504) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dACoT-0005sc-FJ; Mon, 15 May 2017 06:01:13 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 54B9E80493; Mon, 15 May 2017 10:01:12 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-116-102.ams2.redhat.com [10.36.116.102]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v4FA10Ao004293; Mon, 15 May 2017 06:01:11 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 54B9E80493 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=pbonzini@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 54B9E80493 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 15 May 2017 12:00:59 +0200 Message-Id: <20170515100059.15795-8-pbonzini@redhat.com> In-Reply-To: <20170515100059.15795-1-pbonzini@redhat.com> References: <20170515100059.15795-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 15 May 2017 10:01:12 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 7/7] curl: do not do aio_poll when waiting for a free CURLState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jcody@redhat.com, rjones@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead, put the CURLAIOCB on a wait list and yield; curl_clean_state will wake the corresponding coroutine. Because of CURL's callback-based structure, we cannot easily convert everything to CoMutex/CoQueue; keeping the QemuMutex is simpler. However, CoQueue is a simple wrapper around a linked list, so we can easily use QSIMPLEQ and open-code a CoQueue, protected by the BDRVCURLState QemuMutex instead of a CoMutex. Reviewed-by: Jeff Cody Signed-off-by: Paolo Bonzini Reviewed-by: Max Reitz --- block/curl.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/block/curl.c b/block/curl.c index 86a4a73834..630c6e5187 100644 --- a/block/curl.c +++ b/block/curl.c @@ -98,6 +98,8 @@ typedef struct CURLAIOCB { =20 size_t start; size_t end; + + QSIMPLEQ_ENTRY(CURLAIOCB) next; } CURLAIOCB; =20 typedef struct CURLSocket { @@ -133,6 +135,7 @@ typedef struct BDRVCURLState { bool accept_range; AioContext *aio_context; QemuMutex mutex; + QSIMPLEQ_HEAD(, CURLAIOCB) free_state_waitq; char *username; char *password; char *proxyusername; @@ -532,6 +535,7 @@ static int curl_init_state(BDRVCURLState *s, CURLState = *state) /* Called with s->mutex held. */ static void curl_clean_state(CURLState *s) { + CURLAIOCB *next; int j; for (j=3D0; j < CURL_NUM_ACB; j++) { assert(!s->acb[j]); @@ -548,6 +552,14 @@ static void curl_clean_state(CURLState *s) } =20 s->in_use =3D 0; + + next =3D QSIMPLEQ_FIRST(&s->s->free_state_waitq); + if (next) { + QSIMPLEQ_REMOVE_HEAD(&s->s->free_state_waitq, next); + qemu_mutex_unlock(&s->s->mutex); + aio_co_wake(next->co); + qemu_mutex_lock(&s->s->mutex); + } } =20 static void curl_parse_filename(const char *filename, QDict *options, @@ -744,6 +756,7 @@ static int curl_open(BlockDriverState *bs, QDict *optio= ns, int flags, } =20 DPRINTF("CURL: Opening %s\n", file); + QSIMPLEQ_INIT(&s->free_state_waitq); s->aio_context =3D bdrv_get_aio_context(bs); s->url =3D g_strdup(file); qemu_mutex_lock(&s->mutex); @@ -844,8 +857,9 @@ static void curl_setup_preadv(BlockDriverState *bs, CUR= LAIOCB *acb) if (state) { break; } + QSIMPLEQ_INSERT_TAIL(&s->free_state_waitq, acb, next); qemu_mutex_unlock(&s->mutex); - aio_poll(bdrv_get_aio_context(bs), true); + qemu_coroutine_yield(); qemu_mutex_lock(&s->mutex); } =20 --=20 2.12.2