diff options
| author | Zhihao Cheng <chengzhihao1@huawei.com> | 2019-06-14 20:14:38 +0800 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-06-16 12:27:10 +0200 |
| commit | c74c62420cbe1939c924e83f00e8838f148ae051 (patch) | |
| tree | ca3a6363ad10e20d4bbae02d41da68b098e2eae3 /tests/ubi-tests/integ.c | |
| parent | e5530fea6a3e094e83303749c20622f0af12f21f (diff) | |
ubi-tests: ubi_mkvol_request: Fully initialize 'struct ubi_mkvol_request req'
'struct ubi_mkvol_request req' is one parameter of the function 'ubi_mkvol'
, this parameter will be passed to kernel and then be checked. It acts as a
local variable in many ubi tests, such as io_basic, io_read, mkvol_bad,
mkvol_basic, etc.
After commit c355aa465fce ("ubi: expose the volume CRC check skip flag") in
linux-stable, 'struct ubi_mkvol_request' supports a new configuration named
'flags', and req.flags will be checked in kernel function
'verify_mkvol_req'. Currently, there is no initialization for req.flags
before 'ubi_mkvol' invoked. So, req.flags can be an arbitrary number passed
to kernel. When we run ubi tests in qemu (x86_64, kernel image: 5.2.0-rc4),
the following errors may occur:
======================================================================
======================================================================
======================================================================
Test on mtdram, fastmap enabled, VID header offset factor 1
======================================================================
======================================================================
======================================================================
mtdram: 16MiB, PEB size 16KiB, fastmap enabled
Running mkvol_basic /dev/ubi0
Running mkvol_bad /dev/ubi0
[mkvol_bad] test_mkvol():105: ubi_mkvol failed with error 22
(Invalid argument), expected 28 (No space left on device)
[mkvol_bad] test_mkvol():105: bytes = 16060929
Error: mkvol_bad failed
FAILURE
This patch fully initializes every 'struct ubi_mkvol_request req' passed to
'ubi_mkvol', which can fix the bug that the ubi test failed caused by that
req.flags was not initialized. And it is still compatible with old kernel
before kernel commit c355aa465fce ("ubi: expose the volume CRC check skip
flag").
----------------------------------------
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'tests/ubi-tests/integ.c')
| -rw-r--r-- | tests/ubi-tests/integ.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/ubi-tests/integ.c b/tests/ubi-tests/integ.c index 1cd0649..fd38ef5 100644 --- a/tests/ubi-tests/integ.c +++ b/tests/ubi-tests/integ.c @@ -467,6 +467,7 @@ static void operate_on_ubi_device(struct ubi_device_info *ubi_device) req.vol_id = UBI_VOL_NUM_AUTO; req.alignment = 1; /* TODO: What is this? */ req.bytes = ubi_device->info.leb_size * max_ebs_per_vol; + req.flags = 0; if (req.bytes == 0 || req.bytes > ubi_device->info.avail_bytes) req.bytes = ubi_device->info.avail_bytes; req.vol_type = UBI_DYNAMIC_VOLUME; |