From nobody Wed Dec 17 05:36:59 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=1680007030; cv=none; d=zohomail.com; s=zohoarc; b=J7WKgclrl18klQx2tqIqueTiOEfFQ+kf7W0pxLg1X5T0K17Rl8Cs0pvqsgq57ewfFSg9H2fE4wwqGOnZ18v//J53hapsKdxl8Yl4WdwTYKmMHt/bAepM4l9+1ugwJX6nsRUakPv6RBRGJ+rXZjsMOkzd7CMS4mYc63xlXPPguQY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680007030; 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=RA1ZnMKSxLra8z0VlFyzeY9VJiVlM6sAzM3t1q82S6M=; b=hpGHW1/uRY05AGTYpptZkCtRDc+G4WNcilTaIre3D7mY5yxN10/3qaNDq3blgb99xMMKufye9PDrf5cwi0GtJpHVFXRmrfFATX23FDt5nvBXWcAmW4zkXo1oN8gKMS4X5laFHHKEyqKRhqygR1zEhSIeMpyK9fREfurD4N7tA8o= 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 1680007030680950.3564167588169; Tue, 28 Mar 2023 05:37:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ph8YQ-0004DM-Us; Tue, 28 Mar 2023 08:35:58 -0400 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 1ph8YO-0004BX-6k for qemu-devel@nongnu.org; Tue, 28 Mar 2023 08:35:56 -0400 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 1ph8YM-0006CN-Ay for qemu-devel@nongnu.org; Tue, 28 Mar 2023 08:35:55 -0400 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-481-7Ec6T_y4NeuTFxScQUTQrA-1; Tue, 28 Mar 2023 08:35:52 -0400 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 972FF1C27D85; Tue, 28 Mar 2023 12:35:51 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF12FC15BA0; Tue, 28 Mar 2023 12:35:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680006953; 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=RA1ZnMKSxLra8z0VlFyzeY9VJiVlM6sAzM3t1q82S6M=; b=h5qR3LJZKhnI738AR4LHu0tlNXuW9ijRTJ5t6xqmr465ssWKD1umQFO0OuzUqa6timAl7U xMYNy8NatF2GP6ZulZEx+2fEsPmVzTwxVL5dJhepGPDWO71pLopaY+cl+ojmuvsqr5pHe/ RYYBNnMz8zQE1Mbj4dDoWk097PLtV1E= X-MC-Unique: 7Ec6T_y4NeuTFxScQUTQrA-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Subject: [PULL 2/4] block/export: only acquire AioContext once for vhost_user_server_stop() Date: Tue, 28 Mar 2023 14:35:40 +0200 Message-Id: <20230328123542.222022-3-kwolf@redhat.com> In-Reply-To: <20230328123542.222022-1-kwolf@redhat.com> References: <20230328123542.222022-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.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=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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1680007032036100003 Content-Type: text/plain; charset="utf-8" From: Stefan Hajnoczi vhost_user_server_stop() uses AIO_WAIT_WHILE(). AIO_WAIT_WHILE() requires that AioContext is only acquired once. Since blk_exp_request_shutdown() already acquires the AioContext it shouldn't be acquired again in vhost_user_server_stop(). Signed-off-by: Stefan Hajnoczi Message-Id: <20230323145853.1345527-1-stefanha@redhat.com> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- util/vhost-user-server.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/util/vhost-user-server.c b/util/vhost-user-server.c index 40f36ea214..5b6216069c 100644 --- a/util/vhost-user-server.c +++ b/util/vhost-user-server.c @@ -346,10 +346,9 @@ static void vu_accept(QIONetListener *listener, QIOCha= nnelSocket *sioc, aio_context_release(server->ctx); } =20 +/* server->ctx acquired by caller */ void vhost_user_server_stop(VuServer *server) { - aio_context_acquire(server->ctx); - qemu_bh_delete(server->restart_listener_bh); server->restart_listener_bh =3D NULL; =20 @@ -366,8 +365,6 @@ void vhost_user_server_stop(VuServer *server) AIO_WAIT_WHILE(server->ctx, server->co_trip); } =20 - aio_context_release(server->ctx); - if (server->listener) { qio_net_listener_disconnect(server->listener); object_unref(OBJECT(server->listener)); --=20 2.39.2