linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] powerpc/kvm/e500_tlb: Fix a minor copy-paste tracing bug
@ 2010-08-27 19:06 Kyle Moffett
  2010-08-28  0:58 ` Alexander Graf
  2010-08-30 15:38 ` Kyle Moffett
  0 siblings, 2 replies; 6+ messages in thread
From: Kyle Moffett @ 2010-08-27 19:06 UTC (permalink / raw)
  To: linux-kernel; +Cc: linuxppc-dev, Kyle Moffett, Liu Yu, Kyle Moffett, kvm-ppc

The kvmppc_e500_stlbe_invalidate() function was trying to pass too many
parameters to trace_kvm_stlb_inval().  This appears to be a bad
copy-paste from a call to trace_kvm_stlb_write().

Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>
---
 arch/powerpc/kvm/e500_tlb.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c
index 21011e1..1261a21 100644
--- a/arch/powerpc/kvm/e500_tlb.c
+++ b/arch/powerpc/kvm/e500_tlb.c
@@ -226,8 +226,7 @@ static void kvmppc_e500_stlbe_invalidate(struct kvmppc_vcpu_e500 *vcpu_e500,
 
 	kvmppc_e500_shadow_release(vcpu_e500, tlbsel, esel);
 	stlbe->mas1 = 0;
-	trace_kvm_stlb_inval(index_of(tlbsel, esel), stlbe->mas1, stlbe->mas2,
-			     stlbe->mas3, stlbe->mas7);
+	trace_kvm_stlb_inval(index_of(tlbsel, esel));
 }
 
 static void kvmppc_e500_tlb1_invalidate(struct kvmppc_vcpu_e500 *vcpu_e500,
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] powerpc/kvm/e500_tlb: Fix a minor copy-paste tracing bug
  2010-08-27 19:06 [PATCH] powerpc/kvm/e500_tlb: Fix a minor copy-paste tracing bug Kyle Moffett
@ 2010-08-28  0:58 ` Alexander Graf
  2010-08-28  5:24   ` Kyle Moffett
  2010-08-30 15:38 ` Kyle Moffett
  1 sibling, 1 reply; 6+ messages in thread
From: Alexander Graf @ 2010-08-28  0:58 UTC (permalink / raw)
  To: Kyle Moffett; +Cc: linuxppc-dev, Kyle Moffett, Liu Yu, linux-kernel, kvm-ppc


On 27.08.2010, at 21:06, Kyle Moffett wrote:

> The kvmppc_e500_stlbe_invalidate() function was trying to pass too =
many
> parameters to trace_kvm_stlb_inval().  This appears to be a bad
> copy-paste from a call to trace_kvm_stlb_write().

Which kernel is this against? That trace point is already commented out =
in my tree.


Alex

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] powerpc/kvm/e500_tlb: Fix a minor copy-paste tracing bug
  2010-08-28  0:58 ` Alexander Graf
@ 2010-08-28  5:24   ` Kyle Moffett
  2010-08-28 10:51     ` Alexander Graf
  0 siblings, 1 reply; 6+ messages in thread
From: Kyle Moffett @ 2010-08-28  5:24 UTC (permalink / raw)
  To: Alexander Graf; +Cc: kvm-ppc, linuxppc-dev, Liu Yu, linux-kernel, Kyle Moffett

On Fri, Aug 27, 2010 at 20:58, Alexander Graf <agraf@suse.de> wrote:
> On 27.08.2010, at 21:06, Kyle Moffett wrote:
>> The kvmppc_e500_stlbe_invalidate() function was trying to pass too many
>> parameters to trace_kvm_stlb_inval(). =C2=A0This appears to be a bad
>> copy-paste from a call to trace_kvm_stlb_write().
>
> Which kernel is this against? That trace point is already commented out i=
n my tree.

Oh, hm, I guess I haven't rebased this patch since 2.6.35-ish.  The
trace point seems to work correctly with the fixed arguments; if
you'll tell me which tree I should base it on I can easily resubmit.

Cheers,
Kyle Moffett

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] powerpc/kvm/e500_tlb: Fix a minor copy-paste tracing bug
  2010-08-28  5:24   ` Kyle Moffett
@ 2010-08-28 10:51     ` Alexander Graf
  0 siblings, 0 replies; 6+ messages in thread
From: Alexander Graf @ 2010-08-28 10:51 UTC (permalink / raw)
  To: Kyle Moffett; +Cc: kvm-ppc, linuxppc-dev, Liu Yu, linux-kernel, Kyle Moffett

[-- Attachment #1: Type: text/plain, Size: 828 bytes --]


On 28.08.2010, at 07:24, Kyle Moffett wrote:

> On Fri, Aug 27, 2010 at 20:58, Alexander Graf <agraf@suse.de> wrote:
>> On 27.08.2010, at 21:06, Kyle Moffett wrote:
>>> The kvmppc_e500_stlbe_invalidate() function was trying to pass too many
>>> parameters to trace_kvm_stlb_inval().  This appears to be a bad
>>> copy-paste from a call to trace_kvm_stlb_write().
>> 
>> Which kernel is this against? That trace point is already commented out in my tree.
> 
> Oh, hm, I guess I haven't rebased this patch since 2.6.35-ish.  The
> trace point seems to work correctly with the fixed arguments; if
> you'll tell me which tree I should base it on I can easily resubmit.

My tree is at git://github.com/agraf/linux-2.6.git kvm-ppc-next. If you like I'll gladly take a patch in to enable the point again :).

Alex


[-- Attachment #2: Type: text/html, Size: 1552 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH] powerpc/kvm/e500_tlb: Fix a minor copy-paste tracing bug
  2010-08-27 19:06 [PATCH] powerpc/kvm/e500_tlb: Fix a minor copy-paste tracing bug Kyle Moffett
  2010-08-28  0:58 ` Alexander Graf
@ 2010-08-30 15:38 ` Kyle Moffett
  2010-08-31  1:07   ` Alexander Graf
  1 sibling, 1 reply; 6+ messages in thread
From: Kyle Moffett @ 2010-08-30 15:38 UTC (permalink / raw)
  To: linux-kernel; +Cc: linuxppc-dev, Kyle Moffett, Liu Yu, Kyle Moffett, kvm-ppc

The kvmppc_e500_stlbe_invalidate() function was trying to pass too many
parameters to trace_kvm_stlb_inval().  This appears to be a bad
copy-paste from a call to trace_kvm_stlb_write().

Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>

---
Alex,

This is the rebased patch to re-enable the tracepoint.

I also pushed a tree with this patch on top of kvm-ppc-next out to:
  git://opensource.exmeritus.com/hww-1u-1a/linux.git kvm-ppc-patches
  http://opensource.exmeritus.com/git/hww-1u-1a/linux.git/kvm-ppc-patches

Thanks again!

Cheers,
Kyle Moffett

---
 arch/powerpc/kvm/e500_tlb.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c
index 66845a5..a413883 100644
--- a/arch/powerpc/kvm/e500_tlb.c
+++ b/arch/powerpc/kvm/e500_tlb.c
@@ -226,11 +226,7 @@ static void kvmppc_e500_stlbe_invalidate(struct kvmppc_vcpu_e500 *vcpu_e500,
 
 	kvmppc_e500_shadow_release(vcpu_e500, tlbsel, esel);
 	stlbe->mas1 = 0;
-	/* XXX doesn't compile */
-#if 0
-	trace_kvm_stlb_inval(index_of(tlbsel, esel), stlbe->mas1, stlbe->mas2,
-			     stlbe->mas3, stlbe->mas7);
-#endif
+	trace_kvm_stlb_inval(index_of(tlbsel, esel));
 }
 
 static void kvmppc_e500_tlb1_invalidate(struct kvmppc_vcpu_e500 *vcpu_e500,
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] powerpc/kvm/e500_tlb: Fix a minor copy-paste tracing bug
  2010-08-30 15:38 ` Kyle Moffett
@ 2010-08-31  1:07   ` Alexander Graf
  0 siblings, 0 replies; 6+ messages in thread
From: Alexander Graf @ 2010-08-31  1:07 UTC (permalink / raw)
  To: Kyle Moffett; +Cc: linuxppc-dev, Kyle Moffett, Liu Yu, linux-kernel, kvm-ppc


On 30.08.2010, at 17:38, Kyle Moffett wrote:

> The kvmppc_e500_stlbe_invalidate() function was trying to pass too many
> parameters to trace_kvm_stlb_inval().  This appears to be a bad
> copy-paste from a call to trace_kvm_stlb_write().
> 
> Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>

Thanks, applied.

Alex

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2010-08-31  1:07 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-27 19:06 [PATCH] powerpc/kvm/e500_tlb: Fix a minor copy-paste tracing bug Kyle Moffett
2010-08-28  0:58 ` Alexander Graf
2010-08-28  5:24   ` Kyle Moffett
2010-08-28 10:51     ` Alexander Graf
2010-08-30 15:38 ` Kyle Moffett
2010-08-31  1:07   ` Alexander Graf

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).