Re: [Xen-devel] [PATCH 16/19] tools: tracing: deal with new Credit2 events

2016-07-07 Thread George Dunlap
On Sat, Jun 18, 2016 at 12:13 AM, Dario Faggioli
 wrote:
> more specifically, with: TICKLE_NEW, RUNQ_MAX_WEIGHT,
> MIGRATE, LOAD_CHECK, LOAD_BALANCE and PICKED_CPU, and
> in both both xenalyze and formats (for xentrace_format).
>
> Signed-off-by: Dario Faggioli 

Acked-by: George Dunlap 

___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel


[Xen-devel] [PATCH 16/19] tools: tracing: deal with new Credit2 events

2016-06-17 Thread Dario Faggioli
more specifically, with: TICKLE_NEW, RUNQ_MAX_WEIGHT,
MIGRATE, LOAD_CHECK, LOAD_BALANCE and PICKED_CPU, and
in both both xenalyze and formats (for xentrace_format).

Signed-off-by: Dario Faggioli 
---
Cc: George Dunlap 
Cc: Ian Jackson 
Cc: Wei Liu 
Cc: Anshul Makkar 
---
 tools/xentrace/formats|6 +++
 tools/xentrace/xenalyze.c |   78 -
 2 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/tools/xentrace/formats b/tools/xentrace/formats
index 2e58d03..caafb5f 100644
--- a/tools/xentrace/formats
+++ b/tools/xentrace/formats
@@ -55,6 +55,12 @@
 0x0002220a  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  csched2:runq_assign[ 
dom:vcpu = 0x%(1)08x, rq_id = %(2)d ]
 0x0002220b  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  csched2:updt_vcpu_load [ 
dom:vcpu = 0x%(3)08x, vcpuload = 0x%(2)08x%(1)08x, wshift = %(4)d ]
 0x0002220c  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  csched2:updt_runq_load [ 
rq_load[16]:rq_id[8]:wshift[8] = 0x%(5)08x, rq_avgload = 0x%(2)08x%(1)08x, 
b_avgload = 0x%(4)08x%(3)08x ]
+0x0002220d  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  csched2:tickle_new [ 
dom:vcpu = 0x%(1)08x, processor = %(2)d credit = %(3)d ]
+0x0002220e  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  csched2:runq_max_weight [ 
rq_id[16]:max_weight[16] = 0x%(1)08x ]
+0x0002220f  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  csched2:migrrate   [ 
dom:vcpu = 0x%(1)08x, rq_id[16]:trq_id[16] = 0x%(2)08x ]
+0x00022210  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  csched2:load_check [ 
lrq_id[16]:orq_id[16] = 0x%(1)08x, delta = %(2)d ]
+0x00022211  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  csched2:load_balance   [ 
l_bavgload = 0x%(2)08x%(1)08x, o_bavgload = 0x%(4)08x%(3)08x, 
lrq_id[16]:orq_id[16] = 0x%(5)08x ]
+0x00022212  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  csched2:pick_cpu   [ 
b_avgload = 0x%(2)08x%(1)08x, dom:vcpu = 0x%(3)08x, rq_id[16]:new_cpu[16] = 
%(4)d ]
 
 0x00022801  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  rtds:tickle[ cpu = 
%(1)d ]
 0x00022802  CPU%(cpu)d  %(tsc)d (+%(reltsc)8d)  rtds:runq_pick [ dom:vcpu 
= 0x%(1)08x, cur_deadline = 0x%(3)08x%(2)08x, cur_budget = 0x%(5)08x%(4)08x ]
diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c
index f2f97bd..d223de6 100644
--- a/tools/xentrace/xenalyze.c
+++ b/tools/xentrace/xenalyze.c
@@ -7725,7 +7725,6 @@ void sched_process(struct pcpu_info *p)
 /* CREDIT 2 (TRC_CSCHED2_xxx) */
 case TRC_SCHED_CLASS_EVT(CSCHED2, 1): /* TICK  */
 case TRC_SCHED_CLASS_EVT(CSCHED2, 4): /* CREDIT_ADD*/
-case TRC_SCHED_CLASS_EVT(CSCHED2, 9): /* UPDATE_LOAD   */
 break;
 case TRC_SCHED_CLASS_EVT(CSCHED2, 2): /* RUNQ_POS  */
 if(opt.dump_all) {
@@ -7788,11 +7787,15 @@ void sched_process(struct pcpu_info *p)
 if(opt.dump_all)
 printf(" %s csched2:sched_tasklet\n", ri->dump_header);
 break;
+case TRC_SCHED_CLASS_EVT(CSCHED2, 9):  /* UPDATE_LOAD  */
+if(opt.dump_all)
+printf(" %s csched2:update_load\n", ri->dump_header);
+break;
 case TRC_SCHED_CLASS_EVT(CSCHED2, 10): /* RUNQ_ASSIGN  */
 if(opt.dump_all) {
 struct {
 unsigned int vcpuid:16, domid:16;
-unsigned int rqi;
+unsigned int rqi:16;
 } *r = (typeof(r))ri->d;
 
 printf(" %s csched2:runq_assign d%uv%u on rq# %u\n",
@@ -7834,6 +7837,77 @@ void sched_process(struct pcpu_info *p)
avgload, r->rq_avgload, b_avgload, r->b_avgload);
 }
 break;
+case TRC_SCHED_CLASS_EVT(CSCHED2, 13): /* TICKLE_NEW   */
+if (opt.dump_all) {
+struct {
+unsigned vcpuid:16, domid:16;
+unsigned processor, credit;
+} *r = (typeof(r))ri->d;
+
+printf(" %s csched2:runq_tickle_new d%uv%u, "
+   "processor = %u, credit = %u\n",
+   ri->dump_header, r->domid, r->vcpuid,
+   r->processor, r->credit);
+}
+break;
+case TRC_SCHED_CLASS_EVT(CSCHED2, 14): /* RUNQ_MAX_WEIGHT  */
+if (opt.dump_all) {
+struct {
+unsigned rqi:16, max_weight:16;
+} *r = (typeof(r))ri->d;
+
+printf(" %s csched2:update_max_weight rq# %u, max_weight = 
%u\n",
+   ri->dump_header, r->rqi, r->max_weight);
+}
+break;
+case TRC_SCHED_CLASS_EVT(CSCHED2, 15): /* MIGRATE  */
+if (opt.dump_all) {
+struct {
+unsigned vcpuid:16, domid:16;
+unsigned rqi:16, trqi:16;
+} *r =