diff options
| author | Ming Lei <ming.lei@redhat.com> | 2025-03-21 21:53:24 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-03-21 14:09:24 -0600 |
| commit | ffde32a49a145a27af07e6acfb0c1d83c26479c4 (patch) | |
| tree | 8921aac1fba4d614130893b34088c443416494e3 | |
| parent | 07754bfd9aee59063f8549f6e4d455eae636ecc7 (diff) | |
selftests: ublk: fix starting ublk device
Firstly ublk char device node may not be created by udev yet, so wait
a while until it can be opened or timeout.
Secondly delete created ublk device in case of start failure, otherwise
the device becomes zombie.
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20250321135324.259677-1-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | tools/testing/selftests/ublk/file_backed.c | 4 | ||||
| -rw-r--r-- | tools/testing/selftests/ublk/kublk.c | 30 |
2 files changed, 23 insertions, 11 deletions
diff --git a/tools/testing/selftests/ublk/file_backed.c b/tools/testing/selftests/ublk/file_backed.c index 8a07356eccaf..570a5158b665 100644 --- a/tools/testing/selftests/ublk/file_backed.c +++ b/tools/testing/selftests/ublk/file_backed.c @@ -196,11 +196,13 @@ static int ublk_loop_tgt_init(struct ublk_dev *dev) }, }; - assert(dev->tgt.nr_backing_files == 1); ret = backing_file_tgt_init(dev); if (ret) return ret; + if (dev->tgt.nr_backing_files != 1) + return -EINVAL; + bytes = dev->tgt.backing_file_size[0]; dev->tgt.dev_size = bytes; p.basic.dev_sectors = bytes >> 9; diff --git a/tools/testing/selftests/ublk/kublk.c b/tools/testing/selftests/ublk/kublk.c index 148355717ee7..11005a87bcfa 100644 --- a/tools/testing/selftests/ublk/kublk.c +++ b/tools/testing/selftests/ublk/kublk.c @@ -379,26 +379,34 @@ static int ublk_queue_init(struct ublk_queue *q) return -ENOMEM; } +#define WAIT_USEC 100000 +#define MAX_WAIT_USEC (3 * 1000000) static int ublk_dev_prep(struct ublk_dev *dev) { int dev_id = dev->dev_info.dev_id; + unsigned int wait_usec = 0; + int ret = 0, fd = -1; char buf[64]; - int ret = 0; snprintf(buf, 64, "%s%d", UBLKC_DEV, dev_id); - dev->fds[0] = open(buf, O_RDWR); - if (dev->fds[0] < 0) { - ret = -EBADF; - ublk_err("can't open %s, ret %d\n", buf, dev->fds[0]); - goto fail; + + while (wait_usec < MAX_WAIT_USEC) { + fd = open(buf, O_RDWR); + if (fd >= 0) + break; + usleep(WAIT_USEC); + wait_usec += WAIT_USEC; + } + if (fd < 0) { + ublk_err("can't open %s %s\n", buf, strerror(errno)); + return -1; } + dev->fds[0] = fd; if (dev->tgt.ops->init_tgt) ret = dev->tgt.ops->init_tgt(dev); - - return ret; -fail: - close(dev->fds[0]); + if (ret) + close(dev->fds[0]); return ret; } @@ -856,6 +864,8 @@ static int __cmd_dev_add(const struct dev_ctx *ctx) ret = ublk_start_daemon(ctx, dev); ublk_dbg(UBLK_DBG_DEV, "%s: daemon exit %d\b", ret); + if (ret < 0) + ublk_ctrl_del_dev(dev); fail: if (ret < 0) |