[v1] spapr/xive: Fix kvm_xive_source_reset trace event

[PATCH] spapr/xive: Fix kvm_xive_source_reset trace event

Posted by Cédric Le Goater 4 years, 4 months ago

Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 hw/intc/spapr_xive_kvm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c
index 53731d158625..7ac2502cc013 100644
--- a/hw/intc/spapr_xive_kvm.c
+++ b/hw/intc/spapr_xive_kvm.c
@@ -236,6 +236,8 @@ int kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp)
     SpaprXive *xive = SPAPR_XIVE(xsrc->xive);
     uint64_t state = 0;
 
+    trace_kvm_xive_source_reset(srcno);
+
     assert(xive->fd != -1);
 
     if (xive_source_irq_is_lsi(xsrc, srcno)) {
@@ -323,8 +325,6 @@ uint64_t kvmppc_xive_esb_rw(XiveSource *xsrc, int srcno, uint32_t offset,
         return xive_esb_rw(xsrc, srcno, offset, data, 1);
     }
 
-    trace_kvm_xive_source_reset(srcno);
-
     /*
      * Special Load EOI handling for LSI sources. Q bit is never set
      * and the interrupt should be re-triggered if the level is still
-- 
2.31.1

Re: [PATCH] spapr/xive: Fix kvm_xive_source_reset trace event

Posted by Greg Kurz 4 years, 4 months ago

On Tue, 21 Sep 2021 08:56:52 +0200
Cédric Le Goater <clg@kaod.org> wrote:

> Signed-off-by: Cédric Le Goater <clg@kaod.org>
> ---

Maybe add ?

Fixes: 4e960974d4ee ("xive: Add trace events")

anyway

Reviewed-by: Greg Kurz <groug@kaod.org>

>  hw/intc/spapr_xive_kvm.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c
> index 53731d158625..7ac2502cc013 100644
> --- a/hw/intc/spapr_xive_kvm.c
> +++ b/hw/intc/spapr_xive_kvm.c
> @@ -236,6 +236,8 @@ int kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp)
>      SpaprXive *xive = SPAPR_XIVE(xsrc->xive);
>      uint64_t state = 0;
>  
> +    trace_kvm_xive_source_reset(srcno);
> +
>      assert(xive->fd != -1);
>  
>      if (xive_source_irq_is_lsi(xsrc, srcno)) {
> @@ -323,8 +325,6 @@ uint64_t kvmppc_xive_esb_rw(XiveSource *xsrc, int srcno, uint32_t offset,
>          return xive_esb_rw(xsrc, srcno, offset, data, 1);
>      }
>  
> -    trace_kvm_xive_source_reset(srcno);
> -
>      /*
>       * Special Load EOI handling for LSI sources. Q bit is never set
>       * and the interrupt should be re-triggered if the level is still

Re: [PATCH] spapr/xive: Fix kvm_xive_source_reset trace event

Posted by David Gibson 4 years, 4 months ago

On Tue, Sep 21, 2021 at 09:13:54AM +0200, Greg Kurz wrote:
> On Tue, 21 Sep 2021 08:56:52 +0200
> Cédric Le Goater <clg@kaod.org> wrote:
> 
> > Signed-off-by: Cédric Le Goater <clg@kaod.org>
> > ---
> 
> Maybe add ?
> 
> Fixes: 4e960974d4ee ("xive: Add trace events")

That would be helpful.

and... this really needs at least *some* commit message.

> 
> anyway
> 
> Reviewed-by: Greg Kurz <groug@kaod.org>
> 
> >  hw/intc/spapr_xive_kvm.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c
> > index 53731d158625..7ac2502cc013 100644
> > --- a/hw/intc/spapr_xive_kvm.c
> > +++ b/hw/intc/spapr_xive_kvm.c
> > @@ -236,6 +236,8 @@ int kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp)
> >      SpaprXive *xive = SPAPR_XIVE(xsrc->xive);
> >      uint64_t state = 0;
> >  
> > +    trace_kvm_xive_source_reset(srcno);
> > +
> >      assert(xive->fd != -1);
> >  
> >      if (xive_source_irq_is_lsi(xsrc, srcno)) {
> > @@ -323,8 +325,6 @@ uint64_t kvmppc_xive_esb_rw(XiveSource *xsrc, int srcno, uint32_t offset,
> >          return xive_esb_rw(xsrc, srcno, offset, data, 1);
> >      }
> >  
> > -    trace_kvm_xive_source_reset(srcno);
> > -
> >      /*
> >       * Special Load EOI handling for LSI sources. Q bit is never set
> >       * and the interrupt should be re-triggered if the level is still
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson