From nobody Mon Feb 9 23:00:05 2026 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=1658735298; cv=none; d=zohomail.com; s=zohoarc; b=U64bcHMrKmqLAYljOrD5BIVOjA8MNiB2oMk9Vix7RQNT2LP8eCVH8NobytJUcDQ2mYYAml6kn1AvF/oVTauNcDCq/h4v3NdG5syRop692/xrBz3S5HcpmsCP2Nsv9dv3D/HFW4xvT4IgyoaaBWQMxyi9/cl92ivCRyR4MVGqJq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658735298; 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=0lH5FBszu6H6hJ8X8MED5qu3+8Ue/9t6M4NbXaUuEqE=; b=Hq9PBvQJwPn/Z7iIVZ9C/vaKJ/3ItGe4OXLuk5Zah/lyqa9lAZxBLyhVqJQW6u1yxYtVSEyhPoMNgWbUZvLVsNW2fAmbQU2VoV4h+fh0eAOgByK9Kxhyia42VnvdjOk1fFHw5Ikggz5ovHxgoW4ztOFq6OUvFEGsxhvmu3KYFsY= 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 1658735298248368.6866796285334; Mon, 25 Jul 2022 00:48:18 -0700 (PDT) Received: from localhost ([::1]:32804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFsp7-0006ka-57 for importer@patchew.org; Mon, 25 Jul 2022 03:48:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFsgS-0004LI-Gq for qemu-devel@nongnu.org; Mon, 25 Jul 2022 03:39:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:47265) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFsgI-0003GB-Nb for qemu-devel@nongnu.org; Mon, 25 Jul 2022 03:39:20 -0400 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-450-yXZedxzuMy2vPbeKtiqhcg-1; Mon, 25 Jul 2022 03:39:06 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EEA03811E81; Mon, 25 Jul 2022 07:39:05 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9EF9F2166B2A; Mon, 25 Jul 2022 07:39:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658734750; 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=0lH5FBszu6H6hJ8X8MED5qu3+8Ue/9t6M4NbXaUuEqE=; b=S8l+IdgznKO3kYLIn2F08r+xrwMhcRJ12hsrx7+Ui+krZj3PGLTtmPqBvfsAw70kZRJdJa q5fszarVJvjSEDNFj8DhCuYOAM8IuBUMnC/cfoNiwcjsf5n6KRGBq0H/IzWREWcDOVm7ho 0/Dx3mEzTkKE6zW9DzROApROu2/lD3E= X-MC-Unique: yXZedxzuMy2vPbeKtiqhcg-1 From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Cc: Kevin Wolf , Hanna Reitz , Paolo Bonzini , John Snow , Vladimir Sementsov-Ogievskiy , Wen Congyang , Xie Changlong , Markus Armbruster , Stefan Hajnoczi , Fam Zheng , qemu-devel@nongnu.org, Emanuele Giuseppe Esposito Subject: [PATCH v10 17/21] blockjob: protect iostatus field in BlockJob struct Date: Mon, 25 Jul 2022 03:38:51 -0400 Message-Id: <20220725073855.76049-18-eesposit@redhat.com> In-Reply-To: <20220725073855.76049-1-eesposit@redhat.com> References: <20220725073855.76049-1-eesposit@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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=eesposit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658735299300100001 Content-Type: text/plain; charset="utf-8" iostatus is the only field (together with .job) that needs protection using the job mutex. It is set in the main loop (GLOBAL_STATE functions) but read in I/O code (block_job_error_action). In order to protect it, change block_job_iostatus_set_err to block_job_iostatus_set_err_locked(), always called under job lock. Signed-off-by: Emanuele Giuseppe Esposito Reviewed-by: Kevin Wolf --- blockjob.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/blockjob.c b/blockjob.c index 0663faee2c..448bdb5a53 100644 --- a/blockjob.c +++ b/blockjob.c @@ -363,7 +363,8 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **er= rp) return block_job_query_locked(job, errp); } =20 -static void block_job_iostatus_set_err(BlockJob *job, int error) +/* Called with job lock held */ +static void block_job_iostatus_set_err_locked(BlockJob *job, int error) { if (job->iostatus =3D=3D BLOCK_DEVICE_IO_STATUS_OK) { job->iostatus =3D error =3D=3D ENOSPC ? BLOCK_DEVICE_IO_STATUS_NOS= PACE : @@ -577,8 +578,8 @@ BlockErrorAction block_job_error_action(BlockJob *job, = BlockdevOnError on_err, */ job->job.user_paused =3D true; } + block_job_iostatus_set_err_locked(job, error); } - block_job_iostatus_set_err(job, error); } return action; } --=20 2.31.1