* [Qemu-devel] [PATCH] target-ppc: Fix h_enter to loop correctly
@ 2014-03-14 13:51 Aneesh Kumar K.V
2014-03-19 14:31 ` Aneesh Kumar K.V
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Aneesh Kumar K.V @ 2014-03-14 13:51 UTC (permalink / raw)
To: agraf, paulus, Paolo Bonzini; +Cc: qemu-ppc, qemu-devel, Aneesh Kumar K.V
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
We wanted to loop till index is 8. On 8 we return with H_PTEG_FULL. If we are
successful in loading hpte with any other index, we continue with that
index value.
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
hw/ppc/spapr_hcall.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index e999bbaea062..2ab55d568bf4 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -110,16 +110,15 @@ static target_ulong h_enter(PowerPCCPU *cpu, sPAPREnvironment *spapr,
if (likely((flags & H_EXACT) == 0)) {
pte_index &= ~7ULL;
token = ppc_hash64_start_access(cpu, pte_index);
- do {
- if (index == 8) {
- ppc_hash64_stop_access(token);
- return H_PTEG_FULL;
- }
+ for (; index < 8; index++) {
if ((ppc_hash64_load_hpte0(env, token, index) & HPTE64_V_VALID) == 0) {
break;
}
- } while (index++);
+ }
ppc_hash64_stop_access(token);
+ if (index == 8) {
+ return H_PTEG_FULL;
+ }
} else {
token = ppc_hash64_start_access(cpu, pte_index);
if (ppc_hash64_load_hpte0(env, token, 0) & HPTE64_V_VALID) {
--
1.8.3.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] target-ppc: Fix h_enter to loop correctly
2014-03-14 13:51 [Qemu-devel] [PATCH] target-ppc: Fix h_enter to loop correctly Aneesh Kumar K.V
@ 2014-03-19 14:31 ` Aneesh Kumar K.V
2014-03-19 15:46 ` Andreas Färber
2014-03-19 15:50 ` Paolo Bonzini
2 siblings, 0 replies; 4+ messages in thread
From: Aneesh Kumar K.V @ 2014-03-19 14:31 UTC (permalink / raw)
To: agraf, paulus, Paolo Bonzini, Peter Maydell; +Cc: qemu-ppc, qemu-devel
Hi,
I guess this should get into 2.0 ?
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> writes:
> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
>
> We wanted to loop till index is 8. On 8 we return with H_PTEG_FULL. If we are
> successful in loading hpte with any other index, we continue with that
> index value.
>
> Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> ---
> hw/ppc/spapr_hcall.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> index e999bbaea062..2ab55d568bf4 100644
> --- a/hw/ppc/spapr_hcall.c
> +++ b/hw/ppc/spapr_hcall.c
> @@ -110,16 +110,15 @@ static target_ulong h_enter(PowerPCCPU *cpu, sPAPREnvironment *spapr,
> if (likely((flags & H_EXACT) == 0)) {
> pte_index &= ~7ULL;
> token = ppc_hash64_start_access(cpu, pte_index);
> - do {
> - if (index == 8) {
> - ppc_hash64_stop_access(token);
> - return H_PTEG_FULL;
> - }
> + for (; index < 8; index++) {
> if ((ppc_hash64_load_hpte0(env, token, index) & HPTE64_V_VALID) == 0) {
> break;
> }
> - } while (index++);
> + }
> ppc_hash64_stop_access(token);
> + if (index == 8) {
> + return H_PTEG_FULL;
> + }
> } else {
> token = ppc_hash64_start_access(cpu, pte_index);
> if (ppc_hash64_load_hpte0(env, token, 0) & HPTE64_V_VALID) {
> --
> 1.8.3.2
-aneesh
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] target-ppc: Fix h_enter to loop correctly
2014-03-14 13:51 [Qemu-devel] [PATCH] target-ppc: Fix h_enter to loop correctly Aneesh Kumar K.V
2014-03-19 14:31 ` Aneesh Kumar K.V
@ 2014-03-19 15:46 ` Andreas Färber
2014-03-19 15:50 ` Paolo Bonzini
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Färber @ 2014-03-19 15:46 UTC (permalink / raw)
To: Aneesh Kumar K.V, agraf, Paolo Bonzini; +Cc: qemu-ppc, paulus, qemu-devel
Am 14.03.2014 14:51, schrieb Aneesh Kumar K.V:
> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
>
> We wanted to loop till index is 8. On 8 we return with H_PTEG_FULL. If we are
> successful in loading hpte with any other index, we continue with that
> index value.
>
> Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Thanks, applied to my ppc-next:
https://github.com/afaerber/qemu-cpu/commits/ppc-next
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] target-ppc: Fix h_enter to loop correctly
2014-03-14 13:51 [Qemu-devel] [PATCH] target-ppc: Fix h_enter to loop correctly Aneesh Kumar K.V
2014-03-19 14:31 ` Aneesh Kumar K.V
2014-03-19 15:46 ` Andreas Färber
@ 2014-03-19 15:50 ` Paolo Bonzini
2 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2014-03-19 15:50 UTC (permalink / raw)
To: Aneesh Kumar K.V, agraf, paulus; +Cc: qemu-ppc, qemu-devel
Il 14/03/2014 14:51, Aneesh Kumar K.V ha scritto:
> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
>
> We wanted to loop till index is 8. On 8 we return with H_PTEG_FULL. If we are
> successful in loading hpte with any other index, we continue with that
> index value.
>
> Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> ---
> hw/ppc/spapr_hcall.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> index e999bbaea062..2ab55d568bf4 100644
> --- a/hw/ppc/spapr_hcall.c
> +++ b/hw/ppc/spapr_hcall.c
> @@ -110,16 +110,15 @@ static target_ulong h_enter(PowerPCCPU *cpu, sPAPREnvironment *spapr,
> if (likely((flags & H_EXACT) == 0)) {
> pte_index &= ~7ULL;
> token = ppc_hash64_start_access(cpu, pte_index);
> - do {
> - if (index == 8) {
> - ppc_hash64_stop_access(token);
> - return H_PTEG_FULL;
> - }
> + for (; index < 8; index++) {
> if ((ppc_hash64_load_hpte0(env, token, index) & HPTE64_V_VALID) == 0) {
> break;
> }
> - } while (index++);
> + }
> ppc_hash64_stop_access(token);
> + if (index == 8) {
> + return H_PTEG_FULL;
> + }
> } else {
> token = ppc_hash64_start_access(cpu, pte_index);
> if (ppc_hash64_load_hpte0(env, token, 0) & HPTE64_V_VALID) {
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-19 15:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-14 13:51 [Qemu-devel] [PATCH] target-ppc: Fix h_enter to loop correctly Aneesh Kumar K.V
2014-03-19 14:31 ` Aneesh Kumar K.V
2014-03-19 15:46 ` Andreas Färber
2014-03-19 15:50 ` Paolo Bonzini
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).