From nobody Tue Apr 8 17:34:57 2025 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1677178412; cv=none; d=zohomail.com; s=zohoarc; b=i4Q2/CFVOEIwvjjoVIIkwnADwLE7maPvPh2hxR+sxh0rxISjLhnIwxgP52A37i1wSUIDUWo0H+HhRg7R8GSGXgQHDjO6njGcftoa9mQERv6blWWecCyrj/Yg3S7zy5ry3IFLAq9r77/riNk5VPNWV/KZ1pB2eiaNCDS2J6Gf9j4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677178412; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eRfUwW7W+NRR0iIjypfr/5pPgmRwfhMP49v359YeetA=; b=KcOJexmw93z8UD6nSge+YRFG8w4/PtMkQ9vbe7Ye7KfBnFF7xVcql96vxCHIMqx0dSkaH1Gfq1IVt4fg/6qwdLu+Y055asXFcKLIsljWOWEHEd382CsYDQVnSwKWxUkA6TBs/+j518Hq9VRL8nHXBzj1MoyrAkT6f/XPXGVpeIo= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677178412929326.5636194261183; Thu, 23 Feb 2023 10:53:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVGhL-0006nx-LX; Thu, 23 Feb 2023 13:52:07 -0500 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 1pVGhI-0006lt-20 for qemu-devel@nongnu.org; Thu, 23 Feb 2023 13:52:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVGhG-00031E-9J for qemu-devel@nongnu.org; Thu, 23 Feb 2023 13:52:03 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-77-sXBmeTwXMUy99Qxn21GSmA-1; Thu, 23 Feb 2023 13:51:57 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3570738173CC; Thu, 23 Feb 2023 18:51:57 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.192.128]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82E151121314; Thu, 23 Feb 2023 18:51:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677178321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eRfUwW7W+NRR0iIjypfr/5pPgmRwfhMP49v359YeetA=; b=BoXEfNtnjVt1Ht+cebEC2HfXF2tT2V5bAl+3/LhX2Vaqd3irTRWmXZ2TnI720uAFOxqiQU 4Cx6M6wOcX3U4U0jhI3BTWjozTNPlKZHksMOw3qnjZw1VG1SLkbESHDXSJUqZ0MQekuplK xH32DCgqF4RQuDPqAeMYSrz08OOt7Og= X-MC-Unique: sXBmeTwXMUy99Qxn21GSmA-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Subject: [PULL 06/29] block/qed: add missing graph rdlock in qed_need_check_timer_entry Date: Thu, 23 Feb 2023 19:51:23 +0100 Message-Id: <20230223185146.306454-7-kwolf@redhat.com> In-Reply-To: <20230223185146.306454-1-kwolf@redhat.com> References: <20230223185146.306454-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @redhat.com) X-ZM-MESSAGEID: 1677178414623100002 Content-Type: text/plain; charset="utf-8" From: Emanuele Giuseppe Esposito This function is called in two different places: - timer callback, which does not take the graph rdlock. - bdrv_qed_drain_begin(), which is .bdrv_drain_begin() callback documented as function that does not take the lock. Since it calls recursive functions that traverse the graph, we need to protect them with the graph rdlock. Signed-off-by: Emanuele Giuseppe Esposito Signed-off-by: Kevin Wolf Message-Id: <20230203152202.49054-7-kwolf@redhat.com> Reviewed-by: Emanuele Giuseppe Esposito Signed-off-by: Kevin Wolf --- block/qed.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/qed.c b/block/qed.c index 175a46c67b..7690d0215d 100644 --- a/block/qed.c +++ b/block/qed.c @@ -282,11 +282,12 @@ static void coroutine_fn qed_unplug_allocating_write_= reqs(BDRVQEDState *s) qemu_co_mutex_unlock(&s->table_lock); } =20 -static void coroutine_fn qed_need_check_timer(BDRVQEDState *s) +static void coroutine_fn GRAPH_RDLOCK qed_need_check_timer(BDRVQEDState *s) { int ret; =20 trace_qed_need_check_timer_cb(s); + assert_bdrv_graph_readable(); =20 if (!qed_plug_allocating_write_reqs(s)) { return; @@ -312,6 +313,7 @@ static void coroutine_fn qed_need_check_timer(BDRVQEDSt= ate *s) static void coroutine_fn qed_need_check_timer_entry(void *opaque) { BDRVQEDState *s =3D opaque; + GRAPH_RDLOCK_GUARD(); =20 qed_need_check_timer(opaque); bdrv_dec_in_flight(s->bs); --=20 2.39.2