The following changes since commit f5fe7c17ac4e309e47e78f0f9761aebc8d2f2c81:

Merge tag 'pull-tcg-20230823-2' of https://gitlab.com/rth7680/qemu into staging (2023-08-28 16:07:04 -0400)

are available in the Git repository at:

https://gitlab.com/hreitz/qemu.git tags/pull-block-2023-09-01

for you to fetch changes up to 380448464dd89291cf7fd7434be6c225482a334d:

tests/file-io-error: New test (2023-08-29 13:01:24 +0200)

Block patches

- Fix for file-posix's zoning code crashing on I/O errors

- Throttling refactoring

Zhenwei Pi (9):

throttle: introduce enum ThrottleDirection

test-throttle: use enum ThrottleDirection

throttle: support read-only and write-only

test-throttle: test read only and write only

cryptodev: use NULL throttle timer cb for read direction

throttle: use enum ThrottleDirection instead of bool is_write

throttle: use THROTTLE_MAX/ARRAY_SIZE for hard code

fsdev: Use ThrottleDirection instread of bool is_write

block/throttle-groups: Use ThrottleDirection instread of bool is_write

fsdev/qemu-fsdev-throttle.h | 4 +-

include/block/throttle-groups.h | 6 +-

include/qemu/throttle.h | 16 +-

backends/cryptodev.c | 12 +-

block/block-backend.c | 4 +-

block/file-posix.c | 42 +++---

block/throttle-groups.c | 163 +++++++++++----------

block/throttle.c | 8 +-

fsdev/qemu-fsdev-throttle.c | 18 ++-

hw/9pfs/cofile.c | 4 +-

tests/unit/test-throttle.c | 76 +++++++++-

util/throttle.c | 84 +++++++----

tests/qemu-iotests/tests/file-io-error | 119 +++++++++++++++

tests/qemu-iotests/tests/file-io-error.out | 33 +++++

14 files changed, 418 insertions(+), 171 deletions(-)

create mode 100755 tests/qemu-iotests/tests/file-io-error

create mode 100644 tests/qemu-iotests/tests/file-io-error.out

2.41.0

This is a regression test for

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

All this test needs to do is trigger an I/O error inside of file-posix

(specifically raw_co_prw()). One reliable way to do this without

requiring special privileges is to use a FUSE export, which allows us to

inject any error that we want, e.g. via blkdebug.

Signed-off-by: Hanna Czenczek <hreitz@redhat.com>

Message-Id: <20230824155345.109765-6-hreitz@redhat.com>

[hreitz: Fixed test to be skipped when there is no FUSE support, to

suppress fusermount's allow_other warning, and to be skipped

with $IMGOPTSSYNTAX enabled]

Signed-off-by: Hanna Czenczek <hreitz@redhat.com>

tests/qemu-iotests/tests/file-io-error | 119 +++++++++++++++++++++

tests/qemu-iotests/tests/file-io-error.out | 33 ++++++

2 files changed, 152 insertions(+)

create mode 100755 tests/qemu-iotests/tests/file-io-error

create mode 100644 tests/qemu-iotests/tests/file-io-error.out

diff --git a/tests/qemu-iotests/tests/file-io-error b/tests/qemu-iotests/tests/file-io-error

new file mode 100755

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/tests/qemu-iotests/tests/file-io-error

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

+#!/usr/bin/env bash

+# group: rw

+#

+# Produce an I/O error in file-posix, and hope that it is not catastrophic.

+# Regression test for: https://bugzilla.redhat.com/show_bug.cgi?id=2234374

+#

+# Copyright (C) 2023 Red Hat, Inc.

+#

+# This program is free software; you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program. If not, see <http://www.gnu.org/licenses/>.

+#

+

+seq=$(basename "$0")

+echo "QA output created by $seq"

+

+status=1    # failure is the default!

+

+_cleanup()

+{

+ _cleanup_qemu

+ rm -f "$TEST_DIR/fuse-export"

+}

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

+

+# get standard environment, filters and checks

+. ../common.rc

+. ../common.filter

+. ../common.qemu

+

+# Format-agnostic (we do not use any), but we do test the file protocol

+_supported_proto file

+_require_drivers blkdebug null-co

+

+if [ "$IMGOPTSSYNTAX" = "true" ]; then

+ # We need `$QEMU_IO -f file` to work; IMGOPTSSYNTAX uses --image-opts,

+ # breaking -f.

+ _unsupported_fmt $IMGFMT

+fi

+

+# This is a regression test of a bug in which flie-posix would access zone

+# information in case of an I/O error even when there is no zone information,

+# resulting in a division by zero.

+# To reproduce the problem, we need to trigger an I/O error inside of

+# file-posix, which can be done (rootless) by providing a FUSE export that

+# presents only errors when accessed.

+

+_launch_qemu

+_send_qemu_cmd $QEMU_HANDLE \

+ "{'execute': 'qmp_capabilities'}" \

+ 'return'

+

+_send_qemu_cmd $QEMU_HANDLE \

+ "{'execute': 'blockdev-add',

+ 'arguments': {

+ 'driver': 'blkdebug',

+ 'node-name': 'node0',

+ 'inject-error': [{'event': 'none'}],

+ 'image': {

+ 'driver': 'null-co'

+ }

+ }}" \

+ 'return'

+

+# FUSE mountpoint must exist and be a regular file

+touch "$TEST_DIR/fuse-export"

+

+# The grep -v to filter fusermount's (benign) error when /etc/fuse.conf does

+# not contain user_allow_other and the subsequent check for missing FUSE support

+# have both been taken from iotest 308.

+output=$(_send_qemu_cmd $QEMU_HANDLE \

+ "{'execute': 'block-export-add',

+ 'arguments': {

+ 'id': 'exp0',

+ 'type': 'fuse',

+ 'node-name': 'node0',

+ 'mountpoint': '$TEST_DIR/fuse-export',

+ 'writable': true

+ }}" \

+ 'return' \

+ | grep -v 'option allow_other only allowed if')

+

+if echo "$output" | grep -q "Parameter 'type' does not accept value 'fuse'"; then

+ _notrun 'No FUSE support'

+fi

+echo "$output"

+

+echo

+# This should fail, but gracefully, i.e. just print an I/O error, not crash.

+$QEMU_IO -f file -c 'write 0 64M' "$TEST_DIR/fuse-export" | _filter_qemu_io

+echo

+

+_send_qemu_cmd $QEMU_HANDLE \

+ "{'execute': 'block-export-del',

+ 'arguments': {'id': 'exp0'}}" \

+ 'return'

+

+_send_qemu_cmd $QEMU_HANDLE \

+ '' \

+ 'BLOCK_EXPORT_DELETED'

+

+_send_qemu_cmd $QEMU_HANDLE \

+ "{'execute': 'blockdev-del',

+ 'arguments': {'node-name': 'node0'}}" \

+ 'return'

+

+# success, all done

+echo "*** done"

+rm -f $seq.full

+status=0

diff --git a/tests/qemu-iotests/tests/file-io-error.out b/tests/qemu-iotests/tests/file-io-error.out

+++ b/tests/qemu-iotests/tests/file-io-error.out

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

+QA output created by file-io-error

+{'execute': 'qmp_capabilities'}

+{"return": {}}

+{'execute': 'blockdev-add',

+ 'arguments': {

+ 'driver': 'blkdebug',

+ 'node-name': 'node0',

+ 'inject-error': [{'event': 'none'}],

+ 'image': {

+ 'driver': 'null-co'

+ }

+ }}

+{"return": {}}

+{'execute': 'block-export-add',

+ 'arguments': {

+ 'id': 'exp0',

+ 'type': 'fuse',

+ 'node-name': 'node0',

+ 'mountpoint': 'TEST_DIR/fuse-export',

+ 'writable': true

+ }}

+{"return": {}}

+

+write failed: Input/output error

+

+{'execute': 'block-export-del',

+ 'arguments': {'id': 'exp0'}}

+{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_EXPORT_DELETED", "data": {"id": "exp0"}}

+{'execute': 'blockdev-del',

+ 'arguments': {'node-name': 'node0'}}

+{"return": {}}

+*** done

2.41.0

From: zhenwei pi <pizhenwei@bytedance.com>

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

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

Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>

Message-Id: <20230728022006.1098509-5-pizhenwei@bytedance.com>

Signed-off-by: Hanna Czenczek <hreitz@redhat.com>

tests/unit/test-throttle.c | 66 ++++++++++++++++++++++++++++++++++++++

1 file changed, 66 insertions(+)

diff --git a/tests/unit/test-throttle.c b/tests/unit/test-throttle.c

--- a/tests/unit/test-throttle.c

+++ b/tests/unit/test-throttle.c

@@ -XXX,XX +XXX,XX @@ static void test_init(void)

throttle_timers_destroy(tt);

+static void test_init_readonly(void)

+ tt = &tgm.throttle_timers;

+

+ /* fill the structures with crap */

+ memset(&ts, 1, sizeof(ts));

+ memset(tt, 1, sizeof(*tt));

+

+ /* init structures */

+ throttle_init(&ts);

+ throttle_timers_init(tt, ctx, QEMU_CLOCK_VIRTUAL,

+ read_timer_cb, NULL, &ts);

+

+ /* check initialized fields */

+ g_assert(tt->clock_type == QEMU_CLOCK_VIRTUAL);

+ g_assert(tt->timers[THROTTLE_READ]);

+ g_assert(!tt->timers[THROTTLE_WRITE]);

+

+ /* check other fields where cleared */

+ g_assert(!ts.previous_leak);

+ g_assert(!ts.cfg.op_size);

+ for (i = 0; i < BUCKETS_COUNT; i++) {

+ g_assert(!ts.cfg.buckets[i].avg);

+ g_assert(!ts.cfg.buckets[i].max);

+ g_assert(!ts.cfg.buckets[i].level);

+ }

+

+ throttle_timers_destroy(tt);

+}

+

+static void test_init_writeonly(void)

+ tt = &tgm.throttle_timers;

+

+ /* fill the structures with crap */

+ memset(&ts, 1, sizeof(ts));

+ memset(tt, 1, sizeof(*tt));

+

+ /* init structures */

+ throttle_init(&ts);

+ throttle_timers_init(tt, ctx, QEMU_CLOCK_VIRTUAL,

+ NULL, write_timer_cb, &ts);

+

+ /* check initialized fields */

+ g_assert(tt->clock_type == QEMU_CLOCK_VIRTUAL);

+ g_assert(!tt->timers[THROTTLE_READ]);

+ g_assert(tt->timers[THROTTLE_WRITE]);

+

+ /* check other fields where cleared */

+ g_assert(!ts.previous_leak);

+ g_assert(!ts.cfg.op_size);

+ for (i = 0; i < BUCKETS_COUNT; i++) {

+ g_assert(!ts.cfg.buckets[i].avg);

+ g_assert(!ts.cfg.buckets[i].max);

+ g_assert(!ts.cfg.buckets[i].level);

+ }

+

+ throttle_timers_destroy(tt);

+}

+

static void test_destroy(void)

int i;

@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv)

g_test_add_func("/throttle/leak_bucket", test_leak_bucket);

g_test_add_func("/throttle/compute_wait", test_compute_wait);

g_test_add_func("/throttle/init", test_init);

+ g_test_add_func("/throttle/init_readonly", test_init_readonly);

+ g_test_add_func("/throttle/init_writeonly", test_init_writeonly);

g_test_add_func("/throttle/destroy", test_destroy);

g_test_add_func("/throttle/have_timer", test_have_timer);

g_test_add_func("/throttle/detach_attach", test_detach_attach);

2.41.0