SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

block-backend: per-device throttling of BLOCK_IO_ERROR reports

Browse Source 
BLOCK_IO_ERROR events comes from guest, so we must throttle them.
We still want per-device throttling, so let's use device id as a key.

Signed-off-by: Leonid Kaplan <xeor@yandex-team.ru>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-ID: <20241002151806.592469-3-vsementsov@yandex-team.ru>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Leonid Kaplan 2024-10-02 18:18:06 +03:00 committed by Kevin Wolf
parent 7452162ade
commit 2155d2dd7f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
monitor/monitor.c
View File

@ -308,6 +308,7 @@ int error_printf_unless_qmp(const char *fmt, ...)
static MonitorQAPIEventConf monitor_qapi_event_conf[QAPI_EVENT__MAX] = { static MonitorQAPIEventConf monitor_qapi_event_conf[QAPI_EVENT__MAX] = {
/* Limit guest-triggerable events to 1 per second */ /* Limit guest-triggerable events to 1 per second */
[QAPI_EVENT_RTC_CHANGE] = { 1000 * SCALE_MS }, [QAPI_EVENT_RTC_CHANGE] = { 1000 * SCALE_MS },
[QAPI_EVENT_BLOCK_IO_ERROR] = { 1000 * SCALE_MS },
[QAPI_EVENT_WATCHDOG] = { 1000 * SCALE_MS }, [QAPI_EVENT_WATCHDOG] = { 1000 * SCALE_MS },
[QAPI_EVENT_BALLOON_CHANGE] = { 1000 * SCALE_MS }, [QAPI_EVENT_BALLOON_CHANGE] = { 1000 * SCALE_MS },
[QAPI_EVENT_QUORUM_REPORT_BAD] = { 1000 * SCALE_MS }, [QAPI_EVENT_QUORUM_REPORT_BAD] = { 1000 * SCALE_MS },
@ -493,7 +494,8 @@ static unsigned int qapi_event_throttle_hash(const void *key)
hash += g_str_hash(qdict_get_str(evstate->data, "node-name")); hash += g_str_hash(qdict_get_str(evstate->data, "node-name"));
} }
if (evstate->event == QAPI_EVENT_MEMORY_DEVICE_SIZE_CHANGE) { if (evstate->event == QAPI_EVENT_MEMORY_DEVICE_SIZE_CHANGE ||
evstate->event == QAPI_EVENT_BLOCK_IO_ERROR) {
hash += g_str_hash(qdict_get_str(evstate->data, "qom-path")); hash += g_str_hash(qdict_get_str(evstate->data, "qom-path"));
} }
@ -519,7 +521,8 @@ static gboolean qapi_event_throttle_equal(const void *a, const void *b)
qdict_get_str(evb->data, "node-name")); qdict_get_str(evb->data, "node-name"));
} }
if (eva->event == QAPI_EVENT_MEMORY_DEVICE_SIZE_CHANGE) { if (eva->event == QAPI_EVENT_MEMORY_DEVICE_SIZE_CHANGE ||
eva->event == QAPI_EVENT_BLOCK_IO_ERROR) {
return !strcmp(qdict_get_str(eva->data, "qom-path"), return !strcmp(qdict_get_str(eva->data, "qom-path"),
qdict_get_str(evb->data, "qom-path")); qdict_get_str(evb->data, "qom-path"));
} }

2
qapi/block-core.json
View File

@ -5611,6 +5611,8 @@
# .. note:: If action is "stop", a STOP event will eventually follow # .. note:: If action is "stop", a STOP event will eventually follow
# the BLOCK_IO_ERROR event. # the BLOCK_IO_ERROR event.
# #
# .. note:: This event is rate-limited.
#
# Since: 0.13 # Since: 0.13
# #
# .. qmp-example:: # .. qmp-example::