From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 15 Aug 2025 12:48:49 +0000 (+0200)
Subject: testing: Increase memory for guest hosts to run Debian trixie
X-Git-Tag: 6.0.3dr1~1^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3aa7e1d418dfcc4532c9eba6486d48385320402a;p=thirdparty%2Fstrongswan.git

testing: Increase memory for guest hosts to run Debian trixie

While some increase was necessary anyway because the idle system requires
about 5-10 MiB more memory, the main issue is resolving the code line and
function name in case of a memory leak.  Calling addr2line requires a lot
more memory than before.  Using backtraces via libbfd doesn't help either
because the trigger is the bfd_find_nearest_line() call we use as well.
And because we'd try to resolve all symbols that way (for whitelisting),
the memory overhead would be even higher and affect every shutdown, even
if no leak occurred.  It also causes a significant time overhead (running
all tests took 75m instead of 48m).

I also tested switching to ASAN/LSAN.  The peak memory usage is slightly
higher than when using libbfd, but enabling it also increased the runtime
overhead a lot (the daemon and swanctl both required about 10-20 MiB more
memory, not just during the shutdown).
---

diff --git a/testing/config/kvm/alice.xml b/testing/config/kvm/alice.xml
index 9cdb251665..d1212665ed 100644
--- a/testing/config/kvm/alice.xml
+++ b/testing/config/kvm/alice.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
   <name>alice</name>
   <uuid>1f35c25d-6a7b-4ee1-2461-d7e530e7b2a9</uuid>
-  <memory unit='MiB'>200</memory>
-  <currentMemory unit='MiB'>200</currentMemory>
+  <memory unit='MiB'>260</memory>
+  <currentMemory unit='MiB'>260</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
diff --git a/testing/config/kvm/bob.xml b/testing/config/kvm/bob.xml
index 982a1aac0f..b55bf8ca26 100644
--- a/testing/config/kvm/bob.xml
+++ b/testing/config/kvm/bob.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
   <name>bob</name>
   <uuid>72728516-377f-f5be-ea1d-b1f1e851538f</uuid>
-  <memory unit='MiB'>128</memory>
-  <currentMemory unit='MiB'>128</currentMemory>
+  <memory unit='MiB'>150</memory>
+  <currentMemory unit='MiB'>150</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
diff --git a/testing/config/kvm/carol.xml b/testing/config/kvm/carol.xml
index 33dc08adc7..60c15350db 100644
--- a/testing/config/kvm/carol.xml
+++ b/testing/config/kvm/carol.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
   <name>carol</name>
   <uuid>6bc2eef5-7faf-cde0-5f27-6fc29f93bc3d</uuid>
-  <memory unit='MiB'>128</memory>
-  <currentMemory unit='MiB'>128</currentMemory>
+  <memory unit='MiB'>150</memory>
+  <currentMemory unit='MiB'>150</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
diff --git a/testing/config/kvm/dave.xml b/testing/config/kvm/dave.xml
index 93ce82e632..e9402b4fbe 100644
--- a/testing/config/kvm/dave.xml
+++ b/testing/config/kvm/dave.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
   <name>dave</name>
   <uuid>05f1debe-4e38-4f3d-10a0-c07fbb70d816</uuid>
-  <memory unit='MiB'>128</memory>
-  <currentMemory unit='MiB'>128</currentMemory>
+  <memory unit='MiB'>150</memory>
+  <currentMemory unit='MiB'>150</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
diff --git a/testing/config/kvm/moon.xml b/testing/config/kvm/moon.xml
index df77348d08..e2271384c8 100644
--- a/testing/config/kvm/moon.xml
+++ b/testing/config/kvm/moon.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
   <name>moon</name>
   <uuid>b5e00ad3-1c81-3b2a-7f66-cdf8727b3c65</uuid>
-  <memory unit='MiB'>128</memory>
-  <currentMemory unit='MiB'>128</currentMemory>
+  <memory unit='MiB'>150</memory>
+  <currentMemory unit='MiB'>150</currentMemory>
   <vcpu placement='static'>4</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
diff --git a/testing/config/kvm/sun.xml b/testing/config/kvm/sun.xml
index 68c160a805..b76ff3541e 100644
--- a/testing/config/kvm/sun.xml
+++ b/testing/config/kvm/sun.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
   <name>sun</name>
   <uuid>35341843-346c-a63a-786b-9df0fd5e6264</uuid>
-  <memory unit='MiB'>144</memory>
-  <currentMemory unit='MiB'>144</currentMemory>
+  <memory unit='MiB'>150</memory>
+  <currentMemory unit='MiB'>150</currentMemory>
   <vcpu placement='static'>2</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
diff --git a/testing/config/kvm/venus.xml b/testing/config/kvm/venus.xml
index 07e1b995d6..ca13695847 100644
--- a/testing/config/kvm/venus.xml
+++ b/testing/config/kvm/venus.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
   <name>venus</name>
   <uuid>f0838df9-7cc0-84f5-6c14-2d16ab002e8d</uuid>
-  <memory unit='MiB'>128</memory>
-  <currentMemory unit='MiB'>128</currentMemory>
+  <memory unit='MiB'>150</memory>
+  <currentMemory unit='MiB'>150</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
diff --git a/testing/config/kvm/winnetou.xml b/testing/config/kvm/winnetou.xml
index aa259d06f4..89c07b9816 100644
--- a/testing/config/kvm/winnetou.xml
+++ b/testing/config/kvm/winnetou.xml
@@ -1,8 +1,8 @@
 <domain type='kvm'>
   <name>winnetou</name>
   <uuid>b1d3d2f7-e20b-ab95-277e-66d4cac33cc3</uuid>
-  <memory unit='MiB'>160</memory>
-  <currentMemory unit='MiB'>160</currentMemory>
+  <memory unit='MiB'>200</memory>
+  <currentMemory unit='MiB'>200</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>