From: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>

New versions of Glusters libgfapi.so have an updated glfs_ftruncate()

function that returns additional 'struct stat' structures to enable

advanced caching of attributes. This is useful for file servers, not so

much for QEMU. Nevertheless, the API has changed and needs to be

adopted.

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>

Signed-off-by: Niels de Vos <ndevos@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

configure | 18 ++++++++++++++++++

block/gluster.c | 4 ++++

2 files changed, 22 insertions(+)

diff --git a/configure b/configure

index XXXXXXX..XXXXXXX 100755

--- a/configure

+++ b/configure

@@ -XXX,XX +XXX,XX @@ glusterfs_xlator_opt="no"

glusterfs_discard="no"

glusterfs_fallocate="no"

glusterfs_zerofill="no"

+glusterfs_ftruncate_has_stat="no"

gtk=""

gtk_gl="no"

tls_priority="NORMAL"

@@ -XXX,XX +XXX,XX @@ if test "$glusterfs" != "no" ; then

glusterfs_fallocate="yes"

glusterfs_zerofill="yes"

fi

+ cat > $TMPC << EOF

+#include <glusterfs/api/glfs.h>

+

+int

+main(void)

+{

+    /* new glfs_ftruncate() passes two additional args */

+    return glfs_ftruncate(NULL, 0, NULL, NULL);

+}

+EOF

+ if compile_prog "$glusterfs_cflags" "$glusterfs_libs" ; then

+ glusterfs_ftruncate_has_stat="yes"

+ fi

else

if test "$glusterfs" = "yes" ; then

feature_not_found "GlusterFS backend support" \

@@ -XXX,XX +XXX,XX @@ if test "$glusterfs_zerofill" = "yes" ; then

echo "CONFIG_GLUSTERFS_ZEROFILL=y" >> $config_host_mak

fi

+if test "$glusterfs_ftruncate_has_stat" = "yes" ; then

+ echo "CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT=y" >> $config_host_mak

+fi

+

if test "$libssh2" = "yes" ; then

echo "CONFIG_LIBSSH2=m" >> $config_host_mak

echo "LIBSSH2_CFLAGS=$libssh2_cflags" >> $config_host_mak

diff --git a/block/gluster.c b/block/gluster.c

index XXXXXXX..XXXXXXX 100644

--- a/block/gluster.c

+++ b/block/gluster.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/option.h"

#include "qemu/cutils.h"

+#ifdef CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT

+# define glfs_ftruncate(fd, offset) glfs_ftruncate(fd, offset, NULL, NULL)

+#endif

+

#define GLUSTER_OPT_FILENAME "filename"

#define GLUSTER_OPT_VOLUME "volume"

#define GLUSTER_OPT_PATH "path"

--

2.20.1

From: Niels de Vos <ndevos@redhat.com>

The glfs_*_async() functions do a callback once finished. This callback

has changed its arguments, pre- and post-stat structures have been

added. This makes it possible to improve caching, which is useful for

Samba and NFS-Ganesha, but not so much for QEMU. Gluster 6 is the first

release that includes these new arguments.

With an additional detection in ./configure, the new arguments can

conditionally get included in the glfs_io_cbk handler.

Signed-off-by: Niels de Vos <ndevos@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

configure | 24 ++++++++++++++++++++++++

block/gluster.c | 6 +++++-

2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/configure b/configure

index XXXXXXX..XXXXXXX 100755

--- a/configure

+++ b/configure

@@ -XXX,XX +XXX,XX @@ glusterfs_discard="no"

glusterfs_fallocate="no"

glusterfs_zerofill="no"

glusterfs_ftruncate_has_stat="no"

+glusterfs_iocb_has_stat="no"

gtk=""

gtk_gl="no"

tls_priority="NORMAL"

@@ -XXX,XX +XXX,XX @@ EOF

if compile_prog "$glusterfs_cflags" "$glusterfs_libs" ; then

glusterfs_ftruncate_has_stat="yes"

fi

+ cat > $TMPC << EOF

+#include <glusterfs/api/glfs.h>

+

+/* new glfs_io_cbk() passes two additional glfs_stat structs */

+static void

+glusterfs_iocb(glfs_fd_t *fd, ssize_t ret, struct glfs_stat *prestat, struct glfs_stat *poststat, void *data)

+{}

+

+int

+main(void)

+{

+    glfs_io_cbk iocb = &glusterfs_iocb;

+    iocb(NULL, 0 , NULL, NULL, NULL);

+    return 0;

+}

+EOF

+ if compile_prog "$glusterfs_cflags" "$glusterfs_libs" ; then

+ glusterfs_iocb_has_stat="yes"

+ fi

else

if test "$glusterfs" = "yes" ; then

feature_not_found "GlusterFS backend support" \

@@ -XXX,XX +XXX,XX @@ if test "$glusterfs_ftruncate_has_stat" = "yes" ; then

echo "CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT=y" >> $config_host_mak

fi

+if test "$glusterfs_iocb_has_stat" = "yes" ; then

+ echo "CONFIG_GLUSTERFS_IOCB_HAS_STAT=y" >> $config_host_mak

+fi

+

if test "$libssh2" = "yes" ; then

echo "CONFIG_LIBSSH2=m" >> $config_host_mak

echo "LIBSSH2_CFLAGS=$libssh2_cflags" >> $config_host_mak

diff --git a/block/gluster.c b/block/gluster.c

index XXXXXXX..XXXXXXX 100644

--- a/block/gluster.c

+++ b/block/gluster.c

@@ -XXX,XX +XXX,XX @@ static struct glfs *qemu_gluster_init(BlockdevOptionsGluster *gconf,

/*

* AIO callback routine called from GlusterFS thread.

*/

-static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret, void *arg)

+static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret,

+#ifdef CONFIG_GLUSTERFS_IOCB_HAS_STAT

+ struct glfs_stat *pre, struct glfs_stat *post,

+#endif

+ void *arg)

{

GlusterAIOCB *acb = (GlusterAIOCB *)arg;

--

2.20.1

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

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

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

qapi/block-core.json | 4 ++--

blockdev.c | 12 ++++++------

2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json

index XXXXXXX..XXXXXXX 100644

--- a/qapi/block-core.json

+++ b/qapi/block-core.json

@@ -XXX,XX +XXX,XX @@

# If only @device parameter is specified, remove all present latency histograms

# for the device. Otherwise, add/reset some of (or all) latency histograms.

#

-# @device: device name to set latency histogram for.

+# @id: The name or QOM path of the guest device.

#

# @boundaries: list of interval boundary values (see description in

# BlockLatencyHistogramInfo definition). If specified, all

@@ -XXX,XX +XXX,XX @@

# <- { "return": {} }

##

{ 'command': 'x-block-latency-histogram-set',

- 'data': {'device': 'str',

+ 'data': {'id': 'str',

'*boundaries': ['uint64'],

'*boundaries-read': ['uint64'],

'*boundaries-write': ['uint64'],

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

index XXXXXXX..XXXXXXX 100644

--- a/blockdev.c

+++ b/blockdev.c

@@ -XXX,XX +XXX,XX @@ void qmp_x_blockdev_set_iothread(const char *node_name, StrOrNull *iothread,

}

void qmp_x_block_latency_histogram_set(

- const char *device,

+ const char *id,

bool has_boundaries, uint64List *boundaries,

bool has_boundaries_read, uint64List *boundaries_read,

bool has_boundaries_write, uint64List *boundaries_write,

bool has_boundaries_flush, uint64List *boundaries_flush,

Error **errp)

{

- BlockBackend *blk = blk_by_name(device);

+ BlockBackend *blk = qmp_get_blk(NULL, id, errp);

BlockAcctStats *stats;

int ret;

if (!blk) {

- error_setg(errp, "Device '%s' not found", device);

return;

}

+

stats = blk_get_stats(blk);

if (!has_boundaries && !has_boundaries_read && !has_boundaries_write &&

@@ -XXX,XX +XXX,XX @@ void qmp_x_block_latency_histogram_set(

stats, BLOCK_ACCT_READ,

has_boundaries_read ? boundaries_read : boundaries);

if (ret) {

- error_setg(errp, "Device '%s' set read boundaries fail", device);

+ error_setg(errp, "Device '%s' set read boundaries fail", id);

return;

}

}

@@ -XXX,XX +XXX,XX @@ void qmp_x_block_latency_histogram_set(

stats, BLOCK_ACCT_WRITE,

has_boundaries_write ? boundaries_write : boundaries);

if (ret) {

- error_setg(errp, "Device '%s' set write boundaries fail", device);

+ error_setg(errp, "Device '%s' set write boundaries fail", id);

return;

}

}

@@ -XXX,XX +XXX,XX @@ void qmp_x_block_latency_histogram_set(

stats, BLOCK_ACCT_FLUSH,

has_boundaries_flush ? boundaries_flush : boundaries);

if (ret) {

- error_setg(errp, "Device '%s' set flush boundaries fail", device);

+ error_setg(errp, "Device '%s' set flush boundaries fail", id);

return;

}

}

--

2.20.1

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

Drop x- and x_ prefixes for latency histograms and update version to

3.1

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

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

qapi/block-core.json | 20 ++++++++++----------

block/qapi.c | 12 ++++++------

blockdev.c | 2 +-

3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json

index XXXXXXX..XXXXXXX 100644

--- a/qapi/block-core.json

+++ b/qapi/block-core.json

@@ -XXX,XX +XXX,XX @@

# +------------------

# 10 50 100

#

-# Since: 2.12

+# Since: 4.0

##

{ 'struct': 'BlockLatencyHistogramInfo',

'data': {'boundaries': ['uint64'], 'bins': ['uint64'] } }

##

-# @x-block-latency-histogram-set:

+# @block-latency-histogram-set:

#

# Manage read, write and flush latency histograms for the device.

#

@@ -XXX,XX +XXX,XX @@

#

# Returns: error if device is not found or any boundary arrays are invalid.

#

-# Since: 2.12

+# Since: 4.0

#

# Example: set new histograms for all io types with intervals

# [0, 10), [10, 50), [50, 100), [100, +inf):

@@ -XXX,XX +XXX,XX @@

# "arguments": { "device": "drive0" } }

# <- { "return": {} }

##

-{ 'command': 'x-block-latency-histogram-set',

+{ 'command': 'block-latency-histogram-set',

'data': {'id': 'str',

'*boundaries': ['uint64'],

'*boundaries-read': ['uint64'],

@@ -XXX,XX +XXX,XX @@

# @timed_stats: Statistics specific to the set of previously defined

# intervals of time (Since 2.5)

#

-# @x_rd_latency_histogram: @BlockLatencyHistogramInfo. (Since 2.12)

+# @rd_latency_histogram: @BlockLatencyHistogramInfo. (Since 4.0)

#

-# @x_wr_latency_histogram: @BlockLatencyHistogramInfo. (Since 2.12)

+# @wr_latency_histogram: @BlockLatencyHistogramInfo. (Since 4.0)

#

-# @x_flush_latency_histogram: @BlockLatencyHistogramInfo. (Since 2.12)

+# @flush_latency_histogram: @BlockLatencyHistogramInfo. (Since 4.0)

#

# Since: 0.14.0

##

@@ -XXX,XX +XXX,XX @@

'invalid_wr_operations': 'int', 'invalid_flush_operations': 'int',

'account_invalid': 'bool', 'account_failed': 'bool',

'timed_stats': ['BlockDeviceTimedStats'],

- '*x_rd_latency_histogram': 'BlockLatencyHistogramInfo',

- '*x_wr_latency_histogram': 'BlockLatencyHistogramInfo',

- '*x_flush_latency_histogram': 'BlockLatencyHistogramInfo' } }

+ '*rd_latency_histogram': 'BlockLatencyHistogramInfo',

+ '*wr_latency_histogram': 'BlockLatencyHistogramInfo',

+ '*flush_latency_histogram': 'BlockLatencyHistogramInfo' } }

##

# @BlockStats:

diff --git a/block/qapi.c b/block/qapi.c

index XXXXXXX..XXXXXXX 100644

--- a/block/qapi.c

+++ b/block/qapi.c

@@ -XXX,XX +XXX,XX @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk)

}

bdrv_latency_histogram_stats(&stats->latency_histogram[BLOCK_ACCT_READ],

- &ds->has_x_rd_latency_histogram,

- &ds->x_rd_latency_histogram);

+ &ds->has_rd_latency_histogram,

+ &ds->rd_latency_histogram);

bdrv_latency_histogram_stats(&stats->latency_histogram[BLOCK_ACCT_WRITE],

- &ds->has_x_wr_latency_histogram,

- &ds->x_wr_latency_histogram);

+ &ds->has_wr_latency_histogram,

+ &ds->wr_latency_histogram);

bdrv_latency_histogram_stats(&stats->latency_histogram[BLOCK_ACCT_FLUSH],

- &ds->has_x_flush_latency_histogram,

- &ds->x_flush_latency_histogram);

+ &ds->has_flush_latency_histogram,

+ &ds->flush_latency_histogram);

}

static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs,

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

index XXXXXXX..XXXXXXX 100644

--- a/blockdev.c

+++ b/blockdev.c

@@ -XXX,XX +XXX,XX @@ void qmp_x_blockdev_set_iothread(const char *node_name, StrOrNull *iothread,

aio_context_release(old_context);

}

-void qmp_x_block_latency_histogram_set(

+void qmp_block_latency_histogram_set(

const char *id,

bool has_boundaries, uint64List *boundaries,

bool has_boundaries_read, uint64List *boundaries_read,

--

2.20.1

tests/virtio-blk-test uses a temporary image file that it deletes while

QEMU is still running, so it can't be reopened when writers are

attached or detached. Disable auto-read-only to keep it always writable.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

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

---

tests/virtio-blk-test.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c

index XXXXXXX..XXXXXXX 100644

--- a/tests/virtio-blk-test.c

+++ b/tests/virtio-blk-test.c

@@ -XXX,XX +XXX,XX @@ static void *virtio_blk_test_setup(GString *cmd_line, void *arg)

char *tmp_path = drive_create();

g_string_append_printf(cmd_line,

- " -drive if=none,id=drive0,file=%s,format=raw "

+ " -drive if=none,id=drive0,file=%s,format=raw,auto-read-only=off "

"-drive if=none,id=drive1,file=null-co://,format=raw ",

tmp_path);

--

2.20.1

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

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

---

tests/qemu-iotests/232 | 31 +++++++++++++++++++++++++++++++

tests/qemu-iotests/232.out | 20 ++++++++++++++++++++

2 files changed, 51 insertions(+)

diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/232

+++ b/tests/qemu-iotests/232

@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!

_cleanup()

{

_cleanup_test_img

+ rm -f $TEST_IMG.[01234]

}

trap "_cleanup; exit \$status" 0 1 2 3 15

@@ -XXX,XX +XXX,XX @@ run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,a

run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,auto-read-only=on

run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0

+echo

+echo "=== Try commit to backing file with auto-read-only ==="

+echo

+

+TEST_IMG="$TEST_IMG.0" _make_test_img $size

+TEST_IMG="$TEST_IMG.1" _make_test_img $size

+TEST_IMG="$TEST_IMG.2" _make_test_img $size

+TEST_IMG="$TEST_IMG.3" _make_test_img $size

+TEST_IMG="$TEST_IMG.4" _make_test_img $size

+

+(cat <<EOF

+{"execute":"qmp_capabilities"}

+{"execute":"block-commit",

+ "arguments":{"device":"format-4", "top-node": "format-2", "base-node":"format-0", "job-id":"job0"}}

+EOF

+sleep 1

+echo '{"execute":"quit"}'

+) | $QEMU -qmp stdio -nographic -nodefaults \

+ -blockdev file,node-name=file-0,filename=$TEST_IMG.0,auto-read-only=on \

+ -blockdev qcow2,node-name=format-0,file=file-0,read-only=on \

+ -blockdev file,node-name=file-1,filename=$TEST_IMG.1,auto-read-only=on \

+ -blockdev qcow2,node-name=format-1,file=file-1,read-only=on,backing=format-0 \

+ -blockdev file,node-name=file-2,filename=$TEST_IMG.2,auto-read-only=on \

+ -blockdev qcow2,node-name=format-2,file=file-2,read-only=on,backing=format-1 \

+ -blockdev file,node-name=file-3,filename=$TEST_IMG.3,auto-read-only=on \

+ -blockdev qcow2,node-name=format-3,file=file-3,read-only=on,backing=format-2 \

+ -blockdev file,node-name=file-4,filename=$TEST_IMG.4,auto-read-only=on \

+ -blockdev qcow2,node-name=format-4,file=file-4,read-only=on,backing=format-3 |

+ _filter_qmp

+

# success, all done

echo "*** done"

rm -f $seq.full

diff --git a/tests/qemu-iotests/232.out b/tests/qemu-iotests/232.out

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/232.out

+++ b/tests/qemu-iotests/232.out

@@ -XXX,XX +XXX,XX @@ QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0,read

QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0,auto-read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied

node0: TEST_DIR/t.IMGFMT (file, read-only)

QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0: Could not open 'TEST_DIR/t.IMGFMT': Permission denied

+

+=== Try commit to backing file with auto-read-only ===

+

+Formatting 'TEST_DIR/t.IMGFMT.0', fmt=IMGFMT size=134217728

+Formatting 'TEST_DIR/t.IMGFMT.1', fmt=IMGFMT size=134217728

+Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=134217728

+Formatting 'TEST_DIR/t.IMGFMT.3', fmt=IMGFMT size=134217728

+Formatting 'TEST_DIR/t.IMGFMT.4', fmt=IMGFMT size=134217728

+QMP_VERSION

+{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}

+{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 134217728, "offset": 134217728, "speed": 0, "type": "commit"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}

+{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}

*** done

--

2.20.1

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Alberto Garcia <berto@igalia.com>

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

---

block.c | 4 +---

1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/block.c b/block.c

index XXXXXXX..XXXXXXX 100644

--- a/block.c

+++ b/block.c

@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_multiple(AioContext *ctx, BlockReopenQueue *bs_queue, Error **er

{

int ret = -1;

BlockReopenQueueEntry *bs_entry, *next;

- Error *local_err = NULL;

assert(bs_queue != NULL);

QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) {

assert(bs_entry->state.bs->quiesce_counter > 0);

- if (bdrv_reopen_prepare(&bs_entry->state, bs_queue, &local_err)) {

- error_propagate(errp, local_err);

+ if (bdrv_reopen_prepare(&bs_entry->state, bs_queue, errp)) {

goto cleanup;

}

bs_entry->prepared = true;

--

2.20.1