Skip to content

types: Change LM CDQ sz argument from u8 to u32. #1006

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 1 commit into from
May 8, 2025
Merged

types: Change LM CDQ sz argument from u8 to u32. #1006

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions src/nvme/api-types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,9 @@ struct nvme_dim_args {
* by the controller if no error is present. For Delete CDQ, this field is the CDQID
* to delete.
* @sel: Select (SEL): This field specifies the type of management operation to perform.
* @sz: For Create CDQ, specifies the size of CDQ, in dwords
* @sz_u8: For Create CDQ, specifies the size of CDQ, in dwords - 1 byte
* @rsvd1: Reserved
* @sz: For Create CDQ, specifies the size of CDQ, in dwords - 4 byte
*/
struct nvme_lm_cdq_args {
__u32 *result;
Expand All @@ -988,7 +990,9 @@ struct nvme_lm_cdq_args {
__u16 cntlid;
__u16 cdqid;
__u8 sel;
__u8 sz;
__u8 sz_u8;
__u8 rsvd1[4];
__u32 sz;
};

/**
Expand Down
18 changes: 15 additions & 3 deletions src/nvme/ioctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2353,15 +2353,27 @@ int nvme_dim_send(struct nvme_dim_args *args)

int nvme_lm_cdq(struct nvme_lm_cdq_args *args)
{
const size_t size_v1 = sizeof_args(struct nvme_lm_cdq_args, sz_u8, __u64);
const size_t size_v2 = sizeof_args(struct nvme_lm_cdq_args, sz, __u64);
__u32 cdw10 = NVME_SET(args->sel, LM_CDQ_SEL) |
NVME_SET(args->mos, LM_CDQ_MOS);
__u32 cdw11 = 0, data_len = 0;
__u32 cdw11 = 0, data_len = 0, sz = 0;
int err;

if (args->args_size < size_v1 || args->args_size > size_v2) {
errno = EINVAL;
return -1;
}

if (args->args_size == size_v1)
sz = args->sz_u8;
else
sz = args->sz;

if (args->sel == NVME_LM_SEL_CREATE_CDQ) {
cdw11 = NVME_SET(args->cntlid, LM_CREATE_CDQ_CNTLID) |
NVME_LM_CREATE_CDQ_PC;
data_len = args->sz << 2;
data_len = sz << 2;
} else if (args->sel == NVME_LM_SEL_DELETE_CDQ) {
cdw11 = NVME_SET(args->cdqid, LM_DELETE_CDQ_CDQID);
}
Expand All @@ -2370,7 +2382,7 @@ int nvme_lm_cdq(struct nvme_lm_cdq_args *args)
.opcode = nvme_admin_ctrl_data_queue,
.cdw10 = cdw10,
.cdw11 = cdw11,
.cdw12 = args->sz,
.cdw12 = sz,
.addr = (__u64)(uintptr_t)args->data,
.data_len = data_len,
.timeout_ms = args->timeout,
Expand Down