Skip to content

Add missing features tests #1024

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

Merged
igaw merged 2 commits into from
Jun 6, 2025
Merged

Add missing features tests #1024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73d4264
ioctl: fix nvme_lm_set_features_ctrl_data_queue
MaisenbacherD Jun 6, 2025
9ad28eb
test: add missing tests for features functions
MaisenbacherD Jun 6, 2025
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
2 changes: 1 addition & 1 deletion src/nvme/ioctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2509,7 +2509,7 @@ int nvme_lm_set_features_ctrl_data_queue(int fd, __u16 cdqid, __u32 hp, __u32 tp
.fd = fd,
.fid = NVME_FEAT_FID_CTRL_DATA_QUEUE,
.nsid = NVME_NSID_NONE,
.cdw11 = cdqid | NVME_SET(tpt, LM_CTRL_DATA_QUEUE_ETPT),
.cdw11 = cdqid | NVME_SET(etpt, LM_CTRL_DATA_QUEUE_ETPT),
.cdw12 = hp,
.cdw13 = tpt,
.save = false,
Expand Down
54 changes: 54 additions & 0 deletions test/ioctl/features.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#define TEST_CDW12 0x12121212
#define TEST_CDW13 0x13131313
#define TEST_CDW15 0x15151515
#define TEST_CDQID 0x8765
#define TEST_UUIDX 0b1001110
#define TEST_FID 0xFE
#define TEST_RESULT 0x12345678
Expand Down Expand Up @@ -1519,6 +1520,57 @@ static void test_get_kernel_error(void)
check(!result, "result unexpectedly set to %" PRIu32, result);
}

static void test_lm_set_features_ctrl_data_queue(void)
{
__u32 hp = 0x12, tpt = 0x34;
bool etpt = true;
struct mock_cmd mock_admin_cmd = {
.opcode = nvme_admin_set_features,
.nsid = NVME_NSID_NONE,
.cdw10 = NVME_FEAT_FID_CTRL_DATA_QUEUE,
.cdw11 = TEST_CDQID | etpt << 31,
.cdw12 = hp,
.cdw13 = tpt,
.result = TEST_RESULT,
};
uint32_t result = 0;
int err;

set_mock_admin_cmds(&mock_admin_cmd, 1);
err = nvme_lm_set_features_ctrl_data_queue(TEST_FD, TEST_CDQID, hp, tpt,
etpt, &result);
end_mock_cmds();
check(err == 0, "set features returned error %d, errno %m", err);
check(result == TEST_RESULT,
"got result %" PRIu32 ", expected %" PRIu32, result, TEST_RESULT);
}

static void test_lm_get_features_ctrl_data_queue(void)
{
struct nvme_lm_ctrl_data_queue_fid_data expected_data, data = {};
struct mock_cmd mock_admin_cmd = {
.opcode = nvme_admin_get_features,
.nsid = NVME_NSID_NONE,
.cdw10 = NVME_FEAT_FID_CTRL_DATA_QUEUE,
.cdw11 = TEST_CDQID,
.data_len = sizeof(expected_data),
.out_data = &expected_data,
.result = TEST_RESULT,
};
uint32_t result = 0;
int err;

arbitrary(&expected_data, sizeof(expected_data));
set_mock_admin_cmds(&mock_admin_cmd, 1);
err = nvme_lm_get_features_ctrl_data_queue(TEST_FD, TEST_CDQID, &data,
&result);
end_mock_cmds();
check(err == 0, "get features returned error %d, errno %m", err);
check(result == TEST_RESULT,
"got result %" PRIu32 ", expected %" PRIu32, result, TEST_RESULT);
cmp(&data, &expected_data, sizeof(data), "incorrect data");
}

static void run_test(const char *test_name, void (*test_fn)(void))
{
printf("Running test %s...", test_name);
Expand Down Expand Up @@ -1601,4 +1653,6 @@ int main(void)
RUN_TEST(set_kernel_error);
RUN_TEST(get_status_code_error);
RUN_TEST(get_kernel_error);
RUN_TEST(lm_set_features_ctrl_data_queue);
RUN_TEST(lm_get_features_ctrl_data_queue);
}