* [Qemu-devel] [PATCH] target/mips: hold BQL for timer interrupts
@ 2017-03-03 11:20 Yongbok Kim
2017-03-06 10:43 ` Alex Bennée
2017-03-06 11:40 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 3+ messages in thread
From: Yongbok Kim @ 2017-03-03 11:20 UTC (permalink / raw)
To: QEMU Developers; +Cc: Alex Bennée
Hold BQL when accessing timer which can cause interrupts
Signed-off-by: Yongbok Kim <yongbok.kim@imgtec.com>
---
target/mips/op_helper.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c
index b683fcb..e5f3ea4 100644
--- a/target/mips/op_helper.c
+++ b/target/mips/op_helper.c
@@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
+#include "qemu/main-loop.h"
#include "cpu.h"
#include "qemu/host-utils.h"
#include "exec/helper-proto.h"
@@ -827,7 +828,11 @@ target_ulong helper_mftc0_tcschefback(CPUMIPSState *env)
target_ulong helper_mfc0_count(CPUMIPSState *env)
{
- return (int32_t)cpu_mips_get_count(env);
+ int32_t count;
+ qemu_mutex_lock_iothread();
+ count = (int32_t) cpu_mips_get_count(env);
+ qemu_mutex_unlock_iothread();
+ return count;
}
target_ulong helper_mftc0_entryhi(CPUMIPSState *env)
@@ -1375,7 +1380,9 @@ void helper_mtc0_hwrena(CPUMIPSState *env, target_ulong arg1)
void helper_mtc0_count(CPUMIPSState *env, target_ulong arg1)
{
+ qemu_mutex_lock_iothread();
cpu_mips_store_count(env, arg1);
+ qemu_mutex_unlock_iothread();
}
void helper_mtc0_entryhi(CPUMIPSState *env, target_ulong arg1)
@@ -1424,7 +1431,9 @@ void helper_mttc0_entryhi(CPUMIPSState *env, target_ulong arg1)
void helper_mtc0_compare(CPUMIPSState *env, target_ulong arg1)
{
+ qemu_mutex_lock_iothread();
cpu_mips_store_compare(env, arg1);
+ qemu_mutex_unlock_iothread();
}
void helper_mtc0_status(CPUMIPSState *env, target_ulong arg1)
@@ -1475,7 +1484,9 @@ void helper_mtc0_srsctl(CPUMIPSState *env, target_ulong arg1)
void helper_mtc0_cause(CPUMIPSState *env, target_ulong arg1)
{
+ qemu_mutex_lock_iothread();
cpu_mips_store_cause(env, arg1);
+ qemu_mutex_unlock_iothread();
}
void helper_mttc0_cause(CPUMIPSState *env, target_ulong arg1)
@@ -2296,12 +2307,16 @@ target_ulong helper_rdhwr_synci_step(CPUMIPSState *env)
target_ulong helper_rdhwr_cc(CPUMIPSState *env)
{
+ int32_t count;
check_hwrena(env, 2, GETPC());
#ifdef CONFIG_USER_ONLY
- return env->CP0_Count;
+ count = env->CP0_Count;
#else
- return (int32_t)cpu_mips_get_count(env);
+ qemu_mutex_lock_iothread();
+ count = (int32_t)cpu_mips_get_count(env);
+ qemu_mutex_unlock_iothread();
#endif
+ return count;
}
target_ulong helper_rdhwr_ccres(CPUMIPSState *env)
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] target/mips: hold BQL for timer interrupts
2017-03-03 11:20 [Qemu-devel] [PATCH] target/mips: hold BQL for timer interrupts Yongbok Kim
@ 2017-03-06 10:43 ` Alex Bennée
2017-03-06 11:40 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Alex Bennée @ 2017-03-06 10:43 UTC (permalink / raw)
To: Yongbok Kim; +Cc: QEMU Developers
Yongbok Kim <yongbok.kim@imgtec.com> writes:
> Hold BQL when accessing timer which can cause interrupts
>
> Signed-off-by: Yongbok Kim <yongbok.kim@imgtec.com>
Thanks, applied to my tree.
> ---
> target/mips/op_helper.c | 21 ++++++++++++++++++---
> 1 file changed, 18 insertions(+), 3 deletions(-)
>
> diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c
> index b683fcb..e5f3ea4 100644
> --- a/target/mips/op_helper.c
> +++ b/target/mips/op_helper.c
> @@ -17,6 +17,7 @@
> * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> */
> #include "qemu/osdep.h"
> +#include "qemu/main-loop.h"
> #include "cpu.h"
> #include "qemu/host-utils.h"
> #include "exec/helper-proto.h"
> @@ -827,7 +828,11 @@ target_ulong helper_mftc0_tcschefback(CPUMIPSState *env)
>
> target_ulong helper_mfc0_count(CPUMIPSState *env)
> {
> - return (int32_t)cpu_mips_get_count(env);
> + int32_t count;
> + qemu_mutex_lock_iothread();
> + count = (int32_t) cpu_mips_get_count(env);
> + qemu_mutex_unlock_iothread();
> + return count;
> }
>
> target_ulong helper_mftc0_entryhi(CPUMIPSState *env)
> @@ -1375,7 +1380,9 @@ void helper_mtc0_hwrena(CPUMIPSState *env, target_ulong arg1)
>
> void helper_mtc0_count(CPUMIPSState *env, target_ulong arg1)
> {
> + qemu_mutex_lock_iothread();
> cpu_mips_store_count(env, arg1);
> + qemu_mutex_unlock_iothread();
> }
>
> void helper_mtc0_entryhi(CPUMIPSState *env, target_ulong arg1)
> @@ -1424,7 +1431,9 @@ void helper_mttc0_entryhi(CPUMIPSState *env, target_ulong arg1)
>
> void helper_mtc0_compare(CPUMIPSState *env, target_ulong arg1)
> {
> + qemu_mutex_lock_iothread();
> cpu_mips_store_compare(env, arg1);
> + qemu_mutex_unlock_iothread();
> }
>
> void helper_mtc0_status(CPUMIPSState *env, target_ulong arg1)
> @@ -1475,7 +1484,9 @@ void helper_mtc0_srsctl(CPUMIPSState *env, target_ulong arg1)
>
> void helper_mtc0_cause(CPUMIPSState *env, target_ulong arg1)
> {
> + qemu_mutex_lock_iothread();
> cpu_mips_store_cause(env, arg1);
> + qemu_mutex_unlock_iothread();
> }
>
> void helper_mttc0_cause(CPUMIPSState *env, target_ulong arg1)
> @@ -2296,12 +2307,16 @@ target_ulong helper_rdhwr_synci_step(CPUMIPSState *env)
>
> target_ulong helper_rdhwr_cc(CPUMIPSState *env)
> {
> + int32_t count;
> check_hwrena(env, 2, GETPC());
> #ifdef CONFIG_USER_ONLY
> - return env->CP0_Count;
> + count = env->CP0_Count;
> #else
> - return (int32_t)cpu_mips_get_count(env);
> + qemu_mutex_lock_iothread();
> + count = (int32_t)cpu_mips_get_count(env);
> + qemu_mutex_unlock_iothread();
> #endif
> + return count;
> }
>
> target_ulong helper_rdhwr_ccres(CPUMIPSState *env)
--
Alex Bennée
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] target/mips: hold BQL for timer interrupts
2017-03-03 11:20 [Qemu-devel] [PATCH] target/mips: hold BQL for timer interrupts Yongbok Kim
2017-03-06 10:43 ` Alex Bennée
@ 2017-03-06 11:40 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-03-06 11:40 UTC (permalink / raw)
To: Yongbok Kim; +Cc: QEMU Developers, Alex Bennée
On Fri, Mar 3, 2017 at 8:20 AM, Yongbok Kim <yongbok.kim@imgtec.com> wrote:
> Hold BQL when accessing timer which can cause interrupts
>
> Signed-off-by: Yongbok Kim <yongbok.kim@imgtec.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> target/mips/op_helper.c | 21 ++++++++++++++++++---
> 1 file changed, 18 insertions(+), 3 deletions(-)
>
> diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c
> index b683fcb..e5f3ea4 100644
> --- a/target/mips/op_helper.c
> +++ b/target/mips/op_helper.c
> @@ -17,6 +17,7 @@
> * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> */
> #include "qemu/osdep.h"
> +#include "qemu/main-loop.h"
> #include "cpu.h"
> #include "qemu/host-utils.h"
> #include "exec/helper-proto.h"
> @@ -827,7 +828,11 @@ target_ulong helper_mftc0_tcschefback(CPUMIPSState *env)
>
> target_ulong helper_mfc0_count(CPUMIPSState *env)
> {
> - return (int32_t)cpu_mips_get_count(env);
> + int32_t count;
> + qemu_mutex_lock_iothread();
> + count = (int32_t) cpu_mips_get_count(env);
> + qemu_mutex_unlock_iothread();
> + return count;
> }
>
> target_ulong helper_mftc0_entryhi(CPUMIPSState *env)
> @@ -1375,7 +1380,9 @@ void helper_mtc0_hwrena(CPUMIPSState *env, target_ulong arg1)
>
> void helper_mtc0_count(CPUMIPSState *env, target_ulong arg1)
> {
> + qemu_mutex_lock_iothread();
> cpu_mips_store_count(env, arg1);
> + qemu_mutex_unlock_iothread();
> }
>
> void helper_mtc0_entryhi(CPUMIPSState *env, target_ulong arg1)
> @@ -1424,7 +1431,9 @@ void helper_mttc0_entryhi(CPUMIPSState *env, target_ulong arg1)
>
> void helper_mtc0_compare(CPUMIPSState *env, target_ulong arg1)
> {
> + qemu_mutex_lock_iothread();
> cpu_mips_store_compare(env, arg1);
> + qemu_mutex_unlock_iothread();
> }
>
> void helper_mtc0_status(CPUMIPSState *env, target_ulong arg1)
> @@ -1475,7 +1484,9 @@ void helper_mtc0_srsctl(CPUMIPSState *env, target_ulong arg1)
>
> void helper_mtc0_cause(CPUMIPSState *env, target_ulong arg1)
> {
> + qemu_mutex_lock_iothread();
> cpu_mips_store_cause(env, arg1);
> + qemu_mutex_unlock_iothread();
> }
>
> void helper_mttc0_cause(CPUMIPSState *env, target_ulong arg1)
> @@ -2296,12 +2307,16 @@ target_ulong helper_rdhwr_synci_step(CPUMIPSState *env)
>
> target_ulong helper_rdhwr_cc(CPUMIPSState *env)
> {
> + int32_t count;
> check_hwrena(env, 2, GETPC());
> #ifdef CONFIG_USER_ONLY
> - return env->CP0_Count;
> + count = env->CP0_Count;
> #else
> - return (int32_t)cpu_mips_get_count(env);
> + qemu_mutex_lock_iothread();
> + count = (int32_t)cpu_mips_get_count(env);
> + qemu_mutex_unlock_iothread();
> #endif
> + return count;
> }
>
> target_ulong helper_rdhwr_ccres(CPUMIPSState *env)
> --
> 2.7.4
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-06 11:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-03 11:20 [Qemu-devel] [PATCH] target/mips: hold BQL for timer interrupts Yongbok Kim
2017-03-06 10:43 ` Alex Bennée
2017-03-06 11:40 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).