@@ -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.
@@ -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.
@@ -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,
@@ -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);
@@ -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);
Fixes: e1b1ae66b240 ("tst_find_backing_dev: Get dev name from /sys/dev/block/*/uevent") On 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. Signed-off-by: Edward Liaw <edliaw@google.com> Reviewed-by: Petr Vorel <pvorel@suse.cz> Reviewed-by: Cyril Hrubis <chrubis@suse.cz> --- 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(-)