[PATCH] xen: sched: rename vcpu_destroy perf counter to vcpu_remove

[PATCH] xen: sched: rename vcpu_destroy perf counter to vcpu_remove

[Dario Faggioli]

It seems this have had to be done as part of 7e6b926a
("cpupools: Make interface more consistent"), which
renamed the function but not the counter.

In fact, because of cpupools, vcpus are not only removed
from a scheduler when they are destroyed, but also when
domains move between pools.

Make the related statistics counter reflect that more
properly.

Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>
---
Cc: George Dunlap <george.dunlap@eu.citrix.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Meng Xu <mengxu@cis.upenn.edu>
Cc: Jan Beulich <jbeulich@suse.com>
---
 xen/common/sched_credit.c    |    2 +-
 xen/common/sched_credit2.c   |    2 +-
 xen/common/sched_rt.c        |    2 +-
 xen/include/xen/perfc_defn.h |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c
index a1945ac..fb05276 100644
--- a/xen/common/sched_credit.c
+++ b/xen/common/sched_credit.c
@@ -927,7 +927,7 @@ csched_vcpu_remove(const struct scheduler *ops, struct vcpu *vc)
     struct csched_dom * const sdom = svc->sdom;
     unsigned long flags;
 
-    SCHED_STAT_CRANK(vcpu_destroy);
+    SCHED_STAT_CRANK(vcpu_remove);
 
     if ( test_and_clear_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) )
     {
diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c
index 75e0321..135cf88 100644
--- a/xen/common/sched_credit2.c
+++ b/xen/common/sched_credit2.c
@@ -917,7 +917,7 @@ csched2_vcpu_remove(const struct scheduler *ops, struct vcpu *vc)
     {
         spinlock_t *lock;
 
-        SCHED_STAT_CRANK(vcpu_destroy);
+        SCHED_STAT_CRANK(vcpu_remove);
 
         /* Remove from runqueue */
         lock = vcpu_schedule_lock_irq(vc);
diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c
index 4372486..31b0a9e 100644
--- a/xen/common/sched_rt.c
+++ b/xen/common/sched_rt.c
@@ -648,7 +648,7 @@ rt_vcpu_remove(const struct scheduler *ops, struct vcpu *vc)
     struct rt_dom * const sdom = svc->sdom;
     spinlock_t *lock;
 
-    SCHED_STAT_CRANK(vcpu_destroy);
+    SCHED_STAT_CRANK(vcpu_remove);
 
     BUG_ON( sdom == NULL );
 
diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h
index 526002d..43d1dfd 100644
--- a/xen/include/xen/perfc_defn.h
+++ b/xen/include/xen/perfc_defn.h
@@ -20,7 +20,7 @@ PERFCOUNTER(schedule,               "sched: specific scheduler")
 PERFCOUNTER(dom_init,               "sched: dom_init")
 PERFCOUNTER(dom_destroy,            "sched: dom_destroy")
 PERFCOUNTER(vcpu_init,              "sched: vcpu_init")
-PERFCOUNTER(vcpu_destroy,           "sched: vcpu_destroy")
+PERFCOUNTER(vcpu_remove,            "sched: vcpu_remove")
 PERFCOUNTER(vcpu_sleep,             "sched: vcpu_sleep")
 PERFCOUNTER(vcpu_wake_running,      "sched: vcpu_wake_running")
 PERFCOUNTER(vcpu_wake_onrunq,       "sched: vcpu_wake_onrunq")

Re: [PATCH] xen: sched: rename vcpu_destroy perf counter to vcpu_remove

[Juergen Gross]

On 09/24/2015 05:43 PM, Dario Faggioli wrote:
> It seems this have had to be done as part of 7e6b926a
> ("cpupools: Make interface more consistent"), which
> renamed the function but not the counter.
>
> In fact, because of cpupools, vcpus are not only removed
> from a scheduler when they are destroyed, but also when
> domains move between pools.
>
> Make the related statistics counter reflect that more
> properly.
>
> Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>

I'd change the following as well for the same reason:

vcpu_init -> vcpu_alloc_vdata

Nevertheless:

Reviewed-by: Juergen Gross <jgross@suse.com>

> ---
> Cc: George Dunlap <george.dunlap@eu.citrix.com>
> Cc: Juergen Gross <jgross@suse.com>
> Cc: Meng Xu <mengxu@cis.upenn.edu>
> Cc: Jan Beulich <jbeulich@suse.com>
> ---
>   xen/common/sched_credit.c    |    2 +-
>   xen/common/sched_credit2.c   |    2 +-
>   xen/common/sched_rt.c        |    2 +-
>   xen/include/xen/perfc_defn.h |    2 +-
>   4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c
> index a1945ac..fb05276 100644
> --- a/xen/common/sched_credit.c
> +++ b/xen/common/sched_credit.c
> @@ -927,7 +927,7 @@ csched_vcpu_remove(const struct scheduler *ops, struct vcpu *vc)
>       struct csched_dom * const sdom = svc->sdom;
>       unsigned long flags;
>
> -    SCHED_STAT_CRANK(vcpu_destroy);
> +    SCHED_STAT_CRANK(vcpu_remove);
>
>       if ( test_and_clear_bit(CSCHED_FLAG_VCPU_PARKED, &svc->flags) )
>       {
> diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c
> index 75e0321..135cf88 100644
> --- a/xen/common/sched_credit2.c
> +++ b/xen/common/sched_credit2.c
> @@ -917,7 +917,7 @@ csched2_vcpu_remove(const struct scheduler *ops, struct vcpu *vc)
>       {
>           spinlock_t *lock;
>
> -        SCHED_STAT_CRANK(vcpu_destroy);
> +        SCHED_STAT_CRANK(vcpu_remove);
>
>           /* Remove from runqueue */
>           lock = vcpu_schedule_lock_irq(vc);
> diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c
> index 4372486..31b0a9e 100644
> --- a/xen/common/sched_rt.c
> +++ b/xen/common/sched_rt.c
> @@ -648,7 +648,7 @@ rt_vcpu_remove(const struct scheduler *ops, struct vcpu *vc)
>       struct rt_dom * const sdom = svc->sdom;
>       spinlock_t *lock;
>
> -    SCHED_STAT_CRANK(vcpu_destroy);
> +    SCHED_STAT_CRANK(vcpu_remove);
>
>       BUG_ON( sdom == NULL );
>
> diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h
> index 526002d..43d1dfd 100644
> --- a/xen/include/xen/perfc_defn.h
> +++ b/xen/include/xen/perfc_defn.h
> @@ -20,7 +20,7 @@ PERFCOUNTER(schedule,               "sched: specific scheduler")
>   PERFCOUNTER(dom_init,               "sched: dom_init")
>   PERFCOUNTER(dom_destroy,            "sched: dom_destroy")
>   PERFCOUNTER(vcpu_init,              "sched: vcpu_init")
> -PERFCOUNTER(vcpu_destroy,           "sched: vcpu_destroy")
> +PERFCOUNTER(vcpu_remove,            "sched: vcpu_remove")
>   PERFCOUNTER(vcpu_sleep,             "sched: vcpu_sleep")
>   PERFCOUNTER(vcpu_wake_running,      "sched: vcpu_wake_running")
>   PERFCOUNTER(vcpu_wake_onrunq,       "sched: vcpu_wake_onrunq")
>
>

Re: [PATCH] xen: sched: rename vcpu_destroy perf counter to vcpu_remove

[Dario Faggioli]

[-- Attachment #1.1: Type: text/plain, Size: 1050 bytes --]

On Fri, 2015-09-25 at 06:44 +0200, Juergen Gross wrote:
> On 09/24/2015 05:43 PM, Dario Faggioli wrote:
> > It seems this have had to be done as part of 7e6b926a
> > ("cpupools: Make interface more consistent"), which
> > renamed the function but not the counter.
> > 
> > In fact, because of cpupools, vcpus are not only removed
> > from a scheduler when they are destroyed, but also when
> > domains move between pools.
> > 
> > Make the related statistics counter reflect that more
> > properly.
> > 
> > Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>
> 
> I'd change the following as well for the same reason:
> 
> vcpu_init -> vcpu_alloc_vdata
> 
Good point, I'll do that (although I may go for "vcpu_alloc" as a name)
.

Thanks and Regards,
Dario
-- 
<<This happens because I choose it to happen!>> (Raistlin Majere)
-----------------------------------------------------------------
Dario Faggioli, Ph.D, http://about.me/dario.faggioli
Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)


[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

[-- Attachment #2: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel