block: Remove wr_highest_sector from BlockAcctStats

[qemu.git] / block / nfs.c

diff --git a/block/nfs.c b/block/nfs.c
index 98aa363e48d15fe49a3a8b8648ba4fd22fd75589..887a98e3fcfbee935cb4e2c04a791d4ef396606e 100644 (file)
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -35,11 +35,15 @@
 #include "sysemu/sysemu.h"
 #include <nfsc/libnfs.h>
 
 #include "sysemu/sysemu.h"
 #include <nfsc/libnfs.h>
 

+#define QEMU_NFS_MAX_READAHEAD_SIZE 1048576
+

 typedef struct NFSClient {
     struct nfs_context *context;
     struct nfsfh *fh;
     int events;
     bool has_zero_init;
 typedef struct NFSClient {
     struct nfs_context *context;
     struct nfsfh *fh;
     int events;
     bool has_zero_init;

+    AioContext *aio_context;
+    blkcnt_t st_blocks;

 } NFSClient;
 
 typedef struct NFSRPC {
 } NFSClient;
 
 typedef struct NFSRPC {


@@ -49,6 +53,7 @@ typedef struct NFSRPC {
     struct stat *st;
     Coroutine *co;
     QEMUBH *bh;
     struct stat *st;
     Coroutine *co;
     QEMUBH *bh;

+    NFSClient *client;

 } NFSRPC;
 
 static void nfs_process_read(void *arg);
 } NFSRPC;
 
 static void nfs_process_read(void *arg);


@@ -58,10 +63,11 @@ static void nfs_set_events(NFSClient *client)
 {
     int ev = nfs_which_events(client->context);
     if (ev != client->events) {
 {
     int ev = nfs_which_events(client->context);
     if (ev != client->events) {

-        qemu_aio_set_fd_handler(nfs_get_fd(client->context),
-                      (ev & POLLIN) ? nfs_process_read : NULL,
-                      (ev & POLLOUT) ? nfs_process_write : NULL,
-                      client);
+        aio_set_fd_handler(client->aio_context,
+                           nfs_get_fd(client->context),
+                           (ev & POLLIN) ? nfs_process_read : NULL,
+                           (ev & POLLOUT) ? nfs_process_write : NULL,
+                           client);

 
     }
     client->events = ev;
 
     }
     client->events = ev;


@@ -84,13 +90,15 @@ static void nfs_process_write(void *arg)
 static void nfs_co_init_task(NFSClient *client, NFSRPC *task)
 {
     *task = (NFSRPC) {
 static void nfs_co_init_task(NFSClient *client, NFSRPC *task)
 {
     *task = (NFSRPC) {

-        .co         = qemu_coroutine_self(),
+        .co             = qemu_coroutine_self(),
+        .client         = client,

     };
 }
 
 static void nfs_co_generic_bh_cb(void *opaque)
 {
     NFSRPC *task = opaque;
     };
 }
 
 static void nfs_co_generic_bh_cb(void *opaque)
 {
     NFSRPC *task = opaque;

+    task->complete = 1;

     qemu_bh_delete(task->bh);
     qemu_coroutine_enter(task->co, NULL);
 }
     qemu_bh_delete(task->bh);
     qemu_coroutine_enter(task->co, NULL);
 }


@@ -100,7 +108,6 @@ nfs_co_generic_cb(int ret, struct nfs_context *nfs, void *data,
                   void *private_data)
 {
     NFSRPC *task = private_data;
                   void *private_data)
 {
     NFSRPC *task = private_data;

-    task->complete = 1;

     task->ret = ret;
     if (task->ret > 0 && task->iov) {
         if (task->ret <= task->iov->size) {
     task->ret = ret;
     if (task->ret > 0 && task->iov) {
         if (task->ret <= task->iov->size) {


@@ -116,8 +123,11 @@ nfs_co_generic_cb(int ret, struct nfs_context *nfs, void *data,
         error_report("NFS Error: %s", nfs_get_error(nfs));
     }
     if (task->co) {
         error_report("NFS Error: %s", nfs_get_error(nfs));
     }
     if (task->co) {

-        task->bh = qemu_bh_new(nfs_co_generic_bh_cb, task);
+        task->bh = aio_bh_new(task->client->aio_context,
+                              nfs_co_generic_bh_cb, task);

         qemu_bh_schedule(task->bh);
         qemu_bh_schedule(task->bh);

+    } else {
+        task->complete = 1;

     }
 }
 
     }
 }
 


@@ -165,7 +175,11 @@ static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
 
     nfs_co_init_task(client, &task);
 
 
     nfs_co_init_task(client, &task);
 

-    buf = g_malloc(nb_sectors * BDRV_SECTOR_SIZE);
+    buf = g_try_malloc(nb_sectors * BDRV_SECTOR_SIZE);
+    if (nb_sectors && buf == NULL) {
+        return -ENOMEM;
+    }
+

     qemu_iovec_to_buf(iov, 0, buf, nb_sectors * BDRV_SECTOR_SIZE);
 
     if (nfs_pwrite_async(client->context, client->fh,
     qemu_iovec_to_buf(iov, 0, buf, nb_sectors * BDRV_SECTOR_SIZE);
 
     if (nfs_pwrite_async(client->context, client->fh,


@@ -224,13 +238,34 @@ static QemuOptsList runtime_opts = {
     },
 };
 
     },
 };
 

+static void nfs_detach_aio_context(BlockDriverState *bs)
+{
+    NFSClient *client = bs->opaque;
+
+    aio_set_fd_handler(client->aio_context,
+                       nfs_get_fd(client->context),
+                       NULL, NULL, NULL);
+    client->events = 0;
+}
+
+static void nfs_attach_aio_context(BlockDriverState *bs,
+                                   AioContext *new_context)
+{
+    NFSClient *client = bs->opaque;
+
+    client->aio_context = new_context;
+    nfs_set_events(client);
+}
+

 static void nfs_client_close(NFSClient *client)
 {
     if (client->context) {
         if (client->fh) {
             nfs_close(client->context, client->fh);
         }
 static void nfs_client_close(NFSClient *client)
 {
     if (client->context) {
         if (client->fh) {
             nfs_close(client->context, client->fh);
         }

-        qemu_aio_set_fd_handler(nfs_get_fd(client->context), NULL, NULL, NULL);
+        aio_set_fd_handler(client->aio_context,
+                           nfs_get_fd(client->context),
+                           NULL, NULL, NULL);

         nfs_destroy_context(client->context);
     }
     memset(client, 0, sizeof(NFSClient));
         nfs_destroy_context(client->context);
     }
     memset(client, 0, sizeof(NFSClient));


@@ -256,6 +291,10 @@ static int64_t nfs_client_open(NFSClient *client, const char *filename,
         error_setg(errp, "Invalid URL specified");
         goto fail;
     }
         error_setg(errp, "Invalid URL specified");
         goto fail;
     }

+    if (!uri->server) {
+        error_setg(errp, "Invalid URL specified");
+        goto fail;
+    }

     strp = strrchr(uri->path, '/');
     if (strp == NULL) {
         error_setg(errp, "Invalid URL specified");
     strp = strrchr(uri->path, '/');
     if (strp == NULL) {
         error_setg(errp, "Invalid URL specified");


@@ -272,17 +311,32 @@ static int64_t nfs_client_open(NFSClient *client, const char *filename,
 
     qp = query_params_parse(uri->query);
     for (i = 0; i < qp->n; i++) {
 
     qp = query_params_parse(uri->query);
     for (i = 0; i < qp->n; i++) {

+        unsigned long long val;

         if (!qp->p[i].value) {
             error_setg(errp, "Value for NFS parameter expected: %s",
                        qp->p[i].name);
             goto fail;
         }
         if (!qp->p[i].value) {
             error_setg(errp, "Value for NFS parameter expected: %s",
                        qp->p[i].name);
             goto fail;
         }

-        if (!strncmp(qp->p[i].name, "uid", 3)) {
-            nfs_set_uid(client->context, atoi(qp->p[i].value));
-        } else if (!strncmp(qp->p[i].name, "gid", 3)) {
-            nfs_set_gid(client->context, atoi(qp->p[i].value));
-        } else if (!strncmp(qp->p[i].name, "tcp-syncnt", 10)) {
-            nfs_set_tcp_syncnt(client->context, atoi(qp->p[i].value));
+        if (parse_uint_full(qp->p[i].value, &val, 0)) {
+            error_setg(errp, "Illegal value for NFS parameter: %s",
+                       qp->p[i].name);
+            goto fail;
+        }
+        if (!strcmp(qp->p[i].name, "uid")) {
+            nfs_set_uid(client->context, val);
+        } else if (!strcmp(qp->p[i].name, "gid")) {
+            nfs_set_gid(client->context, val);
+        } else if (!strcmp(qp->p[i].name, "tcp-syncnt")) {
+            nfs_set_tcp_syncnt(client->context, val);
+#ifdef LIBNFS_FEATURE_READAHEAD
+        } else if (!strcmp(qp->p[i].name, "readahead")) {
+            if (val > QEMU_NFS_MAX_READAHEAD_SIZE) {
+                error_report("NFS Warning: Truncating NFS readahead"
+                             " size to %d", QEMU_NFS_MAX_READAHEAD_SIZE);
+                val = QEMU_NFS_MAX_READAHEAD_SIZE;
+            }
+            nfs_set_readahead(client->context, val);
+#endif

         } else {
             error_setg(errp, "Unknown NFS parameter name: %s",
                        qp->p[i].name);
         } else {
             error_setg(errp, "Unknown NFS parameter name: %s",
                        qp->p[i].name);


@@ -321,6 +375,7 @@ static int64_t nfs_client_open(NFSClient *client, const char *filename,
     }
 
     ret = DIV_ROUND_UP(st.st_size, BDRV_SECTOR_SIZE);
     }
 
     ret = DIV_ROUND_UP(st.st_size, BDRV_SECTOR_SIZE);

+    client->st_blocks = st.st_blocks;

     client->has_zero_init = S_ISREG(st.st_mode);
     goto out;
 fail:
     client->has_zero_init = S_ISREG(st.st_mode);
     goto out;
 fail:


@@ -341,36 +396,52 @@ static int nfs_file_open(BlockDriverState *bs, QDict *options, int flags,
     QemuOpts *opts;
     Error *local_err = NULL;
 
     QemuOpts *opts;
     Error *local_err = NULL;
 

+    client->aio_context = bdrv_get_aio_context(bs);
+

     opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
     qemu_opts_absorb_qdict(opts, options, &local_err);
     opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
     qemu_opts_absorb_qdict(opts, options, &local_err);

-    if (error_is_set(&local_err)) {
+    if (local_err) {

         error_propagate(errp, local_err);
         error_propagate(errp, local_err);

-        return -EINVAL;
+        ret = -EINVAL;
+        goto out;

     }
     ret = nfs_client_open(client, qemu_opt_get(opts, "filename"),
                           (flags & BDRV_O_RDWR) ? O_RDWR : O_RDONLY,
                           errp);
     if (ret < 0) {
     }
     ret = nfs_client_open(client, qemu_opt_get(opts, "filename"),
                           (flags & BDRV_O_RDWR) ? O_RDWR : O_RDONLY,
                           errp);
     if (ret < 0) {

-        return ret;
+        goto out;

     }
     bs->total_sectors = ret;
     }
     bs->total_sectors = ret;

-    return 0;
+    ret = 0;
+out:
+    qemu_opts_del(opts);
+    return ret;

 }
 
 }
 

-static int nfs_file_create(const char *url, QEMUOptionParameter *options,
-                           Error **errp)
+static QemuOptsList nfs_create_opts = {
+    .name = "nfs-create-opts",
+    .head = QTAILQ_HEAD_INITIALIZER(nfs_create_opts.head),
+    .desc = {
+        {
+            .name = BLOCK_OPT_SIZE,
+            .type = QEMU_OPT_SIZE,
+            .help = "Virtual disk size"
+        },
+        { /* end of list */ }
+    }
+};
+
+static int nfs_file_create(const char *url, QemuOpts *opts, Error **errp)

 {
     int ret = 0;
     int64_t total_size = 0;
 {
     int ret = 0;
     int64_t total_size = 0;

-    NFSClient *client = g_malloc0(sizeof(NFSClient));
+    NFSClient *client = g_new0(NFSClient, 1);
+
+    client->aio_context = qemu_get_aio_context();

 
     /* Read out options */
 
     /* Read out options */

-    while (options && options->name) {
-        if (!strcmp(options->name, "size")) {
-            total_size = options->value.n;
-        }
-        options++;
-    }
+    total_size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),
+                          BDRV_SECTOR_SIZE);

 
     ret = nfs_client_open(client, url, O_CREAT, errp);
     if (ret < 0) {
 
     ret = nfs_client_open(client, url, O_CREAT, errp);
     if (ret < 0) {


@@ -395,6 +466,11 @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs)
     NFSRPC task = {0};
     struct stat st;
 
     NFSRPC task = {0};
     struct stat st;
 

+    if (bdrv_is_read_only(bs) &&
+        !(bs->open_flags & BDRV_O_NOCACHE)) {
+        return client->st_blocks * 512;
+    }
+

     task.st = &st;
     if (nfs_fstat_async(client->context, client->fh, nfs_co_generic_cb,
                         &task) != 0) {
     task.st = &st;
     if (nfs_fstat_async(client->context, client->fh, nfs_co_generic_cb,
                         &task) != 0) {


@@ -403,10 +479,10 @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs)
 
     while (!task.complete) {
         nfs_set_events(client);
 
     while (!task.complete) {
         nfs_set_events(client);

-        qemu_aio_wait();
+        aio_poll(client->aio_context, true);

     }
 
     }
 

-    return (task.ret < 0 ? task.ret : st.st_blocks * st.st_blksize);
+    return (task.ret < 0 ? task.ret : st.st_blocks * 512);

 }
 
 static int nfs_file_truncate(BlockDriverState *bs, int64_t offset)
 }
 
 static int nfs_file_truncate(BlockDriverState *bs, int64_t offset)


@@ -415,23 +491,57 @@ static int nfs_file_truncate(BlockDriverState *bs, int64_t offset)
     return nfs_ftruncate(client->context, client->fh, offset);
 }
 
     return nfs_ftruncate(client->context, client->fh, offset);
 }
 

+/* Note that this will not re-establish a connection with the NFS server
+ * - it is effectively a NOP.  */
+static int nfs_reopen_prepare(BDRVReopenState *state,
+                              BlockReopenQueue *queue, Error **errp)
+{
+    NFSClient *client = state->bs->opaque;
+    struct stat st;
+    int ret = 0;
+
+    if (state->flags & BDRV_O_RDWR && bdrv_is_read_only(state->bs)) {
+        error_setg(errp, "Cannot open a read-only mount as read-write");
+        return -EACCES;
+    }
+
+    /* Update cache for read-only reopens */
+    if (!(state->flags & BDRV_O_RDWR)) {
+        ret = nfs_fstat(client->context, client->fh, &st);
+        if (ret < 0) {
+            error_setg(errp, "Failed to fstat file: %s",
+                       nfs_get_error(client->context));
+            return ret;
+        }
+        client->st_blocks = st.st_blocks;
+    }
+
+    return 0;
+}
+

 static BlockDriver bdrv_nfs = {
 static BlockDriver bdrv_nfs = {

-    .format_name     = "nfs",
-    .protocol_name   = "nfs",
-
-    .instance_size   = sizeof(NFSClient),
-    .bdrv_needs_filename = true,
-    .bdrv_has_zero_init = nfs_has_zero_init,
-    .bdrv_get_allocated_file_size = nfs_get_allocated_file_size,
-    .bdrv_truncate = nfs_file_truncate,
-
-    .bdrv_file_open  = nfs_file_open,
-    .bdrv_close      = nfs_file_close,
-    .bdrv_create     = nfs_file_create,
-
-    .bdrv_co_readv         = nfs_co_readv,
-    .bdrv_co_writev        = nfs_co_writev,
-    .bdrv_co_flush_to_disk = nfs_co_flush,
+    .format_name                    = "nfs",
+    .protocol_name                  = "nfs",
+
+    .instance_size                  = sizeof(NFSClient),
+    .bdrv_needs_filename            = true,
+    .create_opts                    = &nfs_create_opts,
+
+    .bdrv_has_zero_init             = nfs_has_zero_init,
+    .bdrv_get_allocated_file_size   = nfs_get_allocated_file_size,
+    .bdrv_truncate                  = nfs_file_truncate,
+
+    .bdrv_file_open                 = nfs_file_open,
+    .bdrv_close                     = nfs_file_close,
+    .bdrv_create                    = nfs_file_create,
+    .bdrv_reopen_prepare            = nfs_reopen_prepare,
+
+    .bdrv_co_readv                  = nfs_co_readv,
+    .bdrv_co_writev                 = nfs_co_writev,
+    .bdrv_co_flush_to_disk          = nfs_co_flush,
+
+    .bdrv_detach_aio_context        = nfs_detach_aio_context,
+    .bdrv_attach_aio_context        = nfs_attach_aio_context,

 };
 
 static void nfs_block_init(void)
 };
 
 static void nfs_block_init(void)