Skip to content

Commit 830c479

Browse files
committed
tests/int/cgroups: Use 64K aligned limits for memory.max
When a non–page-aligned value is written to memory.max, the kernel aligns it down to the nearest page boundary. On systems with a page size greater than 4K (e.g., 64K), this caused failures because the configured memory.max value was not 64K aligned. This patch fixes the issue by explicitly aligning the memory.max value to 64K. Since 64K is also a multiple of 4K, the value is correctly aligned on both 4K and 64K page size systems. However, this approach will still fail on systems where the hardcoded memory.max value is not aligned to the system page size. Fixes: #4841 Signed-off-by: Vishal Chourasia <[email protected]> Signed-off-by: Donet Tom <[email protected]>
1 parent f3ea522 commit 830c479

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tests/integration/cgroups.bats

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ convert_hugetlb_size() {
362362

363363
set_cgroups_path
364364
update_config ' .linux.resources.unified |= {
365-
"memory.max": "20484096",
365+
"memory.max": "20512768",
366366
"memory.swap.max": "20971520"
367367
}'
368368

@@ -373,10 +373,10 @@ convert_hugetlb_size() {
373373
[ "$status" -eq 0 ]
374374
echo "$output"
375375

376-
echo "$output" | grep -q '^memory.max:20484096$'
376+
echo "$output" | grep -q '^memory.max:20512768$'
377377
echo "$output" | grep -q '^memory.swap.max:20971520$'
378378

379-
check_systemd_value "MemoryMax" 20484096
379+
check_systemd_value "MemoryMax" 20512768
380380
check_systemd_value "MemorySwapMax" 20971520
381381
}
382382

0 commit comments

Comments
 (0)