From 37acfe84ccbc4cc050e7be0ba9c8c4134a7b004e Mon Sep 17 00:00:00 2001

From: Max Reitz <mreitz@redhat.com>

Date: Tue, 19 Nov 2019 15:29:57 +0000

Subject: [PATCH 5/8] curl: Pass CURLSocket to curl_multi_do()

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Max Reitz <mreitz@redhat.com>

Message-id: <20191119153000.101646-5-mreitz@redhat.com>

Patchwork-id: 92518

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH 4/7] curl: Pass CURLSocket to curl_multi_do()

Bugzilla: 1744602

RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>

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 <mreitz@redhat.com>

Message-id: 20190910124136.10565-5-mreitz@redhat.com

Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>

Reviewed-by: John Snow <jsnow@redhat.com>

Signed-off-by: Max Reitz <mreitz@redhat.com>

(cherry picked from commit 9dbad87d25587ff640ef878f7b6159fc368ff541)

Signed-off-by: Max Reitz <mreitz@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 block/curl.c | 20 +++++++++++---------

 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/block/curl.c b/block/curl.c

index 8f31594..de00ec8 100644

--- a/block/curl.c

+++ b/block/curl.c

@@ -194,15 +194,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,

@@ -401,9 +401,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;

@@ -422,12 +423,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)

-- 

1.8.3.1