ia64/xen-unstable

changeset 11290:d5eb5205ff35

Remove redundant performance counters.

Signed-off-by: Steven Hand <steven@xensource.com>
author Steven Hand <steven@xensource.com>
date Thu Aug 24 16:25:49 2006 +0100 (2006-08-24)
parents ba3061912d3d
children 54a905c6c84d
files xen/arch/x86/mm.c xen/common/multicall.c xen/include/asm-x86/perfc_defn.h xen/include/xen/perfc_defn.h
line diff
     1.1 --- a/xen/arch/x86/mm.c	Thu Aug 24 14:07:01 2006 +0100
     1.2 +++ b/xen/arch/x86/mm.c	Thu Aug 24 16:25:49 2006 +0100
     1.3 @@ -2264,7 +2264,6 @@ int do_mmu_update(
     1.4  
     1.5      perfc_incrc(calls_to_mmu_update);
     1.6      perfc_addc(num_page_updates, count);
     1.7 -    perfc_incr_histo(bpt_updates, count, PT_UPDATES);
     1.8  
     1.9      if ( unlikely(!guest_handle_okay(ureqs, count)) )
    1.10      {
     2.1 --- a/xen/common/multicall.c	Thu Aug 24 14:07:01 2006 +0100
     2.2 +++ b/xen/common/multicall.c	Thu Aug 24 16:25:49 2006 +0100
     2.3 @@ -6,7 +6,6 @@
     2.4  #include <xen/types.h>
     2.5  #include <xen/lib.h>
     2.6  #include <xen/mm.h>
     2.7 -#include <xen/perfc.h>
     2.8  #include <xen/sched.h>
     2.9  #include <xen/event.h>
    2.10  #include <xen/multicall.h>
     3.1 --- a/xen/include/asm-x86/perfc_defn.h	Thu Aug 24 14:07:01 2006 +0100
     3.2 +++ b/xen/include/asm-x86/perfc_defn.h	Thu Aug 24 16:25:49 2006 +0100
     3.3 @@ -2,27 +2,6 @@
     3.4  /*#ifndef __XEN_PERFC_DEFN_H__*/
     3.5  /*#define __XEN_PERFC_DEFN_H__*/
     3.6  
     3.7 -#define PERFC_MAX_PT_UPDATES 64
     3.8 -#define PERFC_PT_UPDATES_BUCKET_SIZE 3
     3.9 -PERFCOUNTER_ARRAY(wpt_updates,          "writable pt updates",
    3.10 -                  PERFC_MAX_PT_UPDATES)
    3.11 -PERFCOUNTER_ARRAY(bpt_updates,          "batched pt updates",
    3.12 -                  PERFC_MAX_PT_UPDATES)
    3.13 -PERFCOUNTER_ARRAY(l1_entries_checked,   "l1 entries checked",
    3.14 -                  PERFC_MAX_PT_UPDATES)
    3.15 -PERFCOUNTER_ARRAY(shm_l2_updates,       "shadow mode L2 pt updates",
    3.16 -                  PERFC_MAX_PT_UPDATES)
    3.17 -PERFCOUNTER_ARRAY(shm_hl2_updates,      "shadow mode HL2 pt updates",
    3.18 -                  PERFC_MAX_PT_UPDATES)
    3.19 -#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
    3.20 -PERFCOUNTER_ARRAY(shm_l3_updates,       "shadow mode L3 pt updates",
    3.21 -                  PERFC_MAX_PT_UPDATES)
    3.22 -PERFCOUNTER_ARRAY(shm_l4_updates,       "shadow mode L4 pt updates",
    3.23 -                  PERFC_MAX_PT_UPDATES)
    3.24 -#endif
    3.25 -PERFCOUNTER_ARRAY(snapshot_copies,      "entries copied per snapshot",
    3.26 -                  PERFC_MAX_PT_UPDATES)
    3.27 -
    3.28  PERFCOUNTER_ARRAY(exceptions,           "exceptions", 32)
    3.29  
    3.30  #define VMX_PERF_EXIT_REASON_SIZE 44
    3.31 @@ -36,7 +15,6 @@ PERFCOUNTER_ARRAY(svmexits,             
    3.32  PERFCOUNTER_CPU(seg_fixups,             "segmentation fixups")
    3.33  
    3.34  PERFCOUNTER_CPU(apic_timer,             "apic timer interrupts")
    3.35 -PERFCOUNTER_CPU(timer_max,           "timer max error (ns)")
    3.36  
    3.37  PERFCOUNTER_CPU(domain_page_tlb_flush,  "domain page tlb flushes")
    3.38  
    3.39 @@ -46,107 +24,17 @@ PERFCOUNTER_CPU(calls_to_update_va,     
    3.40  PERFCOUNTER_CPU(page_faults,            "page faults")
    3.41  PERFCOUNTER_CPU(copy_user_faults,       "copy_user faults")
    3.42  
    3.43 -PERFCOUNTER_CPU(shadow_fault_calls,     "calls to shadow_fault")
    3.44 -PERFCOUNTER_CPU(shadow_fault_bail_pde_not_present,
    3.45 -                "sf bailed due to pde not present")
    3.46 -PERFCOUNTER_CPU(shadow_fault_bail_pte_not_present,
    3.47 -                "sf bailed due to pte not present")
    3.48 -PERFCOUNTER_CPU(shadow_fault_bail_ro_mapping,
    3.49 -                "sf bailed due to a ro mapping")
    3.50 -PERFCOUNTER_CPU(shadow_fault_fixed,     "sf fixed the pgfault")
    3.51 -PERFCOUNTER_CPU(write_fault_bail,       "sf bailed due to write_fault")
    3.52 -PERFCOUNTER_CPU(read_fault_bail,        "sf bailed due to read_fault")
    3.53 -
    3.54  PERFCOUNTER_CPU(map_domain_page_count,  "map_domain_page count")
    3.55  PERFCOUNTER_CPU(ptwr_emulations,        "writable pt emulations")
    3.56  
    3.57 -#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
    3.58 -PERFCOUNTER_CPU(shadow_l4_table_count,  "shadow_l4_table count")
    3.59 -PERFCOUNTER_CPU(shadow_l3_table_count,  "shadow_l3_table count")
    3.60 -#endif
    3.61 -PERFCOUNTER_CPU(shadow_l2_table_count,  "shadow_l2_table count")
    3.62 -PERFCOUNTER_CPU(shadow_l1_table_count,  "shadow_l1_table count")
    3.63 -PERFCOUNTER_CPU(unshadow_table_count,   "unshadow_table count")
    3.64 -PERFCOUNTER_CPU(shadow_fixup_count,     "shadow_fixup count")
    3.65 -PERFCOUNTER_CPU(shadow_update_va_fail1, "shadow_update_va_fail1")
    3.66 -PERFCOUNTER_CPU(shadow_update_va_fail2, "shadow_update_va_fail2")
    3.67 -
    3.68 -/* STATUS counters do not reset when 'P' is hit */
    3.69 -#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
    3.70 -PERFSTATUS(shadow_l4_pages,             "current # shadow L4 pages")
    3.71 -PERFSTATUS(shadow_l3_pages,             "current # shadow L3 pages")
    3.72 -#endif
    3.73 -PERFSTATUS(shadow_l2_pages,             "current # shadow L2 pages")
    3.74 -PERFSTATUS(shadow_l1_pages,             "current # shadow L1 pages")
    3.75 -PERFSTATUS(hl2_table_pages,             "current # hl2 pages")
    3.76 -PERFSTATUS(snapshot_pages,              "current # fshadow snapshot pages")
    3.77 -PERFSTATUS(writable_pte_predictions,    "# writable pte predictions")
    3.78 -PERFSTATUS(free_l1_pages,               "current # free shadow L1 pages")
    3.79 -
    3.80 -PERFCOUNTER_CPU(check_pagetable,        "calls to check_pagetable")
    3.81 -PERFCOUNTER_CPU(check_all_pagetables,   "calls to check_all_pagetables")
    3.82 -
    3.83 -PERFCOUNTER_CPU(shadow_hl2_table_count, "shadow_hl2_table count")
    3.84 -PERFCOUNTER_CPU(shadow_set_l1e_force_map, "shadow_set_l1e forced to map l1")
    3.85 -PERFCOUNTER_CPU(shadow_set_l1e_unlinked, "shadow_set_l1e found unlinked l1")
    3.86 -PERFCOUNTER_CPU(shadow_set_l1e_fail,    "shadow_set_l1e failed (no sl1)")
    3.87 -#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
    3.88 -PERFCOUNTER_CPU(shadow_set_l2e_force_map, "shadow_set_l2e forced to map l2")
    3.89 -PERFCOUNTER_CPU(shadow_set_l3e_force_map, "shadow_set_l3e forced to map l3")
    3.90 -#endif
    3.91 -PERFCOUNTER_CPU(shadow_invlpg_faults,   "shadow_invlpg's get_user faulted")
    3.92 -PERFCOUNTER_CPU(unshadow_l2_count,      "unpinned L2 count")
    3.93 +PERFCOUNTER_CPU(exception_fixed,        "pre-exception fixed")
    3.94  
    3.95 -PERFCOUNTER_CPU(shadow_status_shortcut, "fastpath miss on shadow cache")
    3.96 -PERFCOUNTER_CPU(shadow_status_calls,    "calls to shadow_status")
    3.97 -PERFCOUNTER_CPU(shadow_status_miss,     "missed shadow cache")
    3.98 -PERFCOUNTER_CPU(shadow_status_hit_head, "hits on head of bucket")
    3.99 -PERFCOUNTER_CPU(shadow_max_type,        "calls to shadow_max_type")
   3.100 -
   3.101 -PERFCOUNTER_CPU(shadow_sync_all,        "calls to shadow_sync_all")
   3.102 -PERFCOUNTER_CPU(shadow_sync_va,         "calls to shadow_sync_va")
   3.103 -PERFCOUNTER_CPU(resync_l1,              "resync L1 page")
   3.104 -PERFCOUNTER_CPU(resync_l2,              "resync L2 page")
   3.105 -#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
   3.106 -PERFCOUNTER_CPU(resync_l3,              "resync L3 page")
   3.107 -PERFCOUNTER_CPU(resync_l4,              "resync L4 page")
   3.108 -#endif
   3.109 -PERFCOUNTER_CPU(resync_hl2,             "resync HL2 page")
   3.110 -PERFCOUNTER_CPU(shadow_make_snapshot,   "snapshots created")
   3.111 -PERFCOUNTER_CPU(shadow_mark_mfn_out_of_sync_calls,
   3.112 -                "calls to shadow_mk_out_of_sync")
   3.113 -PERFCOUNTER_CPU(shadow_out_of_sync_calls, "calls to shadow_out_of_sync")
   3.114 -PERFCOUNTER_CPU(snapshot_entry_matches_calls, "calls to ss_entry_matches")
   3.115 -PERFCOUNTER_CPU(snapshot_entry_matches_true, "ss_entry_matches returns true")
   3.116 -
   3.117 -PERFCOUNTER_CPU(validate_pte_calls,     "calls to validate_pte_change")
   3.118 -PERFCOUNTER_CPU(validate_pte_changes1,  "validate_pte makes changes1")
   3.119 -PERFCOUNTER_CPU(validate_pte_changes2,  "validate_pte makes changes2")
   3.120 -PERFCOUNTER_CPU(validate_pte_changes3,  "validate_pte makes changes3")
   3.121 -PERFCOUNTER_CPU(validate_pte_changes4,  "validate_pte makes changes4")
   3.122 -PERFCOUNTER_CPU(validate_pde_calls,     "calls to validate_pde_change")
   3.123 -PERFCOUNTER_CPU(validate_pde_changes,   "validate_pde makes changes")
   3.124 -PERFCOUNTER_CPU(shadow_get_page_fail,   "shadow_get_page_from_l1e fails")
   3.125 -PERFCOUNTER_CPU(validate_hl2e_calls,    "calls to validate_hl2e_change")
   3.126 -PERFCOUNTER_CPU(validate_hl2e_changes,  "validate_hl2e makes changes")
   3.127 -#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
   3.128 -PERFCOUNTER_CPU(validate_entry_changes,  "validate_entry changes")
   3.129 -#endif
   3.130 -PERFCOUNTER_CPU(exception_fixed,        "pre-exception fixed")
   3.131 -PERFCOUNTER_CPU(get_mfn_from_gpfn_foreign, "calls to get_mfn_from_gpfn_foreign")
   3.132 -PERFCOUNTER_CPU(remove_all_access,      "calls to remove_all_access")
   3.133 -PERFCOUNTER_CPU(remove_write_access,    "calls to remove_write_access")
   3.134 -PERFCOUNTER_CPU(remove_write_access_easy, "easy outs of remove_write_access")
   3.135 -PERFCOUNTER_CPU(remove_write_no_work,   "no work in remove_write_access")
   3.136 -PERFCOUNTER_CPU(remove_write_not_writable, "remove_write non-writable page")
   3.137 -PERFCOUNTER_CPU(remove_write_fast_exit, "remove_write hit predicted entry")
   3.138 -PERFCOUNTER_CPU(remove_write_predicted, "remove_write predict hit&exit")
   3.139 -PERFCOUNTER_CPU(remove_write_bad_prediction, "remove_write bad prediction")
   3.140 -PERFCOUNTER_CPU(update_hl2e_invlpg,     "update_hl2e calls invlpg")
   3.141  
   3.142  /* Shadow2 counters */
   3.143  PERFCOUNTER_CPU(shadow2_alloc,          "calls to shadow2_alloc")
   3.144  PERFCOUNTER_CPU(shadow2_alloc_tlbflush, "shadow2_alloc flushed TLBs")
   3.145 +
   3.146 +/* STATUS counters do not reset when 'P' is hit */
   3.147  PERFSTATUS(shadow2_alloc_count,         "number of shadow pages in use")
   3.148  PERFCOUNTER_CPU(shadow2_free,           "calls to shadow2_free")
   3.149  PERFCOUNTER_CPU(shadow2_prealloc_1,     "shadow2 recycles old shadows")
     4.1 --- a/xen/include/xen/perfc_defn.h	Thu Aug 24 14:07:01 2006 +0100
     4.2 +++ b/xen/include/xen/perfc_defn.h	Thu Aug 24 16:25:49 2006 +0100
     4.3 @@ -8,7 +8,6 @@ PERFCOUNTER_ARRAY(hypercalls,           
     4.4  
     4.5  PERFCOUNTER_CPU(irqs,                   "#interrupts")
     4.6  PERFCOUNTER_CPU(ipis,                   "#IPIs")
     4.7 -PERFCOUNTER_CPU(irq_time,               "cycles spent in irq handler")
     4.8  
     4.9  PERFCOUNTER_CPU(sched_irq,              "sched: timer")
    4.10  PERFCOUNTER_CPU(sched_run,              "sched: runs through scheduler")