Commit 5c61afec authored by Jan Kiszka's avatar Jan Kiszka Committed by Blue Swirl
Browse files

kvmvapic: Fix TB invalidation after instruction patching 



Since 0b57e287, cpu_memory_rw_debug already triggers a TB invalidation.
As it doesn't (and cannot) set is_cpu_write_access=1 but "consumes" the
currently executed TB, the tb_invalidate_phys_page_range call from
patch_instruction didn't work anymore.

Fix this by open-coding the required bits to restore the CPU state from
the current TB position before patching and resume execution on the
patched instruction afterward.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Tested-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent b8c6a5d9

hw/kvmvapic.c

+16 −4
Original line number Diff line number Diff line
@@ -384,10 +384,13 @@ static void patch_call(VAPICROMState *s, CPUX86State *env, target_ulong ip, 


static void patch_instruction(VAPICROMState *s, CPUX86State *env, target_ulong ip)

{

    hwaddr paddr;

    VAPICHandlers *handlers;

    uint8_t opcode[2];

    uint32_t imm32;

    TranslationBlock *current_tb;

    target_ulong current_pc = 0;

    target_ulong current_cs_base = 0;

    int current_flags = 0;



    if (smp_cpus == 1) {

        handlers = &s->rom_state.up;
@@ -395,6 +398,13 @@ static void patch_instruction(VAPICROMState *s, CPUX86State *env, target_ulong i 
        handlers = &s->rom_state.mp;

    }



    if (!kvm_enabled()) {

        current_tb = tb_find_pc(env->mem_io_pc);

        cpu_restore_state(current_tb, env, env->mem_io_pc);

        cpu_get_tb_cpu_state(env, &current_pc, &current_cs_base,

                             &current_flags);

    }



    pause_all_vcpus();



    cpu_memory_rw_debug(env, ip, opcode, sizeof(opcode), 0);
@@ -430,9 +440,11 @@ static void patch_instruction(VAPICROMState *s, CPUX86State *env, target_ulong i 


    resume_all_vcpus();



    paddr = cpu_get_phys_page_debug(env, ip);

    paddr += ip & ~TARGET_PAGE_MASK;

    tb_invalidate_phys_page_range(paddr, paddr + 1, 1);

    if (!kvm_enabled()) {

        env->current_tb = NULL;

        tb_gen_code(env, current_pc, current_cs_base, current_flags, 1);

        cpu_resume_from_signal(env, NULL);

    }

}



void vapic_report_tpr_access(DeviceState *dev, void *cpu, target_ulong ip,