From nobody Thu May 9 11:59:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1633460296; cv=none; d=zohomail.com; s=zohoarc; b=Dd2gbNqXQnzTHFL8Bw5+T7xRB7/QgHft3jhWZ/PNrzJRrJMOE8k31n1+0bKInsX3XHjdgmCDQGJRnBkUAdyEp5qej83tXRbGcJWcttJj09PZWhNaDALVFzqCLxY3z/Z5CbWdns8Q4MJA55DIYnHN69mXEHZQrHKI7P09awnalq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633460296; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=+W7Y6rnsDDZf/ETt0uqjFCnv3qWeNLJXTQ9FgIMtpVs=; b=DGP87QoH7Uz52Bj+P1muULL321akEUNciBIYr6RH8PE/PCjC5NWFvp1dfX3FMD7E8bSaIMKQUbEzXpYKB11Ju20I/8nHbPDmGsoDiFQl8ijSQKkFxIVKHvW2gOgvFmA10eey+7PykjSLiyQt0GW+clf8X/OjBYVFwjsNI6sx0d0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1633460296791660.7409945129582; Tue, 5 Oct 2021 11:58:16 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-135-QMsCF81bPFqFrx8FP6gfjA-1; Tue, 05 Oct 2021 14:58:14 -0400 Received: by mail-wr1-f72.google.com with SMTP id k2-20020adff5c2000000b00160b12639a5so78661wrp.3 for ; Tue, 05 Oct 2021 11:58:14 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id e14sm8762358wrw.33.2021.10.05.11.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 11:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633460295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+W7Y6rnsDDZf/ETt0uqjFCnv3qWeNLJXTQ9FgIMtpVs=; b=LuWTkjx8hm+188Y2/v/zZjjdsO1fkVRxbcfXzCsOx/pO87Q/WgnV0loOdyUs6FfCt8DGLt U5X2aV6hWBBPv/V+xsdpGAkjgXS4N1W/ZJImtYS6WYz276j+ORlOygWKDRbAVSV+uhkR2u +/oeBRgtY6YvK5Q04gUQ0R5iwbwGRY4= X-MC-Unique: QMsCF81bPFqFrx8FP6gfjA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+W7Y6rnsDDZf/ETt0uqjFCnv3qWeNLJXTQ9FgIMtpVs=; b=ikLN5wppxqEkqwH42oSPohPA1IhQQ5w2xpTj3TlLdCIweAz1tvJVm0IMf0uB/nal2D +e8ubyrG42aFhkTOIlTXC81s2gRV3awwv0JoGW2LF+5eZnZSHpnkv2e5Qv/EUAvCa+gw OiEKPlaz2Ah6hEvLCmge2kk3fchADG7Jx5KPN3DvVvRwhrG+JuL0v3O89bXXaGyaGXKE 2PKGbapOa7F+AiuEMYEUGzX2BiIcswobGQpuLehEk/BLO5I01jOO9Feo1OSqYWo+ZytE LF0Lf44HrlDcdBhfq74Rm+ZGaZ5+jsyCmtI0exIxcyAjgZaQ8dSYpJ8ilBT3OdblZx6u cmYw== X-Gm-Message-State: AOAM533Yc/y2oLwRnWw5PjgdK0LqjHB4KZIDI8ij/NA87hOrVk2WwRpF tVHuHuxHX19f0Zs51ymkyM4jUDlPegNyWq+cxLvCHCExfHwEq5JvD1kWM4eoUfZzMiaYNQH7plD IIDM5BucKaTuDow== X-Received: by 2002:a7b:c954:: with SMTP id i20mr5325420wml.126.1633460293610; Tue, 05 Oct 2021 11:58:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwidVFBmid0TDIDnJBkgBPtHJbHDrccdTXyE39Dq8J28z1hKYZoZJx3yeUgSE41KAWAMMDktg== X-Received: by 2002:a7b:c954:: with SMTP id i20mr5325359wml.126.1633460293104; Tue, 05 Oct 2021 11:58:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr . David Alan Gilbert" , Vladimir Sementsov-Ogievskiy , Kevin Wolf , Stefan Hajnoczi , "Michael S. Tsirkin" , Fam Zheng , Hanna Reitz , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 1/4] block/aio: Add automatically released aio_context variants Date: Tue, 5 Oct 2021 20:58:04 +0200 Message-Id: <20211005185807.4134557-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211005185807.4134557-1-philmd@redhat.com> References: <20211005185807.4134557-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633460298895100003 Similarly to commit 5626f8c6d46 ("rcu: Add automatically released rcu_read_lock variants"): AIO_CONTEXT_ACQUIRE_GUARD() acquires the aio context and then uses glib's g_auto infrastructure (and thus whatever the compiler's hooks are) to release it on all exits of the block. WITH_AIO_CONTEXT_ACQUIRE_GUARD() is similar but is used as a wrapper for the lock, i.e.: WITH_AIO_CONTEXT_ACQUIRE_GUARD() { stuff with context acquired } Inspired-by: Dr. David Alan Gilbert Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/block/aio.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/block/aio.h b/include/block/aio.h index 47fbe9d81f2..4fa5a5c2720 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -294,6 +294,30 @@ void aio_context_acquire(AioContext *ctx); /* Relinquish ownership of the AioContext. */ void aio_context_release(AioContext *ctx); =20 +static inline AioContext *aio_context_auto_acquire(AioContext *ctx) +{ + aio_context_acquire(ctx); + return ctx; +} + +static inline void aio_context_auto_release(AioContext *ctx) +{ + aio_context_release(ctx); +} + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(AioContext, aio_context_auto_release) + +#define WITH_AIO_CONTEXT_ACQUIRE_GUARD(ctx) \ + WITH_AIO_CONTEXT_ACQUIRE_GUARD_(glue(_aio_context_auto, __COUNTER__), = ctx) + +#define WITH_AIO_CONTEXT_ACQUIRE_GUARD_(var, ctx) \ + for (g_autoptr(AioContext) var =3D aio_context_auto_acquire(ctx); \ + (var); aio_context_auto_release(var), (var) =3D NULL) + +#define AIO_CONTEXT_ACQUIRE_GUARD(ctx) \ + g_autoptr(AioContext) _aio_context_auto __attribute__((unused)) \ + =3D aio_context_auto_acquire(ctx) + /** * aio_bh_schedule_oneshot_full: Allocate a new bottom half structure that= will * run only once and as soon as possible. --=20 2.31.1 From nobody Thu May 9 11:59:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1633460300; cv=none; d=zohomail.com; s=zohoarc; b=G9BaSgaTrQv30c+mAFct+BRWND8fTg5q0ZirlXJRGC/q6Yy1614byrOhiPop51qfG8V7V2wSTuc+nf+LSgrdaB4UBdhcmh8zprO01DXYJDnI6Cy8aj8p0TFlPwvMhglqV8IW1hfCrec5gknqsIPeqrLoASzEXjv3aph87Wrug/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633460300; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=/l+iPsFyRbttZ9o4aXnxrKdZE8dURbTJQ5ld8MPAwxM=; b=PclY4DH/jeVFxFj/C0p/3tIlbYSJSQD7fCQlSZI0OQ9tBZpu8kzJQk7rTWFWb2hImmt44VxvcHwylfXoys9mrUNN74adwY5rDadZfYEb610EWaytAcXvTi9ibA4UjL1fPwYnSflU8h9T7evgl0wYeKd4H+obC+csXHrv5Gn+DD0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1633460300573917.8610627968695; Tue, 5 Oct 2021 11:58:20 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-517-JGJif8-RMi2S3I00jIgMaA-1; Tue, 05 Oct 2021 14:58:18 -0400 Received: by mail-wr1-f72.google.com with SMTP id c2-20020adfa302000000b0015e4260febdso69746wrb.20 for ; Tue, 05 Oct 2021 11:58:18 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id k128sm3020741wme.41.2021.10.05.11.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 11:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633460299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/l+iPsFyRbttZ9o4aXnxrKdZE8dURbTJQ5ld8MPAwxM=; b=Ks6t+r+0xhweM0DhqwcrEw5e0d9UnAg7QP44SrlDTyNyizkokTXeDm6zdVf7TQhFNXClvg UtdWDiyWsNWEUHQBoDaT5zW2rw/4ix4oRwGXSh8Q1yAdUvFi15JUZu62KVKutE3RtQWXA3 ZwWNhzfl1pu+aThwwaUFicvor/2OUPk= X-MC-Unique: JGJif8-RMi2S3I00jIgMaA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/l+iPsFyRbttZ9o4aXnxrKdZE8dURbTJQ5ld8MPAwxM=; b=wxl39Eg76y4QPICcoi9z6YPGIO6wGgTVGfElNp32exSwKWtwVN4NC/CFjDiY5qqk6Q aog3UuCMYuFaMmYmoMsou9TnJOH7QkZb0cPF8ss6j1knn1qCUvpLRvMr2o3s8QMV9z1I iqcxyRHes6KWLSc9EyQrP6JhAiG1oVzd0qlPoMuvX4km4rphO3frLvxw8oXZGxvJLOq3 StXZiBFWk6lDAu33redkORLPa+4tIeyd3upifX7d3O2Ot6gQJtr3npkxivQvsbEMvucH pKpBbxiDTnnbIeOkc5MjCJ2jbg/l0n7DZgArnVWYdt6DhComnI/V+LIxBkEuIFcXrQee 5UZw== X-Gm-Message-State: AOAM530MO94mXgvsooXrWTyHSkV4YpGmmQj4FbcAJNby9Cr8bMi7Igm/ Ln4iTnkC4aR+KHh6+Bo3QnpQPdp/GIq8Wd4aqzJ6j8dU/WXLkf676+JCH8hcQrlzNEWGv4irdhb ontMtPTpCXMZQ9w== X-Received: by 2002:a7b:cb49:: with SMTP id v9mr5161641wmj.76.1633460297561; Tue, 05 Oct 2021 11:58:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/WOij0B7vKYjkaYr9RjdMJscd/g/HhX+NhQVooN2vCuHpKCTMULPRmmyt2cuPyL5QOyySyg== X-Received: by 2002:a7b:cb49:: with SMTP id v9mr5161627wmj.76.1633460297427; Tue, 05 Oct 2021 11:58:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr . David Alan Gilbert" , Vladimir Sementsov-Ogievskiy , Kevin Wolf , Stefan Hajnoczi , "Michael S. Tsirkin" , Fam Zheng , Hanna Reitz , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 2/4] hw/scsi/scsi-disk: Use automatic AIO context lock Date: Tue, 5 Oct 2021 20:58:05 +0200 Message-Id: <20211005185807.4134557-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211005185807.4134557-1-philmd@redhat.com> References: <20211005185807.4134557-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633460301477100001 Use the automatic AIO context acquire/release in scsi_block_realize(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/scsi/scsi-disk.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index e8a547dbb7d..fa2d8543718 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2605,7 +2605,6 @@ static int get_device_type(SCSIDiskState *s) static void scsi_block_realize(SCSIDevice *dev, Error **errp) { SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, dev); - AioContext *ctx; int sg_version; int rc; =20 @@ -2620,8 +2619,7 @@ static void scsi_block_realize(SCSIDevice *dev, Error= **errp) "be removed in a future version"); } =20 - ctx =3D blk_get_aio_context(s->qdev.conf.blk); - aio_context_acquire(ctx); + AIO_CONTEXT_ACQUIRE_GUARD(blk_get_aio_context(dev->conf.blk)); =20 /* check we are using a driver managing SG_IO (version 3 and after) */ rc =3D blk_ioctl(s->qdev.conf.blk, SG_GET_VERSION_NUM, &sg_version); @@ -2630,18 +2628,18 @@ static void scsi_block_realize(SCSIDevice *dev, Err= or **errp) if (rc !=3D -EPERM) { error_append_hint(errp, "Is this a SCSI device?\n"); } - goto out; + return; } if (sg_version < 30000) { error_setg(errp, "scsi generic interface too old"); - goto out; + return; } =20 /* get device type from INQUIRY data */ rc =3D get_device_type(s); if (rc < 0) { error_setg(errp, "INQUIRY failed"); - goto out; + return; } =20 /* Make a guess for the block size, we'll fix it when the guest sends. @@ -2661,9 +2659,6 @@ static void scsi_block_realize(SCSIDevice *dev, Error= **errp) =20 scsi_realize(&s->qdev, errp); scsi_generic_read_device_inquiry(&s->qdev); - -out: - aio_context_release(ctx); } =20 typedef struct SCSIBlockReq { --=20 2.31.1 From nobody Thu May 9 11:59:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1633460305; cv=none; d=zohomail.com; s=zohoarc; b=jzqyWLuqw+V+c7NBKcElJ9auxoCqhENnI0ZcGH9TcgDTikui/QnAjwIg6aX7IxlgOZ8SZOblDd9NHgkpx3ftwfBZRViCOAF5rjL3XVT05H3jTCBQskEElzkjy6Epo0JC09XdXpUhuiWiFSJGmV8sf1TBB8iX2gGnES3wH8sCsOM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633460305; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=WZHNlTuTnklt4Xwql7kVo/EoV/I/Z/JZGj7l0lQfqyg=; b=BwOCyCh8roDJA0mAyJm7P8ngErjsHTMoqT1LPNvcv0bFnQKhnc5bRu9CDts+3/y24b+zoLsdLC8AKFlstIpbiF3F4ZY7y8WERmzt8mk7c25rZqU0NZrzi9TlHZBqEhHy0JAfz1ZbEvYwwJHo5TSmPjybzzG9r280RTk13qV/+SU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1633460305149465.559038557157; Tue, 5 Oct 2021 11:58:25 -0700 (PDT) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-441-sgZaqnO6N0CI71KxhxBQ0g-1; Tue, 05 Oct 2021 14:58:23 -0400 Received: by mail-wr1-f70.google.com with SMTP id s18-20020adfbc12000000b00160b2d4d5ebso77632wrg.7 for ; Tue, 05 Oct 2021 11:58:22 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id h17sm3382759wrx.55.2021.10.05.11.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 11:58:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633460304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WZHNlTuTnklt4Xwql7kVo/EoV/I/Z/JZGj7l0lQfqyg=; b=bttIkjEFVpM0FVBIqJTggQLAJ1huAGG8duMhBxPYZ/IK1Hcct7Y9CzBOB/MYLWCJlAGhTg jRrlgQRhApujJ8A3T8NsrnxIfQVdupPx1ia0847aly2W7Rp8EJu0xsPhGIvKAeXTmkF0Vk gy0X19nWpLyba3/tnP/lN0G29ibhOuw= X-MC-Unique: sgZaqnO6N0CI71KxhxBQ0g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WZHNlTuTnklt4Xwql7kVo/EoV/I/Z/JZGj7l0lQfqyg=; b=a9hytjch2Ai8uVpRMATml/pWCMS7cYVfGv9oRmXmMqY8QXgo89A6+FMr0BC6uP/Mk1 sLQKsMpK22YGf+jTtLDVARXEdcFCH0ndTXnTVsCxXOHhvn/TPGGNwWoN+sivFEi8XlFs S7CzeHmp6ytcld1e6MIQHhrFGaP/Uqowxr2VAGidiS6KUZfSuDUNmlnHv3dNChC4WbDx DoLGWDSMfQ2YZ3Iri4s8e1jWrOFr+4DYDxUpcuXv/22wnB7bT+en+oIzMsqCSVrVq38L IRGyJM6ZGoy8wLwjsF0rEpqyhEahDkr+kkaaxB72rjFBUNV3G4RZ53+44FK+I1eFFW96 noRw== X-Gm-Message-State: AOAM530etyL2GA1rMY9l8icKc67WMdA97pyHRc2aW/W/S/wS9mRlAdR4 o3RmemWmvNbOKiSsr9kEOOIvCMsaGBUhyTcCWa7G05gx27mLb5N3Ck1+UlBt6ZizDsUg6ePaXg2 6Ew4dqJr4ugUSgQ== X-Received: by 2002:a1c:3b06:: with SMTP id i6mr5330290wma.172.1633460302028; Tue, 05 Oct 2021 11:58:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyV8xwrb2B23Lu4C67s97BE/vo8DdZ5JC2Yvzb8kRL4v6ceSDU53m5SUnUzUxbiru8jpeaWw== X-Received: by 2002:a1c:3b06:: with SMTP id i6mr5330274wma.172.1633460301883; Tue, 05 Oct 2021 11:58:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr . David Alan Gilbert" , Vladimir Sementsov-Ogievskiy , Kevin Wolf , Stefan Hajnoczi , "Michael S. Tsirkin" , Fam Zheng , Hanna Reitz , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 3/4] hw/scsi/scsi-generic: Use automatic AIO context lock Date: Tue, 5 Oct 2021 20:58:06 +0200 Message-Id: <20211005185807.4134557-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211005185807.4134557-1-philmd@redhat.com> References: <20211005185807.4134557-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633460305338100001 Use the automatic AIO context acquire/release in scsi_command_complete(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/scsi/scsi-generic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 665baf900e4..08ef623c030 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -114,9 +114,9 @@ static void scsi_command_complete(void *opaque, int ret) assert(r->req.aiocb !=3D NULL); r->req.aiocb =3D NULL; =20 - aio_context_acquire(blk_get_aio_context(s->conf.blk)); - scsi_command_complete_noio(r, ret); - aio_context_release(blk_get_aio_context(s->conf.blk)); + WITH_AIO_CONTEXT_ACQUIRE_GUARD(blk_get_aio_context(s->conf.blk)) { + scsi_command_complete_noio(r, ret); + } } =20 static int execute_command(BlockBackend *blk, --=20 2.31.1 From nobody Thu May 9 11:59:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1633460309; cv=none; d=zohomail.com; s=zohoarc; b=GwruRJGSsJcDibDWE+HDb8hO/N+7y2kwuumSXz4ct9V7lnJNktkTTUqbQleuEa6HOWGkO9PqtxMvLjxZl5PoYV52i9pZx5fHOvS3CIrUzmKKrlbeUrxDGa3HIw0FiWPf36e1XfgVGJ8mqjKpqeOtbNWHmN9fP8k7NzacW8t4SX8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633460309; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=f8Ls47LDQwx5EUQb8VoETc5nYTSCXK17qEkxYGf41pg=; b=GxjKESeFNcRzyOWXuYZ94zHPY3pJz0ffDr5YMcsnNTAVRmc/acTpT02IXQIorCTcxI71B4HZkMtL7yvEKanu12YRqDlkxoblO2ZAOFL2vxrT9ZmyQgVkSaWCrghXVNVAz1zaTzKwwm7FzIskR6w+FnnwzB60UUyVExUGy0S/BvQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1633460309853706.3730137319644; Tue, 5 Oct 2021 11:58:29 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-31-hrbfSX-MOYiSSwDVwvz58g-1; Tue, 05 Oct 2021 14:58:27 -0400 Received: by mail-wr1-f71.google.com with SMTP id e11-20020a5d500b000000b001609d035ea5so69887wrt.22 for ; Tue, 05 Oct 2021 11:58:27 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id u17sm4364007wrw.85.2021.10.05.11.58.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 11:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633460308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f8Ls47LDQwx5EUQb8VoETc5nYTSCXK17qEkxYGf41pg=; b=XoTuGRPT5Rv52ifVAFdsac09hFRR+Y9INDCw8m7SU9T4QqTKl2QdyumfjVh/56qTFbJ8A6 RJLFvisxBdk2hZBXGAp5sp7XSoLJ7oqgzKgAnj2kEVjW+qZhjG24DGJMG2e7Zbl2cVbNJe TJQz8NDH1CW4EYR+L5GdfEt3WQIEBYs= X-MC-Unique: hrbfSX-MOYiSSwDVwvz58g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f8Ls47LDQwx5EUQb8VoETc5nYTSCXK17qEkxYGf41pg=; b=4xgkm0Xk6Pj4DpjgTKC+R5EJIlJkEdem/7S3C5cOVNXrXRi9MjijrCsz7AG0BduZvT Wm6vK1Yj9UYny4o0wGUQ7DLk9X4NDp2z3glPQXW/OonZW1QG9aikjfZyjL/fWvGSiQtT cVrceZnvZwnowJr32nUhPxrwU5FOWmcfZHQ+uA0KfD+4b1nyh5byuqGjDkKScKbydI4C covbVxZpBiy7VS+nFvhm3haWUSfw+CmtxhdAaL+1njiSOkeay7Grfz+MZ3SGlqianTxJ EdgoVup4QBtdQB9E2YHUjzzCcaNKH8QMCcjoNx4wXVhCeAbpT7OlIeA0lHg7JrggojB3 LLCQ== X-Gm-Message-State: AOAM530jXtIeTK0Z3uNo619Kc25j/NBHrN7UwH4qP8pEmfPXSe8q5Zth u9rZdbZ5BmJITtYRB9yRnTv8b9ls8bVkMZaX4ExcYqmf4Y5LLds51Eufan8uxzFLWLmrMlFoWO4 U9aIr7+vktSKsfA== X-Received: by 2002:a05:600c:1d18:: with SMTP id l24mr5322782wms.98.1633460306489; Tue, 05 Oct 2021 11:58:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpsLJqgIzOS/1WvaTqnMG9oMbi3+E5hwQvvcTn6XEkKxOy/03Y3mE4/cRQ/NQW8J6HO7v/5w== X-Received: by 2002:a05:600c:1d18:: with SMTP id l24mr5322754wms.98.1633460306278; Tue, 05 Oct 2021 11:58:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr . David Alan Gilbert" , Vladimir Sementsov-Ogievskiy , Kevin Wolf , Stefan Hajnoczi , "Michael S. Tsirkin" , Fam Zheng , Hanna Reitz , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 4/4] hw/block/virtio-blk: Use automatic AIO context lock Date: Tue, 5 Oct 2021 20:58:07 +0200 Message-Id: <20211005185807.4134557-5-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211005185807.4134557-1-philmd@redhat.com> References: <20211005185807.4134557-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633460311863100001 Use the automatic AIO context acquire/release in virtio_blk_reset(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/virtio-blk.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index f139cd7cc9c..2dd6428e7b3 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -896,24 +896,22 @@ static void virtio_blk_dma_restart_cb(void *opaque, b= ool running, static void virtio_blk_reset(VirtIODevice *vdev) { VirtIOBlock *s =3D VIRTIO_BLK(vdev); - AioContext *ctx; VirtIOBlockReq *req; =20 - ctx =3D blk_get_aio_context(s->blk); - aio_context_acquire(ctx); - blk_drain(s->blk); - - /* We drop queued requests after blk_drain() because blk_drain() itsel= f can - * produce them. */ - while (s->rq) { - req =3D s->rq; - s->rq =3D req->next; - virtqueue_detach_element(req->vq, &req->elem, 0); - virtio_blk_free_request(req); + WITH_AIO_CONTEXT_ACQUIRE_GUARD(blk_get_aio_context(s->blk)) { + blk_drain(s->blk); + /* + * We drop queued requests after blk_drain() because + * blk_drain() itself can produce them. + */ + while (s->rq) { + req =3D s->rq; + s->rq =3D req->next; + virtqueue_detach_element(req->vq, &req->elem, 0); + virtio_blk_free_request(req); + } } =20 - aio_context_release(ctx); - assert(!s->dataplane_started); blk_set_enable_write_cache(s->blk, s->original_wce); } --=20 2.31.1