Skip to content

selftests: ublk: cap nthreads to kernel's actual nr_hw_queues #829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blktests-ci wants to merge 1 commit into
base: linus-master_base
Choose a base branch
from
Open

selftests: ublk: cap nthreads to kernel's actual nr_hw_queues #829

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions tools/testing/selftests/ublk/kublk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1735,6 +1735,17 @@ static int __cmd_dev_add(const struct dev_ctx *ctx)
goto fail;
}

/*
* The kernel may reduce nr_hw_queues (e.g. capped to nr_cpu_ids).
* Cap nthreads to the actual queue count to avoid creating extra
* handler threads that will hang during device removal.
*
* per_io_tasks mode is excluded: threads interleave across all
* queues so nthreads > nr_hw_queues is valid and intentional.
*/
if (!ctx->per_io_tasks && dev->nthreads > info->nr_hw_queues)
dev->nthreads = info->nr_hw_queues;

ret = ublk_start_daemon(ctx, dev);
ublk_dbg(UBLK_DBG_DEV, "%s: daemon exit %d\n", __func__, ret);
if (ret < 0)
Expand Down