The overcommit test uses sum_total, the sum (memory and swap) to test
the overcommit settings.
This fixes two problems on 32-bit systems. The first is seen with a
integer overflow can occur when calculating sum_total * 2, if the
sum_total is larger than 2GB. The second is limited virtual address
space (2-3GB) means the test can fail from address space exhaustion
before overcommit has been tested.
Now the test runs correctly on low-memory 32-bit systems while avoiding
both the overflow bug and virtual address space issues.
Signed-off-by: Ben Copeland <ben.copeland(a)linaro.org>
Acked-by: Arnd Bergmann <arnd(a)arndb.de>
Reviewed-by: Petr Vorel <pvorel(a)suse.cz>
---
.../kernel/mem/tunable/overcommit_memory.c | 33 +++++++++++++++----
1 file changed, 27 insertions(+), 6 deletions(-)
diff --git a/testcases/kernel/mem/tunable/overcommit_memory.c b/testcases/kernel/mem/tunable/overcommit_memory.c
index 9b2cb479d..7ff5a98d0 100644
--- a/testcases/kernel/mem/tunable/overcommit_memory.c
+++ b/testcases/kernel/mem/tunable/overcommit_memory.c
@@ -131,24 +131,45 @@ static void overcommit_memory_test(void)
TST_SYS_CONF_LONG_SET(OVERCOMMIT_MEMORY, 2, 1);
update_mem_commit();
- alloc_and_check(commit_left * 2, EXPECT_FAIL);
- alloc_and_check(commit_limit + total_batch_size, EXPECT_FAIL);
+ /* Skip tests that would overflow or exceed 32-bit address space */
+ if (tst_kernel_bits() == 64 || (unsigned long)commit_left <= TST_GB / TST_KB) {
+ alloc_and_check(commit_left * 2, EXPECT_FAIL);
+ alloc_and_check(commit_limit + total_batch_size, EXPECT_FAIL);
+ } else {
+ tst_res(TCONF, "Skipping large allocation tests due to address space limits");
+ }
update_mem_commit();
- alloc_and_check(commit_left / 2, EXPECT_PASS);
+ if (tst_kernel_bits() == 64 || (unsigned long)commit_left <= TST_GB / TST_KB) {
+ alloc_and_check(commit_left / 2, EXPECT_PASS);
+ } else {
+ tst_res(TCONF, "Skipping commit_left/2 allocation test due to address space limits");
+ }
/* start to test overcommit_memory=0 */
TST_SYS_CONF_LONG_SET(OVERCOMMIT_MEMORY, 0, 1);
update_mem();
alloc_and_check(free_total / 2, EXPECT_PASS);
- alloc_and_check(sum_total * 2, EXPECT_FAIL);
+ /* Skip if sum_total * 2 would exceed address space.
+ * On 32-bit, skip when sum_total > ULONG_MAX/4 (~1GB).
+ * Most 32-bit systems with <=1GB RAM can map 2x that in 3GB vaddr space.
+ * Systems with 2GB+ RAM likely cannot fit allocations in vaddr space. */
+ if (tst_kernel_bits() == 64 || (unsigned long)sum_total <= TST_GB / TST_KB) {
+ alloc_and_check(sum_total * 2, EXPECT_FAIL);
+ } else {
+ tst_res(TCONF, "Skipping large allocation test due to address space limits");
+ }
/* start to test overcommit_memory=1 */
TST_SYS_CONF_LONG_SET(OVERCOMMIT_MEMORY, 1, 1);
alloc_and_check(sum_total / 2, EXPECT_PASS);
- alloc_and_check(sum_total, EXPECT_PASS);
- alloc_and_check(sum_total * 2, EXPECT_PASS);
+ if (tst_kernel_bits() == 64 || (unsigned long)sum_total <= TST_GB / TST_KB) {
+ alloc_and_check(sum_total, EXPECT_PASS);
+ alloc_and_check(sum_total * 2, EXPECT_PASS);
+ } else {
+ tst_res(TCONF, "Skipping large allocation tests due to address space limits");
+ }
}
--
2.51.0
Total jobs: 265
Total errors: 91 (34.34%)
LAVA errors: 0 (0.00%)
Test errors: 84 (31.70%)
Job errors: 1 (0.38%)
Infra errors: 6 (2.26%)
Canceled jobs: 0 (0.00%)
Device type: dragonboard-845c
Total jobs: 135
Total errors: 35 (25.93%)
Error type: Test
Error count: 35 (25.93%)
Error: Device NOT found!
Count: 3 (2.22%)
IDs:
db845c-04:
8491509 8492682
db845c-06:
8492659
Error: No match for error type 'Test', message 'tradefed - adb device lost[d966d3f5]'
Count: 3 (2.22%)
IDs:
db845c-03:
8491511 8491614 8492669
Error: No match for error type 'Test', message 'tradefed - adb device lost[a6622a22]'
Count: 8 (5.93%)
IDs:
db845c-09:
8491467 8491516 8491536 8491717 8491742
8491771 8491777 8492612
Error: No match for error type 'Test', message 'Device NOT found after DUT booted up! adb wait-for-device timed out after 300s'
Count: 12 (8.89%)
IDs:
db845c-04:
8491543 8491643 8491675 8491728
db845c-06:
8491440 8491593 8491665
db845c-09:
8491352 8491661 8491774 8492566
db845c-10:
8491609
Error: No match for error type 'Test', message 'tradefed - adb device lost[30e1e2ee]'
Count: 1 (0.74%)
IDs:
db845c-08:
8491781
Error: No match for error type 'Test', message 'tradefed - adb device lost[dd3b965f]'
Count: 2 (1.48%)
IDs:
db845c-02:
8491729 8491773
Error: No match for error type 'Test', message 'tradefed - adb device lost[476f370a]'
Count: 3 (2.22%)
IDs:
db845c-10:
8491454 8491469 8491730
Error: No match for error type 'Test', message 'tradefed - adb device lost[f3a58ae3]'
Count: 3 (2.22%)
IDs:
db845c-04:
8491357 8491453 8491510
Device type: qrb5165-rb5
Total jobs: 101
Total errors: 40 (39.60%)
Error type: Test
Error count: 33 (32.67%)
Error: No match for error type 'Test', message 'tradefed - adb device lost[74d67c95]'
Count: 7 (6.93%)
IDs:
rb5-03:
8491459 8491534 8491541 8491568 8491760
8492369 8492681
Error: Device NOT found!
Count: 3 (2.97%)
IDs:
rb5-01:
8491759 8492619 8492673
Error: No match for error type 'Test', message 'tradefed - adb device lost[d8a1879f]'
Count: 3 (2.97%)
IDs:
rb5-07:
8491589 8492387 8492618
Error: No match for error type 'Test', message 'tradefed - adb device lost[93dcfd96]'
Count: 1 (0.99%)
IDs:
rb5-01:
8492407
Error: No match for error type 'Test', message 'lava-docker-test-shell timed out after 298 seconds'
Count: 1 (0.99%)
IDs:
rb5-07:
8491923
Error: No match for error type 'Test', message 'lava-docker-test-shell timed out after 296 seconds'
Count: 1 (0.99%)
IDs:
rb5-03:
8491755
Error: No match for error type 'Test', message 'Device NOT found after DUT booted up! adb wait-for-device timed out after 300s'
Count: 13 (12.87%)
IDs:
rb5-01:
8491458 8491462 8491526 8491527 8491613
8491624 8491698
rb5-07:
8491476 8491525 8491538 8491580 8491725
8491737
Error: No match for error type 'Test', message 'lava-docker-test-shell timed out after 898 seconds'
Count: 1 (0.99%)
IDs:
rb5-01:
8491724
Error: No match for error type 'Test', message 'tradefed - adb device lost[4fc7b22]'
Count: 3 (2.97%)
IDs:
rb5-06:
8491524 8491544 8491555
Error type: Infrastructure
Error count: 6 (5.94%)
Error: Connection closed
Count: 6 (5.94%)
IDs:
rb5-01:
8491461 8491475 8491523 8491573 8491697
8492570
Error type: Job
Error count: 1 (0.99%)
Error: No match for error type 'Job', message 'login-action timed out after 873 seconds'
Count: 1 (0.99%)
IDs:
rb5-01:
8491722
Device type: sm8550-hdk
Total jobs: 18
Total errors: 8 (44.44%)
Error type: Test
Error count: 8 (44.44%)
Error: No match for error type 'Test', message 'tradefed - adb device lost[124d1c34]'
Count: 2 (11.11%)
IDs:
sm8550-hdk-01:
8491748 8492379
Error: No match for error type 'Test', message 'Device NOT found after DUT booted up! adb wait-for-device timed out after 300s'
Count: 5 (27.78%)
IDs:
sm8550-hdk-01:
8491479 8491654 8491657 8491744 8491746
Error: No match for error type 'Test', message 'lava-docker-test-shell timed out after 28798 seconds'
Count: 1 (5.56%)
IDs:
sm8550-hdk-01:
8491482
Device type: x86
Total jobs: 1
Total errors: 0 (0.00%)
Device type: hi6220-hikey-r2
Total jobs: 9
Total errors: 8 (88.89%)
Error type: Test
Error count: 8 (88.89%)
Error: No match for error type 'Test', message 'tradefed - adb device lost[8D6E5F00030E051]'
Count: 2 (22.22%)
IDs:
hikey-6220-r2-02:
8491548 8491797
Error: No match for error type 'Test', message 'tradefed - adb device lost[4595FE84003F72FC]'
Count: 2 (22.22%)
IDs:
hikey-6220-r2-04:
8491578 8491796
Error: No match for error type 'Test', message 'The network seems not available, as the ping command failed'
Count: 1 (11.11%)
IDs:
hikey-6220-r2-01:
8491711
Error: No match for error type 'Test', message 'Device NOT found after DUT booted up! adb wait-for-device timed out after 300s'
Count: 2 (22.22%)
IDs:
hikey-6220-r2-03:
8491710
hikey-6220-r2-05:
8491681
Error: No match for error type 'Test', message 'tradefed - adb device lost[235D989C003B0752]'
Count: 1 (11.11%)
IDs:
hikey-6220-r2-03:
8491503
Device type: dragonboard-410c
Total jobs: 1
Total errors: 0 (0.00%)
Total jobs: 116
Total errors: 44 (37.93%)
LAVA errors: 0 (0.00%)
Test errors: 40 (34.48%)
Job errors: 1 (0.86%)
Infra errors: 3 (2.59%)
Canceled jobs: 0 (0.00%)
Device type: dragonboard-845c
Total jobs: 52
Total errors: 20 (38.46%)
Error type: Test
Error count: 20 (38.46%)
Error: No match for error type 'Test', message 'tradefed - adb device lost[a6622a22]'
Count: 7 (13.46%)
IDs:
db845c-09:
8489738 8490446 8491204 8491283 8491336
8491377 8491502
Error: No match for error type 'Test', message 'Device NOT found after DUT booted up! adb wait-for-device timed out after 300s'
Count: 8 (15.38%)
IDs:
db845c-04:
8489308 8489698 8491346
db845c-06:
8489085 8489125
db845c-09:
8491486 8491489
db845c-10:
8489090
Error: No match for error type 'Test', message 'tradefed - adb device lost[f3a58ae3]'
Count: 3 (5.77%)
IDs:
db845c-04:
8489127 8490767 8491485
Error: No match for error type 'Test', message 'tradefed - adb device lost[30e1e2ee]'
Count: 1 (1.92%)
IDs:
db845c-08:
8489123
Error: No match for error type 'Test', message 'tradefed - adb device lost[d966d3f5]'
Count: 1 (1.92%)
IDs:
db845c-03:
8489073
Device type: qrb5165-rb5
Total jobs: 42
Total errors: 15 (35.71%)
Error type: Test
Error count: 13 (30.95%)
Error: No match for error type 'Test', message 'tradefed - adb device lost[74d67c95]'
Count: 1 (2.38%)
IDs:
rb5-03:
8491491
Error: No match for error type 'Test', message 'Device NOT found after DUT booted up! adb wait-for-device timed out after 300s'
Count: 7 (16.67%)
IDs:
rb5-01:
8491360 8491431
rb5-05:
8491356
rb5-07:
8489317 8489333 8491362 8491382
Error: Device NOT found!
Count: 5 (11.90%)
IDs:
rb5-01:
8489320 8491428
rb5-05:
8489722
rb5-07:
8491361 8491430
Error type: Infrastructure
Error count: 2 (4.76%)
Error: No match for error type 'Infrastructure', message 'wait-device-boardid timed out after 1173 seconds'
Count: 1 (2.38%)
IDs:
rb5-05:
8491390
Error: Connection closed
Count: 1 (2.38%)
IDs:
rb5-01:
8489318
Device type: hi6220-hikey-r2
Total jobs: 6
Total errors: 6 (100.00%)
Error type: Test
Error count: 5 (83.33%)
Error: No match for error type 'Test', message 'tradefed - adb device lost[191FC75C003312EE]'
Count: 1 (16.67%)
IDs:
hikey-6220-r2-06:
8491409
Error: No match for error type 'Test', message 'tradefed - adb device lost[235D989C003B0752]'
Count: 1 (16.67%)
IDs:
hikey-6220-r2-03:
8491294
Error: No match for error type 'Test', message 'tradefed - adb device lost[8D6E5F00030E051]'
Count: 1 (16.67%)
IDs:
hikey-6220-r2-02:
8489737
Error: No match for error type 'Test', message 'Device NOT found after DUT booted up! adb wait-for-device timed out after 300s'
Count: 1 (16.67%)
IDs:
hikey-6220-r2-06:
8489726
Error: No match for error type 'Test', message 'The network seems not available, as the ping command failed'
Count: 1 (16.67%)
IDs:
hikey-6220-r2-06:
8489699
Error type: Infrastructure
Error count: 1 (16.67%)
Error: No match for error type 'Infrastructure', message 'wait-device-boardid timed out after 888 seconds'
Count: 1 (16.67%)
IDs:
hikey-6220-r2-06:
8489119
Device type: hi960-hikey
Total jobs: 7
Total errors: 1 (14.29%)
Error type: Job
Error count: 1 (14.29%)
Error: No match for error type 'Job', message 'download-postprocess-docker timed out after 4187 seconds'
Count: 1 (14.29%)
IDs:
hi960-hikey-02:
8489719
Device type: sm8550-hdk
Total jobs: 6
Total errors: 2 (33.33%)
Error type: Test
Error count: 2 (33.33%)
Error: No match for error type 'Test', message 'Device NOT found after DUT booted up! adb wait-for-device timed out after 300s'
Count: 2 (33.33%)
IDs:
sm8550-hdk-01:
8491366 8491367
Device type: rk3399-rock-pi-4b
Total jobs: 1
Total errors: 0 (0.00%)
Device type: juno-r2
Total jobs: 2
Total errors: 0 (0.00%)