26ba25
From e0d145328022f5c0897a6d157400a9d071acc767 Mon Sep 17 00:00:00 2001
26ba25
From: John Snow <jsnow@redhat.com>
26ba25
Date: Wed, 18 Jul 2018 22:55:06 +0200
26ba25
Subject: [PATCH 248/268] nbd/server: introduce NBD_CMD_CACHE
26ba25
26ba25
RH-Author: John Snow <jsnow@redhat.com>
26ba25
Message-id: <20180718225511.14878-31-jsnow@redhat.com>
26ba25
Patchwork-id: 81419
26ba25
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 30/35] nbd/server: introduce NBD_CMD_CACHE
26ba25
Bugzilla: 1207657
26ba25
RH-Acked-by: Eric Blake <eblake@redhat.com>
26ba25
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
26ba25
RH-Acked-by: Fam Zheng <famz@redhat.com>
26ba25
26ba25
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
26ba25
26ba25
Handle nbd CACHE command. Just do read, without sending read data back.
26ba25
Cache mechanism should be done by exported node driver chain.
26ba25
26ba25
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
26ba25
Message-Id: <20180413143156.11409-1-vsementsov@virtuozzo.com>
26ba25
Reviewed-by: Eric Blake <eblake@redhat.com>
26ba25
[eblake: fix two missing case labels in switch statements]
26ba25
Signed-off-by: Eric Blake <eblake@redhat.com>
26ba25
(cherry picked from commit bc37b06a5cde24fb24c2a2cc44dd86756034ba9d)
26ba25
Signed-off-by: John Snow <jsnow@redhat.com>
26ba25
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 include/block/nbd.h |  3 ++-
26ba25
 nbd/common.c        |  2 ++
26ba25
 nbd/server.c        | 11 +++++++----
26ba25
 3 files changed, 11 insertions(+), 5 deletions(-)
26ba25
26ba25
diff --git a/include/block/nbd.h b/include/block/nbd.h
26ba25
index 8bb9606..daaeae6 100644
26ba25
--- a/include/block/nbd.h
26ba25
+++ b/include/block/nbd.h
26ba25
@@ -135,6 +135,7 @@ typedef struct NBDExtent {
26ba25
 #define NBD_FLAG_SEND_TRIM         (1 << 5) /* Send TRIM (discard) */
26ba25
 #define NBD_FLAG_SEND_WRITE_ZEROES (1 << 6) /* Send WRITE_ZEROES */
26ba25
 #define NBD_FLAG_SEND_DF           (1 << 7) /* Send DF (Do not Fragment) */
26ba25
+#define NBD_FLAG_SEND_CACHE        (1 << 8) /* Send CACHE (prefetch) */
26ba25
 
26ba25
 /* New-style handshake (global) flags, sent from server to client, and
26ba25
    control what will happen during handshake phase. */
26ba25
@@ -195,7 +196,7 @@ enum {
26ba25
     NBD_CMD_DISC = 2,
26ba25
     NBD_CMD_FLUSH = 3,
26ba25
     NBD_CMD_TRIM = 4,
26ba25
-    /* 5 reserved for failed experiment NBD_CMD_CACHE */
26ba25
+    NBD_CMD_CACHE = 5,
26ba25
     NBD_CMD_WRITE_ZEROES = 6,
26ba25
     NBD_CMD_BLOCK_STATUS = 7,
26ba25
 };
26ba25
diff --git a/nbd/common.c b/nbd/common.c
26ba25
index 8c95c1d..41f5ed8 100644
26ba25
--- a/nbd/common.c
26ba25
+++ b/nbd/common.c
26ba25
@@ -148,6 +148,8 @@ const char *nbd_cmd_lookup(uint16_t cmd)
26ba25
         return "flush";
26ba25
     case NBD_CMD_TRIM:
26ba25
         return "trim";
26ba25
+    case NBD_CMD_CACHE:
26ba25
+        return "cache";
26ba25
     case NBD_CMD_WRITE_ZEROES:
26ba25
         return "write zeroes";
26ba25
     case NBD_CMD_BLOCK_STATUS:
26ba25
diff --git a/nbd/server.c b/nbd/server.c
26ba25
index 2c2d62c..2746046 100644
26ba25
--- a/nbd/server.c
26ba25
+++ b/nbd/server.c
26ba25
@@ -1252,7 +1252,7 @@ static coroutine_fn int nbd_negotiate(NBDClient *client, Error **errp)
26ba25
     int ret;
26ba25
     const uint16_t myflags = (NBD_FLAG_HAS_FLAGS | NBD_FLAG_SEND_TRIM |
26ba25
                               NBD_FLAG_SEND_FLUSH | NBD_FLAG_SEND_FUA |
26ba25
-                              NBD_FLAG_SEND_WRITE_ZEROES);
26ba25
+                              NBD_FLAG_SEND_WRITE_ZEROES | NBD_FLAG_SEND_CACHE);
26ba25
     bool oldStyle;
26ba25
 
26ba25
     /* Old style negotiation header, no room for options
26ba25
@@ -2034,7 +2034,9 @@ static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request,
26ba25
         return -EIO;
26ba25
     }
26ba25
 
26ba25
-    if (request->type == NBD_CMD_READ || request->type == NBD_CMD_WRITE) {
26ba25
+    if (request->type == NBD_CMD_READ || request->type == NBD_CMD_WRITE ||
26ba25
+        request->type == NBD_CMD_CACHE)
26ba25
+    {
26ba25
         if (request->len > NBD_MAX_BUFFER_SIZE) {
26ba25
             error_setg(errp, "len (%" PRIu32" ) is larger than max len (%u)",
26ba25
                        request->len, NBD_MAX_BUFFER_SIZE);
26ba25
@@ -2119,7 +2121,7 @@ static coroutine_fn int nbd_do_cmd_read(NBDClient *client, NBDRequest *request,
26ba25
     int ret;
26ba25
     NBDExport *exp = client->exp;
26ba25
 
26ba25
-    assert(request->type == NBD_CMD_READ);
26ba25
+    assert(request->type == NBD_CMD_READ || request->type == NBD_CMD_CACHE);
26ba25
 
26ba25
     /* XXX: NBD Protocol only documents use of FUA with WRITE */
26ba25
     if (request->flags & NBD_CMD_FLAG_FUA) {
26ba25
@@ -2138,7 +2140,7 @@ static coroutine_fn int nbd_do_cmd_read(NBDClient *client, NBDRequest *request,
26ba25
 
26ba25
     ret = blk_pread(exp->blk, request->from + exp->dev_offset, data,
26ba25
                     request->len);
26ba25
-    if (ret < 0) {
26ba25
+    if (ret < 0 || request->type == NBD_CMD_CACHE) {
26ba25
         return nbd_send_generic_reply(client, request->handle, ret,
26ba25
                                       "reading from file failed", errp);
26ba25
     }
26ba25
@@ -2171,6 +2173,7 @@ static coroutine_fn int nbd_handle_request(NBDClient *client,
26ba25
 
26ba25
     switch (request->type) {
26ba25
     case NBD_CMD_READ:
26ba25
+    case NBD_CMD_CACHE:
26ba25
         return nbd_do_cmd_read(client, request, data, errp);
26ba25
 
26ba25
     case NBD_CMD_WRITE:
26ba25
-- 
26ba25
1.8.3.1
26ba25