From: Alexander Graf <agraf@suse.de> To: kvm-ppc@vger.kernel.org Cc: KVM list <kvm@vger.kernel.org>, Paul Mackerras <paulus@samba.org> Subject: [PATCH 13/38] KVM: PPC: Book3S HV: Fix incorrect branch in H_CEDE code Date: Wed, 15 Aug 2012 01:04:18 +0200 [thread overview] Message-ID: <1344985483-7440-14-git-send-email-agraf@suse.de> (raw) In-Reply-To: <1344985483-7440-1-git-send-email-agraf@suse.de> From: Paul Mackerras <paulus@samba.org> In handling the H_CEDE hypercall, if this vcpu has already been prodded (with the H_PROD hypercall, which Linux guests don't in fact use), we branch to a numeric label '1f'. Unfortunately there is another '1:' label before the one that we want to jump to. This fixes the problem by using a textual label, 'kvm_cede_prodded'. It also changes the label for another longish branch from '2:' to 'kvm_cede_exit' to avoid a possible future problem if code modifications add another numeric '2:' label in between. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Alexander Graf <agraf@suse.de> --- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S index 5a84c8d..44b72fe 100644 --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S @@ -1421,13 +1421,13 @@ _GLOBAL(kvmppc_h_cede) sync /* order setting ceded vs. testing prodded */ lbz r5,VCPU_PRODDED(r3) cmpwi r5,0 - bne 1f + bne kvm_cede_prodded li r0,0 /* set trap to 0 to say hcall is handled */ stw r0,VCPU_TRAP(r3) li r0,H_SUCCESS std r0,VCPU_GPR(R3)(r3) BEGIN_FTR_SECTION - b 2f /* just send it up to host on 970 */ + b kvm_cede_exit /* just send it up to host on 970 */ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_206) /* @@ -1446,7 +1446,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_206) or r4,r4,r0 PPC_POPCNTW(R7,R4) cmpw r7,r8 - bge 2f + bge kvm_cede_exit stwcx. r4,0,r6 bne 31b li r0,1 @@ -1555,7 +1555,8 @@ kvm_end_cede: b hcall_real_fallback /* cede when already previously prodded case */ -1: li r0,0 +kvm_cede_prodded: + li r0,0 stb r0,VCPU_PRODDED(r3) sync /* order testing prodded vs. clearing ceded */ stb r0,VCPU_CEDED(r3) @@ -1563,7 +1564,8 @@ kvm_end_cede: blr /* we've ceded but we want to give control to the host */ -2: li r3,H_TOO_HARD +kvm_cede_exit: + li r3,H_TOO_HARD blr secondary_too_late: -- 1.6.0.2
WARNING: multiple messages have this Message-ID (diff)
From: Alexander Graf <agraf@suse.de> To: kvm-ppc@vger.kernel.org Cc: KVM list <kvm@vger.kernel.org>, Paul Mackerras <paulus@samba.org> Subject: [PATCH 13/38] KVM: PPC: Book3S HV: Fix incorrect branch in H_CEDE code Date: Tue, 14 Aug 2012 23:04:18 +0000 [thread overview] Message-ID: <1344985483-7440-14-git-send-email-agraf@suse.de> (raw) In-Reply-To: <1344985483-7440-1-git-send-email-agraf@suse.de> From: Paul Mackerras <paulus@samba.org> In handling the H_CEDE hypercall, if this vcpu has already been prodded (with the H_PROD hypercall, which Linux guests don't in fact use), we branch to a numeric label '1f'. Unfortunately there is another '1:' label before the one that we want to jump to. This fixes the problem by using a textual label, 'kvm_cede_prodded'. It also changes the label for another longish branch from '2:' to 'kvm_cede_exit' to avoid a possible future problem if code modifications add another numeric '2:' label in between. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Alexander Graf <agraf@suse.de> --- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S index 5a84c8d..44b72fe 100644 --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S @@ -1421,13 +1421,13 @@ _GLOBAL(kvmppc_h_cede) sync /* order setting ceded vs. testing prodded */ lbz r5,VCPU_PRODDED(r3) cmpwi r5,0 - bne 1f + bne kvm_cede_prodded li r0,0 /* set trap to 0 to say hcall is handled */ stw r0,VCPU_TRAP(r3) li r0,H_SUCCESS std r0,VCPU_GPR(R3)(r3) BEGIN_FTR_SECTION - b 2f /* just send it up to host on 970 */ + b kvm_cede_exit /* just send it up to host on 970 */ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_206) /* @@ -1446,7 +1446,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_206) or r4,r4,r0 PPC_POPCNTW(R7,R4) cmpw r7,r8 - bge 2f + bge kvm_cede_exit stwcx. r4,0,r6 bne 31b li r0,1 @@ -1555,7 +1555,8 @@ kvm_end_cede: b hcall_real_fallback /* cede when already previously prodded case */ -1: li r0,0 +kvm_cede_prodded: + li r0,0 stb r0,VCPU_PRODDED(r3) sync /* order testing prodded vs. clearing ceded */ stb r0,VCPU_CEDED(r3) @@ -1563,7 +1564,8 @@ kvm_end_cede: blr /* we've ceded but we want to give control to the host */ -2: li r3,H_TOO_HARD +kvm_cede_exit: + li r3,H_TOO_HARD blr secondary_too_late: -- 1.6.0.2
next prev parent reply other threads:[~2012-08-14 23:04 UTC|newest] Thread overview: 150+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-14 23:04 [PULL 00/38] ppc patch queue 2012-08-15 Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 01/38] PPC: epapr: create define for return code value of success Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 02/38] KVM: PPC: use definitions in epapr header for hcalls Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 03/38] KVM: PPC: add pvinfo for hcall opcodes on e500mc/e5500 Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 04/38] KVM: PPC: Add support for ePAPR idle hcall in host kernel Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 05/38] KVM: PPC: ev_idle hcall support for e500 guests Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 06/38] PPC: select EPAPR_PARAVIRT for all users of epapr hcalls Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 07/38] powerpc/fsl-soc: use CONFIG_EPAPR_PARAVIRT for hcalls Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 08/38] PPC: Don't use hardcoded opcode for ePAPR hcall invocation Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 09/38] KVM: PPC: PR: Use generic tracepoint for guest exit Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 10/38] KVM: PPC: Expose SYNC cap based on mmu notifiers Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 11/38] KVM: PPC: BookE: Expose remote TLB flushes in debugfs Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 12/38] KVM: PPC: E500: Fix clear_tlb_refs Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` Alexander Graf [this message] 2012-08-14 23:04 ` [PATCH 13/38] KVM: PPC: Book3S HV: Fix incorrect branch in H_CEDE code Alexander Graf 2012-08-14 23:04 ` [PATCH 14/38] KVM: PPC: Quieten message about allocating linear regions Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 15/38] powerpc/epapr: export epapr_hypercall_start Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 16/38] KVM: PPC: BookE: Add check_requests helper function Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-15 0:10 ` Scott Wood 2012-08-15 0:10 ` Scott Wood 2012-08-15 0:13 ` Alexander Graf 2012-08-15 0:13 ` Alexander Graf 2012-08-15 0:20 ` Scott Wood 2012-08-15 0:20 ` Scott Wood 2012-08-15 18:28 ` Marcelo Tosatti 2012-08-15 18:28 ` Marcelo Tosatti 2012-08-14 23:04 ` [PATCH 17/38] KVM: PPC: BookE: Add support for vcpu->mode Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-15 0:17 ` Scott Wood 2012-08-15 0:17 ` Scott Wood 2012-08-15 0:26 ` Alexander Graf 2012-08-15 0:26 ` Alexander Graf 2012-08-15 1:17 ` Scott Wood 2012-08-15 1:17 ` Scott Wood 2012-08-15 9:29 ` Alexander Graf 2012-08-15 9:29 ` Alexander Graf 2012-08-21 1:41 ` Scott Wood 2012-08-21 1:41 ` Scott Wood 2012-08-15 1:25 ` Scott Wood 2012-08-15 1:25 ` Scott Wood 2012-08-14 23:04 ` [PATCH 18/38] KVM: PPC: E500: Implement MMU notifiers Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-15 1:20 ` Scott Wood 2012-08-15 1:20 ` Scott Wood 2012-08-15 9:38 ` Alexander Graf 2012-08-15 9:38 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 19/38] KVM: PPC: Add cache flush on page map Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-15 1:23 ` Scott Wood 2012-08-15 1:23 ` Scott Wood 2012-08-15 9:52 ` Alexander Graf 2012-08-15 9:52 ` Alexander Graf 2012-08-15 17:26 ` Scott Wood 2012-08-15 17:26 ` Scott Wood 2012-08-15 17:27 ` Alexander Graf 2012-08-15 17:27 ` Alexander Graf 2012-08-15 17:47 ` Scott Wood 2012-08-15 17:47 ` Scott Wood 2012-08-15 18:01 ` Alexander Graf 2012-08-15 18:01 ` Alexander Graf 2012-08-15 18:16 ` Scott Wood 2012-08-15 18:16 ` Scott Wood 2012-08-15 18:27 ` Alexander Graf 2012-08-15 18:27 ` Alexander Graf 2012-08-15 18:29 ` Alexander Graf 2012-08-15 18:29 ` Alexander Graf 2012-08-15 18:33 ` Scott Wood 2012-08-15 18:33 ` Scott Wood 2012-08-15 18:51 ` Alexander Graf 2012-08-15 18:51 ` Alexander Graf 2012-08-15 18:56 ` Scott Wood 2012-08-15 18:56 ` Scott Wood 2012-08-15 18:58 ` Alexander Graf 2012-08-15 18:58 ` Alexander Graf 2012-08-15 19:05 ` Scott Wood 2012-08-15 19:05 ` Scott Wood 2012-08-15 19:29 ` Alexander Graf 2012-08-15 19:29 ` Alexander Graf 2012-08-15 19:53 ` Scott Wood 2012-08-15 19:53 ` Scott Wood 2012-08-14 23:04 ` [PATCH 20/38] KVM: PPC: BookE: Add some more trace points Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 21/38] KVM: PPC: BookE: No duplicate request != 0 check Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 22/38] KVM: PPC: Use same kvmppc_prepare_to_enter code for booke and book3s_pr Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 23/38] KVM: PPC: Book3s: PR: Add (dumb) MMU Notifier support Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 24/38] KVM: PPC: BookE: Drop redundant vcpu->mode set Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 25/38] KVM: PPC: Book3S: PR: Only do resched check once per exit Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 26/38] KVM: PPC: Exit guest context while handling exit Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 27/38] KVM: PPC: Book3S: PR: Indicate we're out of guest mode Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 28/38] KVM: PPC: Consistentify vcpu exit path Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 29/38] KVM: PPC: Book3S: PR: Rework irq disabling Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-17 21:47 ` Benjamin Herrenschmidt 2012-08-17 21:47 ` Benjamin Herrenschmidt 2012-09-28 0:52 ` Alexander Graf 2012-09-28 0:52 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 30/38] KVM: PPC: Move kvm_guest_enter call into generic code Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 31/38] KVM: PPC: Ignore EXITING_GUEST_MODE mode Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 32/38] KVM: PPC: Add return value in prepare_to_enter Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 33/38] KVM: PPC: Add return value to core_check_requests Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 34/38] KVM: PPC: booke: Add watchdog emulation Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 35/38] booke: Added ONE_REG interface for IAC/DAC debug registers Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:44 ` Scott Wood 2012-08-14 23:44 ` Scott Wood 2012-08-14 23:47 ` Alexander Graf 2012-08-14 23:47 ` Alexander Graf 2012-08-15 0:06 ` Scott Wood 2012-08-15 0:06 ` Scott Wood 2012-08-14 23:04 ` [PATCH 36/38] KVM: PPC: 44x: Initialize PVR Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 37/38] KVM: PPC: BookE: Add MCSR SPR support Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-14 23:04 ` [PATCH 38/38] ppc: e500_tlb memset clears nothing Alexander Graf 2012-08-14 23:04 ` Alexander Graf 2012-08-15 10:07 ` Avi Kivity 2012-08-15 10:07 ` Avi Kivity 2012-08-15 10:09 ` Alexander Graf 2012-08-15 10:09 ` Alexander Graf 2012-08-15 10:10 ` Avi Kivity 2012-08-15 10:10 ` Avi Kivity
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1344985483-7440-14-git-send-email-agraf@suse.de \ --to=agraf@suse.de \ --cc=kvm-ppc@vger.kernel.org \ --cc=kvm@vger.kernel.org \ --cc=paulus@samba.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.