From nobody Mon Feb 9 07:05:16 2026 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