Skip to content

test: add tests for miscellaneous ioctl functions #1036

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 3 commits into from
Jul 11, 2025
Merged

test: add tests for miscellaneous ioctl functions #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdb79ef
ioctl: fix nvme_directive_recv_stream_status
MaisenbacherD Jul 8, 2025
46416a9
test: move _cleanup_free_ to util.h
MaisenbacherD Jul 9, 2025
83705ae
test: add tests for miscellaneous ioctl functions
MaisenbacherD Jul 8, 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
8 changes: 7 additions & 1 deletion src/nvme/ioctl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#ifndef _LIBNVME_IOCTL_H
#define _LIBNVME_IOCTL_H

#include <errno.h>
#include <stddef.h>
#include <sys/ioctl.h>

Expand Down Expand Up @@ -4041,6 +4042,11 @@ static inline int nvme_directive_recv_stream_status(int fd, __u32 nsid,
unsigned int nr_entries,
struct nvme_streams_directive_status *id)
{
if (nr_entries > NVME_STREAM_ID_MAX) {
errno = EINVAL;
return -1;
}

struct nvme_directive_recv_args args = {
.result = NULL,
.data = id,
Expand All @@ -4051,7 +4057,7 @@ static inline int nvme_directive_recv_stream_status(int fd, __u32 nsid,
.doper = NVME_DIRECTIVE_RECEIVE_STREAMS_DOPER_STATUS,
.dtype = NVME_DIRECTIVE_DTYPE_STREAMS,
.cdw12 = 0,
.data_len = sizeof(*id),
.data_len = (__u32)(sizeof(*id) + nr_entries * sizeof(__le16)),
.dspec = 0,
};

Expand Down
2 changes: 2 additions & 0 deletions src/nvme/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
* @NVMF_TSAS_SIZE: Max Transport Specific Address Subtype size
* @NVME_ZNS_CHANGED_ZONES_MAX: Max number of zones in the changed zones log
* page
* @NVME_STREAM_ID_MAX: Max number of stream IDs
*/
enum nvme_constants {
NVME_NSID_ALL = 0xffffffff,
Expand Down Expand Up @@ -147,6 +148,7 @@ enum nvme_constants {
NVMF_TRADDR_SIZE = 256,
NVMF_TSAS_SIZE = 256,
NVME_ZNS_CHANGED_ZONES_MAX = 511,
NVME_STREAM_ID_MAX = 0xffff,
};

/**
Expand Down
Loading