bitkeeper revision 1.1261 (4242ef64dXDbGRaZN94_Vg02rxL1tg)

Snapshots of L1 page table pages now only snapshot the active portion of
the page.

Improved the tlb flushing of shadow mode somewhat...

Fixed a bug in the shadow_min_max encoding stuff.

Signed-off-by: michael.fetterman@cl.cam.ac.uk

1 files changed, 23 insertions, 12 deletions

diff --git a/xen/include/xen/perfc_defn.h b/xen/include/xen/perfc_defn.h
index b63fffd9d7..bcb3555206 100644
--- a/xen/include/xen/perfc_defn.h
+++ b/xen/include/xen/perfc_defn.h
@@ -2,6 +2,10 @@
 #define PERFC_PT_UPDATES_BUCKET_SIZE 3
 PERFCOUNTER_ARRAY( wpt_updates, "writable pt updates", PERFC_MAX_PT_UPDATES )
 PERFCOUNTER_ARRAY( bpt_updates, "batched pt updates", PERFC_MAX_PT_UPDATES )
+PERFCOUNTER_ARRAY( l1_entries_checked, "l1 entries checked", PERFC_MAX_PT_UPDATES )
+PERFCOUNTER_ARRAY( shm_l2_updates, "shadow mode L2 pt updates", PERFC_MAX_PT_UPDATES )
+PERFCOUNTER_ARRAY( shm_hl2_updates, "shadow mode HL2 pt updates", PERFC_MAX_PT_UPDATES )
+PERFCOUNTER_ARRAY( snapshot_copies, "entries copied per snapshot", PERFC_MAX_PT_UPDATES )
 
 PERFCOUNTER_ARRAY( hypercalls, "hypercalls", NR_hypercalls )
 PERFCOUNTER_ARRAY( exceptions, "exceptions", 32 )
@@ -31,12 +35,21 @@ PERFCOUNTER_CPU( num_page_updates, "num_page_updates" )
 PERFCOUNTER_CPU( calls_to_update_va, "calls_to_update_va_map" )
 PERFCOUNTER_CPU( page_faults, "page faults" )
 PERFCOUNTER_CPU( copy_user_faults, "copy_user faults" )
+
+PERFCOUNTER_CPU(shadow_fault_calls,                "calls to shadow_fault")
+PERFCOUNTER_CPU(shadow_fault_bail_pde_not_present, "sf bailed due to pde not present")
+PERFCOUNTER_CPU(shadow_fault_bail_pte_not_present, "sf bailed due to pte not present")
+PERFCOUNTER_CPU(shadow_fault_bail_ro_mapping,      "sf bailed due to a ro mapping")
+PERFCOUNTER_CPU(shadow_fault_fixed,                "sf fixed the pgfault")
+PERFCOUNTER_CPU(write_fault_bail,                  "sf bailed due to write_fault")
+PERFCOUNTER_CPU(read_fault_bail,                   "sf bailed due to read_fault")
+
 PERFCOUNTER_CPU( map_domain_mem_count, "map_domain_mem count" )
 
-PERFCOUNTER_CPU( shadow_l2_table_count, "shadow_l2_table count" )
-PERFCOUNTER_CPU( shadow_l1_table_count, "shadow_l1_table count" )
-PERFCOUNTER_CPU( unshadow_table_count, "unshadow_table count" )
-PERFCOUNTER_CPU( shadow_fixup_count, "shadow_fixup count" )
+PERFCOUNTER_CPU( shadow_l2_table_count,  "shadow_l2_table count" )
+PERFCOUNTER_CPU( shadow_l1_table_count,  "shadow_l1_table count" )
+PERFCOUNTER_CPU( unshadow_table_count,   "unshadow_table count" )
+PERFCOUNTER_CPU( shadow_fixup_count,     "shadow_fixup count" )
 PERFCOUNTER_CPU( shadow_update_va_fail1, "shadow_update_va_fail1" )
 PERFCOUNTER_CPU( shadow_update_va_fail2, "shadow_update_va_fail2" )
 
@@ -62,8 +75,13 @@ PERFCOUNTER_CPU(shadow_status_shortcut, "fastpath miss on shadow cache")
 PERFCOUNTER_CPU(shadow_status_calls,    "calls to ___shadow_status" )
 PERFCOUNTER_CPU(shadow_status_miss,     "missed shadow cache" )
 PERFCOUNTER_CPU(shadow_status_hit_head, "hits on head of bucket" )
+PERFCOUNTER_CPU(shadow_max_type,        "calls to shadow_max_type" )
 
 PERFCOUNTER_CPU(shadow_sync_all,                   "calls to shadow_sync_all")
+PERFCOUNTER_CPU(shadow_sync_va,                    "calls to shadow_sync_va")
+PERFCOUNTER_CPU(resync_l1,                         "resync L1 page")
+PERFCOUNTER_CPU(resync_l2,                         "resync L2 page")
+PERFCOUNTER_CPU(resync_hl2,                        "resync HL2 page")
 PERFCOUNTER_CPU(shadow_make_snapshot,              "snapshots created")
 PERFCOUNTER_CPU(shadow_mark_mfn_out_of_sync_calls, "calls to shadow_mk_out_of_sync")
 PERFCOUNTER_CPU(shadow_out_of_sync_calls,          "calls to shadow_out_of_sync")
@@ -71,11 +89,6 @@ PERFCOUNTER_CPU(extra_va_update_sync,              "extra syncs for bug in chk_p
 PERFCOUNTER_CPU(snapshot_entry_matches_calls,      "calls to ss_entry_matches")
 PERFCOUNTER_CPU(snapshot_entry_matches_true,       "ss_entry_matches returns true")
 
-PERFCOUNTER_CPU(shadow_fault_calls,                "calls to shadow_fault")
-PERFCOUNTER_CPU(shadow_fault_bail_pde_not_present, "sf bailed due to pde not present")
-PERFCOUNTER_CPU(shadow_fault_bail_pte_not_present, "sf bailed due to pte not present")
-PERFCOUNTER_CPU(shadow_fault_bail_ro_mapping,      "sf bailed due to a ro mapping")
-PERFCOUNTER_CPU(shadow_fault_fixed,                "sf fixed the pgfault")
 PERFCOUNTER_CPU(validate_pte_calls,                "calls to validate_pte_change")
 PERFCOUNTER_CPU(validate_pte_changes,              "validate_pte makes changes")
 PERFCOUNTER_CPU(validate_pde_calls,                "calls to validate_pde_change")
@@ -92,6 +105,4 @@ PERFCOUNTER_CPU(remove_write_not_writable,         "remove_write non-writable pa
 PERFCOUNTER_CPU(remove_write_fast_exit,            "remove_write hit predicted entry")
 PERFCOUNTER_CPU(remove_write_predicted,            "remove_write predict hit&exit")
 PERFCOUNTER_CPU(remove_write_bad_prediction,       "remove_write bad prediction")
-PERFCOUNTER_CPU(write_fault_bail,                  "sf bailed due to write_fault")
-PERFCOUNTER_CPU(read_fault_bail,                   "sf bailed due to read_fault")
-PERFCOUNTER_CPU(update_hl2e_invlpg,                 "update_hl2e calls invlpg")
+PERFCOUNTER_CPU(update_hl2e_invlpg,                "update_hl2e calls invlpg")