From nobody Sun Oct 5 21:17:17 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544882474612196.10035502646963; Sat, 15 Dec 2018 06:01:14 -0800 (PST) Received: from localhost ([::1]:39153 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYAV7-00021u-S0 for importer@patchew.org; Sat, 15 Dec 2018 09:01:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYAOF-0004qT-JN for qemu-devel@nongnu.org; Sat, 15 Dec 2018 08:54:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gYAOE-0008DV-A1 for qemu-devel@nongnu.org; Sat, 15 Dec 2018 08:53:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36514) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gYAOB-0008Ap-6f; Sat, 15 Dec 2018 08:53:55 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 84837C049599; Sat, 15 Dec 2018 13:53:54 +0000 (UTC) Received: from red.redhat.com (ovpn-122-76.rdu2.redhat.com [10.10.122.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D6985C1B2; Sat, 15 Dec 2018 13:53:52 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Sat, 15 Dec 2018 07:53:13 -0600 Message-Id: <20181215135324.152629-12-eblake@redhat.com> In-Reply-To: <20181215135324.152629-1-eblake@redhat.com> References: <20181215135324.152629-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Sat, 15 Dec 2018 13:53:54 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 11/22] nbd/client: Change signature of nbd_negotiate_simple_meta_context() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , vsementsov@virtuozzo.com, qemu-block@nongnu.org, rjones@redhat.com, Max Reitz , nsoffer@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Pass 'info' instead of three separate parameters related to info, when requesting the server to set the meta context. Update the NBDExportInfo struct to rename the received id field to match the fact that we are currently overloading the field to match whatever context the user supplied through the x-dirty-bitmap hack, as well as adding a TODO comment to remind future patches about a desire to request two contexts at once. Signed-off-by: Eric Blake Reviewed-by: Richard W.M. Jones Reviewed-by: Vladimir Sementsov-Ogievskiy --- v2: split patch into easier-to-review pieces [Rich, Vladimir] rename NBDExportInfo meta_base_allocation_id [Vladimir] --- include/block/nbd.h | 2 +- block/nbd-client.c | 4 ++-- nbd/client.c | 53 +++++++++++++++++++++------------------------ 3 files changed, 28 insertions(+), 31 deletions(-) diff --git a/include/block/nbd.h b/include/block/nbd.h index 65feff8ba96..ae5fe28f486 100644 --- a/include/block/nbd.h +++ b/include/block/nbd.h @@ -276,7 +276,7 @@ struct NBDExportInfo { uint32_t opt_block; uint32_t max_block; - uint32_t meta_base_allocation_id; + uint32_t context_id; }; typedef struct NBDExportInfo NBDExportInfo; diff --git a/block/nbd-client.c b/block/nbd-client.c index 417971d8b05..608b578e1d3 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -246,11 +246,11 @@ static int nbd_parse_blockstatus_payload(NBDClientSes= sion *client, } context_id =3D payload_advance32(&payload); - if (client->info.meta_base_allocation_id !=3D context_id) { + if (client->info.context_id !=3D context_id) { error_setg(errp, "Protocol error: unexpected context id %d for " "NBD_REPLY_TYPE_BLOCK_STATUS, when negotiated con= text " "id is %d", context_id, - client->info.meta_base_allocation_id); + client->info.context_id); return -EINVAL; } diff --git a/nbd/client.c b/nbd/client.c index 7462fa5ae0e..bcccd5f555e 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -628,26 +628,30 @@ static QIOChannel *nbd_receive_starttls(QIOChannel *i= oc, } /* nbd_negotiate_simple_meta_context: - * Set one meta context. Simple means that reply must contain zero (not - * negotiated) or one (negotiated) contexts. More contexts would be consid= ered - * as a protocol error. It's also implied that meta-data query equals quer= ied - * context name, so, if server replies with something different than @cont= ext, - * it is considered an error too. - * return 1 for successful negotiation, context_id is set + * Request the server to set the meta context for export @info->name + * using @info->x_dirty_bitmap with a fallback to "base:allocation", + * setting @info->context_id to the resulting id. Fail if the server + * responds with more than one context or with a context different + * than the query. + * return 1 for successful negotiation, * 0 if operation is unsupported, * -1 with errp set for any other error */ static int nbd_negotiate_simple_meta_context(QIOChannel *ioc, - const char *export, - const char *context, - uint32_t *context_id, + NBDExportInfo *info, Error **errp) { + /* + * TODO: Removing the x_dirty_bitmap hack will mean refactoring + * this function to request and store ids for multiple contexts + * (both base:allocation and a dirty bitmap), at which point this + * function should lose the term _simple. + */ int ret; NBDOptionReply reply; - uint32_t received_id =3D 0; + const char *context =3D info->x_dirty_bitmap ?: "base:allocation"; bool received =3D false; - uint32_t export_len =3D strlen(export); + uint32_t export_len =3D strlen(info->name); uint32_t context_len =3D strlen(context); uint32_t data_len =3D sizeof(export_len) + export_len + sizeof(uint32_t) + /* number of queries */ @@ -655,9 +659,9 @@ static int nbd_negotiate_simple_meta_context(QIOChannel= *ioc, char *data =3D g_malloc(data_len); char *p =3D data; - trace_nbd_opt_meta_request(context, export); + trace_nbd_opt_meta_request(context, info->name); stl_be_p(p, export_len); - memcpy(p +=3D sizeof(export_len), export, export_len); + memcpy(p +=3D sizeof(export_len), info->name, export_len); stl_be_p(p +=3D export_len, 1); stl_be_p(p +=3D sizeof(uint32_t), context_len); memcpy(p +=3D sizeof(context_len), context, context_len); @@ -683,7 +687,7 @@ static int nbd_negotiate_simple_meta_context(QIOChannel= *ioc, if (reply.type =3D=3D NBD_REP_META_CONTEXT) { char *name; - if (reply.length !=3D sizeof(received_id) + context_len) { + if (reply.length !=3D sizeof(info->context_id) + context_len) { error_setg(errp, "Failed to negotiate meta context '%s', serve= r " "answered with unexpected length %" PRIu32, context, reply.length); @@ -691,12 +695,13 @@ static int nbd_negotiate_simple_meta_context(QIOChann= el *ioc, return -1; } - if (nbd_read(ioc, &received_id, sizeof(received_id), errp) < 0) { + if (nbd_read(ioc, &info->context_id, sizeof(info->context_id), + errp) < 0) { return -1; } - received_id =3D be32_to_cpu(received_id); + info->context_id =3D be32_to_cpu(info->context_id); - reply.length -=3D sizeof(received_id); + reply.length -=3D sizeof(info->context_id); name =3D g_malloc(reply.length + 1); if (nbd_read(ioc, name, reply.length, errp) < 0) { g_free(name); @@ -713,7 +718,7 @@ static int nbd_negotiate_simple_meta_context(QIOChannel= *ioc, } g_free(name); - trace_nbd_opt_meta_reply(context, received_id); + trace_nbd_opt_meta_reply(context, info->context_id); received =3D true; /* receive NBD_REP_ACK */ @@ -742,12 +747,7 @@ static int nbd_negotiate_simple_meta_context(QIOChanne= l *ioc, return -1; } - if (received) { - *context_id =3D received_id; - return 1; - } - - return 0; + return received; } int nbd_receive_negotiate(QIOChannel *ioc, QCryptoTLSCreds *tlscreds, @@ -846,10 +846,7 @@ int nbd_receive_negotiate(QIOChannel *ioc, QCryptoTLSC= reds *tlscreds, } if (info->structured_reply && base_allocation) { - result =3D nbd_negotiate_simple_meta_context( - ioc, info->name, - info->x_dirty_bitmap ?: "base:allocation", - &info->meta_base_allocation_id, errp); + result =3D nbd_negotiate_simple_meta_context(ioc, info, er= rp); if (result < 0) { goto fail; } --=20 2.17.2