mttcg/i386: Patch instruction using async_safe_* framework
PATCH v2 1/1 mttcg/i386: Patch instruction using async_safe_* framework
In mttcg, calling pause_all_vcpus() during execution from the generated TBs causes a deadlock if some vCPU is waiting for exclusive execution in start_exclusive(). Fix this by using the aync_safe_* framework instead of pausing vcpus for patching instructions.
--- hw/i386/kvmvapic.c | 82 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 30 deletions(-)
hw/i386/kvmvapic.c +52 -30
@@ -383,8 +383,7 @@ static void patch_byte(X86CPU *cpu, target_ulong addr, uint8_t byte)cpu_memory_rw_debug (CPU (cpu), addr, &byte,1 ,1 ); } -static void patch_call (VAPICROMState *s,X86CPU *cpu,target_ulong ip, -uint32_t target) +static void patch_call (X86CPU *cpu,target_ulong ip,uint32_t target) {uint32_t offset;
@@ -393,23 +392,24 @@ static void patch_call(VAPICROMState *s, X86CPU *cpu, target_ulong ip,cpu_memory_rw_debug (CPU (cpu), ip +1 , (void *)&offset,sizeof (offset),1 ); } -static void patch_instruction (VAPICROMState *s,X86CPU *cpu,target_ulong ip) +struct PatchInfo { +VAPICHandlers *handler; +target_ulong ip; +}; + +static void do_patch_instruction (CPUState *cs,run_on_cpu_data data) { -CPUState *cs =CPU (cpu); -CPUX86State *env = &cpu->env; -VAPICHandlers *handlers; +X86CPU *x86_cpu =X86_CPU (cs); +CPUX86State *env = &x86_cpu->env; +struct PatchInfo *info = (struct PatchInfo *) data.host_ptr; +VAPICHandlers *handlers = info->handler; +target_ulong ip = info->ip;uint8_t opcode[2 ];uint32_t imm32 =0 ;target_ulong current_pc =0 ;target_ulong current_cs_base =0 ;uint32_t current_flags =0 ; -if (smp_cpus ==1 ) { - handlers = &s->rom_state.up; - }else { - handlers = &s->rom_state.mp; - } -if (!kvm_enabled ()) {cpu_get_tb_cpu_state (env, ¤t_pc, ¤t_cs_base, ¤t_flags);
@@ -421,48 +421,70 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip) } } -pause_all_vcpus (); -cpu_memory_rw_debug (cs, ip, opcode,sizeof (opcode),0 );switch (opcode[0 ]) {case 0x89 :/* mov r32 to r/m32 */ -patch_byte (cpu, ip,0x50 +modrm_reg (opcode[1 ]));/* push reg */ -patch_call (s, cpu, ip +1 , handlers->set_tpr); +patch_byte (x86_cpu, ip,0x50 +modrm_reg (opcode[1 ]));/* push reg */ +patch_call (x86_cpu, ip +1 , handlers->set_tpr);break ;case 0x8b :/* mov r/m32 to r32 */ -patch_byte (cpu, ip,0x90 ); -patch_call (s, cpu, ip +1 , handlers->get_tpr[modrm_reg (opcode[1 ])]); +patch_byte (x86_cpu, ip,0x90 ); +patch_call (x86_cpu, ip +1 , handlers->get_tpr[modrm_reg (opcode[1 ])]);break ;case 0xa1 :/* mov abs to eax */ -patch_call (s, cpu, ip, handlers->get_tpr[0 ]); +patch_call (x86_cpu, ip, handlers->get_tpr[0 ]);break ;case 0xa3 :/* mov eax to abs */ -patch_call (s, cpu, ip, handlers->set_tpr_eax); +patch_call (x86_cpu, ip, handlers->set_tpr_eax);break ;case 0xc7 :/* mov imm32, r/m32 (c7/0) */ -patch_byte (cpu, ip,0x68 );/* push imm32 */ +patch_byte (x86_cpu, ip,0x68 );/* push imm32 */ cpu_memory_rw_debug (cs, ip +6 , (void *)&imm32,sizeof (imm32),0 );cpu_memory_rw_debug (cs, ip +1 , (void *)&imm32,sizeof (imm32),1 ); -patch_call (s, cpu, ip +5 , handlers->set_tpr); +patch_call (x86_cpu, ip +5 , handlers->set_tpr);break ;case 0xff :/* push r/m32 */ -patch_byte (cpu, ip,0x50 );/* push eax */ -patch_call (s, cpu, ip +1 , handlers->get_tpr_stack); +patch_byte (x86_cpu, ip,0x50 );/* push eax */ +patch_call (x86_cpu, ip +1 , handlers->get_tpr_stack);break ;default :abort (); } -resume_all_vcpus (); +g_free (info); +} + +static void patch_instruction (VAPICROMState *s,X86CPU *cpu,target_ulong ip) +{ +CPUState *cs =CPU (cpu); +VAPICHandlers *handlers; +struct PatchInfo *info; + +if (smp_cpus ==1 ) { + handlers = &s->rom_state.up; + }else { + handlers = &s->rom_state.mp; + } + + info = g_new(struct PatchInfo, 1); + info->handler = handlers; + info->ip = ip;if (!kvm_enabled ()) { -/* Both tb_lock and iothread_mutex will be reset when -* longjmps back into the cpu_exec loop. */ -tb_lock (); -tb_gen_code (cs, current_pc, current_cs_base, current_flags,1 ); -cpu_loop_exit_noexc (cs); +const run_on_cpu_func fn = do_patch_instruction; + +async_safe_run_on_cpu (cs, fn,RUN_ON_CPU_HOST_PTR (info)); + cs->exception_index =EXCP_INTERRUPT ; +cpu_loop_exit (cs); } + +pause_all_vcpus (); + +do_patch_instruction (cs,RUN_ON_CPU_HOST_PTR (info)); + +resume_all_vcpus (); +g_free (info); } void vapic_report_tpr_access(DeviceState *dev, CPUState *cs, target_ulong ip,
Signature · 1 line
2.7.4
Quoted 5 lines · Pranith Kumar
In mttcg, calling
pause_all_vcpus()during execution from the generated TBs causes a deadlock if some vCPU is waiting for exclusive execution instart_exclusive(). Fix this by using the aync_safe_* framework instead of pausing vcpus for patching instructions.
Quoted 7 lines
CC Richard Henderson <[email protected]>CC Peter Maydell <[email protected]>CC Alex Bennée <[email protected]>Signed-off-by Pranith Kumar <[email protected]>--- hw/i386/kvmvapic.c | 82 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 30 deletions(-)
r~
Quoted 138 lines · Pranith Kumar
In mttcg, calling
pause_all_vcpus()during execution from the generated TBs causes a deadlock if some vCPU is waiting for exclusive execution instart_exclusive(). Fix this by using the aync_safe_* framework instead of pausing vcpus for patching instructions.CC Richard Henderson <[email protected]>CC Peter Maydell <[email protected]>CC Alex Bennée <[email protected]>Signed-off-by Pranith Kumar <[email protected]>--- hw/i386/kvmvapic.c | 82 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 30 deletions(-)hw/i386/kvmvapic.c +43
-30@@ -383,8 +383,7 @@ static void patch_byte(X86CPU *cpu, target_ulong addr, uint8_t byte)cpu_memory_rw_debug (CPU (cpu), addr, &byte,1 ,1 ); } -static void patch_call (VAPICROMState *s,X86CPU *cpu,target_ulong ip, -uint32_t target) +static void patch_call (X86CPU *cpu,target_ulong ip,uint32_t target) {uint32_t offset;@@ -393,23 +392,24 @@ static void patch_call(VAPICROMState *s, X86CPU *cpu, target_ulong ip,cpu_memory_rw_debug (CPU (cpu), ip +1 , (void *)&offset,sizeof (offset),1 ); } -static void patch_instruction (VAPICROMState *s,X86CPU *cpu,target_ulong ip) +struct PatchInfo { +VAPICHandlers *handler; +target_ulong ip; +}; + +static void do_patch_instruction (CPUState *cs,run_on_cpu_data data) { -CPUState *cs =CPU (cpu); -CPUX86State *env = &cpu->env; -VAPICHandlers *handlers; +X86CPU *x86_cpu =X86_CPU (cs); +CPUX86State *env = &x86_cpu->env; +struct PatchInfo *info = (struct PatchInfo *) data.host_ptr; +VAPICHandlers *handlers = info->handler; +target_ulong ip = info->ip;uint8_t opcode[2 ];uint32_t imm32 =0 ;target_ulong current_pc =0 ;target_ulong current_cs_base =0 ;uint32_t current_flags =0 ; -if (smp_cpus ==1 ) { - handlers = &s->rom_state.up; - }else { - handlers = &s->rom_state.mp; - } -if (!kvm_enabled ()) {cpu_get_tb_cpu_state (env, ¤t_pc, ¤t_cs_base, ¤t_flags);@@ -421,48 +421,70 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip) } } -pause_all_vcpus (); -cpu_memory_rw_debug (cs, ip, opcode,sizeof (opcode),0 );switch (opcode[0 ]) {case 0x89 :/* mov r32 to r/m32 */ -patch_byte (cpu, ip,0x50 +modrm_reg (opcode[1 ]));/* push reg */ -patch_call (s, cpu, ip +1 , handlers->set_tpr); +patch_byte (x86_cpu, ip,0x50 +modrm_reg (opcode[1 ]));/* push reg */ +patch_call (x86_cpu, ip +1 , handlers->set_tpr);break ;case 0x8b :/* mov r/m32 to r32 */ -patch_byte (cpu, ip,0x90 ); -patch_call (s, cpu, ip +1 , handlers->get_tpr[modrm_reg (opcode[1 ])]); +patch_byte (x86_cpu, ip,0x90 ); +patch_call (x86_cpu, ip +1 , handlers->get_tpr[modrm_reg (opcode[1 ])]);break ;case 0xa1 :/* mov abs to eax */ -patch_call (s, cpu, ip, handlers->get_tpr[0 ]); +patch_call (x86_cpu, ip, handlers->get_tpr[0 ]);break ;case 0xa3 :/* mov eax to abs */ -patch_call (s, cpu, ip, handlers->set_tpr_eax); +patch_call (x86_cpu, ip, handlers->set_tpr_eax);break ;case 0xc7 :/* mov imm32, r/m32 (c7/0) */ -patch_byte (cpu, ip,0x68 );/* push imm32 */ +patch_byte (x86_cpu, ip,0x68 );/* push imm32 */ cpu_memory_rw_debug (cs, ip +6 , (void *)&imm32,sizeof (imm32),0 );cpu_memory_rw_debug (cs, ip +1 , (void *)&imm32,sizeof (imm32),1 ); -patch_call (s, cpu, ip +5 , handlers->set_tpr); +patch_call (x86_cpu, ip +5 , handlers->set_tpr);break ;case 0xff :/* push r/m32 */ -patch_byte (cpu, ip,0x50 );/* push eax */ -patch_call (s, cpu, ip +1 , handlers->get_tpr_stack); +patch_byte (x86_cpu, ip,0x50 );/* push eax */ +patch_call (x86_cpu, ip +1 , handlers->get_tpr_stack);break ;default :abort (); } -resume_all_vcpus (); +g_free (info); +} + +static void patch_instruction (VAPICROMState *s,X86CPU *cpu,target_ulong ip) +{ +CPUState *cs =CPU (cpu); +VAPICHandlers *handlers; +struct PatchInfo *info; + +if (smp_cpus ==1 ) { + handlers = &s->rom_state.up; + }else { + handlers = &s->rom_state.mp; + } + + info = g_new(struct PatchInfo, 1); + info->handler = handlers; + info->ip = ip;if (!kvm_enabled ()) { -/* Both tb_lock and iothread_mutex will be reset when -* longjmps back into the cpu_exec loop. */ -tb_lock (); -tb_gen_code (cs, current_pc, current_cs_base, current_flags,1 ); -cpu_loop_exit_noexc (cs); +const run_on_cpu_func fn = do_patch_instruction; + +async_safe_run_on_cpu (cs, fn,RUN_ON_CPU_HOST_PTR (info));
hw/i386/kvmvapic.c static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip) · line 487
Quoted 10 lines
hw/i386/kvmvapic.c +9
-0+ cs->exception_index =EXCP_INTERRUPT ; +cpu_loop_exit (cs); } + +pause_all_vcpus (); + +do_patch_instruction (cs,RUN_ON_CPU_HOST_PTR (info)); + +resume_all_vcpus (); +g_free (info);
I don't know if there is any benefit scheduling this as async work for KVM but I'll leave that up to Paolo to decide. From a TCG point of view I think its good:
Quoted 3 lines
hw/i386/kvmvapic.c +0
-0} void vapic_report_tpr_access(DeviceState *dev, CPUState *cs, target_ulong ip,
Signature · 1 line
Alex Bennée
Hi Alex,
Quoted 7 lines · Alex Bennée
Quoted 5 lines · Pranith Kumar
In mttcg, calling
pause_all_vcpus()during execution from the generated TBs causes a deadlock if some vCPU is waiting for exclusive execution instart_exclusive(). Fix this by using the aync_safe_* framework instead of pausing vcpus for patching instructions.
<...>
Quoted 39 lines
Quoted 39 lines
hw/i386/kvmvapic.c +26
-7--- a/hw/i386/kvmvapic.c -resume_all_vcpus (); +g_free (info); +} + +static void patch_instruction (VAPICROMState *s,X86CPU *cpu,target_ulong ip) +{ +CPUState *cs =CPU (cpu); +VAPICHandlers *handlers; +struct PatchInfo *info; + +if (smp_cpus ==1 ) { + handlers = &s->rom_state.up; + }else { + handlers = &s->rom_state.mp; + } + + info = g_new(struct PatchInfo, 1); + info->handler = handlers; + info->ip = ip;if (!kvm_enabled ()) { -/* Both tb_lock and iothread_mutex will be reset when -* longjmps back into the cpu_exec loop. */ -tb_lock (); -tb_gen_code (cs, current_pc, current_cs_base, current_flags,1 ); -cpu_loop_exit_noexc (cs); +const run_on_cpu_func fn = do_patch_instruction; + +async_safe_run_on_cpu (cs, fn,RUN_ON_CPU_HOST_PTR (info)); + cs->exception_index =EXCP_INTERRUPT ; +cpu_loop_exit (cs); } + +pause_all_vcpus (); +
Quoted 9 lines
hw/i386/kvmvapic.c static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip) · line 487
Quoted 4 lines
hw/i386/kvmvapic.c +4
-0+do_patch_instruction (cs,RUN_ON_CPU_HOST_PTR (info)); + +resume_all_vcpus (); +g_free (info);I don't know if there is any benefit scheduling this as async work for KVM but I'll leave that up to Paolo to decide. From a TCG point of view I think its good:
We are scheduling this as async work only for non-KVM cases. For KVM, we use go to the pause/resume path above and patch it there itself.
Thanks,
Signature · 1 line
Pranith
Quoted 63 lines · Pranith Kumar
Hi Alex,
Quoted 7 lines · Alex Bennée
Quoted 5 lines · Pranith Kumar
In mttcg, calling
pause_all_vcpus()during execution from the generated TBs causes a deadlock if some vCPU is waiting for exclusive execution instart_exclusive(). Fix this by using the aync_safe_* framework instead of pausing vcpus for patching instructions.<...>
Quoted 39 lines
Quoted 39 lines
hw/i386/kvmvapic.c +26
-7--- a/hw/i386/kvmvapic.c -resume_all_vcpus (); +g_free (info); +} + +static void patch_instruction (VAPICROMState *s,X86CPU *cpu,target_ulong ip) +{ +CPUState *cs =CPU (cpu); +VAPICHandlers *handlers; +struct PatchInfo *info; + +if (smp_cpus ==1 ) { + handlers = &s->rom_state.up; + }else { + handlers = &s->rom_state.mp; + } + + info = g_new(struct PatchInfo, 1); + info->handler = handlers; + info->ip = ip;if (!kvm_enabled ()) { -/* Both tb_lock and iothread_mutex will be reset when -* longjmps back into the cpu_exec loop. */ -tb_lock (); -tb_gen_code (cs, current_pc, current_cs_base, current_flags,1 ); -cpu_loop_exit_noexc (cs); +const run_on_cpu_func fn = do_patch_instruction; + +async_safe_run_on_cpu (cs, fn,RUN_ON_CPU_HOST_PTR (info)); + cs->exception_index =EXCP_INTERRUPT ; +cpu_loop_exit (cs); } + +pause_all_vcpus (); +Quoted 9 lines
hw/i386/kvmvapic.c static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip) · line 487
Quoted 4 lines
hw/i386/kvmvapic.c +4
-0+do_patch_instruction (cs,RUN_ON_CPU_HOST_PTR (info)); + +resume_all_vcpus (); +g_free (info);I don't know if there is any benefit scheduling this as async work for KVM but I'll leave that up to Paolo to decide. From a TCG point of view I think its good:
Quoted 2 lines
We are scheduling this as async work only for non-KVM cases. For KVM, we use go to the pause/resume path above and patch it there itself.
No I mean would it be more efficient to do that for KVM as safe work. To be honest the code to pause_all_vcpus() seems a little hokey given cpu_stop_current() somehow stops itself while cpu_exit'ing the rest of the vcpus. But I guess you would involve an additional KVM transition for the calling thread, I'm not sure hence the deference to the KVM experts ;-)
Quoted 2 lines
Thanks,
--
Alex Bennée
Can someone please pick this up?
Thanks,
Quoted 154 lines · Pranith Kumar
In mttcg, calling
pause_all_vcpus()during execution from the generated TBs causes a deadlock if some vCPU is waiting for exclusive execution instart_exclusive(). Fix this by using the aync_safe_* framework instead of pausing vcpus for patching instructions.CC Richard Henderson <[email protected]>CC Peter Maydell <[email protected]>CC Alex Bennée <[email protected]>Signed-off-by Pranith Kumar <[email protected]>--- hw/i386/kvmvapic.c | 82 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 30 deletions(-)hw/i386/kvmvapic.c +52
-31@@ -383,8 +383,7 @@ static void patch_byte(X86CPU *cpu, target_ulong addr, uint8_t byte)cpu_memory_rw_debug (CPU (cpu), addr, &byte,1 ,1 ); } -static void patch_call (VAPICROMState *s,X86CPU *cpu,target_ulong ip, -uint32_t target) +static void patch_call (X86CPU *cpu,target_ulong ip,uint32_t target) {uint32_t offset;@@ -393,23 +392,24 @@ static void patch_call(VAPICROMState *s, X86CPU *cpu, target_ulong ip,cpu_memory_rw_debug (CPU (cpu), ip +1 , (void *)&offset,sizeof (offset),1 ); } -static void patch_instruction (VAPICROMState *s,X86CPU *cpu,target_ulong ip) +struct PatchInfo { +VAPICHandlers *handler; +target_ulong ip; +}; + +static void do_patch_instruction (CPUState *cs,run_on_cpu_data data) { -CPUState *cs =CPU (cpu); -CPUX86State *env = &cpu->env; -VAPICHandlers *handlers; +X86CPU *x86_cpu =X86_CPU (cs); +CPUX86State *env = &x86_cpu->env; +struct PatchInfo *info = (struct PatchInfo *) data.host_ptr; +VAPICHandlers *handlers = info->handler; +target_ulong ip = info->ip;uint8_t opcode[2 ];uint32_t imm32 =0 ;target_ulong current_pc =0 ;target_ulong current_cs_base =0 ;uint32_t current_flags =0 ; -if (smp_cpus ==1 ) { - handlers = &s->rom_state.up; - }else { - handlers = &s->rom_state.mp; - } -if (!kvm_enabled ()) {cpu_get_tb_cpu_state (env, ¤t_pc, ¤t_cs_base, ¤t_flags);@@ -421,48 +421,70 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip) } } -pause_all_vcpus (); -cpu_memory_rw_debug (cs, ip, opcode,sizeof (opcode),0 );switch (opcode[0 ]) {case 0x89 :/* mov r32 to r/m32 */ -patch_byte (cpu, ip,0x50 +modrm_reg (opcode[1 ]));/* push reg */ -patch_call (s, cpu, ip +1 , handlers->set_tpr); +patch_byte (x86_cpu, ip,0x50 +modrm_reg (opcode[1 ]));/* push reg */ +patch_call (x86_cpu, ip +1 , handlers->set_tpr);break ;case 0x8b :/* mov r/m32 to r32 */ -patch_byte (cpu, ip,0x90 ); -patch_call (s, cpu, ip +1 , handlers->get_tpr[modrm_reg (opcode[1 ])]); +patch_byte (x86_cpu, ip,0x90 ); +patch_call (x86_cpu, ip +1 , handlers->get_tpr[modrm_reg (opcode[1 ])]);break ;case 0xa1 :/* mov abs to eax */ -patch_call (s, cpu, ip, handlers->get_tpr[0 ]); +patch_call (x86_cpu, ip, handlers->get_tpr[0 ]);break ;case 0xa3 :/* mov eax to abs */ -patch_call (s, cpu, ip, handlers->set_tpr_eax); +patch_call (x86_cpu, ip, handlers->set_tpr_eax);break ;case 0xc7 :/* mov imm32, r/m32 (c7/0) */ -patch_byte (cpu, ip,0x68 );/* push imm32 */ +patch_byte (x86_cpu, ip,0x68 );/* push imm32 */ cpu_memory_rw_debug (cs, ip +6 , (void *)&imm32,sizeof (imm32),0 );cpu_memory_rw_debug (cs, ip +1 , (void *)&imm32,sizeof (imm32),1 ); -patch_call (s, cpu, ip +5 , handlers->set_tpr); +patch_call (x86_cpu, ip +5 , handlers->set_tpr);break ;case 0xff :/* push r/m32 */ -patch_byte (cpu, ip,0x50 );/* push eax */ -patch_call (s, cpu, ip +1 , handlers->get_tpr_stack); +patch_byte (x86_cpu, ip,0x50 );/* push eax */ +patch_call (x86_cpu, ip +1 , handlers->get_tpr_stack);break ;default :abort (); } -resume_all_vcpus (); +g_free (info); +} + +static void patch_instruction (VAPICROMState *s,X86CPU *cpu,target_ulong ip) +{ +CPUState *cs =CPU (cpu); +VAPICHandlers *handlers; +struct PatchInfo *info; + +if (smp_cpus ==1 ) { + handlers = &s->rom_state.up; + }else { + handlers = &s->rom_state.mp; + } + + info = g_new(struct PatchInfo, 1); + info->handler = handlers; + info->ip = ip;if (!kvm_enabled ()) { -/* Both tb_lock and iothread_mutex will be reset when -* longjmps back into the cpu_exec loop. */ -tb_lock (); -tb_gen_code (cs, current_pc, current_cs_base, current_flags,1 ); -cpu_loop_exit_noexc (cs); +const run_on_cpu_func fn = do_patch_instruction; + +async_safe_run_on_cpu (cs, fn,RUN_ON_CPU_HOST_PTR (info)); + cs->exception_index =EXCP_INTERRUPT ; +cpu_loop_exit (cs); } + +pause_all_vcpus (); + +do_patch_instruction (cs,RUN_ON_CPU_HOST_PTR (info)); + +resume_all_vcpus (); +g_free (info); } void vapic_report_tpr_access(DeviceState *dev, CPUState *cs, target_ulong ip, --2.7.4
Signature · 1 line
Pranith
Quoted 1 line · Pranith Kumar
Can someone please pick this up?
It needs to be re-posted with the review tag and ping Paolo re: async work for KVM.
Quoted 154 lines
Thanks,
Quoted 150 lines · Pranith Kumar
In mttcg, calling
pause_all_vcpus()during execution from the generated TBs causes a deadlock if some vCPU is waiting for exclusive execution instart_exclusive(). Fix this by using the aync_safe_* framework instead of pausing vcpus for patching instructions.CC Richard Henderson <[email protected]>CC Peter Maydell <[email protected]>CC Alex Bennée <[email protected]>Signed-off-by Pranith Kumar <[email protected]>--- hw/i386/kvmvapic.c | 82 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 30 deletions(-)hw/i386/kvmvapic.c +52
-30@@ -383,8 +383,7 @@ static void patch_byte(X86CPU *cpu, target_ulong addr, uint8_t byte)cpu_memory_rw_debug (CPU (cpu), addr, &byte,1 ,1 ); } -static void patch_call (VAPICROMState *s,X86CPU *cpu,target_ulong ip, -uint32_t target) +static void patch_call (X86CPU *cpu,target_ulong ip,uint32_t target) {uint32_t offset;@@ -393,23 +392,24 @@ static void patch_call(VAPICROMState *s, X86CPU *cpu, target_ulong ip,cpu_memory_rw_debug (CPU (cpu), ip +1 , (void *)&offset,sizeof (offset),1 ); } -static void patch_instruction (VAPICROMState *s,X86CPU *cpu,target_ulong ip) +struct PatchInfo { +VAPICHandlers *handler; +target_ulong ip; +}; + +static void do_patch_instruction (CPUState *cs,run_on_cpu_data data) { -CPUState *cs =CPU (cpu); -CPUX86State *env = &cpu->env; -VAPICHandlers *handlers; +X86CPU *x86_cpu =X86_CPU (cs); +CPUX86State *env = &x86_cpu->env; +struct PatchInfo *info = (struct PatchInfo *) data.host_ptr; +VAPICHandlers *handlers = info->handler; +target_ulong ip = info->ip;uint8_t opcode[2 ];uint32_t imm32 =0 ;target_ulong current_pc =0 ;target_ulong current_cs_base =0 ;uint32_t current_flags =0 ; -if (smp_cpus ==1 ) { - handlers = &s->rom_state.up; - }else { - handlers = &s->rom_state.mp; - } -if (!kvm_enabled ()) {cpu_get_tb_cpu_state (env, ¤t_pc, ¤t_cs_base, ¤t_flags);@@ -421,48 +421,70 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip) } } -pause_all_vcpus (); -cpu_memory_rw_debug (cs, ip, opcode,sizeof (opcode),0 );switch (opcode[0 ]) {case 0x89 :/* mov r32 to r/m32 */ -patch_byte (cpu, ip,0x50 +modrm_reg (opcode[1 ]));/* push reg */ -patch_call (s, cpu, ip +1 , handlers->set_tpr); +patch_byte (x86_cpu, ip,0x50 +modrm_reg (opcode[1 ]));/* push reg */ +patch_call (x86_cpu, ip +1 , handlers->set_tpr);break ;case 0x8b :/* mov r/m32 to r32 */ -patch_byte (cpu, ip,0x90 ); -patch_call (s, cpu, ip +1 , handlers->get_tpr[modrm_reg (opcode[1 ])]); +patch_byte (x86_cpu, ip,0x90 ); +patch_call (x86_cpu, ip +1 , handlers->get_tpr[modrm_reg (opcode[1 ])]);break ;case 0xa1 :/* mov abs to eax */ -patch_call (s, cpu, ip, handlers->get_tpr[0 ]); +patch_call (x86_cpu, ip, handlers->get_tpr[0 ]);break ;case 0xa3 :/* mov eax to abs */ -patch_call (s, cpu, ip, handlers->set_tpr_eax); +patch_call (x86_cpu, ip, handlers->set_tpr_eax);break ;case 0xc7 :/* mov imm32, r/m32 (c7/0) */ -patch_byte (cpu, ip,0x68 );/* push imm32 */ +patch_byte (x86_cpu, ip,0x68 );/* push imm32 */ cpu_memory_rw_debug (cs, ip +6 , (void *)&imm32,sizeof (imm32),0 );cpu_memory_rw_debug (cs, ip +1 , (void *)&imm32,sizeof (imm32),1 ); -patch_call (s, cpu, ip +5 , handlers->set_tpr); +patch_call (x86_cpu, ip +5 , handlers->set_tpr);break ;case 0xff :/* push r/m32 */ -patch_byte (cpu, ip,0x50 );/* push eax */ -patch_call (s, cpu, ip +1 , handlers->get_tpr_stack); +patch_byte (x86_cpu, ip,0x50 );/* push eax */ +patch_call (x86_cpu, ip +1 , handlers->get_tpr_stack);break ;default :abort (); } -resume_all_vcpus (); +g_free (info); +} + +static void patch_instruction (VAPICROMState *s,X86CPU *cpu,target_ulong ip) +{ +CPUState *cs =CPU (cpu); +VAPICHandlers *handlers; +struct PatchInfo *info; + +if (smp_cpus ==1 ) { + handlers = &s->rom_state.up; + }else { + handlers = &s->rom_state.mp; + } + + info = g_new(struct PatchInfo, 1); + info->handler = handlers; + info->ip = ip;if (!kvm_enabled ()) { -/* Both tb_lock and iothread_mutex will be reset when -* longjmps back into the cpu_exec loop. */ -tb_lock (); -tb_gen_code (cs, current_pc, current_cs_base, current_flags,1 ); -cpu_loop_exit_noexc (cs); +const run_on_cpu_func fn = do_patch_instruction; + +async_safe_run_on_cpu (cs, fn,RUN_ON_CPU_HOST_PTR (info)); + cs->exception_index =EXCP_INTERRUPT ; +cpu_loop_exit (cs); } + +pause_all_vcpus (); + +do_patch_instruction (cs,RUN_ON_CPU_HOST_PTR (info)); + +resume_all_vcpus (); +g_free (info); }
Quoted 4 lines
Quoted 4 lines
hw/i386/kvmvapic.c +0
-1void vapic_report_tpr_access(DeviceState *dev, CPUState *cs, target_ulong ip, --2.7.4
--
Alex Bennée
Quoted 8 lines · Alex Bennée
Quoted 1 line · Pranith Kumar
Can someone please pick this up?
It needs to be re-posted with the review tag and ping Paolo re: async work for KVM.
Will do.
Thanks,
Signature · 1 line
Pranith