From b288481d2ffc7dc71f37db6aee515babf0dfa56e Mon Sep 17 00:00:00 2001 From: palainp Date: Fri, 26 May 2023 10:27:29 +0200 Subject: [PATCH] remove memreport to Xen to avoid Qubes trying to get back some memory from us --- build-with-docker.sh | 2 +- memory_pressure.ml | 19 +++---------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/build-with-docker.sh b/build-with-docker.sh index 7cd77a6..b4faef7 100755 --- a/build-with-docker.sh +++ b/build-with-docker.sh @@ -5,5 +5,5 @@ docker build -t qubes-mirage-firewall . echo Building Firewall... docker run --rm -i -v `pwd`:/tmp/orb-build qubes-mirage-firewall echo "SHA2 of build: $(sha256sum ./dist/qubes-firewall.xen)" -echo "SHA2 last known: 55a2f823d66473c7d0be66a93289d48b6557f18c9257c6f98aa5a4583663d3c2" +echo "SHA2 last known: d9f7827e2f2c8150ac97a4d348a29f5ee0810a455dbab9233490fff97470f7b8" echo "(hashes should match for released versions)" diff --git a/memory_pressure.ml b/memory_pressure.ml index 2e9e95a..87289c2 100644 --- a/memory_pressure.ml +++ b/memory_pressure.ml @@ -27,19 +27,8 @@ let meminfo stats = SwapTotal: 0 kB\n\ SwapFree: 0 kB\n" (mem_total / 1024) (mem_free / 1024) -let report_mem_usage stats = - Lwt.async (fun () -> - let open Xen_os in - Xs.make () >>= fun xs -> - Xs.immediate xs (fun h -> - Xs.write h "memory/meminfo" (meminfo stats) - ) - ) - let init () = - Gc.full_major (); - let stats = Xen_os.Memory.quick_stat () in - report_mem_usage stats + Gc.full_major () let status () = let stats = Xen_os.Memory.quick_stat () in @@ -48,8 +37,6 @@ let status () = Gc.full_major (); Xen_os.Memory.trim (); let stats = Xen_os.Memory.quick_stat () in - if fraction_free stats < 0.6 then begin - report_mem_usage stats; - `Memory_critical - end else `Ok + if fraction_free stats < 0.6 then `Memory_critical + else `Ok )