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