v1->v2:
-properly handle error from sget()
Previously, the new mballoc unit tests are only tested by running
"./tools/testing/kunit/kunit.py run ..." in which case only rare configs
are enabled.
This series fixes the reported issue and changes are tested with and
without kunit_tool [1].
Result with kunit_tool:
./tools/testing/kunit/kunit.py run --kunitconfig=fs/ext4/.kunitconfig --raw_output
[17:40:24] Configuring KUnit Kernel ...
[17:40:24] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make ARCH=um O=.kunit --jobs=88
[17:40:28] Starting KUnit Kernel (1/1)...
KTAP version 1
1..2
KTAP version 1
# Subtest: ext4_mballoc_test
# module: ext4
1..6
KTAP version 1
# Subtest: test_new_blocks_simple
ok 1 block_bits=10 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
ok 2 block_bits=12 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
ok 3 block_bits=16 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
# test_new_blocks_simple: pass:3 fail:0 skip:0 total:3
ok 1 test_new_blocks_simple
KTAP version 1
# Subtest: test_free_blocks_simple
ok 1 block_bits=10 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
ok 2 block_bits=12 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
ok 3 block_bits=16 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
# test_free_blocks_simple: pass:3 fail:0 skip:0 total:3
ok 2 test_free_blocks_simple
KTAP version 1
# Subtest: test_mb_generate_buddy
ok 1 block_bits=10 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
ok 2 block_bits=12 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
ok 3 block_bits=16 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
# test_mb_generate_buddy: pass:3 fail:0 skip:0 total:3
ok 3 test_mb_generate_buddy
KTAP version 1
# Subtest: test_mb_mark_used
ok 1 block_bits=10 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
ok 2 block_bits=12 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
ok 3 block_bits=16 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
# SKIP blocksize exceeds pagesize
# test_mb_mark_used: pass:2 fail:0 skip:1 total:3
ok 4 test_mb_mark_used
KTAP version 1
# Subtest: test_mb_free_blocks
ok 1 block_bits=10 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
ok 2 block_bits=12 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
ok 3 block_bits=16 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
# SKIP blocksize exceeds pagesize
# test_mb_free_blocks: pass:2 fail:0 skip:1 total:3
ok 5 test_mb_free_blocks
KTAP version 1
# Subtest: test_mark_diskspace_used
ok 1 block_bits=10 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
ok 2 block_bits=12 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
ok 3 block_bits=16 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
# test_mark_diskspace_used: pass:3 fail:0 skip:0 total:3
ok 6 test_mark_diskspace_used
# ext4_mballoc_test: pass:6 fail:0 skip:0 total:6
# Totals: pass:16 fail:0 skip:2 total:18
ok 1 ext4_mballoc_test
KTAP version 1
# Subtest: ext4_inode_test
# module: ext4_inode_test
1..1
KTAP version 1
# Subtest: inode_test_xtimestamp_decoding
ok 1 1901-12-13 Lower bound of 32bit < 0 timestamp, no extra bits
ok 2 1969-12-31 Upper bound of 32bit < 0 timestamp, no extra bits
ok 3 1970-01-01 Lower bound of 32bit >=0 timestamp, no extra bits
ok 4 2038-01-19 Upper bound of 32bit >=0 timestamp, no extra bits
ok 5 2038-01-19 Lower bound of 32bit <0 timestamp, lo extra sec bit on
ok 6 2106-02-07 Upper bound of 32bit <0 timestamp, lo extra sec bit on
ok 7 2106-02-07 Lower bound of 32bit >=0 timestamp, lo extra sec bit on
ok 8 2174-02-25 Upper bound of 32bit >=0 timestamp, lo extra sec bit on
ok 9 2174-02-25 Lower bound of 32bit <0 timestamp, hi extra sec bit on
ok 10 2242-03-16 Upper bound of 32bit <0 timestamp, hi extra sec bit on
ok 11 2242-03-16 Lower bound of 32bit >=0 timestamp, hi extra sec bit on
ok 12 2310-04-04 Upper bound of 32bit >=0 timestamp, hi extra sec bit on
ok 13 2310-04-04 Upper bound of 32bit>=0 timestamp, hi extra sec bit 1. 1 ns
ok 14 2378-04-22 Lower bound of 32bit>= timestamp. Extra sec bits 1. Max ns
ok 15 2378-04-22 Lower bound of 32bit >=0 timestamp. All extra sec bits on
ok 16 2446-05-10 Upper bound of 32bit >=0 timestamp. All extra sec bits on
# inode_test_xtimestamp_decoding: pass:16 fail:0 skip:0 total:16
ok 1 inode_test_xtimestamp_decoding
# Totals: pass:16 fail:0 skip:0 total:16
ok 2 ext4_inode_test
[17:40:28] Elapsed time: 3.990s total, 0.001s configuring, 3.823s building, 0.123s running
Result without kunit_tool (built-in):
Mar 1 18:24:36 localhost kernel: [ 5.260386] KTAP version 1
Mar 1 18:24:36 localhost kernel: [ 5.260558] 1..2
Mar 1 18:24:36 localhost kernel: [ 5.261225] KTAP version 1
Mar 1 18:24:36 localhost kernel: [ 5.261387] # Subtest: ext4_mballoc_test
Mar 1 18:24:36 localhost kernel: [ 5.261581] # module: ext4
Mar 1 18:24:36 localhost kernel: [ 5.261583] 1..6
Mar 1 18:24:36 localhost kernel: [ 5.261886] KTAP version 1
Mar 1 18:24:36 localhost kernel: [ 5.262050] # Subtest: test_new_blocks_simple
Mar 1 18:24:36 localhost kernel: [ 5.262409] ok 1 block_bits=10 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.263342] ok 2 block_bits=12 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.264334] ok 3 block_bits=16 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.264664] # test_new_blocks_simple: pass:3 fail:0 skip:0 total:3
Mar 1 18:24:36 localhost kernel: [ 5.264669] ok 1 test_new_blocks_simple
Mar 1 18:24:36 localhost kernel: [ 5.264893] KTAP version 1
Mar 1 18:24:36 localhost kernel: [ 5.265230] # Subtest: test_free_blocks_simple
Mar 1 18:24:36 localhost kernel: [ 5.265552] ok 1 block_bits=10 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.266451] ok 2 block_bits=12 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.267183] ok 3 block_bits=16 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.267508] # test_free_blocks_simple: pass:3 fail:0 skip:0 total:3
Mar 1 18:24:36 localhost kernel: [ 5.267510] ok 2 test_free_blocks_simple
Mar 1 18:24:36 localhost kernel: [ 5.267748] KTAP version 1
Mar 1 18:24:36 localhost kernel: [ 5.268087] # Subtest: test_mb_generate_buddy
Mar 1 18:24:36 localhost kernel: [ 5.268493] ok 1 block_bits=10 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.269542] ok 2 block_bits=12 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.270824] ok 3 block_bits=16 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.271287] # test_mb_generate_buddy: pass:3 fail:0 skip:0 total:3
Mar 1 18:24:36 localhost kernel: [ 5.271288] ok 3 test_mb_generate_buddy
Mar 1 18:24:36 localhost kernel: [ 5.271512] KTAP version 1
Mar 1 18:24:36 localhost kernel: [ 5.271873] # Subtest: test_mb_mark_used
Mar 1 18:24:36 localhost kernel: [ 5.272194] ok 1 block_bits=10 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.273105] ok 2 block_bits=12 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.273855] ok 3 block_bits=16 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64#012 # SKIP blocksize exceeds pagesize
Mar 1 18:24:36 localhost kernel: [ 5.273857] # test_mb_mark_used: pass:2 fail:0 skip:1 total:3
Mar 1 18:24:36 localhost kernel: [ 5.274306] ok 4 test_mb_mark_used
Mar 1 18:24:36 localhost kernel: [ 5.274526] KTAP version 1
Mar 1 18:24:36 localhost kernel: [ 5.274863] # Subtest: test_mb_free_blocks
Mar 1 18:24:36 localhost kernel: [ 5.275146] ok 1 block_bits=10 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.275935] ok 2 block_bits=12 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.276706] ok 3 block_bits=16 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64#012 # SKIP blocksize exceeds pagesize
Mar 1 18:24:36 localhost kernel: [ 5.276708] # test_mb_free_blocks: pass:2 fail:0 skip:1 total:3
Mar 1 18:24:36 localhost kernel: [ 5.277155] ok 5 test_mb_free_blocks
Mar 1 18:24:36 localhost kernel: [ 5.277370] KTAP version 1
Mar 1 18:24:36 localhost kernel: [ 5.277711] # Subtest: test_mark_diskspace_used
Mar 1 18:24:36 localhost kernel: [ 5.277936] ok 1 block_bits=10 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.278825] ok 2 block_bits=12 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.279712] ok 3 block_bits=16 cluster_bits=3 blocks_per_group=8192 group_count=4 desc_size=64
Mar 1 18:24:36 localhost kernel: [ 5.280039] # test_mark_diskspace_used: pass:3 fail:0 skip:0 total:3
Mar 1 18:24:36 localhost kernel: [ 5.280041] ok 6 test_mark_diskspace_used
Mar 1 18:24:36 localhost kernel: [ 5.280262] # ext4_mballoc_test: pass:6 fail:0 skip:0 total:6
Mar 1 18:24:36 localhost kernel: [ 5.280438] # Totals: pass:16 fail:0 skip:2 total:18
Mar 1 18:24:36 localhost kernel: [ 5.280661] ok 1 ext4_mballoc_test
Mar 1 18:24:36 localhost kernel: [ 5.281017] KTAP version 1
Mar 1 18:24:36 localhost kernel: [ 5.281168] # Subtest: ext4_inode_test
Mar 1 18:24:36 localhost kernel: [ 5.281347] # module: ext4_inode_test
Mar 1 18:24:36 localhost kernel: [ 5.281349] 1..1
Mar 1 18:24:36 localhost kernel: [ 5.281698] KTAP version 1
Mar 1 18:24:36 localhost kernel: [ 5.281863] # Subtest: inode_test_xtimestamp_decoding
Mar 1 18:24:36 localhost kernel: [ 5.282082] ok 1 1901-12-13 Lower bound of 32bit < 0 timestamp, no extra bits
Mar 1 18:24:36 localhost kernel: [ 5.282463] ok 2 1969-12-31 Upper bound of 32bit < 0 timestamp, no extra bits
Mar 1 18:24:36 localhost kernel: [ 5.282936] ok 3 1970-01-01 Lower bound of 32bit >=0 timestamp, no extra bits
Mar 1 18:24:36 localhost kernel: [ 5.283425] ok 4 2038-01-19 Upper bound of 32bit >=0 timestamp, no extra bits
Mar 1 18:24:36 localhost kernel: [ 5.283909] ok 5 2038-01-19 Lower bound of 32bit <0 timestamp, lo extra sec bit on
Mar 1 18:24:36 localhost kernel: [ 5.284398] ok 6 2106-02-07 Upper bound of 32bit <0 timestamp, lo extra sec bit on
Mar 1 18:24:36 localhost kernel: [ 5.284895] ok 7 2106-02-07 Lower bound of 32bit >=0 timestamp, lo extra sec bit on
Mar 1 18:24:36 localhost kernel: [ 5.285360] ok 8 2174-02-25 Upper bound of 32bit >=0 timestamp, lo extra sec bit on
Mar 1 18:24:36 localhost kernel: [ 5.285849] ok 9 2174-02-25 Lower bound of 32bit <0 timestamp, hi extra sec bit on
Mar 1 18:24:36 localhost kernel: [ 5.286307] ok 10 2242-03-16 Upper bound of 32bit <0 timestamp, hi extra sec bit on
Mar 1 18:24:36 localhost kernel: [ 5.287497] ok 11 2242-03-16 Lower bound of 32bit >=0 timestamp, hi extra sec bit on
Mar 1 18:24:36 localhost kernel: [ 5.288002] ok 12 2310-04-04 Upper bound of 32bit >=0 timestamp, hi extra sec bit on
Mar 1 18:24:36 localhost kernel: [ 5.288469] ok 13 2310-04-04 Upper bound of 32bit>=0 timestamp, hi extra sec bit 1. 1 ns
Mar 1 18:24:36 localhost kernel: [ 5.288971] ok 14 2378-04-22 Lower bound of 32bit>= timestamp. Extra sec bits 1. Max ns
Mar 1 18:24:36 localhost kernel: [ 5.289479] ok 15 2378-04-22 Lower bound of 32bit >=0 timestamp. All extra sec bits on
Mar 1 18:24:36 localhost kernel: [ 5.290023] ok 16 2446-05-10 Upper bound of 32bit >=0 timestamp. All extra sec bits on
Mar 1 18:24:36 localhost kernel: [ 5.290326] # inode_test_xtimestamp_decoding: pass:16 fail:0 skip:0 total:16
Mar 1 18:24:36 localhost kernel: [ 5.290651] ok 1 inode_test_xtimestamp_decoding
Mar 1 18:24:36 localhost kernel: [ 5.290930] # Totals: pass:16 fail:0 skip:0 total:16
Mar 1 18:24:36 localhost kernel: [ 5.291123] ok 2 ext4_inode_test
[1] https://docs.kernel.org/dev-tools/kunit/run_manual.html
Kemeng Shi (2):
ext4: alloc test super block from sget
ext4: hold group lock in ext4 kunit test
fs/ext4/mballoc-test.c | 62 +++++++++++++++++++++++++++++++-----------
1 file changed, 46 insertions(+), 16 deletions(-)
--
2.30.0
