From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91E84C49ED7 for ; Tue, 10 Sep 2019 16:17:14 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 249C120872 for ; Tue, 10 Sep 2019 16:17:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 249C120872 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7ipM-0006YB-DT for qemu-devel@archiver.kernel.org; Tue, 10 Sep 2019 12:17:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42653) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7ika-0001so-2C for qemu-devel@nongnu.org; Tue, 10 Sep 2019 12:12:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7ikY-0004FG-KF for qemu-devel@nongnu.org; Tue, 10 Sep 2019 12:12:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33694) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7ikU-0004D7-Nw; Tue, 10 Sep 2019 12:12:11 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E9A29197BCE2; Tue, 10 Sep 2019 16:12:09 +0000 (UTC) Received: from dhcp-4-67.tlv.redhat.com (dhcp-4-67.tlv.redhat.com [10.35.4.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A2EB100194E; Tue, 10 Sep 2019 16:12:05 +0000 (UTC) Message-ID: <4a6ec37d8ccc90a0e615fa80dc82af455aef87e1.camel@redhat.com> From: Maxim Levitsky To: Max Reitz , qemu-block@nongnu.org Date: Tue, 10 Sep 2019 19:12:04 +0300 In-Reply-To: <20190910124136.10565-5-mreitz@redhat.com> References: <20190910124136.10565-1-mreitz@redhat.com> <20190910124136.10565-5-mreitz@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Tue, 10 Sep 2019 16:12:09 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [Qemu-block] [PATCH v2 4/7] curl: Pass CURLSocket to curl_multi_do() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-stable@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 2019-09-10 at 14:41 +0200, Max Reitz wrote: > curl_multi_do_locked() currently marks all sockets as ready. That is > not only inefficient, but in fact unsafe (the loop is). A follow-up > patch will change that, but to do so, curl_multi_do_locked() needs to > know exactly which socket is ready; and that is accomplished by this > patch here. > > Cc: qemu-stable@nongnu.org > Signed-off-by: Max Reitz > --- > block/curl.c | 20 +++++++++++--------- > 1 file changed, 11 insertions(+), 9 deletions(-) > > diff --git a/block/curl.c b/block/curl.c > index 5838afef99..cf2686218d 100644 > --- a/block/curl.c > +++ b/block/curl.c > @@ -185,15 +185,15 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action, > switch (action) { > case CURL_POLL_IN: > aio_set_fd_handler(s->aio_context, fd, false, > - curl_multi_do, NULL, NULL, state); > + curl_multi_do, NULL, NULL, socket); > break; > case CURL_POLL_OUT: > aio_set_fd_handler(s->aio_context, fd, false, > - NULL, curl_multi_do, NULL, state); > + NULL, curl_multi_do, NULL, socket); > break; > case CURL_POLL_INOUT: > aio_set_fd_handler(s->aio_context, fd, false, > - curl_multi_do, curl_multi_do, NULL, state); > + curl_multi_do, curl_multi_do, NULL, socket); > break; > case CURL_POLL_REMOVE: > aio_set_fd_handler(s->aio_context, fd, false, > @@ -392,9 +392,10 @@ static void curl_multi_check_completion(BDRVCURLState *s) > } > > /* Called with s->mutex held. */ > -static void curl_multi_do_locked(CURLState *s) > +static void curl_multi_do_locked(CURLSocket *ready_socket) > { > CURLSocket *socket, *next_socket; > + CURLState *s = ready_socket->state; > int running; > int r; > > @@ -413,12 +414,13 @@ static void curl_multi_do_locked(CURLState *s) > > static void curl_multi_do(void *arg) > { > - CURLState *s = (CURLState *)arg; > + CURLSocket *socket = arg; > + BDRVCURLState *s = socket->state->s; > > - qemu_mutex_lock(&s->s->mutex); > - curl_multi_do_locked(s); > - curl_multi_check_completion(s->s); > - qemu_mutex_unlock(&s->s->mutex); > + qemu_mutex_lock(&s->mutex); > + curl_multi_do_locked(socket); > + curl_multi_check_completion(s); > + qemu_mutex_unlock(&s->mutex); > } > > static void curl_multi_timeout_do(void *arg) Reviewed-by: Maxim Levitsky Best regards, Maxim Levitsky