Add cgroup "Shmem THP" column

Summary: Show per-cgroup "Shmem THP"

Reviewed By: lnyng

Differential Revision: D84376003

fbshipit-source-id: 7eaaa07fdd3df13869051e62e0759ae06123b448

Author: oandrew

below/cgroupfs/src/lib.rs

@@ -715,6 +715,7 @@ key_values_format!(MemoryStat; memory.stat; [
     file_writeback,
     file_thp,
     anon_thp,
+    shmem_thp,
     inactive_anon,
     active_anon,
     inactive_file,

below/cgroupfs/src/types.rs

@@ -64,6 +64,7 @@ pub struct MemoryStat {
     pub file_writeback: Option<u64>,
     pub file_thp: Option<u64>,
     pub anon_thp: Option<u64>,
+    pub shmem_thp: Option<u64>,
     pub inactive_anon: Option<u64>,
     pub active_anon: Option<u64>,
     pub inactive_file: Option<u64>,

below/dump/src/test.rs

@@ -503,6 +503,7 @@ fn test_dump_cgroup_titles() {
         "File WB",
         "File THP",
         "Anon THP",
+        "Shmem THP",
         "Inactive Anon",
         "Active Anon",
         "Inactive File",

below/model/src/cgroup.rs

@@ -469,6 +469,7 @@ pub struct CgroupMemoryModel {
     pub file_writeback: Option<u64>,
     pub file_thp: Option<u64>,
     pub anon_thp: Option<u64>,
+    pub shmem_thp: Option<u64>,
     pub inactive_anon: Option<u64>,
     pub active_anon: Option<u64>,
     pub inactive_file: Option<u64>,
@@ -527,6 +528,7 @@ impl std::ops::Add for CgroupMemoryModel {
             file_writeback: opt_add(self.file_writeback, other.file_writeback),
             file_thp: opt_add(self.file_thp, other.file_thp),
             anon_thp: opt_add(self.anon_thp, other.anon_thp),
+            shmem_thp: opt_add(self.shmem_thp, other.shmem_thp),
             inactive_anon: opt_add(self.inactive_anon, other.inactive_anon),
             active_anon: opt_add(self.active_anon, other.active_anon),
             inactive_file: opt_add(self.inactive_file, other.inactive_file),
@@ -598,48 +600,45 @@ impl CgroupMemoryModel {
             zswap: sample.memory_zswap_current.map(|v| v as u64),
             ..Default::default()
         };
-        if let Some(events) = &sample.memory_events {
-            if let Some((
+        if let Some(events) = &sample.memory_events
+            && let Some((
                 CgroupSample {
                     memory_events: Some(last_memory_events),
                     ..
                 },
                 delta,
             )) = last
-            {
-                model.events_low = count_per_sec!(last_memory_events.low, events.low, delta, u64);
-                model.events_high =
-                    count_per_sec!(last_memory_events.high, events.high, delta, u64);
-                model.events_max = count_per_sec!(last_memory_events.max, events.max, delta, u64);
-                model.events_oom = count_per_sec!(last_memory_events.oom, events.oom, delta, u64);
-                model.events_oom_kill =
-                    count_per_sec!(last_memory_events.oom_kill, events.oom_kill, delta, u64);
-            }
+        {
+            model.events_low = count_per_sec!(last_memory_events.low, events.low, delta, u64);
+            model.events_high = count_per_sec!(last_memory_events.high, events.high, delta, u64);
+            model.events_max = count_per_sec!(last_memory_events.max, events.max, delta, u64);
+            model.events_oom = count_per_sec!(last_memory_events.oom, events.oom, delta, u64);
+            model.events_oom_kill =
+                count_per_sec!(last_memory_events.oom_kill, events.oom_kill, delta, u64);
         }
-        if let Some(events_local) = &sample.memory_events_local {
-            if let Some((
+        if let Some(events_local) = &sample.memory_events_local
+            && let Some((
                 CgroupSample {
                     memory_events_local: Some(last_memory_events_local),
                     ..
                 },
                 delta,
             )) = last
-            {
-                model.events_local_low =
-                    count_per_sec!(last_memory_events_local.low, events_local.low, delta, u64);
-                model.events_local_high =
-                    count_per_sec!(last_memory_events_local.high, events_local.high, delta, u64);
-                model.events_local_max =
-                    count_per_sec!(last_memory_events_local.max, events_local.max, delta, u64);
-                model.events_local_oom =
-                    count_per_sec!(last_memory_events_local.oom, events_local.oom, delta, u64);
-                model.events_local_oom_kill = count_per_sec!(
-                    last_memory_events_local.oom_kill,
-                    events_local.oom_kill,
-                    delta,
-                    u64
-                );
-            }
+        {
+            model.events_local_low =
+                count_per_sec!(last_memory_events_local.low, events_local.low, delta, u64);
+            model.events_local_high =
+                count_per_sec!(last_memory_events_local.high, events_local.high, delta, u64);
+            model.events_local_max =
+                count_per_sec!(last_memory_events_local.max, events_local.max, delta, u64);
+            model.events_local_oom =
+                count_per_sec!(last_memory_events_local.oom, events_local.oom, delta, u64);
+            model.events_local_oom_kill = count_per_sec!(
+                last_memory_events_local.oom_kill,
+                events_local.oom_kill,
+                delta,
+                u64
+            );
         }
         if let Some(stat) = &sample.memory_stat {
             model.anon = stat.anon;
@@ -659,6 +658,7 @@ impl CgroupMemoryModel {
             model.file_writeback = stat.file_writeback;
             model.file_thp = stat.file_thp;
             model.anon_thp = stat.anon_thp;
+            model.shmem_thp = stat.shmem_thp;
             model.inactive_anon = stat.inactive_anon;
             model.active_anon = stat.active_anon;
             model.inactive_file = stat.inactive_file;

below/model/src/common_field_ids.rs

@@ -206,6 +206,7 @@ pub const COMMON_MODEL_FIELD_IDS: &[&str] = &[
     "cgroup.[path:/<cgroup_path>/.]mem.file_writeback",
     "cgroup.[path:/<cgroup_path>/.]mem.file_thp",
     "cgroup.[path:/<cgroup_path>/.]mem.anon_thp",
+    "cgroup.[path:/<cgroup_path>/.]mem.shmem_thp",
     "cgroup.[path:/<cgroup_path>/.]mem.inactive_anon",
     "cgroup.[path:/<cgroup_path>/.]mem.active_anon",
     "cgroup.[path:/<cgroup_path>/.]mem.inactive_file",

below/render/src/default_configs.rs

@@ -244,6 +244,7 @@ impl HasRenderConfigForDump for model::SingleCgroupModel {
                 FileWriteback => Some(gauge.unit("bytes")),
                 FileThp => Some(gauge.unit("bytes")),
                 AnonThp => Some(gauge.unit("bytes")),
+                ShmemThp => Some(gauge.unit("bytes")),
                 InactiveAnon => Some(gauge.unit("bytes")),
                 ActiveAnon => Some(gauge.unit("bytes")),
                 InactiveFile => Some(gauge.unit("bytes")),
@@ -370,6 +371,7 @@ impl HasRenderConfig for model::CgroupMemoryModel {
             FileWriteback => rc.title("File WB").format(ReadableSize),
             FileThp => rc.title("File THP").format(ReadableSize),
             AnonThp => rc.title("Anon THP").format(ReadableSize),
+            ShmemThp => rc.title("Shmem THP").format(ReadableSize),
             InactiveAnon => rc.title("Inactive Anon").format(ReadableSize),
             ActiveAnon => rc.title("Active Anon").format(ReadableSize),
             InactiveFile => rc.title("Inactive File").format(ReadableSize),

below/view/src/cgroup_tabs.rs

@@ -108,10 +108,10 @@ impl CgroupTab {
     ) {
         let mut cgroup_stack = vec![cgroup];
         while let Some(cgroup) = cgroup_stack.pop() {
-            if let Some(set) = &filtered_set {
-                if !set.contains(&cgroup.data.full_path) {
-                    continue;
-                }
+            if let Some(set) = &filtered_set
+                && !set.contains(&cgroup.data.full_path)
+            {
+                continue;
             }
 
             let collapsed = state
@@ -282,6 +282,7 @@ pub mod default_tabs {
     use model::CgroupMemoryModelFieldId::Pgscan;
     use model::CgroupMemoryModelFieldId::Pgsteal;
     use model::CgroupMemoryModelFieldId::Shmem;
+    use model::CgroupMemoryModelFieldId::ShmemThp;
     use model::CgroupMemoryModelFieldId::Slab;
     use model::CgroupMemoryModelFieldId::SlabReclaimable;
     use model::CgroupMemoryModelFieldId::SlabUnreclaimable;
@@ -379,6 +380,7 @@ pub mod default_tabs {
             ViewItem::from_default(Mem(FileWriteback)),
             ViewItem::from_default(Mem(FileThp)),
             ViewItem::from_default(Mem(AnonThp)),
+            ViewItem::from_default(Mem(ShmemThp)),
             ViewItem::from_default(Mem(InactiveAnon)),
             ViewItem::from_default(Mem(ActiveAnon)),
             ViewItem::from_default(Mem(InactiveFile)),