| 1 | The following changes since commit 15ef89d2a1a7b93845a6b09c2ee8e1979f6eb30b: | 1 | The following changes since commit fea445e8fe9acea4f775a832815ee22bdf2b0222: |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Update version for v7.0.0-rc1 release (2022-03-22 22:58:44 +0000) | 3 | Merge tag 'pull-maintainer-final-for-real-this-time-200324-1' of https://gitlab.com/stsquad/qemu into staging (2024-03-21 10:31:56 +0000) |
| 4 | 4 | ||
| 5 | are available in the Git repository at: | 5 | are available in the Git repository at: |
| 6 | 6 | ||
| 7 | https://gitlab.com/stefanha/qemu.git tags/block-pull-request | 7 | https://gitlab.com/stefanha/qemu.git tags/block-pull-request |
| 8 | 8 | ||
| 9 | for you to fetch changes up to 2539eade4f689eda7e9fe45486f18334bfbafaf0: | 9 | for you to fetch changes up to 9352f80cd926fe2dde7c89b93ee33bb0356ff40e: |
| 10 | 10 | ||
| 11 | hw: Fix misleading hexadecimal format (2022-03-24 10:38:42 +0000) | 11 | coroutine: reserve 5,000 mappings (2024-03-21 13:14:30 -0400) |
| 12 | 12 | ||
| 13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
| 14 | Pull request | 14 | Pull request |
| 15 | 15 | ||
| 16 | Philippe found cases where the 0x%d format string was used, leading to | 16 | I was too quick in sending the coroutine pool sizing change for -rc0 and still |
| 17 | misleading output. The patches look harmless and could save people time, so I | 17 | needed to address feedback from Daniel Berrangé. |
| 18 | think it's worth including them in 7.0. | ||
| 19 | 18 | ||
| 20 | ---------------------------------------------------------------- | 19 | ---------------------------------------------------------------- |
| 21 | 20 | ||
| 22 | Philippe Mathieu-Daudé (2): | 21 | Stefan Hajnoczi (1): |
| 23 | block: Fix misleading hexadecimal format | 22 | coroutine: reserve 5,000 mappings |
| 24 | hw: Fix misleading hexadecimal format | ||
| 25 | 23 | ||
| 26 | block/parallels-ext.c | 2 +- | 24 | util/qemu-coroutine.c | 15 ++++++++++----- |
| 27 | hw/i386/sgx.c | 2 +- | 25 | 1 file changed, 10 insertions(+), 5 deletions(-) |
| 28 | hw/i386/trace-events | 6 +++--- | ||
| 29 | hw/misc/trace-events | 4 ++-- | ||
| 30 | hw/scsi/trace-events | 4 ++-- | ||
| 31 | 5 files changed, 9 insertions(+), 9 deletions(-) | ||
| 32 | 26 | ||
| 33 | -- | 27 | -- |
| 34 | 2.35.1 | 28 | 2.44.0 |
| 35 | 29 | ||
| 30 | diff view generated by jsdifflib |
| 1 | From: Philippe Mathieu-Daudé <f4bug@amsat.org> | 1 | Daniel P. Berrangé <berrange@redhat.com> pointed out that the coroutine |
|---|---|---|---|
| 2 | pool size heuristic is very conservative. Instead of halving | ||
| 3 | max_map_count, he suggested reserving 5,000 mappings for non-coroutine | ||
| 4 | users based on observations of guests he has access to. | ||
| 2 | 5 | ||
| 3 | "0x%u" format is very misleading, replace by "0x%x". | 6 | Fixes: 86a637e48104 ("coroutine: cap per-thread local pool size") |
| 4 | 7 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | |
| 5 | Found running: | ||
| 6 | |||
| 7 | $ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' block/ | ||
| 8 | |||
| 9 | Inspired-by: Richard Henderson <richard.henderson@linaro.org> | ||
| 10 | Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> | ||
| 11 | Reviewed-by: Hanna Reitz <hreitz@redhat.com> | ||
| 12 | Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> | 8 | Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> |
| 13 | Reviewed-by: Denis V. Lunev <den@openvz.org> | 9 | Message-id: 20240320181232.1464819-1-stefanha@redhat.com |
| 14 | Message-id: 20220323114718.58714-2-philippe.mathieu.daude@gmail.com | ||
| 15 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | 10 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| 16 | --- | 11 | --- |
| 17 | block/parallels-ext.c | 2 +- | 12 | util/qemu-coroutine.c | 15 ++++++++++----- |
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 10 insertions(+), 5 deletions(-) |
| 19 | 14 | ||
| 20 | diff --git a/block/parallels-ext.c b/block/parallels-ext.c | 15 | diff --git a/util/qemu-coroutine.c b/util/qemu-coroutine.c |
| 21 | index XXXXXXX..XXXXXXX 100644 | 16 | index XXXXXXX..XXXXXXX 100644 |
| 22 | --- a/block/parallels-ext.c | 17 | --- a/util/qemu-coroutine.c |
| 23 | +++ b/block/parallels-ext.c | 18 | +++ b/util/qemu-coroutine.c |
| 24 | @@ -XXX,XX +XXX,XX @@ static int parallels_parse_format_extension(BlockDriverState *bs, | 19 | @@ -XXX,XX +XXX,XX @@ static unsigned int get_global_pool_hard_max_size(void) |
| 25 | break; | 20 | NULL) && |
| 26 | 21 | qemu_strtoi(contents, NULL, 10, &max_map_count) == 0) { | |
| 27 | default: | 22 | /* |
| 28 | - error_setg(errp, "Unknown feature: 0x%" PRIu64, fh.magic); | 23 | - * This is a conservative upper bound that avoids exceeding |
| 29 | + error_setg(errp, "Unknown feature: 0x%" PRIx64, fh.magic); | 24 | - * max_map_count. Leave half for non-coroutine users like library |
| 30 | goto fail; | 25 | - * dependencies, vhost-user, etc. Each coroutine takes up 2 VMAs so |
| 31 | } | 26 | - * halve the amount again. |
| 27 | + * This is an upper bound that avoids exceeding max_map_count. Leave a | ||
| 28 | + * fixed amount for non-coroutine users like library dependencies, | ||
| 29 | + * vhost-user, etc. Each coroutine takes up 2 VMAs so halve the | ||
| 30 | + * remaining amount. | ||
| 31 | */ | ||
| 32 | - return max_map_count / 4; | ||
| 33 | + if (max_map_count > 5000) { | ||
| 34 | + return (max_map_count - 5000) / 2; | ||
| 35 | + } else { | ||
| 36 | + /* Disable the global pool but threads still have local pools */ | ||
| 37 | + return 0; | ||
| 38 | + } | ||
| 39 | } | ||
| 40 | #endif | ||
| 32 | 41 | ||
| 33 | -- | 42 | -- |
| 34 | 2.35.1 | 43 | 2.44.0 |
| 35 | 44 | ||
| 36 | 45 | diff view generated by jsdifflib |
Deleted patch | |||
|---|---|---|---|
| 1 | From: Philippe Mathieu-Daudé <f4bug@amsat.org> | ||
| 2 | 1 | ||
| 3 | "0x%u" format is very misleading, replace by "0x%x". | ||
| 4 | |||
| 5 | Found running: | ||
| 6 | |||
| 7 | $ git grep -E '0x%[0-9]*([lL]*|" ?PRI)[dDuU]' hw/ | ||
| 8 | |||
| 9 | Inspired-by: Richard Henderson <richard.henderson@linaro.org> | ||
| 10 | Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> | ||
| 11 | Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> | ||
| 12 | Message-id: 20220323114718.58714-3-philippe.mathieu.daude@gmail.com | ||
| 13 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | ||
| 14 | --- | ||
| 15 | hw/i386/sgx.c | 2 +- | ||
| 16 | hw/i386/trace-events | 6 +++--- | ||
| 17 | hw/misc/trace-events | 4 ++-- | ||
| 18 | hw/scsi/trace-events | 4 ++-- | ||
| 19 | 4 files changed, 8 insertions(+), 8 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c | ||
| 22 | index XXXXXXX..XXXXXXX 100644 | ||
| 23 | --- a/hw/i386/sgx.c | ||
| 24 | +++ b/hw/i386/sgx.c | ||
| 25 | @@ -XXX,XX +XXX,XX @@ void pc_machine_init_sgx_epc(PCMachineState *pcms) | ||
| 26 | } | ||
| 27 | |||
| 28 | if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) { | ||
| 29 | - error_report("Size of all 'sgx-epc' =0x%"PRIu64" causes EPC to wrap", | ||
| 30 | + error_report("Size of all 'sgx-epc' =0x%"PRIx64" causes EPC to wrap", | ||
| 31 | sgx_epc->size); | ||
| 32 | exit(EXIT_FAILURE); | ||
| 33 | } | ||
| 34 | diff --git a/hw/i386/trace-events b/hw/i386/trace-events | ||
| 35 | index XXXXXXX..XXXXXXX 100644 | ||
| 36 | --- a/hw/i386/trace-events | ||
| 37 | +++ b/hw/i386/trace-events | ||
| 38 | @@ -XXX,XX +XXX,XX @@ vtd_fault_disabled(void) "Fault processing disabled for context entry" | ||
| 39 | vtd_replay_ce_valid(const char *mode, uint8_t bus, uint8_t dev, uint8_t fn, uint16_t domain, uint64_t hi, uint64_t lo) "%s: replay valid context device %02"PRIx8":%02"PRIx8".%02"PRIx8" domain 0x%"PRIx16" hi 0x%"PRIx64" lo 0x%"PRIx64 | ||
| 40 | vtd_replay_ce_invalid(uint8_t bus, uint8_t dev, uint8_t fn) "replay invalid context device %02"PRIx8":%02"PRIx8".%02"PRIx8 | ||
| 41 | vtd_page_walk_level(uint64_t addr, uint32_t level, uint64_t start, uint64_t end) "walk (base=0x%"PRIx64", level=%"PRIu32") iova range 0x%"PRIx64" - 0x%"PRIx64 | ||
| 42 | -vtd_page_walk_one(uint16_t domain, uint64_t iova, uint64_t gpa, uint64_t mask, int perm) "domain 0x%"PRIu16" iova 0x%"PRIx64" -> gpa 0x%"PRIx64" mask 0x%"PRIx64" perm %d" | ||
| 43 | +vtd_page_walk_one(uint16_t domain, uint64_t iova, uint64_t gpa, uint64_t mask, int perm) "domain 0x%"PRIx16" iova 0x%"PRIx64" -> gpa 0x%"PRIx64" mask 0x%"PRIx64" perm %d" | ||
| 44 | vtd_page_walk_one_skip_map(uint64_t iova, uint64_t mask, uint64_t translated) "iova 0x%"PRIx64" mask 0x%"PRIx64" translated 0x%"PRIx64 | ||
| 45 | vtd_page_walk_one_skip_unmap(uint64_t iova, uint64_t mask) "iova 0x%"PRIx64" mask 0x%"PRIx64 | ||
| 46 | vtd_page_walk_skip_read(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to unable to read" | ||
| 47 | vtd_page_walk_skip_reserve(uint64_t iova, uint64_t next) "Page walk skip iova 0x%"PRIx64" - 0x%"PRIx64" due to rsrv set" | ||
| 48 | vtd_switch_address_space(uint8_t bus, uint8_t slot, uint8_t fn, bool on) "Device %02x:%02x.%x switching address space (iommu enabled=%d)" | ||
| 49 | vtd_as_unmap_whole(uint8_t bus, uint8_t slot, uint8_t fn, uint64_t iova, uint64_t size) "Device %02x:%02x.%x start 0x%"PRIx64" size 0x%"PRIx64 | ||
| 50 | -vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIu16", iova 0x%"PRIx64 | ||
| 51 | -vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIu16" %d" | ||
| 52 | +vtd_translate_pt(uint16_t sid, uint64_t addr) "source id 0x%"PRIx16", iova 0x%"PRIx64 | ||
| 53 | +vtd_pt_enable_fast_path(uint16_t sid, bool success) "sid 0x%"PRIx16" %d" | ||
| 54 | vtd_irq_generate(uint64_t addr, uint64_t data) "addr 0x%"PRIx64" data 0x%"PRIx64 | ||
| 55 | vtd_reg_read(uint64_t addr, uint64_t size) "addr 0x%"PRIx64" size 0x%"PRIx64 | ||
| 56 | vtd_reg_write(uint64_t addr, uint64_t size, uint64_t val) "addr 0x%"PRIx64" size 0x%"PRIx64" value 0x%"PRIx64 | ||
| 57 | diff --git a/hw/misc/trace-events b/hw/misc/trace-events | ||
| 58 | index XXXXXXX..XXXXXXX 100644 | ||
| 59 | --- a/hw/misc/trace-events | ||
| 60 | +++ b/hw/misc/trace-events | ||
| 61 | @@ -XXX,XX +XXX,XX @@ | ||
| 62 | # See docs/devel/tracing.rst for syntax documentation. | ||
| 63 | |||
| 64 | # allwinner-cpucfg.c | ||
| 65 | -allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIu32 | ||
| 66 | +allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_addr 0x%" PRIx32 | ||
| 67 | allwinner_cpucfg_read(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 | ||
| 68 | allwinner_cpucfg_write(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 | ||
| 69 | |||
| 70 | @@ -XXX,XX +XXX,XX @@ imx7_gpr_write(uint64_t offset, uint64_t value) "addr 0x%08" PRIx64 "value 0x%08 | ||
| 71 | |||
| 72 | # mos6522.c | ||
| 73 | mos6522_set_counter(int index, unsigned int val) "T%d.counter=%d" | ||
| 74 | -mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRId64 " delta_next=0x%"PRId64 | ||
| 75 | +mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRIx64 " delta_next=0x%"PRIx64 | ||
| 76 | mos6522_set_sr_int(void) "set sr_int" | ||
| 77 | mos6522_write(uint64_t addr, const char *name, uint64_t val) "reg=0x%"PRIx64 " [%s] val=0x%"PRIx64 | ||
| 78 | mos6522_read(uint64_t addr, const char *name, unsigned val) "reg=0x%"PRIx64 " [%s] val=0x%x" | ||
| 79 | diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events | ||
| 80 | index XXXXXXX..XXXXXXX 100644 | ||
| 81 | --- a/hw/scsi/trace-events | ||
| 82 | +++ b/hw/scsi/trace-events | ||
| 83 | @@ -XXX,XX +XXX,XX @@ lsi_bad_phase_interrupt(void) "Phase mismatch interrupt" | ||
| 84 | lsi_bad_selection(uint32_t id) "Selected absent target %"PRIu32 | ||
| 85 | lsi_do_dma_unavailable(void) "DMA no data available" | ||
| 86 | lsi_do_dma(uint64_t addr, int len) "DMA addr=0x%"PRIx64" len=%d" | ||
| 87 | -lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRId32 | ||
| 88 | +lsi_queue_command(uint32_t tag) "Queueing tag=0x%"PRIx32 | ||
| 89 | lsi_add_msg_byte_error(void) "MSG IN data too long" | ||
| 90 | lsi_add_msg_byte(uint8_t data) "MSG IN 0x%02x" | ||
| 91 | lsi_reselect(int id) "Reselected target %d" | ||
| 92 | @@ -XXX,XX +XXX,XX @@ lsi_do_msgout_noop(void) "MSG: No Operation" | ||
| 93 | lsi_do_msgout_extended(uint8_t msg, uint8_t len) "Extended message 0x%x (len %d)" | ||
| 94 | lsi_do_msgout_ignored(const char *msg) "%s (ignored)" | ||
| 95 | lsi_do_msgout_simplequeue(uint8_t select_tag) "SIMPLE queue tag=0x%x" | ||
| 96 | -lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRId32 | ||
| 97 | +lsi_do_msgout_abort(uint32_t tag) "MSG: ABORT TAG tag=0x%"PRIx32 | ||
| 98 | lsi_do_msgout_clearqueue(uint32_t tag) "MSG: CLEAR QUEUE tag=0x%"PRIx32 | ||
| 99 | lsi_do_msgout_busdevicereset(uint32_t tag) "MSG: BUS DEVICE RESET tag=0x%"PRIx32 | ||
| 100 | lsi_do_msgout_select(int id) "Select LUN %d" | ||
| 101 | -- | ||
| 102 | 2.35.1 | ||
| 103 | |||
| 104 | diff view generated by jsdifflib |