From nobody Sun May 19 03:38:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568286260; cv=none; d=zoho.com; s=zohoarc; b=N0km//C28grW2h7wfQUze2nbBVdDWSzUlPXzNQ+kxe3AER2e1pZzzyIntQf1bgzihX5oW8Y7QnjYxF+X3jqoH9+7Z4gqESJQB8dSJ3RhgFq2Fjc9KQU6jbMlUK+mXTdHJ87UL9m3S7dCL5+5VVvEJdApOH1FVOPz8O7MpoXvEjI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568286260; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=CCBSBFfEC+sihawQnZR/dg2uq8EsDq/90xp6Xqsj2ok=; b=Gwiab/hHL3HaFYAzCexWlW+s83goMXrlU8jLpRU69ZuwhiB1mgy2I4YU7LezzgyLlov4/j2BdQt62ENp77yEtTyotGgqQEzotF9wnczHFCT9S3FAmamRSK7+tG9KR6DyKzOMgR6WiE/oEtglVqHc9SbJ5jlTpI0RduqURgLhCC8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568286260440624.3528260753621; Thu, 12 Sep 2019 04:04:20 -0700 (PDT) Received: from localhost ([::1]:60996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8Mta-0002Ta-5T for importer@patchew.org; Thu, 12 Sep 2019 07:04:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33882) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8Ms6-0001A0-ON for qemu-devel@nongnu.org; Thu, 12 Sep 2019 07:02:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8Ms5-0000mC-Js for qemu-devel@nongnu.org; Thu, 12 Sep 2019 07:02:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32994) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i8Ms1-0000kT-7v; Thu, 12 Sep 2019 07:02:37 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ACFC818C4274; Thu, 12 Sep 2019 11:02:35 +0000 (UTC) Received: from dritchie.redhat.com (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF14D5D713; Thu, 12 Sep 2019 11:02:31 +0000 (UTC) From: Sergio Lopez To: qemu-block@nongnu.org Date: Thu, 12 Sep 2019 13:00:33 +0200 Message-Id: <20190912110032.26395-1-slp@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Thu, 12 Sep 2019 11:02:35 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] nbd/server: attach client channel to the export's AioContext X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-devel@nongnu.org, Sergio Lopez Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" On creation, the export's AioContext is set to the same one as the BlockBackend, while the AioContext in the client QIOChannel is left untouched. As a result, when using data-plane, nbd_client_receive_next_request() schedules coroutines in the IOThread AioContext, while the client's QIOChannel is serviced from the main_loop, potentially triggering the assertion at qio_channel_restart_[read|write]. To fix this, as soon we have the export corresponding to the client, we call qio_channel_attach_aio_context() to attach the QIOChannel context to the export's AioContext. This matches with the logic at blk_aio_attached(). RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=3D1748253 Signed-off-by: Sergio Lopez Reviewed-by: Eric Blake --- Changelog v2: - Attach the channel once after negotiation completes, avoiding duplication. (thanks Kevin Wolf). --- nbd/server.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nbd/server.c b/nbd/server.c index 28c3c8be85..31d624e146 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -1297,6 +1297,11 @@ static coroutine_fn int nbd_negotiate(NBDClient *cli= ent, Error **errp) return ret; } =20 + /* Attach the channel to the same AioContext as the export */ + if (client->exp && client->exp->ctx) { + qio_channel_attach_aio_context(client->ioc, client->exp->ctx); + } + assert(!client->optlen); trace_nbd_negotiate_success(); =20 --=20 2.21.0