Add tst_dev_block_size utility
PATCH v2 1/1 Add tst_dev_block_size utility
Added tst_dev_block_size function in tst_device.c and updated c-test-api.txt documentation.
--- doc/c-test-api.txt | 11 ++++ include/tst_device.h | 7 +++ lib/newlib_tests/tst_device.c | 96 +++++++++++++++++++++++++++-------- lib/tst_device.c | 15 ++++++ 4 files changed, 109 insertions(+), 20 deletions(-)
doc/c-test-api.txt +11 -0
@@ -1034,6 +1034,17 @@ uint64_t tst_get_device_size(const char *dev_path); This function gets size of the given block device, it checks the 'dev_path' is valid first, if yes, return the size in MB, otherwise return -1. +[source,c] +------------------------------------------------------------------------------- +#include "tst_test.h" + +int tst_dev_block_size(const char *path); +------------------------------------------------------------------------------- + +This function returns the size of a single IO block for the specific `path`. +It finds the device where `path` is located and then uses `ioctl` to get a +single device block size. + 1.16 Formatting a device with a filesystem ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/tst_device.h +7 -0
@@ -112,4 +112,11 @@ void tst_purge_dir(const char *path);*/ void tst_find_backing_dev (const char *path,char *dev); +/* +* Returns the size of a single IO block for the specific path +* @path Path to find the block size +* @return Size of the block size +*/ +int tst_dev_block_size (const char *path); +#endif /* TST_DEVICE_H__ */
lib/newlib_tests/tst_device.c +76 -20
123 lines not on this page · raw message
lib/tst_device.c +15 -0
@@ -547,3 +547,18 @@ void tst_find_backing_dev(const char *path, char *dev)if (S_ISBLK (buf.st_mode) !=1 )tst_brkm (TCONF ,NULL ,"dev(%s) isn't a block dev" , dev); } + +int tst_dev_block_size (const char *path) +{ +int fd; +int size; +char dev_name[1024 ]; + +tst_find_backing_dev (path, dev_name); + + fd =SAFE_OPEN (NULL , dev_name,O_RDONLY ); +SAFE_IOCTL (NULL , fd,BLKSSZGET , &size); +SAFE_CLOSE (NULL , fd); + +return size; +}
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
doc/c-test-api.txt uint64_t tst_get_device_size(const char *dev_path); · line 1044
Quoted 8 lines
+[source,c]
+-------------------------------------------------------------------------------doc/c-test-api.txt +6
-0+#include "tst_test.h" + +int tst_dev_block_size(const char *path); +------------------------------------------------------------------------------- + +This function returns the size of a single IO block for the specific `path`.
^
physical device block size for the specific path
Quoted 1 line
+It finds the device where
pathis located and then usesioctlto get a
^ Maybe we should add here the ioctl constant i.e. BLKSSZGET
Quoted 1 line
+single device block size.
^
physical
Quoted 9 lines
doc/c-test-api.txt +1
-0+ 1.16 Formatting a device with a filesystem ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~include/tst_device.h +0
-0
include/tst_device.h void tst_purge_dir(const char *path); · line 116
Quoted 5 lines
include/tst_device.h +2
-0@@ -112,4 +112,11 @@ void tst_purge_dir(const char *path);*/ void tst_find_backing_dev (const char *path,char *dev); +/* +* Returns the size of a single IO block for the specific path
^
physical device block size for ...
Quoted 19 lines
include/tst_device.h +5
-0+* @path Path to find the block size +* @return Size of the block size +*/ +int tst_dev_block_size (const char *path); +#endif /* TST_DEVICE_H__ */ lib/newlib_tests/tst_device.c +2
-0@@ -1,47 +1,103 @@// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Linux Test Project +* Copyright (C) 2021 SUSE LLC Andrea Cervesato <[email protected]> */ +#define _GNU_SOURCE#include <stdlib.h>
lib/newlib_tests/tst_device.c line 17
Quoted 10 lines
lib/newlib_tests/tst_device.c +4
-1#include <sys/mount.h> #include <stdint.h> +#include <stdio.h> +#include <lapi/loop.h> +#include <time.h> #include "tst_test.h" -static void do_test (void ) +#define PAGESIZE 2048
^ Huh?
The usuall PAGESIZE is 4k, then there are architecture with (optional) 64k pages, but I doubt that I have seen anything with 2k PAGESIZE.
This should have been named DEVBLOCKSIZE instead, naming it PAGESIZE makes it utterly confusing.
Quoted 13 lines
lib/newlib_tests/tst_device.c +7
-3+#define DEV_MIN_SIZE 300 + +static char *mntpoint; +static uint64_t ltp_dev_size; + +static void setup (void ) {int fd; -const char *dev; -char block_dev[100 ]; -uint64_t ltp_dev_size; +int ret;
lib/newlib_tests/tst_device.c line 33
Quoted 10 lines
lib/newlib_tests/tst_device.c +5
-4- dev = tst_device->dev; -if (!dev) -tst_brk (TCONF ,"Failed to acquire test device" ); + ret =asprintf (&mntpoint,"%s/mnt" ,tst_get_tmpdir ()); +if (ret <0 ) +tst_brk (TBROK ,"asprintf failure" ); -SAFE_MKFS (dev,"ext2" ,NULL ,NULL ); +while ((fd =SAFE_OPEN (tst_device->dev,O_RDONLY ,0666 )) <0 ) +usleep (100 );
Why the loop here?
It does not make any sense especially since you call SAFE_OPEN() that cannot fail.
Quoted 94 lines
lib/newlib_tests/tst_device.c +58
-12- fd =SAFE_OPEN (dev,O_RDONLY );SAFE_IOCTL (fd,BLKGETSIZE64 , <p_dev_size); +SAFE_IOCTL (fd,LOOP_SET_BLOCK_SIZE ,PAGESIZE );SAFE_CLOSE (fd); -if (ltp_dev_size/1024 /1024 ==300 ) -tst_res (TPASS ,"Got expected device size" ); +SAFE_MKFS (tst_device->dev, tst_device->fs_type,NULL ,NULL ); + +SAFE_MKDIR (mntpoint,0777 ); +SAFE_MOUNT (tst_device->dev, mntpoint, tst_device->fs_type,0 ,0 ); +} + +static void cleanup (void ) +{ +if (tst_is_mounted (mntpoint)) +SAFE_UMOUNT (mntpoint); +} + +static void test_dev_min_size (void ) +{ +uint64_t size; + + size = ltp_dev_size /1024 /1024 ; + +if (size ==DEV_MIN_SIZE ) +tst_res (TPASS ,"Got expected device size %lu" , size); +else +tst_res (TFAIL ,"Expected device size is %d but got %lu" ,DEV_MIN_SIZE , size); +} + +static void test_tst_find_backing_dev (void ) +{ +char block_dev[100 ]; + +tst_find_backing_dev (mntpoint, block_dev); + +if (!strcmp (tst_device->dev, block_dev)) +tst_res (TPASS ,"%s belongs to %s block dev" , mntpoint, block_dev);else -tst_res (TFAIL ,"Got unexpected device size" ); - -tst_find_backing_dev ("/boot" , block_dev); -tst_res (TPASS ,"/boot belongs to %s block dev" , block_dev); -tst_find_backing_dev ("/" , block_dev); -tst_res (TPASS ,"/ belongs to %s block dev" , block_dev); -tst_find_backing_dev ("/tmp" , block_dev); -tst_find_backing_dev ("/boot/xuyang" , block_dev); +tst_res (TFAIL ,"%s should belong to %s, but %s is returned" , mntpoint, tst_device->dev, block_dev); +} + +static void test_tst_dev_block_size (void ) +{ +int block_size; + + block_size =tst_dev_block_size (mntpoint); + +if (block_size ==PAGESIZE ) +tst_res (TPASS ,"%s has %d block size" , mntpoint, block_size); +else +tst_res (TFAIL ,"%s has %d block size, but expected is %i" , mntpoint, block_size,PAGESIZE ); +} + +static void do_test (void ) +{ +test_dev_min_size (); +test_tst_find_backing_dev (); +test_tst_dev_block_size (); }static struct tst_test test = { .needs_root =1 , .needs_device =1 , - .dev_min_size =300 , + .needs_tmpdir =1 , + .dev_min_size =DEV_MIN_SIZE , .test_all = do_test, + .setup = setup, + .cleanup = cleanup, + .min_kver ="4.14" , };lib/tst_device.c +5
-0@@ -547,3 +547,18 @@ void tst_find_backing_dev(const char *path, char *dev)if (S_ISBLK (buf.st_mode) !=1 )tst_brkm (TCONF ,NULL ,"dev(%s) isn't a block dev" , dev); } + +int tst_dev_block_size (const char *path) +{ +int fd; +int size;
lib/tst_device.c void tst_find_backing_dev(const char *path, char *dev) · line 564
Quoted 10 lines
lib/tst_device.c +10
-0+char dev_name[1024 ]; + +tst_find_backing_dev (path, dev_name); + + fd =SAFE_OPEN (NULL , dev_name,O_RDONLY ); +SAFE_IOCTL (NULL , fd,BLKSSZGET , &size); +SAFE_CLOSE (NULL , fd); + +return size; +}
I guess that it would make sense to add tst_dev_block_size_fd(int fd) that would do the same but for a file descriptor later on, but apart from the minor things the patch looks good.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp