From: Liu Yuan
Flush operation is supposed to flush the write-back cache of
sheepdog cluster.
By issuing flush operation, we can assure the Guest of data
reaching the sheepdog cluster storage.
Cc: Kevin Wolf
Cc: Michael Tokarev
Cc: MORITA Kazutaka
Cc: Stefan Hajnoczi
Signed-off-by: Liu Yuan
---
v2 -> v3:
address Stefan Hajnoczi comments. Thanks !
- use qemu_co_send/recv to send/revc msg
v1 -> v2:
address Michael Tokarev comments. Thanks !
- use per-device flag
- use bs->fd instead of 'connect_to_sdog()'
block/sheepdog.c | 133 --
1 files changed, 119 insertions(+), 14 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 00276f6f..b2bb522 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -32,9 +32,11 @@
#define SD_OP_RELEASE_VDI0x13
#define SD_OP_GET_VDI_INFO 0x14
#define SD_OP_READ_VDIS 0x15
+#define SD_OP_FLUSH_VDI 0x16
#define SD_FLAG_CMD_WRITE0x01
#define SD_FLAG_CMD_COW 0x02
+#define SD_FLAG_CMD_CACHE0x04
#define SD_RES_SUCCESS 0x00 /* Success */
#define SD_RES_UNKNOWN 0x01 /* Unknown error */
@@ -293,6 +295,7 @@ typedef struct BDRVSheepdogState {
char name[SD_MAX_VDI_LEN];
int is_snapshot;
+uint8_t cache_enabled;
char *addr;
char *port;
@@ -516,6 +519,23 @@ static int send_req(int sockfd, SheepdogReq *hdr, void
*data,
return ret;
}
+static int send_co_req(int sockfd, SheepdogReq *hdr, void *data,
+ unsigned int *wlen)
+{
+int ret;
+
+ret = qemu_co_send(sockfd, hdr, sizeof(*hdr));
+if (ret < sizeof(*hdr)) {
+error_report("failed to send a req, %s", strerror(errno));
+}
+
+ret = qemu_co_send(sockfd, data, *wlen);
+if (ret < *wlen) {
+error_report("failed to send a req, %s", strerror(errno));
+}
+
+return ret;
+}
static int do_req(int sockfd, SheepdogReq *hdr, void *data,
unsigned int *wlen, unsigned int *rlen)
{
@@ -550,6 +570,40 @@ out:
return ret;
}
+static int do_co_req(int sockfd, SheepdogReq *hdr, void *data,
+ unsigned int *wlen, unsigned int *rlen)
+{
+int ret;
+
+socket_set_block(sockfd);
+ret = send_co_req(sockfd, hdr, data, wlen);
+if (ret < 0) {
+goto out;
+}
+
+ret = qemu_co_recv(sockfd, hdr, sizeof(*hdr));
+if (ret < sizeof(*hdr)) {
+error_report("failed to get a rsp, %s", strerror(errno));
+goto out;
+}
+
+if (*rlen > hdr->data_length) {
+*rlen = hdr->data_length;
+}
+
+if (*rlen) {
+ret = qemu_co_recv(sockfd, data, *rlen);
+if (ret < *rlen) {
+error_report("failed to get the data, %s", strerror(errno));
+goto out;
+}
+}
+ret = 0;
+out:
+socket_set_nonblock(sockfd);
+return ret;
+}
+
static int coroutine_fn add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req,
struct iovec *iov, int niov, int create,
enum AIOCBState aiocb_type);
@@ -900,6 +954,10 @@ static int coroutine_fn add_aio_request(BDRVSheepdogState
*s, AIOReq *aio_req,
hdr.flags = SD_FLAG_CMD_WRITE | flags;
}
+if (s->cache_enabled) {
+hdr.flags |= SD_FLAG_CMD_CACHE;
+}
+
hdr.oid = oid;
hdr.cow_oid = old_oid;
hdr.copies = s->inode.nr_copies;
@@ -942,7 +1000,7 @@ static int coroutine_fn add_aio_request(BDRVSheepdogState
*s, AIOReq *aio_req,
static int read_write_object(int fd, char *buf, uint64_t oid, int copies,
unsigned int datalen, uint64_t offset,
- int write, int create)
+ int write, int create, uint8_t cache)
{
SheepdogObjReq hdr;
SheepdogObjRsp *rsp = (SheepdogObjRsp *)&hdr;
@@ -965,6 +1023,11 @@ static int read_write_object(int fd, char *buf, uint64_t
oid, int copies,
rlen = datalen;
hdr.opcode = SD_OP_READ_OBJ;
}
+
+if (cache) {
+hdr.flags |= SD_FLAG_CMD_CACHE;
+}
+
hdr.oid = oid;
hdr.data_length = datalen;
hdr.offset = offset;
@@ -986,15 +1049,18 @@ static int read_write_object(int fd, char *buf, uint64_t
oid, int copies,
}
static int read_object(int fd, char *buf, uint64_t oid, int copies,
- unsigned int datalen, uint64_t offset)
+ unsigned int datalen, uint64_t offset, uint8_t cache)
{
-return read_write_object(fd, buf, oid, copies, datalen, offset, 0, 0);
+return read_write_object(fd, buf, oid, copies, datalen, offset, 0, 0,
+ cache);
}
static int write_object(int fd, char *buf, uint64_t oid, int copies,
-unsigned int datalen, uint64_t offset, int create)
+unsigned int datalen, uint64_t offset, int create,
+uint8_t cache)
{
-return read_write_object(fd, buf, oid,
