From 15a4aec1e61d9b1e1ad212fc60058d9ee95620f7 Mon Sep 17 00:00:00 2001

From: John Snow <jsnow@redhat.com>

Date: Fri, 22 Mar 2019 03:22:25 +0100

Subject: [PATCH 058/163] nbd/server: drop old-style negotiation

RH-Author: John Snow <jsnow@redhat.com>

Message-id: <20190322032241.8111-13-jsnow@redhat.com>

Patchwork-id: 85110

O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 12/28] nbd/server: drop old-style negotiation

Bugzilla: 1691563

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

After the previous commit, nbd_client_new's first parameter is always

NULL. Let's drop it with all corresponding old-style negotiation code

path which is unreachable now.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Message-Id: <20181003170228.95973-3-vsementsov@virtuozzo.com>

Reviewed-by: Eric Blake <eblake@redhat.com>

[eblake: re-wrap short line]

Signed-off-by: Eric Blake <eblake@redhat.com>

(cherry picked from commit 7f7dfe2a53446072c136d349e3150c84d322b2bc)

Signed-off-by: John Snow <jsnow@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 blockdev-nbd.c      |  3 +--

 include/block/nbd.h |  3 +--

 nbd/server.c        | 53 +++++++++++++++--------------------------------------

 qemu-nbd.c          |  2 +-

 4 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/blockdev-nbd.c b/blockdev-nbd.c

index 1ef1104..1d170c8 100644

--- a/blockdev-nbd.c

+++ b/blockdev-nbd.c

@@ -36,8 +36,7 @@ static void nbd_accept(QIONetListener *listener, QIOChannelSocket *cioc,

                        gpointer opaque)

 {

     qio_channel_set_name(QIO_CHANNEL(cioc), "nbd-server");

-    nbd_client_new(NULL, cioc,

-                   nbd_server->tlscreds, NULL,

+    nbd_client_new(cioc, nbd_server->tlscreds, NULL,

                    nbd_blockdev_client_closed);

 }

diff --git a/include/block/nbd.h b/include/block/nbd.h

index a53b0cf..6a5bfe5 100644

--- a/include/block/nbd.h

+++ b/include/block/nbd.h

@@ -310,8 +310,7 @@ void nbd_export_set_name(NBDExport *exp, const char *name);

 void nbd_export_set_description(NBDExport *exp, const char *description);

 void nbd_export_close_all(void);

-void nbd_client_new(NBDExport *exp,

-                    QIOChannelSocket *sioc,

+void nbd_client_new(QIOChannelSocket *sioc,

                     QCryptoTLSCreds *tlscreds,

                     const char *tlsaclname,

                     void (*close_fn)(NBDClient *, bool));

diff --git a/nbd/server.c b/nbd/server.c

index df76324..d414861 100644

--- a/nbd/server.c

+++ b/nbd/server.c

@@ -1253,7 +1253,6 @@ static coroutine_fn int nbd_negotiate(NBDClient *client, Error **errp)

     const uint16_t myflags = (NBD_FLAG_HAS_FLAGS | NBD_FLAG_SEND_TRIM |

                               NBD_FLAG_SEND_FLUSH | NBD_FLAG_SEND_FUA |

                               NBD_FLAG_SEND_WRITE_ZEROES | NBD_FLAG_SEND_CACHE);

-    bool oldStyle;

     /* Old style negotiation header, no room for options

         [ 0 ..   7]   passwd       ("NBDMAGIC")

@@ -1274,33 +1273,19 @@ static coroutine_fn int nbd_negotiate(NBDClient *client, Error **errp)

     trace_nbd_negotiate_begin();

     memcpy(buf, "NBDMAGIC", 8);

-    oldStyle = client->exp != NULL && !client->tlscreds;

-    if (oldStyle) {

-        trace_nbd_negotiate_old_style(client->exp->size,

-                                      client->exp->nbdflags | myflags);

-        stq_be_p(buf + 8, NBD_CLIENT_MAGIC);

-        stq_be_p(buf + 16, client->exp->size);

-        stl_be_p(buf + 24, client->exp->nbdflags | myflags);

+    stq_be_p(buf + 8, NBD_OPTS_MAGIC);

+    stw_be_p(buf + 16, NBD_FLAG_FIXED_NEWSTYLE | NBD_FLAG_NO_ZEROES);

-        if (nbd_write(client->ioc, buf, sizeof(buf), errp) < 0) {

-            error_prepend(errp, "write failed: ");

-            return -EINVAL;

-        }

-    } else {

-        stq_be_p(buf + 8, NBD_OPTS_MAGIC);

-        stw_be_p(buf + 16, NBD_FLAG_FIXED_NEWSTYLE | NBD_FLAG_NO_ZEROES);

-

-        if (nbd_write(client->ioc, buf, 18, errp) < 0) {

-            error_prepend(errp, "write failed: ");

-            return -EINVAL;

-        }

-        ret = nbd_negotiate_options(client, myflags, errp);

-        if (ret != 0) {

-            if (ret < 0) {

-                error_prepend(errp, "option negotiation failed: ");

-            }

-            return ret;

+    if (nbd_write(client->ioc, buf, 18, errp) < 0) {

+        error_prepend(errp, "write failed: ");

+        return -EINVAL;

+    }

+    ret = nbd_negotiate_options(client, myflags, errp);

+    if (ret != 0) {

+        if (ret < 0) {

+            error_prepend(errp, "option negotiation failed: ");

         }

+        return ret;

     }

     assert(!client->optlen);

@@ -2396,13 +2381,8 @@ static void nbd_client_receive_next_request(NBDClient *client)

 static coroutine_fn void nbd_co_client_start(void *opaque)

 {

     NBDClient *client = opaque;

-    NBDExport *exp = client->exp;

     Error *local_err = NULL;

-    if (exp) {

-        nbd_export_get(exp);

-        QTAILQ_INSERT_TAIL(&exp->clients, client, next);

-    }

     qemu_co_mutex_init(&client->send_lock);

     if (nbd_negotiate(client, &local_err)) {

@@ -2417,13 +2397,11 @@ static coroutine_fn void nbd_co_client_start(void *opaque)

 }

 /*

- * Create a new client listener on the given export @exp, using the

- * given channel @sioc.  Begin servicing it in a coroutine.  When the

- * connection closes, call @close_fn with an indication of whether the

- * client completed negotiation.

+ * Create a new client listener using the given channel @sioc.

+ * Begin servicing it in a coroutine.  When the connection closes, call

+ * @close_fn with an indication of whether the client completed negotiation.

  */

-void nbd_client_new(NBDExport *exp,

-                    QIOChannelSocket *sioc,

+void nbd_client_new(QIOChannelSocket *sioc,

                     QCryptoTLSCreds *tlscreds,

                     const char *tlsaclname,

                     void (*close_fn)(NBDClient *, bool))

@@ -2433,7 +2411,6 @@ void nbd_client_new(NBDExport *exp,

     client = g_new0(NBDClient, 1);

     client->refcount = 1;

-    client->exp = exp;

     client->tlscreds = tlscreds;

     if (tlscreds) {

         object_ref(OBJECT(client->tlscreds));

diff --git a/qemu-nbd.c b/qemu-nbd.c

index 6aaebe7..e76fe30 100644

--- a/qemu-nbd.c

+++ b/qemu-nbd.c

@@ -354,7 +354,7 @@ static void nbd_accept(QIONetListener *listener, QIOChannelSocket *cioc,

     nb_fds++;

     nbd_update_server_watch();

-    nbd_client_new(NULL, cioc, tlscreds, NULL, nbd_client_closed);

+    nbd_client_new(cioc, tlscreds, NULL, nbd_client_closed);

 }

 static void nbd_update_server_watch(void)

-- 

1.8.3.1