powerpc/kvm: support to handle sw breakpoint
Subsystems (3)
PATCH v3 1/1 powerpc/kvm: support to handle sw breakpoint
This patch adds kernel side support for software breakpoint. Design is that, by using an illegal instruction, we trap to hypervisor via Emulation Assistance interrupt, where we check for the illegal instruction and accordingly we return to Host or Guest. Patch also adds support for software breakpoint in PR KVM.
Changes v2->v3:
Changed the debug instructions. Using the all zero opcode in the instruction word
as illegal instruction as mentioned in Power ISA instead of ABS
Removed reg updated in emulation assist and added a call to
kvmppc_emulate_instruction for reg update.
Changes v1->v2:
Moved the debug instruction #def to kvm_book3s.h. This way PR_KVM can also share it. Added code to use KVM get one reg infrastructure to get debug opcode. Updated emulate.c to include emulation of debug instruction incase of PR_KVM. Made changes to commit message.
--- arch/powerpc/include/asm/kvm_book3s.h | 7 +++++++ arch/powerpc/include/asm/ppc-opcode.h | 5 +++++ arch/powerpc/kvm/book3s.c | 3 ++- arch/powerpc/kvm/book3s_hv.c | 12 ++++++++++-- arch/powerpc/kvm/book3s_pr.c | 3 +++ arch/powerpc/kvm/emulate.c | 9 +++++++++ 6 files changed, 36 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/kvm_book3s.h +7 -0
@@ -24,6 +24,13 @@#include <linux/kvm_host.h> #include <asm/kvm_book3s_asm.h> +/* +* KVMPPC_INST_BOOK3S_DEBUG is debug Instruction for supporting Software Breakpoint. +* Based on PowerISA v2.07, Instruction with opcode 0s will be treated as illegal +* instruction. +*/ +#define KVMPPC_INST_BOOK3S_DEBUG 0x00dddd00 +struct kvmppc_bat {u64 raw;u32 bepi;
arch/powerpc/include/asm/ppc-opcode.h +5 -0
@@ -111,6 +111,11 @@#define OP_31_XOP_LHBRX 790#define OP_31_XOP_STHBRX 918 +/* KVMPPC_INST_BOOK3S_DEBUG -- Software breakpoint Instruction +* 0x00dddd00 -- Primary opcode is 0s +*/ +#define OP_ZERO 0x0 +#define OP_LWZ 32#define OP_LD 58#define OP_LWZU 33
arch/powerpc/kvm/book3s.c +2 -1
@@ -789,7 +789,8 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,int kvm_arch_vcpu_ioctl_set_guest_debug (struct kvm_vcpu *vcpu,struct kvm_guest_debug *dbg) { -return -EINVAL ; + vcpu->guest_debug = dbg->control; +return 0 ; }void kvmppc_decrementer_func (unsigned long data)
arch/powerpc/kvm/book3s_hv.c +10 -2
@@ -725,8 +725,13 @@ static int kvmppc_handle_exit_hv(struct kvm_run *run, struct kvm_vcpu *vcpu,* we don't emulate any guest instructions at this stage. */ case BOOK3S_INTERRUPT_H_EMUL_ASSIST : -kvmppc_core_queue_program (vcpu,SRR1_PROGILL ); - r =RESUME_GUEST ; +if (kvmppc_get_last_inst (vcpu) ==KVMPPC_INST_BOOK3S_DEBUG ) { +kvmppc_emulate_instruction (run, vcpu); + r =RESUME_HOST ; + }else { +kvmppc_core_queue_program (vcpu,SRR1_PROGILL ); + r =RESUME_GUEST ; + }break ;/* * This occurs if the guest (kernel or userspace), does something that
@@ -831,6 +836,9 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,long int i;switch (id) { +case KVM_REG_PPC_DEBUG_INST : + *val =get_reg_val (id,KVMPPC_INST_BOOK3S_DEBUG ); +break ;case KVM_REG_PPC_HIOR : *val =get_reg_val (id,0 );break ;
arch/powerpc/kvm/book3s_pr.c +3 -0
@@ -1229,6 +1229,9 @@ static int kvmppc_get_one_reg_pr(struct kvm_vcpu *vcpu, u64 id,int r =0 ;switch (id) { +case KVM_REG_PPC_DEBUG_INST : + *val =get_reg_val (id,KVMPPC_INST_BOOK3S_DEBUG ); +break ;case KVM_REG_PPC_HIOR : *val =get_reg_val (id,to_book3s (vcpu)->hior);break ;
arch/powerpc/kvm/emulate.c +9 -0
@@ -458,6 +458,15 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)kvmppc_set_gpr (vcpu, ra, vcpu->arch.vaddr_accessed);break ; +case OP_ZERO : +if ((inst &0x00FFFF00 ) ==KVMPPC_INST_BOOK3S_DEBUG ) { + run->exit_reason =KVM_EXIT_DEBUG ; + run->debug.arch.address =kvmppc_get_pc (vcpu); + emulated =EMULATE_EXIT_USER ; + advance =0 ; + } +break ; +default : emulated =EMULATE_FAIL ; }
Signature · 1 line
1.7.11.4
Quoted 5 lines
+/*
+ *KVMPPC_INST_BOOK3S_DEBUGis debug Instruction for supporting Software Breakpoint.
+ * Based on PowerISA v2.07, Instruction with opcode 0s will be treated as illegal
+ * instruction.
+ */
"primary opcode 0" instead?
Quoted 1 line
+#define
OP_ZERO0x0
Using 0x0 where you mean 0, making a #define for 0 in the first place... This all looks rather silly doesn't it.
arch/powerpc/kvm/emulate.c int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) · line 462
Quoted 2 lines
arch/powerpc/kvm/emulate.c +2
-0+case OP_ZERO : +if ((inst &0x00FFFF00 ) ==KVMPPC_INST_BOOK3S_DEBUG ) {
You either shouldn't mask at all here, or the mask is wrong (the primary op is the top six bits, not the top eight).
Segher
Quoted 8 lines · Segher Boessenkool
Quoted 5 lines
+/*
+ *KVMPPC_INST_BOOK3S_DEBUGis debug Instruction for supporting Software Breakpoint.
+ * Based on PowerISA v2.07, Instruction with opcode 0s will be treated as illegal
+ * instruction.
+ */"primary opcode 0" instead?
ok sure.
Quoted 5 lines
Quoted 1 line
+#define
OP_ZERO0x0Using
0x0where you mean 0, making a #define for 0 in the first place... This all looks rather silly doesn't it.
I wanted to avoid zero mentioned in the case statement, but can add a comment explaining it.
Quoted 6 lines
arch/powerpc/kvm/emulate.c int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) · line 462
Quoted 2 lines
arch/powerpc/kvm/emulate.c +2
-0+case OP_ZERO : +if ((inst &0x00FFFF00 ) ==KVMPPC_INST_BOOK3S_DEBUG ) {You either shouldn't mask at all here, or the mask is wrong (the primary op is the top six bits, not the top eight).
Yes. I guess I dont need to check here. Will resend the patch.
Thanks for review
Regards
Maddy
Quoted 3 lines
Segher
Quoted 82 lines · Madhavan Srinivasan
This patch adds kernel side support for software breakpoint. Design is that, by using an illegal instruction, we trap to hypervisor via Emulation Assistance interrupt, where we check for the illegal instruction and accordingly we return to Host or Guest. Patch also adds support for software breakpoint in PR KVM.
Changes
v2->v3:
Changed the debug instructions. Using the all zero opcode in the instruction word
as illegal instruction as mentioned in Power ISA instead of ABS
Removed reg updated in emulation assist and added a call to
kvmppc_emulate_instructionfor reg update.Changes
v1->v2:Moved the debug instruction #def to
kvm_book3s.h. This wayPR_KVMcan also share it. Added code to use KVM get one reg infrastructure to get debug opcode. Updatedemulate.cto include emulation of debug instruction incase ofPR_KVM. Made changes to commit message.Signed-off-by Madhavan Srinivasan <[email protected]>--- arch/powerpc/include/asm/kvm_book3s.h | 7 +++++++ arch/powerpc/include/asm/ppc-opcode.h | 5 +++++ arch/powerpc/kvm/book3s.c | 3 ++- arch/powerpc/kvm/book3s_hv.c | 12 ++++++++++-- arch/powerpc/kvm/book3s_pr.c | 3 +++ arch/powerpc/kvm/emulate.c | 9 +++++++++ 6 files changed, 36 insertions(+), 3 deletions(-)arch/powerpc/include/asm/kvm_book3s.h +7
-0@@ -24,6 +24,13 @@#include <linux/kvm_host.h> #include <asm/kvm_book3s_asm.h> +/* +* KVMPPC_INST_BOOK3S_DEBUG is debug Instruction for supporting Software Breakpoint. +* Based on PowerISA v2.07, Instruction with opcode 0s will be treated as illegal +* instruction. +*/ +#define KVMPPC_INST_BOOK3S_DEBUG 0x00dddd00 +struct kvmppc_bat {u64 raw;u32 bepi;arch/powerpc/include/asm/ppc-opcode.h +5
-0@@ -111,6 +111,11 @@#define OP_31_XOP_LHBRX 790#define OP_31_XOP_STHBRX 918 +/* KVMPPC_INST_BOOK3S_DEBUG -- Software breakpoint Instruction +* 0x00dddd00 -- Primary opcode is 0s +*/ +#define OP_ZERO 0x0 +#define OP_LWZ 32#define OP_LD 58#define OP_LWZU 33arch/powerpc/kvm/book3s.c +2
-1@@ -789,7 +789,8 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,int kvm_arch_vcpu_ioctl_set_guest_debug (struct kvm_vcpu *vcpu,struct kvm_guest_debug *dbg) { -return -EINVAL ; + vcpu->guest_debug = dbg->control; +return 0 ; }void kvmppc_decrementer_func (unsigned long data)arch/powerpc/kvm/book3s_hv.c +0
-0
arch/powerpc/kvm/book3s_hv.c static int kvmppc_handle_exit_hv(struct kvm_run *run, struct kvm_vcpu *vcpu, · line 729
Quoted 7 lines
arch/powerpc/kvm/book3s_hv.c +2
-2@@ -725,8 +725,13 @@ static int kvmppc_handle_exit_hv(struct kvm_run *run, struct kvm_vcpu *vcpu,* we don't emulate any guest instructions at this stage. */ case BOOK3S_INTERRUPT_H_EMUL_ASSIST : -kvmppc_core_queue_program (vcpu,SRR1_PROGILL ); - r =RESUME_GUEST ; +if (kvmppc_get_last_inst (vcpu) ==KVMPPC_INST_BOOK3S_DEBUG ) { +kvmppc_emulate_instruction (run, vcpu);
I changed the emulation code flow very recently, so while I advised you to write it this way this won't work with recent git versions anymore :(.
Please just create a tiny static function that handles this particular inst and duplicate the logic in book3s_emulate.c (for PR) as well as here (for HV).
arch/powerpc/kvm/emulate.c
Quoted 36 lines
arch/powerpc/kvm/book3s_hv.c +8
-0+ r =RESUME_HOST ; + }else { +kvmppc_core_queue_program (vcpu,SRR1_PROGILL ); + r =RESUME_GUEST ; + }break ;/* * This occurs if the guest (kernel or userspace), does something that @@ -831,6 +836,9 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,long int i;switch (id) { +case KVM_REG_PPC_DEBUG_INST : + *val =get_reg_val (id,KVMPPC_INST_BOOK3S_DEBUG ); +break ;case KVM_REG_PPC_HIOR : *val =get_reg_val (id,0 );break ;arch/powerpc/kvm/book3s_pr.c +3
-0@@ -1229,6 +1229,9 @@ static int kvmppc_get_one_reg_pr(struct kvm_vcpu *vcpu, u64 id,int r =0 ;switch (id) { +case KVM_REG_PPC_DEBUG_INST : + *val =get_reg_val (id,KVMPPC_INST_BOOK3S_DEBUG ); +break ;case KVM_REG_PPC_HIOR : *val =get_reg_val (id,to_book3s (vcpu)->hior);break ;arch/powerpc/kvm/emulate.c +0
-0
This should be book3s_emulate.c.
Alex
Quoted 6 lines · Alexander Graf
arch/powerpc/kvm/emulate.c
Quoted 4 lines
arch/powerpc/kvm/emulate.c +0
-0This should be
book3s_emulate.c.
Any reason we can't make that 00dddd00 opcode as breakpoint common to all powerpc variants ?
Cheers,
Ben.
_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev
Quoted 8 lines · Benjamin Herrenschmidt
Quoted 5 lines · Alexander Graf
arch/powerpc/kvm/emulate.c
Quoted 4 lines
arch/powerpc/kvm/emulate.c +0
-0This should be
book3s_emulate.c.Any reason we can't make that
00dddd00opcode as breakpoint common to all powerpc variants ?
I can't think of a good reason. We use a hypercall on booke (which traps into an illegal instruction for pr) today, but I don't think it has to be that way.
Given that the user space API allows us to change it dynamically, there should be nothing blocking us from going with 00dddd00 always.
Alex
Quoted 11 lines · Alexander Graf
Quoted 8 lines · Benjamin Herrenschmidt
Quoted 5 lines · Alexander Graf
arch/powerpc/kvm/emulate.c
Quoted 4 lines
arch/powerpc/kvm/emulate.c +0
-0This should be
book3s_emulate.c.Any reason we can't make that
00dddd00opcode as breakpoint common to all powerpc variants ?
Quoted 7 lines
I can't think of a good reason. We use a hypercall on booke (which traps into an illegal instruction for pr) today, but I don't think it has to be that way.
Given that the user space API allows us to change it dynamically, there should be nothing blocking us from going with
00dddd00always.
Kindly correct me if i am wrong. So we can still have a common code in emulate.c to set the env for both HV and pr incase of illegal instruction (i will rebase latest src). But suggestion here to use 00dddd00, in that case current path in embed is kvmppc_handle_exit (booke.c) -> BOOKE_INTERRUPT_HV_PRIV -> emulation_exit -> kvmppc_emulate_instruction, will change to kvmppc_handle_exit (booke.c) -> BOOKE_INTERRUPT_PROGRAM -> if debug instr call emulation_exit else send to guest?
Thanks for review
regards
Maddy
Quoted 3 lines
Alex
Quoted 17 lines · Madhavan Srinivasan
Quoted 7 lines · Alexander Graf
Quoted 6 lines · Benjamin Herrenschmidt
Quoted 5 lines · Alexander Graf
arch/powerpc/kvm/emulate.c
Quoted 4 lines
arch/powerpc/kvm/emulate.c +0
-0This should be
book3s_emulate.c.Quoted 9 lines
Quoted 2 lines
Any reason we can't make that
00dddd00opcode as breakpoint common to all powerpc variants ?I can't think of a good reason. We use a hypercall on booke (which traps into an illegal instruction for pr) today, but I don't think it has to be that way.
Given that the user space API allows us to change it dynamically, there should be nothing blocking us from going with
00dddd00always.
Quoted 8 lines
Kindly correct me if i am wrong. So we can still have a common code in
emulate.cto set the env for both HV and pr incase of illegal instruction (i will rebase latest src). But suggestion here to use00dddd00, in that case current path in embed iskvmppc_handle_exit(booke.c) ->BOOKE_INTERRUPT_HV_PRIV->emulation_exit->kvmppc_emulate_instruction, will change tokvmppc_handle_exit(booke.c) ->BOOKE_INTERRUPT_PROGRAM-> if debug instr callemulation_exitelse send to guest?
I can't follow your description above.
With the latest git version HV KVM does not include emulate.c anymore.
Also, it would make a lot of sense of have the same soft breakpoint instruction across all ppc targets, so it would make sense to change it to 0x00dddd00 for booke as well.
Basically you would have handling code in emulate.c and book3s_hv.c at the end of the day.
Alex
Quoted 28 lines · Alexander Graf
Quoted 17 lines · Madhavan Srinivasan
Quoted 7 lines · Alexander Graf
Quoted 6 lines · Benjamin Herrenschmidt
Quoted 5 lines · Alexander Graf
arch/powerpc/kvm/emulate.c
Quoted 4 lines
arch/powerpc/kvm/emulate.c +0
-0This should be
book3s_emulate.c.Quoted 9 lines
Quoted 2 lines
Any reason we can't make that
00dddd00opcode as breakpoint common to all powerpc variants ?I can't think of a good reason. We use a hypercall on booke (which traps into an illegal instruction for pr) today, but I don't think it has to be that way.
Given that the user space API allows us to change it dynamically, there should be nothing blocking us from going with
00dddd00always.Quoted 8 lines
Kindly correct me if i am wrong. So we can still have a common code in
emulate.cto set the env for both HV and pr incase of illegal instruction (i will rebase latest src). But suggestion here to use00dddd00, in that case current path in embed iskvmppc_handle_exit(booke.c) ->BOOKE_INTERRUPT_HV_PRIV->emulation_exit->kvmppc_emulate_instruction, will change tokvmppc_handle_exit(booke.c) ->BOOKE_INTERRUPT_PROGRAM-> if debug instr callemulation_exitelse send to guest?
Quoted 2 lines
I can't follow your description above.
My bad.
Quoted 6 lines
With the latest git version HV KVM does not include
emulate.canymore.Also, it would make a lot of sense of have the same soft breakpoint instruction across all ppc targets, so it would make sense to change it to
0x00dddd00for booke as well.
Got it. Was describing the current control flow with respect to booke and where changes needed (for same software breakpoint inst). This is for my understanding and wanted verify.
kvmppc_handle_exit(booke.c)
-> BOOKE_INTERRUPT_HV_PRIV -> emulation_exit ->kvmppc_emulate_instruction
Incase of using the same software breakpoint instruction (0x00dddd00), then we need to add code in booke something like this
kvmppc_handle_exit (booke.c)
-> BOOKE_INTERRUPT_PROGRAM -> if debug instr ->emulation_exit else ->send to guest?
Quoted 3 lines
Basically you would have handling code in
emulate.candbook3s_hv.cat the end of the day.
Yes. Will resend the patch with updated code.
Quoted 3 lines
Alex
Quoted 49 lines · Madhavan Srinivasan
Quoted 26 lines · Alexander Graf
Quoted 17 lines · Madhavan Srinivasan
Quoted 7 lines · Alexander Graf
Quoted 6 lines · Benjamin Herrenschmidt
Quoted 5 lines · Alexander Graf
arch/powerpc/kvm/emulate.c
Quoted 4 lines
arch/powerpc/kvm/emulate.c +0
-0This should be
book3s_emulate.c.Quoted 9 lines
Quoted 2 lines
Any reason we can't make that
00dddd00opcode as breakpoint common to all powerpc variants ?I can't think of a good reason. We use a hypercall on booke (which traps into an illegal instruction for pr) today, but I don't think it has to be that way.
Given that the user space API allows us to change it dynamically, there should be nothing blocking us from going with
00dddd00always.Quoted 8 lines
Kindly correct me if i am wrong. So we can still have a common code in
emulate.cto set the env for both HV and pr incase of illegal instruction (i will rebase latest src). But suggestion here to use00dddd00, in that case current path in embed iskvmppc_handle_exit(booke.c) ->BOOKE_INTERRUPT_HV_PRIV->emulation_exit->kvmppc_emulate_instruction, will change tokvmppc_handle_exit(booke.c) ->BOOKE_INTERRUPT_PROGRAM-> if debug instr callemulation_exitelse send to guest?Quoted 2 lines
I can't follow your description above.
My bad.
Quoted 6 lines
With the latest git version HV KVM does not include
emulate.canymore.Also, it would make a lot of sense of have the same soft breakpoint instruction across all ppc targets, so it would make sense to change it to
0x00dddd00for booke as well.Got it. Was describing the current control flow with respect to booke and where changes needed (for same software breakpoint inst). This is for my understanding and wanted verify.
kvmppc_handle_exit(booke.c)-> BOOKE_INTERRUPT_HV_PRIV -> emulation_exit ->kvmppc_emulate_instructionIncase of using the same software breakpoint instruction (
0x00dddd00), then we need to add code in booke something like this
Quoted 6 lines
kvmppc_handle_exit(booke.c)-> BOOKE_INTERRUPT_PROGRAM -> if debug instr ->emulation_exit else ->send to guest?
Bleks. I see your point. I guess you need something like this for booke:
arch/powerpc/kvm/booke.c +7 -1
@@ -876,6 +876,11 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,case BOOKE_INTERRUPT_HV_PRIV : emulated =kvmppc_get_last_inst (vcpu, false, &last_inst);break ; +case BOOKE_INTERRUPT_PROGRAM : +/* SW breakpoints arrive as illegal instructions on HV */ +if (vcpu->guest_debug &KVM_GUESTDBG_USE_SW_BP ) + emulated =kvmppc_get_last_inst (vcpu, false, &last_inst); +break ;default :break ; }
@@ -953,7 +958,8 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,break ;case BOOKE_INTERRUPT_PROGRAM : -if (vcpu->arch.shared->msr & (MSR_PR |MSR_GS )) { +if ((vcpu->arch.shared->msr & (MSR_PR |MSR_GS )) && + (last_inst !=KVMPPC_INST_SOFT_BREAKPOINT )) {/* * Program traps generated by user-level software must * be handled by the guest kernel.
Quoted 5 lines
Quoted 4 lines
Basically you would have handling code in
emulate.candbook3s_hv.cat the end of the day.Yes. Will resend the patch with updated code.
Thanks,
Alex
Quoted 90 lines · Alexander Graf
Quoted 52 lines · Madhavan Srinivasan
Quoted 29 lines · Alexander Graf
Quoted 20 lines · Madhavan Srinivasan
Quoted 10 lines · Alexander Graf
Quoted 9 lines · Benjamin Herrenschmidt
Quoted 6 lines · Alexander Graf
arch/powerpc/kvm/emulate.c
Quoted 5 lines
arch/powerpc/kvm/emulate.c +0
-0This should be
book3s_emulate.c.Any reason we can't make that
00dddd00opcode as breakpoint common to all powerpc variants ?Quoted 9 lines
I can't think of a good reason. We use a hypercall on booke (which traps
into an illegal instruction for pr) today, but I don't think it has to be that way.Given that the user space API allows us to change it dynamically, there
should be nothing blocking us from going with00dddd00always.Quoted 8 lines
Kindly correct me if i am wrong. So we can still have a common code in
emulate.cto set the env for both HV and pr incase of illegal instruction (i will rebase latest src). But suggestion here to use00dddd00, in that case current path in embed iskvmppc_handle_exit(booke.c) ->BOOKE_INTERRUPT_HV_PRIV->emulation_exit->kvmppc_emulate_instruction, will change tokvmppc_handle_exit(booke.c) ->BOOKE_INTERRUPT_PROGRAM-> if debug instr callemulation_exitelse send to guest?Quoted 2 lines
I can't follow your description above.
My bad.
Quoted 6 lines
With the latest git version HV KVM does not include
emulate.canymore.Also, it would make a lot of sense of have the same soft breakpoint instruction across all ppc targets, so it would make sense to change it to
0x00dddd00for booke as well.Got it. Was describing the current control flow with respect to booke and where changes needed (for same software breakpoint inst). This is for my understanding and wanted verify.
kvmppc_handle_exit(booke.c)-> BOOKE_INTERRUPT_HV_PRIV -> emulation_exit ->kvmppc_emulate_instructionIncase of using the same software breakpoint instruction (
0x00dddd00), then we need to add code in booke something like thisQuoted 6 lines
kvmppc_handle_exit(booke.c)-> BOOKE_INTERRUPT_PROGRAM -> if debug instr ->emulation_exit else ->send to guest?Bleks. I see your point. I guess you need something like this for booke:
arch/powerpc/kvm/booke.c +5
-0@@ -876,6 +876,11 @@ int kvmppc_handle_exit(struct kvm_run *run, structkvm_vcpu *vcpu, case BOOKE_INTERRUPT_HV_PRIV: emulated =kvmppc_get_last_inst (vcpu, false, &last_inst);break ; +case BOOKE_INTERRUPT_PROGRAM : +/* SW breakpoints arrive as illegal instructions on HV */ +if (vcpu->guest_debug &KVM_GUESTDBG_USE_SW_BP ) + emulated =kvmppc_get_last_inst (vcpu, false, &last_inst); +break ;default :break ;}arch/powerpc/kvm/booke.c +2
-1@@ -953,7 +958,8 @@ int kvmppc_handle_exit(struct kvm_run *run, structkvm_vcpu *vcpu, break;case BOOKE_INTERRUPT_PROGRAM : -if (vcpu->arch.shared->msr & (MSR_PR |MSR_GS )) { +if ((vcpu->arch.shared->msr & (MSR_PR |MSR_GS )) && + (last_inst !=KVMPPC_INST_SOFT_BREAKPOINT )) {/* * Program traps generated by user-level software must
Quoted 4 lines
* be handled by the guest kernel.
Ok make sense.
Regards
Maddy
Quoted 11 lines
Quoted 5 lines
Quoted 4 lines
Basically you would have handling code in
emulate.candbook3s_hv.cat the end of the day.Yes. Will resend the patch with updated code.
Thanks,
Alex