The following changes since commit 0a301624c2f4ced3331ffd5bce85b4274fe132af:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20220208' into staging (2022-02-08 11:40:08 +0000)

https://gitlab.com/kmwolf/qemu.git tags/for-upstream

for you to fetch changes up to fdb8541b2e4f6ff60f435fbb5a5e1df20c275a86:

hw/block/fdc-isa: Respect QOM properties when building AML (2022-02-11 17:37:26 +0100)

- Fix crash in blockdev-reopen with iothreads

- fdc-isa: Respect QOM properties when building AML

Bernhard Beschow (1):

hw/block/fdc-isa: Respect QOM properties when building AML

Kevin Wolf (2):

block: Lock AioContext for drain_end in blockdev-reopen

iotests: Test blockdev-reopen with iothreads and throttling

blockdev.c | 11 ++++++++++-

hw/block/fdc-isa.c | 11 +++++++----

tests/qemu-iotests/245 | 36 +++++++++++++++++++++++++++++++++---

tests/qemu-iotests/245.out | 4 ++--

4 files changed, 52 insertions(+), 10 deletions(-)

From: Bernhard Beschow <shentey@gmail.com>

Other ISA devices such as serial-isa use the properties in their

build_aml functions. fdc-isa not using them is probably an oversight.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>

Message-Id: <20220209191558.30393-1-shentey@gmail.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

hw/block/fdc-isa.c | 11 +++++++----

1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c

--- a/hw/block/fdc-isa.c

+++ b/hw/block/fdc-isa.c

@@ -XXX,XX +XXX,XX @@ int cmos_get_fd_drive_type(FloppyDriveType fd0)

static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope)

{

+ FDCtrlISABus *isa = ISA_FDC(isadev);

Aml *dev;

Aml *crs;

int i;

@@ -XXX,XX +XXX,XX @@ static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope)

};

crs = aml_resource_template();

- aml_append(crs, aml_io(AML_DECODE16, 0x03F2, 0x03F2, 0x00, 0x04));

- aml_append(crs, aml_io(AML_DECODE16, 0x03F7, 0x03F7, 0x00, 0x01));

- aml_append(crs, aml_irq_no_flags(6));

aml_append(crs,

- aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, 2));

+ aml_io(AML_DECODE16, isa->iobase + 2, isa->iobase + 2, 0x00, 0x04));

+ aml_append(crs,

+ aml_io(AML_DECODE16, isa->iobase + 7, isa->iobase + 7, 0x00, 0x01));

+ aml_append(crs, aml_irq_no_flags(isa->irq));

+ aml_append(crs,

+ aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, isa->dma));

dev = aml_device("FDC0");

aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0700")));

2.34.1

The 'throttle' block driver implements .bdrv_co_drain_end, so

blockdev-reopen will have to wait for it to complete in the polling

loop at the end of qmp_blockdev_reopen(). This makes AIO_WAIT_WHILE()

release the AioContext lock, which causes a crash if the lock hasn't

correctly been taken.

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

Message-Id: <20220203140534.36522-3-kwolf@redhat.com>

Reviewed-by: Hanna Reitz <hreitz@redhat.com>

tests/qemu-iotests/245 | 36 +++++++++++++++++++++++++++++++++---

tests/qemu-iotests/245.out | 4 ++--

2 files changed, 35 insertions(+), 5 deletions(-)

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/245

+++ b/tests/qemu-iotests/245

@@ -XXX,XX +XXX,XX @@ class TestBlockdevReopen(iotests.QMPTestCase):

self.assertEqual(self.get_node('hd1'), None)

self.assert_qmp(self.get_node('hd2'), 'ro', True)

- def run_test_iothreads(self, iothread_a, iothread_b, errmsg = None):

- opts = hd_opts(0)

+ def run_test_iothreads(self, iothread_a, iothread_b, errmsg = None,

+ opts_a = None, opts_b = None):

+ opts = opts_a or hd_opts(0)

result = self.vm.qmp('blockdev-add', conv_keys = False, **opts)

self.assert_qmp(result, 'return', {})

- opts2 = hd_opts(2)

+ opts2 = opts_b or hd_opts(2)

result = self.vm.qmp('blockdev-add', conv_keys = False, **opts2)

self.assert_qmp(result, 'return', {})

@@ -XXX,XX +XXX,XX @@ class TestBlockdevReopen(iotests.QMPTestCase):

def test_iothreads_switch_overlay(self):

self.run_test_iothreads('', 'iothread0')

+ def test_iothreads_with_throttling(self):

+ # Create a throttle-group object

+ opts = { 'qom-type': 'throttle-group', 'id': 'group0',

+ 'limits': { 'iops-total': 1000 } }

+ result = self.vm.qmp('object-add', conv_keys = False, **opts)

+ self.assert_qmp(result, 'return', {})

+

+ # Options with a throttle filter between format and protocol

+ opts = [

+ {

+ 'driver': iotests.imgfmt,

+ 'node-name': f'hd{idx}',

+ 'file' : {

+ 'node-name': f'hd{idx}-throttle',

+ 'driver': 'throttle',

+ 'throttle-group': 'group0',

+ 'file': {

+ 'driver': 'file',

+ 'node-name': f'hd{idx}-file',

+ 'filename': hd_path[idx],

+ },

+ },

+ }

+ for idx in (0, 2)

+ ]

+

+ self.run_test_iothreads('iothread0', 'iothread0', None,

+ opts[0], opts[1])

+

if __name__ == '__main__':

iotests.activate_logging()

iotests.main(supported_fmts=["qcow2"],

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

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

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

@@ -XXX,XX +XXX,XX @@ read 1/1 bytes at offset 262152

read 1/1 bytes at offset 262160

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

-...............

+................

----------------------------------------------------------------------

-Ran 25 tests

+Ran 26 tests

OK

2.34.1

bdrv_subtree_drained_end() requires the caller to hold the AioContext

lock for the drained node. Not doing this for nodes outside of the main

AioContext leads to crashes when AIO_WAIT_WHILE() needs to wait and

tries to temporarily release the lock.

Fixes: 3908b7a8994fa5ef7a89aa58cd5a02fc58141592

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2046659

Reported-by: Qing Wang <qinwang@redhat.com>

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

Message-Id: <20220203140534.36522-2-kwolf@redhat.com>

Reviewed-by: Hanna Reitz <hreitz@redhat.com>

blockdev.c | 11 ++++++++++-

1 file changed, 10 insertions(+), 1 deletion(-)

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

--- a/blockdev.c

+++ b/blockdev.c

@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_reopen(BlockdevOptionsList *reopen_list, Error **errp)

{

BlockReopenQueue *queue = NULL;

GSList *drained = NULL;

+ GSList *p;

/* Add each one of the BDS that we want to reopen to the queue */

for (; reopen_list != NULL; reopen_list = reopen_list->next) {

@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_reopen(BlockdevOptionsList *reopen_list, Error **errp)

fail:

bdrv_reopen_queue_free(queue);

- g_slist_free_full(drained, (GDestroyNotify) bdrv_subtree_drained_end);

+ for (p = drained; p; p = p->next) {

+ BlockDriverState *bs = p->data;

+ AioContext *ctx = bdrv_get_aio_context(bs);

+

+ aio_context_acquire(ctx);

+ bdrv_subtree_drained_end(bs);

+ aio_context_release(ctx);

+ }

+ g_slist_free(drained);

}

void qmp_blockdev_del(const char *node_name, Error **errp)

2.34.1