From nobody Tue Apr 15 06:10:09 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=1668180633; cv=none; d=zohomail.com; s=zohoarc; b=WjTGWXhXGXPp3Pynzu2I0QlmaxMiZ9Y0wOLuXmaJJInt140HO+S+jaCiS0WRvG+saYjkaEA3Lgy3vgVlsvU/LFV4uxm+1VlSbdn8iZpzpNyYWAoJmxDoW9QWyEEXL3zxLwLC8PdzwSbleeDOjv/KUt3cM7xTrPdMfXknQZl4Vjc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1668180633; 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=Hd0U4gtyaIaGU22uzmgf6PMttPPpzdkhG9V7Ia/RPHc=; b=iYkO/qWmg9yEegi8mu3+/N+LmCWI4X4cmApvmEZIbiMhrZSsodHe6iG1gZe1JSGcB7tJ/j3dE/TmpHoyHmFNHZAbPFNwh3a45mnTTvqkVBOQ3uPA5NILiq9bQfyIXYMyQ1rmjbL8GsyO5KlIpRTPD2dZG0whX9zjHkJoCkrWMlU= 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 1668180633934905.621039666365; Fri, 11 Nov 2022 07:30:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1otVwm-000855-Ns; Fri, 11 Nov 2022 10:28:00 -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 1otVwl-00083A-10 for qemu-devel@nongnu.org; Fri, 11 Nov 2022 10:27:59 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otVwj-0000xW-J6 for qemu-devel@nongnu.org; Fri, 11 Nov 2022 10:27:58 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-670-Iknnls3uO_SSYMD9WemU6w-1; Fri, 11 Nov 2022 10:27:53 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4BEE280A0AE; Fri, 11 Nov 2022 15:27:53 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.193.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F38DC15BA8; Fri, 11 Nov 2022 15:27:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668180477; 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=Hd0U4gtyaIaGU22uzmgf6PMttPPpzdkhG9V7Ia/RPHc=; b=UKFEgkY+YlZzQm5H8YBYEDq8BgonLiBNrR6BcFLrtq9vIbahRilLgXGeed0LsQw6bpNuib IFvFDzW1ED7Pm0y1hJGpf365SSMdKvAK0IBRbXBZKLXsGTSg5kQ7JcV9a3zSk7pxvNtk0w 4sNiqrt0QTJlJRpZmM0jKVUaBggwwds= X-MC-Unique: Iknnls3uO_SSYMD9WemU6w-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com, qemu-devel@nongnu.org Subject: [PULL 03/11] block/mirror: Fix NULL s->job in active writes Date: Fri, 11 Nov 2022 16:27:36 +0100 Message-Id: <20221111152744.261358-4-kwolf@redhat.com> In-Reply-To: <20221111152744.261358-1-kwolf@redhat.com> References: <20221111152744.261358-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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.133.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: 1668180636056100003 Content-Type: text/plain; charset="utf-8" From: Hanna Reitz There is a small gap in mirror_start_job() before putting the mirror filter node into the block graph (bdrv_append() call) and the actual job being created. Before the job is created, MirrorBDSOpaque.job is NULL. It is possible that requests come in when bdrv_drained_end() is called, and those requests would see MirrorBDSOpaque.job =3D=3D NULL. Have our filter node handle that case gracefully. Signed-off-by: Hanna Reitz Message-Id: <20221109165452.67927-4-hreitz@redhat.com> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block/mirror.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 5b6f42392c..251adc5ae0 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1438,11 +1438,13 @@ static int coroutine_fn bdrv_mirror_top_do_write(Bl= ockDriverState *bs, MirrorOp *op =3D NULL; MirrorBDSOpaque *s =3D bs->opaque; int ret =3D 0; - bool copy_to_target; + bool copy_to_target =3D false; =20 - copy_to_target =3D s->job->ret >=3D 0 && - !job_is_cancelled(&s->job->common.job) && - s->job->copy_mode =3D=3D MIRROR_COPY_MODE_WRITE_BLOCK= ING; + if (s->job) { + copy_to_target =3D s->job->ret >=3D 0 && + !job_is_cancelled(&s->job->common.job) && + s->job->copy_mode =3D=3D MIRROR_COPY_MODE_WRITE_B= LOCKING; + } =20 if (copy_to_target) { op =3D active_write_prepare(s->job, offset, bytes); @@ -1487,11 +1489,13 @@ static int coroutine_fn bdrv_mirror_top_pwritev(Blo= ckDriverState *bs, QEMUIOVector bounce_qiov; void *bounce_buf; int ret =3D 0; - bool copy_to_target; + bool copy_to_target =3D false; =20 - copy_to_target =3D s->job->ret >=3D 0 && - !job_is_cancelled(&s->job->common.job) && - s->job->copy_mode =3D=3D MIRROR_COPY_MODE_WRITE_BLOCK= ING; + if (s->job) { + copy_to_target =3D s->job->ret >=3D 0 && + !job_is_cancelled(&s->job->common.job) && + s->job->copy_mode =3D=3D MIRROR_COPY_MODE_WRITE_B= LOCKING; + } =20 if (copy_to_target) { /* The guest might concurrently modify the data to write; but --=20 2.38.1