1 | Just one patch, but should make stable 2.10.1 this week. | 1 | v2: Fix target/loongarch printf formats for vaddr |
---|---|---|---|
2 | Include two more reviewed patches. | ||
2 | 3 | ||
4 | This time with actual pull urls. :-/ | ||
3 | 5 | ||
4 | r~ | 6 | r~ |
5 | 7 | ||
6 | 8 | ||
7 | The following changes since commit 460b6c8e581aa06b86f59eebd9e52edfe7adf417: | 9 | The following changes since commit db7aa99ef894e88fc5eedf02ca2579b8c344b2ec: |
8 | 10 | ||
9 | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2017-09-23 12:55:40 +0100) | 11 | Merge tag 'hw-misc-20250216' of https://github.com/philmd/qemu into staging (2025-02-16 20:48:06 -0500) |
10 | 12 | ||
11 | are available in the git repository at: | 13 | are available in the Git repository at: |
12 | 14 | ||
13 | git://github.com/rth7680/qemu.git tags/pull-tcg-20170925 | 15 | https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20250215-2 |
14 | 16 | ||
15 | for you to fetch changes up to 8b81253332b5a3f3c67b6462f39caef47a00dd29: | 17 | for you to fetch changes up to a39bdd0f4ba96fcbb6b5bcb6e89591d2b24f52eb: |
16 | 18 | ||
17 | accel/tcg/cputlb: avoid recursive BQL (fixes #1706296) (2017-09-25 11:23:30 -0700) | 19 | tcg: Remove TCG_TARGET_HAS_{br,set}cond2 from riscv and loongarch64 (2025-02-17 09:52:07 -0800) |
18 | 20 | ||
19 | ---------------------------------------------------------------- | 21 | ---------------------------------------------------------------- |
20 | BQL bug fix | 22 | tcg: Remove last traces of TCG_TARGET_NEED_POOL_LABELS |
23 | tcg: Cleanups after disallowing 64-on-32 | ||
24 | tcg: Introduce constraint for zero register | ||
25 | tcg: Remove TCG_TARGET_HAS_{br,set}cond2 from riscv and loongarch64 | ||
26 | tcg/i386: Use tcg_{high,unsigned}_cond in tcg_out_brcond2 | ||
27 | linux-user: Move TARGET_SA_RESTORER out of generic/signal.h | ||
28 | linux-user: Fix alignment when unmapping excess reservation | ||
29 | target/sparc: Fix register selection for all F*TOx and FxTO* instructions | ||
30 | target/sparc: Fix gdbstub incorrectly handling registers f32-f62 | ||
31 | target/sparc: fake UltraSPARC T1 PCR and PIC registers | ||
21 | 32 | ||
22 | ---------------------------------------------------------------- | 33 | ---------------------------------------------------------------- |
23 | Alex Bennée (1): | 34 | Andreas Schwab (1): |
24 | accel/tcg/cputlb: avoid recursive BQL (fixes #1706296) | 35 | linux-user: Move TARGET_SA_RESTORER out of generic/signal.h |
25 | 36 | ||
26 | accel/tcg/cputlb.c | 4 ++-- | 37 | Artyom Tarasenko (1): |
27 | 1 file changed, 2 insertions(+), 2 deletions(-) | 38 | target/sparc: fake UltraSPARC T1 PCR and PIC registers |
28 | 39 | ||
40 | Fabiano Rosas (1): | ||
41 | elfload: Fix alignment when unmapping excess reservation | ||
42 | |||
43 | Mikael Szreder (2): | ||
44 | target/sparc: Fix register selection for all F*TOx and FxTO* instructions | ||
45 | target/sparc: Fix gdbstub incorrectly handling registers f32-f62 | ||
46 | |||
47 | Richard Henderson (22): | ||
48 | tcg: Remove last traces of TCG_TARGET_NEED_POOL_LABELS | ||
49 | tcg: Remove TCG_OVERSIZED_GUEST | ||
50 | tcg: Drop support for two address registers in gen_ldst | ||
51 | tcg: Merge INDEX_op_qemu_*_{a32,a64}_* | ||
52 | tcg/arm: Drop addrhi from prepare_host_addr | ||
53 | tcg/i386: Drop addrhi from prepare_host_addr | ||
54 | tcg/mips: Drop addrhi from prepare_host_addr | ||
55 | tcg/ppc: Drop addrhi from prepare_host_addr | ||
56 | tcg: Replace addr{lo,hi}_reg with addr_reg in TCGLabelQemuLdst | ||
57 | plugins: Fix qemu_plugin_read_memory_vaddr parameters | ||
58 | accel/tcg: Fix tlb_set_page_with_attrs, tlb_set_page | ||
59 | target/loongarch: Use VADDR_PRIx for logging pc_next | ||
60 | include/exec: Change vaddr to uintptr_t | ||
61 | include/exec: Use uintptr_t in CPUTLBEntry | ||
62 | tcg: Introduce the 'z' constraint for a hardware zero register | ||
63 | tcg/aarch64: Use 'z' constraint | ||
64 | tcg/loongarch64: Use 'z' constraint | ||
65 | tcg/mips: Use 'z' constraint | ||
66 | tcg/riscv: Use 'z' constraint | ||
67 | tcg/sparc64: Use 'z' constraint | ||
68 | tcg/i386: Use tcg_{high,unsigned}_cond in tcg_out_brcond2 | ||
69 | tcg: Remove TCG_TARGET_HAS_{br,set}cond2 from riscv and loongarch64 | ||
70 | |||
71 | include/exec/tlb-common.h | 10 +- | ||
72 | include/exec/vaddr.h | 16 +- | ||
73 | include/qemu/atomic.h | 18 +- | ||
74 | include/tcg/oversized-guest.h | 23 --- | ||
75 | include/tcg/tcg-opc.h | 28 +-- | ||
76 | include/tcg/tcg.h | 3 +- | ||
77 | linux-user/aarch64/target_signal.h | 2 + | ||
78 | linux-user/arm/target_signal.h | 2 + | ||
79 | linux-user/generic/signal.h | 1 - | ||
80 | linux-user/i386/target_signal.h | 2 + | ||
81 | linux-user/m68k/target_signal.h | 1 + | ||
82 | linux-user/microblaze/target_signal.h | 2 + | ||
83 | linux-user/ppc/target_signal.h | 2 + | ||
84 | linux-user/s390x/target_signal.h | 2 + | ||
85 | linux-user/sh4/target_signal.h | 2 + | ||
86 | linux-user/x86_64/target_signal.h | 2 + | ||
87 | linux-user/xtensa/target_signal.h | 2 + | ||
88 | tcg/aarch64/tcg-target-con-set.h | 12 +- | ||
89 | tcg/aarch64/tcg-target.h | 2 + | ||
90 | tcg/loongarch64/tcg-target-con-set.h | 15 +- | ||
91 | tcg/loongarch64/tcg-target-con-str.h | 1 - | ||
92 | tcg/loongarch64/tcg-target-has.h | 2 - | ||
93 | tcg/loongarch64/tcg-target.h | 2 + | ||
94 | tcg/mips/tcg-target-con-set.h | 26 +-- | ||
95 | tcg/mips/tcg-target-con-str.h | 1 - | ||
96 | tcg/mips/tcg-target.h | 2 + | ||
97 | tcg/riscv/tcg-target-con-set.h | 10 +- | ||
98 | tcg/riscv/tcg-target-con-str.h | 1 - | ||
99 | tcg/riscv/tcg-target-has.h | 2 - | ||
100 | tcg/riscv/tcg-target.h | 2 + | ||
101 | tcg/sparc64/tcg-target-con-set.h | 12 +- | ||
102 | tcg/sparc64/tcg-target-con-str.h | 1 - | ||
103 | tcg/sparc64/tcg-target.h | 3 +- | ||
104 | tcg/tci/tcg-target.h | 1 - | ||
105 | accel/tcg/cputlb.c | 32 +--- | ||
106 | accel/tcg/tcg-all.c | 9 +- | ||
107 | linux-user/elfload.c | 4 +- | ||
108 | plugins/api.c | 2 +- | ||
109 | target/arm/ptw.c | 34 ---- | ||
110 | target/loongarch/tcg/translate.c | 2 +- | ||
111 | target/riscv/cpu_helper.c | 13 +- | ||
112 | target/sparc/gdbstub.c | 18 +- | ||
113 | target/sparc/translate.c | 19 +++ | ||
114 | tcg/optimize.c | 21 +-- | ||
115 | tcg/tcg-op-ldst.c | 103 +++-------- | ||
116 | tcg/tcg.c | 97 +++++------ | ||
117 | tcg/tci.c | 119 +++---------- | ||
118 | docs/devel/multi-thread-tcg.rst | 1 - | ||
119 | docs/devel/tcg-ops.rst | 4 +- | ||
120 | target/loongarch/tcg/insn_trans/trans_atomic.c.inc | 2 +- | ||
121 | target/sparc/insns.decode | 19 ++- | ||
122 | tcg/aarch64/tcg-target.c.inc | 86 ++++------ | ||
123 | tcg/arm/tcg-target.c.inc | 114 ++++--------- | ||
124 | tcg/i386/tcg-target.c.inc | 190 +++++---------------- | ||
125 | tcg/loongarch64/tcg-target.c.inc | 72 +++----- | ||
126 | tcg/mips/tcg-target.c.inc | 169 ++++++------------ | ||
127 | tcg/ppc/tcg-target.c.inc | 164 +++++------------- | ||
128 | tcg/riscv/tcg-target.c.inc | 56 +++--- | ||
129 | tcg/s390x/tcg-target.c.inc | 40 ++--- | ||
130 | tcg/sparc64/tcg-target.c.inc | 45 ++--- | ||
131 | tcg/tci/tcg-target.c.inc | 60 ++----- | ||
132 | 61 files changed, 548 insertions(+), 1160 deletions(-) | ||
133 | delete mode 100644 include/tcg/oversized-guest.h | diff view generated by jsdifflib |
Deleted patch | |||
---|---|---|---|
1 | From: Alex Bennée <alex.bennee@linaro.org> | ||
2 | 1 | ||
3 | The mmio path (see exec.c:prepare_mmio_access) already protects itself | ||
4 | against recursive locking and it makes sense to do the same for | ||
5 | io_readx/writex. Otherwise any helper running in the BQL context will | ||
6 | assert when it attempts to write to device memory as in the case of | ||
7 | the bug report. | ||
8 | |||
9 | Reviewed-by: Peter Maydell <peter.maydell@linaro.org> | ||
10 | Signed-off-by: Alex Bennée <alex.bennee@linaro.org> | ||
11 | CC: Richard Jones <rjones@redhat.com> | ||
12 | CC: Paolo Bonzini <bonzini@gnu.org> | ||
13 | CC: qemu-stable@nongnu.org | ||
14 | Message-Id: <20170921110625.9500-1-alex.bennee@linaro.org> | ||
15 | Signed-off-by: Richard Henderson <richard.henderson@linaro.org> | ||
16 | --- | ||
17 | accel/tcg/cputlb.c | 4 ++-- | ||
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c | ||
21 | index XXXXXXX..XXXXXXX 100644 | ||
22 | --- a/accel/tcg/cputlb.c | ||
23 | +++ b/accel/tcg/cputlb.c | ||
24 | @@ -XXX,XX +XXX,XX @@ static uint64_t io_readx(CPUArchState *env, CPUIOTLBEntry *iotlbentry, | ||
25 | |||
26 | cpu->mem_io_vaddr = addr; | ||
27 | |||
28 | - if (mr->global_locking) { | ||
29 | + if (mr->global_locking && !qemu_mutex_iothread_locked()) { | ||
30 | qemu_mutex_lock_iothread(); | ||
31 | locked = true; | ||
32 | } | ||
33 | @@ -XXX,XX +XXX,XX @@ static void io_writex(CPUArchState *env, CPUIOTLBEntry *iotlbentry, | ||
34 | cpu->mem_io_vaddr = addr; | ||
35 | cpu->mem_io_pc = retaddr; | ||
36 | |||
37 | - if (mr->global_locking) { | ||
38 | + if (mr->global_locking && !qemu_mutex_iothread_locked()) { | ||
39 | qemu_mutex_lock_iothread(); | ||
40 | locked = true; | ||
41 | } | ||
42 | -- | ||
43 | 2.13.5 | ||
44 | |||
45 | diff view generated by jsdifflib |