The following changes since commit 47c1cc30e440860aa695358f7c2dd0b9d7b53d16:

Update version for v3.1.0-rc2 release (2018-11-20 18:10:26 +0000)

git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to 924956b1efc50af7cc334b7a14f56aa213ca27ef:

iotests: Enhance 223 to cover multiple bitmap granularities (2018-11-22 16:43:52 +0100)

Block layer patches:

- block: Fix update of BDRV_O_AUTO_RDONLY in update_flags_from_options()

- qemu-img: Fix memory leak and typo in error message

- nvme: Fixes for lockups and crashes

- scsi-disk: Fix crash if underlying host file or disk returns error

- Several qemu-iotests fixes and improvements

Alberto Garcia (1):

block: Fix update of BDRV_O_AUTO_RDONLY in update_flags_from_options()

Daniel P. Berrangé (1):

iotests: fix nbd test 233 to work correctly with raw images

Eric Blake (2):

iotests: Skip 233 if certtool not installed

iotests: Enhance 223 to cover multiple bitmap granularities

Igor Druzhinin (1):

nvme: call blk_drain in NVMe reset code to avoid lockups

Kevin Wolf (3):

iotests: Replace time.clock() with Timeout

iotests: Replace assertEquals() with assertEqual()

Revert "nvme: fix oob access issue(CVE-2018-16847)"

Logan Gunthorpe (1):

nvme: fix bug with PCI IRQ pins on teardown

Max Reitz (2):

qemu-img: Fix typo

qemu-img: Fix leak

Paolo Bonzini (1):

nvme: fix out-of-bounds access to the CMB

Richard W.M. Jones (1):

scsi-disk: Fix crash if underlying host file or disk returns error

block.c | 4 +--

hw/block/nvme.c | 12 +++-----

hw/scsi/scsi-disk.c | 2 +-

qemu-img.c | 3 +-

tests/nvme-test.c | 68 ++++++++++++++++++++++++++++++++++++-------

tests/Makefile.include | 2 +-

tests/qemu-iotests/041 | 6 ++--

tests/qemu-iotests/118 | 20 +++++--------

tests/qemu-iotests/223 | 43 ++++++++++++++++++++++-----

tests/qemu-iotests/223.out | 32 +++++++++++++++-----

tests/qemu-iotests/233 | 9 ++++--

tests/qemu-iotests/common.tls | 3 ++

tests/qemu-iotests/iotests.py | 2 +-

13 files changed, 148 insertions(+), 58 deletions(-)

From: Eric Blake <eblake@redhat.com>

Testing granularity at the same size as the cluster isn't quite

as fun as what happens when it is larger or smaller. This

enhancement also shows that qemu's nbd server can serve the

same disk over multiple exports simultaneously.

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

Tested-by: John Snow <jsnow@redhat.com>

Reviewed-by: John Snow <jsnow@redhat.com>

tests/qemu-iotests/223 | 43 +++++++++++++++++++++++++++++++-------

tests/qemu-iotests/223.out | 32 +++++++++++++++++++++-------

2 files changed, 60 insertions(+), 15 deletions(-)

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/223

+++ b/tests/qemu-iotests/223

@@ -XXX,XX +XXX,XX @@ run_qemu()

}

echo

-echo "=== Create partially sparse image, then add dirty bitmap ==="

+echo "=== Create partially sparse image, then add dirty bitmaps ==="

echo

-_make_test_img 4M

+# Two bitmaps, to contrast granularity issues

+_make_test_img -o cluster_size=4k 4M

$QEMU_IO -c 'w -P 0x11 1M 2M' "$TEST_IMG" | _filter_qemu_io

run_qemu <<EOF

{ "execute": "qmp_capabilities" }

@@ -XXX,XX +XXX,XX @@ run_qemu <<EOF

"arguments": {

"node": "n",

"name": "b",

- "persistent": true

+ "persistent": true,

+ "granularity": 65536

+ }

+}

+{ "execute": "block-dirty-bitmap-add",

+ "arguments": {

+ "node": "n",

+ "name": "b2",

+ "persistent": true,

+ "granularity": 512

}

}

{ "execute": "quit" }

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

echo "=== Write part of the file under active bitmap ==="

echo

-$QEMU_IO -c 'w -P 0x22 2M 2M' "$TEST_IMG" | _filter_qemu_io

+$QEMU_IO -c 'w -P 0x22 512 512' -c 'w -P 0x33 2M 2M' "$TEST_IMG" \

+ | _filter_qemu_io

echo

-echo "=== End dirty bitmap, and start serving image over NBD ==="

+echo "=== End dirty bitmaps, and start serving image over NBD ==="

echo

_launch_qemu 2> >(_filter_nbd)

@@ -XXX,XX +XXX,XX @@ _send_qemu_cmd $QEMU_HANDLE '{"execute":"blockdev-add",

"file":{"driver":"file", "filename":"'"$TEST_IMG"'"}}}' "return"

_send_qemu_cmd $QEMU_HANDLE '{"execute":"x-block-dirty-bitmap-disable",

"arguments":{"node":"n", "name":"b"}}' "return"

+_send_qemu_cmd $QEMU_HANDLE '{"execute":"x-block-dirty-bitmap-disable",

+ "arguments":{"node":"n", "name":"b2"}}' "return"

_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-start",

"arguments":{"addr":{"type":"unix",

"data":{"path":"'"$TEST_DIR/nbd"'"}}}}' "return"

@@ -XXX,XX +XXX,XX @@ _send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",

"arguments":{"device":"n"}}' "return"

_send_qemu_cmd $QEMU_HANDLE '{"execute":"x-nbd-server-add-bitmap",

"arguments":{"name":"n", "bitmap":"b"}}' "return"

+_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",

+ "arguments":{"device":"n", "name":"n2"}}' "return"

+_send_qemu_cmd $QEMU_HANDLE '{"execute":"x-nbd-server-add-bitmap",

+ "arguments":{"name":"n2", "bitmap":"b2"}}' "return"

echo

-echo "=== Contrast normal status with dirty-bitmap status ==="

+echo "=== Contrast normal status to large granularity dirty-bitmap ==="

echo

QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT

IMG="driver=nbd,export=n,server.type=unix,server.path=$TEST_DIR/nbd"

-$QEMU_IO -r -c 'r -P 0 0 1m' -c 'r -P 0x11 1m 1m' \

- -c 'r -P 0x22 2m 2m' --image-opts "$IMG" | _filter_qemu_io

+$QEMU_IO -r -c 'r -P 0x22 512 512' -c 'r -P 0 512k 512k' -c 'r -P 0x11 1m 1m' \

+ -c 'r -P 0x33 2m 2m' --image-opts "$IMG" | _filter_qemu_io

$QEMU_IMG map --output=json --image-opts \

"$IMG" | _filter_qemu_img_map

$QEMU_IMG map --output=json --image-opts \

"$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b" | _filter_qemu_img_map

+echo

+echo "=== Contrast to small granularity dirty-bitmap ==="

+echo

+IMG="driver=nbd,export=n2,server.type=unix,server.path=$TEST_DIR/nbd"

+$QEMU_IMG map --output=json --image-opts \

+ "$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b2" | _filter_qemu_img_map

+

echo

echo "=== End NBD server ==="

echo

_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-remove",

"arguments":{"name":"n"}}' "return"

+_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-remove",

+ "arguments":{"name":"n2"}}' "return"

_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-stop"}' "return"

_send_qemu_cmd $QEMU_HANDLE '{"execute":"quit"}' "return"

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

index XXXXXXX..XXXXXXX 100644

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

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

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

QA output created by 223

-=== Create partially sparse image, then add dirty bitmap ===

+=== Create partially sparse image, then add dirty bitmaps ===

Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304

wrote 2097152/2097152 bytes at offset 1048576

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

{"return": {}}

{"return": {}}

{"return": {}}

+{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

=== Write part of the file under active bitmap ===

+wrote 512/512 bytes at offset 512

+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

wrote 2097152/2097152 bytes at offset 2097152

2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

-=== End dirty bitmap, and start serving image over NBD ===

+=== End dirty bitmaps, and start serving image over NBD ===

{"return": {}}

{"return": {}}

@@ -XXX,XX +XXX,XX @@ wrote 2097152/2097152 bytes at offset 2097152

{"return": {}}

{"return": {}}

{"return": {}}

+{"return": {}}

+{"return": {}}

+{"return": {}}

-=== Contrast normal status with dirty-bitmap status ===

+=== Contrast normal status to large granularity dirty-bitmap ===

-read 1048576/1048576 bytes at offset 0

-1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

+read 512/512 bytes at offset 512

+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

+read 524288/524288 bytes at offset 524288

+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

read 1048576/1048576 bytes at offset 1048576

1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

read 2097152/2097152 bytes at offset 2097152

2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

-[{ "start": 0, "length": 1048576, "depth": 0, "zero": true, "data": false},

+[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true},

+{ "start": 4096, "length": 1044480, "depth": 0, "zero": true, "data": false},

{ "start": 1048576, "length": 3145728, "depth": 0, "zero": false, "data": true}]

-[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true},

+[{ "start": 0, "length": 65536, "depth": 0, "zero": false, "data": false},

+{ "start": 65536, "length": 2031616, "depth": 0, "zero": false, "data": true},

+{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": false}]

+

+=== Contrast to small granularity dirty-bitmap ===

+

+[{ "start": 0, "length": 512, "depth": 0, "zero": false, "data": true},

+{ "start": 512, "length": 512, "depth": 0, "zero": false, "data": false},

+{ "start": 1024, "length": 2096128, "depth": 0, "zero": false, "data": true},

{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data": false}]

=== End NBD server ===

@@ -XXX,XX +XXX,XX @@ read 2097152/2097152 bytes at offset 2097152

{"return": {}}

{"return": {}}

{"return": {}}

+{"return": {}}

*** done

2.19.1

From: Daniel P. Berrangé <berrange@redhat.com>

The first qemu-io command must honour the $IMGFMT that is set rather

than hardcoding qcow2. The qemu-nbd commands should also set $IMGFMT

to avoid the insecure format probe warning.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

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

tests/qemu-iotests/233 | 9 ++++++---

1 file changed, 6 insertions(+), 3 deletions(-)

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

--- a/tests/qemu-iotests/233

+++ b/tests/qemu-iotests/233

@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c 'w -P 0x11 1m 1m' "$TEST_IMG" | _filter_qemu_io

echo

echo "== check TLS client to plain server fails =="

-nbd_server_start_tcp_socket "$TEST_IMG"

+nbd_server_start_tcp_socket -f $IMGFMT "$TEST_IMG"

$QEMU_IMG info --image-opts \

--object tls-creds-x509,dir=${tls_dir}/client1,endpoint=client,id=tls0 \

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

echo

echo "== check plain client to TLS server fails =="

-nbd_server_start_tcp_socket --object tls-creds-x509,dir=${tls_dir}/server1,endpoint=server,id=tls0,verify-peer=yes --tls-creds tls0 "$TEST_IMG"

+nbd_server_start_tcp_socket \

+ --object tls-creds-x509,dir=${tls_dir}/server1,endpoint=server,id=tls0,verify-peer=yes \

+ --tls-creds tls0 \

+ -f $IMGFMT "$TEST_IMG"

$QEMU_IMG info nbd://localhost:$nbd_tcp_port 2>&1 | sed "s/$nbd_tcp_port/PORT/g"

@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c 'r -P 0x11 1m 1m' -c 'w -P 0x22 1m 1m' --image-opts \

driver=nbd,host=$nbd_tcp_addr,port=$nbd_tcp_port,tls-creds=tls0 \

2>&1 | _filter_qemu_io

-$QEMU_IO -f qcow2 -r -U -c 'r -P 0x22 1m 1m' "$TEST_IMG" | _filter_qemu_io

+$QEMU_IO -f $IMGFMT -r -U -c 'r -P 0x22 1m 1m' "$TEST_IMG" | _filter_qemu_io

2.19.1

This reverts commit 5e3c0220d7e4f0361c4d36c697a8842f2b583402.

We have a better fix commited for this now.

hw/block/nvme.c | 7 -------

1 file changed, 7 deletions(-)

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

--- a/hw/block/nvme.c

+++ b/hw/block/nvme.c

@@ -XXX,XX +XXX,XX @@ static void nvme_cmb_write(void *opaque, hwaddr addr, uint64_t data,

unsigned size)

{

NvmeCtrl *n = (NvmeCtrl *)opaque;

-

- if (addr + size > NVME_CMBSZ_GETSIZE(n->bar.cmbsz)) {

- return;

- }

memcpy(&n->cmbuf[addr], &data, size);

2.19.1