{"id":806838,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806838/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<1503965694-10794-30-git-send-email-mdroth@linux.vnet.ibm.com>","date":"2017-08-29T00:14:04","name":"[29/79] curl: never invoke callbacks with s->mutex held","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1665f1b5d6cb9d0138f5765a707a59bb9f071467","submitter":{"id":5549,"url":"http://patchwork.ozlabs.org/api/1.0/people/5549/?format=json","name":"Michael Roth","email":"mdroth@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-30-git-send-email-mdroth@linux.vnet.ibm.com/mbox/","series":[{"id":281,"url":"http://patchwork.ozlabs.org/api/1.0/series/281/?format=json","date":"2017-08-29T00:13:45","name":"Patch Round-up for stable 2.9.1, freeze on 2017-09-04","version":1,"mbox":"http://patchwork.ozlabs.org/series/281/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806838/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xh8pX2DKzz9sNr\n\tfor ;\n\tTue, 29 Aug 2017 10:36:52 +1000 (AEST)","from localhost ([::1]:41997 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmUWQ-0002qM-3r\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 20:36:50 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47804)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmUCL-000162-7n\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:07 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmUCI-0005J6-0I\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:05 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5]:32792\n\thelo=mx0a-001b2d01.pphosted.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dmUCH-0005IC-PX\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:01 -0400","from pps.filterd (m0098417.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T0EBme044267\n\tfor ; Mon, 28 Aug 2017 20:16:01 -0400","from e35.co.us.ibm.com (e35.co.us.ibm.com [32.97.110.153])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2cmu3kpe34-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Mon, 28 Aug 2017 20:16:01 -0400","from localhost\n\tby e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tMon, 28 Aug 2017 18:16:00 -0600","from b03cxnp08028.gho.boulder.ibm.com (9.17.130.20)\n\tby e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 18:15:57 -0600","from b03ledav006.gho.boulder.ibm.com\n\t(b03ledav006.gho.boulder.ibm.com [9.17.130.237])\n\tby b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v7T0FvpG32047138; Mon, 28 Aug 2017 17:15:57 -0700","from b03ledav006.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 3C34FC603C;\n\tMon, 28 Aug 2017 18:15:57 -0600 (MDT)","from localhost (unknown [9.80.85.217])\n\tby b03ledav006.gho.boulder.ibm.com (Postfix) with ESMTP id 09073C6037;\n\tMon, 28 Aug 2017 18:15:56 -0600 (MDT)"],"From":"Michael Roth ","To":"qemu-devel@nongnu.org","Date":"Mon, 28 Aug 2017 19:14:04 -0500","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","References":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17082900-0012-0000-0000-000014ECDC35","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007630; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000226; SDB=6.00909027; UDB=6.00455849;\n\tIPR=6.00689279; \n\tBA=6.00005557; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016909;\n\tXFM=3.00000015; UTC=2017-08-29 00:15:59","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17082900-0013-0000-0000-00004F43FAF5","Message-Id":"<1503965694-10794-30-git-send-email-mdroth@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-28_13:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=1\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708290001","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.158.5","Subject":"[Qemu-devel] [PATCH 29/79] curl: never invoke callbacks with\n\ts->mutex held","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Paolo Bonzini , Jeff Cody ,\n\tqemu-stable@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Paolo Bonzini \n\nAll curl callbacks go through curl_multi_do, and hence are called with\ns->mutex held. Note that with comments, and make curl_read_cb drop the\nlock before invoking the callback.\n\nLikewise for curl_find_buf, where the callback can be invoked by the\ncaller.\n\nCc: qemu-stable@nongnu.org\nReviewed-by: Jeff Cody \nSigned-off-by: Paolo Bonzini \nReviewed-by: Max Reitz \nMessage-id: 20170515100059.15795-3-pbonzini@redhat.com\nSigned-off-by: Jeff Cody \n(cherry picked from commit 34db05e7ffe8d61ca7288b9532ad6e8300853318)\nSigned-off-by: Michael Roth \n---\n block/curl.c | 12 ++++++++----\n 1 file changed, 8 insertions(+), 4 deletions(-)","diff":"diff --git a/block/curl.c b/block/curl.c\nindex c6dc4c0..59e69c6 100644\n--- a/block/curl.c\n+++ b/block/curl.c\n@@ -147,6 +147,7 @@ static void curl_multi_do(void *arg);\n static void curl_multi_read(void *arg);\n \n #ifdef NEED_CURL_TIMER_CALLBACK\n+/* Called from curl_multi_do_locked, with s->mutex held. */\n static int curl_timer_cb(CURLM *multi, long timeout_ms, void *opaque)\n {\n BDRVCURLState *s = opaque;\n@@ -163,6 +164,7 @@ static int curl_timer_cb(CURLM *multi, long timeout_ms, void *opaque)\n }\n #endif\n \n+/* Called from curl_multi_do_locked, with s->mutex held. */\n static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,\n void *userp, void *sp)\n {\n@@ -212,6 +214,7 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,\n return 0;\n }\n \n+/* Called from curl_multi_do_locked, with s->mutex held. */\n static size_t curl_header_cb(void *ptr, size_t size, size_t nmemb, void *opaque)\n {\n BDRVCURLState *s = opaque;\n@@ -226,6 +229,7 @@ static size_t curl_header_cb(void *ptr, size_t size, size_t nmemb, void *opaque)\n return realsize;\n }\n \n+/* Called from curl_multi_do_locked, with s->mutex held. */\n static size_t curl_read_cb(void *ptr, size_t size, size_t nmemb, void *opaque)\n {\n CURLState *s = ((CURLState*)opaque);\n@@ -264,7 +268,9 @@ static size_t curl_read_cb(void *ptr, size_t size, size_t nmemb, void *opaque)\n request_length - offset);\n }\n \n+ qemu_mutex_unlock(&s->s->mutex);\n acb->common.cb(acb->common.opaque, 0);\n+ qemu_mutex_lock(&s->s->mutex);\n qemu_aio_unref(acb);\n s->acb[i] = NULL;\n }\n@@ -305,8 +311,6 @@ static int curl_find_buf(BDRVCURLState *s, size_t start, size_t len,\n if (clamped_len < len) {\n qemu_iovec_memset(acb->qiov, clamped_len, 0, len - clamped_len);\n }\n- acb->common.cb(acb->common.opaque, 0);\n-\n return FIND_RET_OK;\n }\n \n@@ -832,8 +836,8 @@ static void curl_readv_bh_cb(void *p)\n // we can just call the callback and be done.\n switch (curl_find_buf(s, start, acb->nb_sectors * BDRV_SECTOR_SIZE, acb)) {\n case FIND_RET_OK:\n- qemu_aio_unref(acb);\n- // fall through\n+ ret = 0;\n+ goto out;\n case FIND_RET_WAIT:\n goto out;\n default:\n","prefixes":["29/79"]}