From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2F9A4C35274 for ; Thu, 21 Dec 2023 07:28:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGDSV-0005uh-Ew; Thu, 21 Dec 2023 02:27:07 -0500 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 1rGDST-0005uK-Nk for qemu-devel@nongnu.org; Thu, 21 Dec 2023 02:27:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGDSS-0003W1-BV for qemu-devel@nongnu.org; Thu, 21 Dec 2023 02:27:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703143623; 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:autocrypt:autocrypt; bh=BkYOE3eV/+qj+LfCg0JlleLxMnlLABBOSLMjneOlRlQ=; b=Vq5Y9973pLCnLFpyptlA2q9lPszqcl7wNG8Jwk+69jG+1JCDzFJdgSzFGZZJGs2opwlaun GJ/w/6iiiKUcd1kC/d0/84DwPZZ4QJAEXZf05/jI+42wTmkbJXtyGPKp9vveyY9G5dwq4g RkF6YWLLIhGDY4SSUvpKJQj93mH9SEM= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-694-wRqlZNM-On-Ha7oprtUi-Q-1; Thu, 21 Dec 2023 02:27:01 -0500 X-MC-Unique: wRqlZNM-On-Ha7oprtUi-Q-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9fd0a58549bso48638066b.0 for ; Wed, 20 Dec 2023 23:27:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703143620; x=1703748420; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:cc :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BkYOE3eV/+qj+LfCg0JlleLxMnlLABBOSLMjneOlRlQ=; b=fI4DT7a/BHM12Re/t7J7vSws5Me/VWbjTAY9XDHbhO4TxROeWa42Gg2ev2PMp0F2Bp OJxXOVz79c6OLJtsSyV4CUGw2filLJe/IzKlmClnBhtHdjs7D6y7tEoGpsbS1ypjek/i 1NuV2VHuWCh1Y2AOxprsyoE7H5Rf18qnL0hGmlFMhM2jpU4vTS8z8HlgfqeCIASsibcC atwDhVPGQ2PJP0cMqas2DLlRzHa9V3rzcOUbR07uyUTczM1IJ2Ntx+f7TM5tdb8ahXLu jUuBfGBKoiJb5td7QmC8NwntCdb8TIzoV5hfkcNV6TMf+ls4dpKOYjeb8CJY5qxgtUPj hQ1Q== X-Gm-Message-State: AOJu0YyFadugbNVdBD7wRx87sr/U05CSualTrNA918VdlLDjEZDsIB3X cb9qqF10E36ZpW0CeA0oT6hKInCThKnRDEtdE1KNafgR0aHGwI3lRz7Wlh/AQCn4opfh3lBrzer 7MrpZCZZC564zUkVTgj9N1Y0= X-Received: by 2002:a17:906:3a83:b0:a23:4902:a596 with SMTP id y3-20020a1709063a8300b00a234902a596mr252055ejd.1.1703143620541; Wed, 20 Dec 2023 23:27:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IEiSTyG7zecfvb+kBxNi6UyA1DEK+jP6Jd+xDEivdh0heIOpIAAF0zT6bMPv4xm/rf1K1ag7Q== X-Received: by 2002:a17:906:3a83:b0:a23:4902:a596 with SMTP id y3-20020a1709063a8300b00a234902a596mr252035ejd.1.1703143620189; Wed, 20 Dec 2023 23:27:00 -0800 (PST) Received: from ?IPV6:2001:b07:6468:f312:63a7:c72e:ea0e:6045? ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.googlemail.com with ESMTPSA id wb8-20020a170907d50800b00a234ae227d2sm633592ejc.219.2023.12.20.23.26.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 20 Dec 2023 23:26:59 -0800 (PST) Message-ID: Date: Thu, 21 Dec 2023 08:26:58 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 6/6] nbd/server: introduce NBDClient->lock to protect fields Content-Language: en-US To: Stefan Hajnoczi , Kevin Wolf , qemu-devel@nongnu.org Cc: Leonardo Bras , qemu-block@nongnu.org, Fam Zheng , Vladimir Sementsov-Ogievskiy , Fabiano Rosas , Eric Blake , Hanna Reitz , Juan Quintela , Peter Xu References: <20231221014903.1537962-1-stefanha@redhat.com> <20231221014903.1537962-7-stefanha@redhat.com> From: Paolo Bonzini Autocrypt: addr=pbonzini@redhat.com; keydata= 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 In-Reply-To: <20231221014903.1537962-7-stefanha@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@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.063, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 12/21/23 02:49, Stefan Hajnoczi wrote: > nbd_client_receive_next_request(client); > + > + qemu_mutex_unlock(&client->lock); > + > if (ret == -EIO) { > goto disconnect; > } I think I slightly prefer if disconnect is reached with lock taken, for consistency with the "done" label. It does not complicate the code, because you can just move qio_channel_set_cork() and replace: > @@ -3024,8 +3072,10 @@ static coroutine_fn void nbd_trip(void *opaque) > } > > qio_channel_set_cork(client->ioc, false); > + qemu_mutex_lock(&client->lock); with: + qio_channel_set_cork(client->ioc, false); + qemu_mutex_lock(&client->lock); if (ret < 0) { error_prepend(&local_err, "Failed to send reply: "); goto disconnect; } /* * We must disconnect after NBD_CMD_WRITE or BLOCK_STATUS with * payload if we did not read the payload. */ if (!req->complete) { error_setg(&local_err, "Request handling failed in intermediate state"); goto disconnect; } - qio_channel_set_cork(client->ioc, false); done: Thanks, Paolo > done: > nbd_request_put(req); > + qemu_mutex_unlock(&client->lock);