tst_device.c: Handle Android path for backing device
v4 cover tst_device.c: Handle Android path for backing device
e1b1ae66b240 ("tst_find_backing_dev: Get dev name from /sys/dev/block/*/uevent") added a hardcoded path to check for the backing device in /dev. On Android, it needs to check /dev/block.
The set_dev_path function was renamed to set_dev_loop_path and its return value was changed from 1 on success to 0 on success to be more consistent with other functions. A check was added to tst_find_free_loopdev in the event that the loop device is not ready yet, which appears to happen occasionally on Android.
v1->v2:
Changed the function signature of tst_find_backing_dev to add the length of the path string. Updated all references for this function to include the added parameter.
v2->v3:
Split the function rename, return value change, and the return value check into 3 commits. Fixed logic for non-NULL path check. Added Fixes tag for e1b1ae66b240.
v3->v4:
Rename dev_len argument to dev_size and update documentation and references. Remove != 0 as it is redundant.
Edward Liaw (4):
set_dev_path: Rename to set_dev_loop_path
set_dev_loop_path: Change return value to zero on success
tst_find_free_loopdev: Check return value of set_dev_loop_path
tst_find_backing_dev: Also check /dev/block/ for backing device
doc/c-test-api.txt | 2 +- include/tst_device.h | 7 +-- lib/newlib_tests/tst_device.c | 2 +- lib/tst_device.c | 51 ++++++++++++------- .../kernel/syscalls/ioctl/ioctl_loop05.c | 2 +- 5 files changed, 40 insertions(+), 24 deletions(-)
Signature · 5 lines
2.40.0.348.gf938b09366-goog -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v4 1/4 set_dev_path: Rename to set_dev_loop_path
Rename set_dev_path to set_dev_loop_path and the array dev_variants to dev_loop_variants. This will differentiate it from adding a similar function that is checking a more generic dev path.
--- lib/tst_device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
lib/tst_device.c +6 -6
@@ -54,19 +54,19 @@ static char dev_path[PATH_MAX];static int device_acquired;static unsigned long prev_dev_sec_write; -static const char *dev_variants[] = { +static const char *dev_loop_variants[] = {"/dev/loop%i" ,"/dev/loop/%i" ,"/dev/block/loop%i" }; -static int set_dev_path (int dev,char *path,size_t path_len) +static int set_dev_loop_path (int dev,char *path,size_t path_len) {unsigned int i;struct stat st; -for (i =0 ; i <ARRAY_SIZE (dev_variants); i++) { -snprintf (path, path_len, dev_variants[i], dev); +for (i =0 ; i <ARRAY_SIZE (dev_loop_variants); i++) { +snprintf (path, path_len, dev_loop_variants[i], dev);if (stat (path, &st) ==0 &&S_ISBLK (st.st_mode))return 1 ;
@@ -89,7 +89,7 @@ int tst_find_free_loopdev(char *path, size_t path_len)close (ctl_fd);if (rc >=0 ) {if (path) -set_dev_path (rc, path, path_len); +set_dev_loop_path (rc, path, path_len);tst_resm (TINFO ,"Found free device %d '%s'" , rc, path ?:"" );return rc;
@@ -116,7 +116,7 @@ int tst_find_free_loopdev(char *path, size_t path_len)*/ for (i =0 ; i <256 ; i++) { -if (!set_dev_path (i, buf,sizeof (buf))) +if (!set_dev_loop_path (i, buf,sizeof (buf)))continue ; dev_fd =open (buf,O_RDONLY );
Signature · 5 lines
2.40.0.348.gf938b09366-goog -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v4 2/4 set_dev_loop_path: Change return value to zero on success
In reply to Edward Liaw via ltpset_dev_loop_path was returning 1 on success and 0 on error, which is inconsistent with the other functions in this file. Change it to 0 on success and 1 on error.
--- lib/tst_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
lib/tst_device.c +3 -3
@@ -69,10 +69,10 @@ static int set_dev_loop_path(int dev, char *path, size_t path_len)snprintf (path, path_len, dev_loop_variants[i], dev);if (stat (path, &st) ==0 &&S_ISBLK (st.st_mode)) -return 1 ; +return 0 ; } -return 0 ; +return 1 ; }int tst_find_free_loopdev (char *path,size_t path_len)
@@ -116,7 +116,7 @@ int tst_find_free_loopdev(char *path, size_t path_len)*/ for (i =0 ; i <256 ; i++) { -if (!set_dev_loop_path (i, buf,sizeof (buf))) +if (set_dev_loop_path (i, buf,sizeof (buf)))continue ; dev_fd =open (buf,O_RDONLY );
Signature · 5 lines
2.40.0.348.gf938b09366-goog -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v4 3/4 tst_find_free_loopdev: Check return value of set_dev_loop_path
In reply to Edward Liaw via ltptst_find_free_loopdev does not check the return value of set_dev_loop_path and will return the last attempted path even if it does not pass a stat check. Change it to return TBROK if it fails to acquire a loop device.
--- lib/tst_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/tst_device.c +2 -2
@@ -88,8 +88,8 @@ int tst_find_free_loopdev(char *path, size_t path_len) rc =ioctl (ctl_fd,LOOP_CTL_GET_FREE );close (ctl_fd);if (rc >=0 ) { -if (path) -set_dev_loop_path (rc, path, path_len); +if (path &&set_dev_loop_path (rc, path, path_len)) +tst_brkm (TBROK ,NULL ,"Could not stat loop device %i" , rc);tst_resm (TINFO ,"Found free device %d '%s'" , rc, path ?:"" );return rc;
Signature · 5 lines
2.40.0.348.gf938b09366-goog -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v4 4/4 tst_find_backing_dev: Also check /dev/block/ for backing device
In reply to Edward Liaw via ltpOn Android, the backing devices are created in /dev/block/ and will not be found using the method added in e1b1ae66b240. Adds a check for /dev/block/%s as well as /dev/%s.
Modified the function signature of tst_find_backing_dev to add the length of the dev path string. Updated the documentation and code that references it.
--- doc/c-test-api.txt | 2 +- include/tst_device.h | 7 ++-- lib/newlib_tests/tst_device.c | 2 +- lib/tst_device.c | 37 +++++++++++++------ .../kernel/syscalls/ioctl/ioctl_loop05.c | 2 +- 5 files changed, 33 insertions(+), 17 deletions(-)
doc/c-test-api.txt +1 -1
@@ -1087,7 +1087,7 @@ is created for that intention. ------------------------------------------------------------------------------- #include "tst_test.h" -void tst_find_backing_dev(const char *path, char *dev); +void tst_find_backing_dev(const char *path, char *dev, size_t dev_size); ------------------------------------------------------------------------------- This function finds the block dev that this path belongs to, using uevent in sysfs.
include/tst_device.h +4 -3
@@ -108,10 +108,11 @@ void tst_purge_dir(const char *path);/* * Find the file or path belongs to which block dev -* @path Path to find the backing dev -* @dev The block dev +* @path Path to find the backing dev +* @dev The buffer to store the block dev in +* @dev_size The length of the block dev buffer */ -void tst_find_backing_dev (const char *path,char *dev); +void tst_find_backing_dev (const char *path,char *dev,size_t dev_size);/* * Stat the device mounted on a given path.
lib/newlib_tests/tst_device.c +1 -1
@@ -71,7 +71,7 @@ static void test_tst_find_backing_dev(void) {char block_dev[100 ]; -tst_find_backing_dev (mntpoint, block_dev); +tst_find_backing_dev (mntpoint, block_dev,sizeof (block_dev));if (!strcmp (tst_device->dev, block_dev)) tst_res(TPASS, "%s belongs to %s block dev", mntpoint,
lib/tst_device.c +26 -11
@@ -60,6 +60,11 @@ static const char *dev_loop_variants[] = { "/dev/block/loop%i" }; +static const char *dev_variants[] = { +"/dev/%s" , +"/dev/block/%s" +}; +static int set_dev_loop_path (int dev,char *path,size_t path_len) {unsigned int i;
@@ -75,6 +80,21 @@ static int set_dev_loop_path(int dev, char *path, size_t path_len)return 1 ; } +static int set_dev_path (char *dev,char *path,size_t path_len) +{ +unsigned int i; +struct stat st; + +for (i =0 ; i <ARRAY_SIZE (dev_variants); i++) { +snprintf (path, path_len, dev_variants[i], dev); + +if (stat (path, &st) ==0 &&S_ISBLK (st.st_mode)) +return 0 ; + } + +return 1 ; +} +int tst_find_free_loopdev (char *path,size_t path_len) {int ctl_fd, dev_fd, rc, i;
@@ -512,7 +532,7 @@ unsigned long tst_dev_bytes_written(const char *dev) } __attribute__((nonnull)) -void tst_find_backing_dev (const char *path,char *dev) +void tst_find_backing_dev (const char *path,char *dev,size_t dev_size) {struct stat buf;struct btrfs_ioctl_fs_info_args args = {0 };
@@ -575,7 +595,7 @@ void tst_find_backing_dev(const char *path, char *dev)sprintf (uevent_path,"%s/%s/uevent" , bdev_path, d->d_name); }else { -tst_brkm (TBROK |TERRNO ,NULL ,"No backining device found while looking in %s." , bdev_path); +tst_brkm (TBROK |TERRNO ,NULL ,"No backing device found while looking in %s." , bdev_path); }if (SAFE_READDIR (NULL , dir))
@@ -591,17 +611,12 @@ void tst_find_backing_dev(const char *path, char *dev)if (!access (uevent_path,R_OK )) {FILE_LINES_SCANF (NULL , uevent_path,"DEVNAME=%s" , dev_name); -if (dev_name[0 ]) -sprintf (dev,"/dev/%s" , dev_name); +if (!dev_name[0 ] ||set_dev_path (dev_name, dev, dev_size)) +tst_brkm (TBROK ,NULL ,"Could not stat backing device %s" , dev); + }else {tst_brkm (TBROK ,NULL ,"uevent file (%s) access failed" , uevent_path); } - -if (stat (dev, &buf) <0 ) -tst_brkm (TWARN |TERRNO ,NULL ,"stat(%s) failed" , dev); - -if (S_ISBLK (buf.st_mode) !=1 ) -tst_brkm (TCONF ,NULL ,"dev(%s) isn't a block dev" , dev); }void tst_stat_mount_dev (const char *const mnt_path,struct stat *const st)
@@ -644,7 +659,7 @@ int tst_dev_block_size(const char *path)int size;char dev_name[PATH_MAX ]; -tst_find_backing_dev (path, dev_name); +tst_find_backing_dev (path, dev_name,sizeof (dev_name)); fd =SAFE_OPEN (NULL , dev_name,O_RDONLY );SAFE_IOCTL (NULL , fd,BLKSSZGET , &size);
testcases/kernel/syscalls/ioctl/ioctl_loop05.c +1 -1
@@ -125,7 +125,7 @@ static void setup(void)* needn't transform transfer. */ sprintf (backing_file_path,"%s/test.img" ,tst_get_tmpdir ()); -tst_find_backing_dev (backing_file_path, bd_path); +tst_find_backing_dev (backing_file_path, bd_path,sizeof (bd_path)); block_devfd =SAFE_OPEN (bd_path,O_RDWR );SAFE_IOCTL (block_devfd,BLKSSZGET , &logical_block_size);tst_res (TINFO ,"backing dev(%s) logical_block_size is %d" , bd_path, logical_block_size);
Signature · 5 lines
2.40.0.348.gf938b09366-goog -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Edward, All,
Nice work. Patchset applied, thanks!
Signature · 6 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp