Skip to content

Feature overlap range #3212

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
Mar 30, 2026
Merged

Feature overlap range #3212

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
728d91e
nvme-print: fix nvme_show_cmd_err to pass admin parameter
ikegami-t Mar 30, 2026
4dae9ac
nvme-print: change nvme_show_cmd_err cmd parameter to opcode
ikegami-t Mar 30, 2026
e848bfc
nvme: add get and set features specific status code string
ikegami-t Mar 27, 2026
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
15 changes: 15 additions & 0 deletions libnvme/src/nvme/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8215,6 +8215,11 @@ struct nvme_mi_vpd_hdr {
* @NVME_SC_NS_INSUFFICIENT_CAP: Namespace Insufficient Capacity: Creating
* the namespace requires more free space
* than is currently available.
* @NVME_SC_FEAT_IOCS_COMBINATION_REJECTED: Set Features - I/O Command Set
* Combination Rejected: This error indicates
* that the controller did not accept the
* request to select the requested I/O
* Command Set Combination.
* @NVME_SC_NS_ID_UNAVAILABLE: Namespace Identifier Unavailable: The
* number of namespaces supported has been
* exceeded.
Expand Down Expand Up @@ -8306,6 +8311,10 @@ struct nvme_mi_vpd_hdr {
* suspended.
* @NVME_SC_CONTROLLER_DATA_QUEUE_FULL: The controller detected that a
* Controller Data Queue became full.
* @NVME_SC_INVALID_POWER_LIMIT: Invalid Power Limit: The power limit
* specified for the Power Limit feature is
* invalid because that power limit prohibits
* all operational power states.
* @NVME_SC_BAD_ATTRIBUTES: Conflicting Dataset Management Attributes
* @NVME_SC_INVALID_PI: Invalid Protection Information
* @NVME_SC_READ_ONLY: Attempted Write to Read Only Range
Expand Down Expand Up @@ -8535,6 +8544,7 @@ enum nvme_status_field {
NVME_SC_FW_ACTIVATE_PROHIBITED = 0x13,
NVME_SC_OVERLAPPING_RANGE = 0x14,
NVME_SC_NS_INSUFFICIENT_CAP = 0x15,
NVME_SC_FEAT_IOCS_COMBINATION_REJECTED = 0x15,
NVME_SC_NS_ID_UNAVAILABLE = 0x16,
NVME_SC_NS_ALREADY_ATTACHED = 0x18,
NVME_SC_NS_IS_PRIVATE = 0x19,
Expand Down Expand Up @@ -8582,6 +8592,11 @@ enum nvme_status_field {
NVME_SC_CONTROLLER_NOT_SUSPENDED = 0x3A,
NVME_SC_CONTROLLER_DATA_QUEUE_FULL = 0x3B,

/*
* Command Set Specific - Set Features
*/
NVME_SC_INVALID_POWER_LIMIT = 0x3e,

/*
* I/O Command Set Specific - NVM commands:
*/
Expand Down
43 changes: 41 additions & 2 deletions libnvme/src/nvme/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,35 @@ nvme_sanitize_ns_status_to_string(__u16 sc)
return NULL;
};

/**
* nvme_set_features_status_to_string() - Returns set features status string.
* @sc: Return status code from an set features command
*
* Return: The set features status string if it is a specific status code.
*/
static inline const char *
nvme_set_features_status_to_string(__u16 sc)
{
switch (sc) {
case NVME_SC_FEATURE_NOT_SAVEABLE:
case NVME_SC_FEATURE_NOT_CHANGEABLE:
case NVME_SC_FEATURE_NOT_PER_NS:
break;
case NVME_SC_OVERLAPPING_RANGE:
return "Overlapping Range: LBA range type data structure";
case NVME_SC_FEAT_IOCS_COMBINATION_REJECTED:
return "I/O Command Set Combination Rejected";
case NVME_SC_INVALID_CONTROLER_DATA_QUEUE:
break;
case NVME_SC_INVALID_POWER_LIMIT:
return "Invalid Power Limit";
default:
break;
}

return NULL;
};

Copy link
Copy Markdown
Collaborator

@igaw igaw Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you mind to add the other command specific status values here as well while at it? Thanks

Copy link
Copy Markdown
Contributor Author

@ikegami-t ikegami-t Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also added the other command specific status values. Thank you.

/**
* nvme_opcode_status_to_string() - Returns nvme opcode status string.
* @status: Return status from an nvme passthrough command
Expand All @@ -120,8 +149,18 @@ nvme_opcode_status_to_string(int status, bool admin, __u8 opcode)
const char *s = NULL;

if (status >= 0 && sct == NVME_SCT_CMD_SPECIFIC) {
if (admin && opcode == nvme_admin_sanitize_ns)
s = nvme_sanitize_ns_status_to_string(sc);
if (admin) {
switch (opcode) {
case nvme_admin_sanitize_ns:
s = nvme_sanitize_ns_status_to_string(sc);
break;
case nvme_admin_set_features:
s = nvme_set_features_status_to_string(sc);
break;
default:
break;
}
}
}

if (s)
Expand Down
19 changes: 8 additions & 11 deletions nvme-print.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,34 +522,31 @@ void nvme_show_status(int status)
ops->show_status(status);
}

static void nvme_show_cmd_err(const char *msg, bool admin,
struct nvme_passthru_cmd *cmd, int err)
static void nvme_show_cmd_err(const char *msg, bool admin, __u8 opcode, int err)
{
if (!err)
return;
else if (err < 0)
nvme_show_error("%s: %s", msg, nvme_strerror(-err));
else if (cmd)
nvme_show_opcode_status(err, false, cmd->opcode);
else if (opcode)
nvme_show_opcode_status(err, admin, opcode);
else
nvme_show_status(err);
}

void nvme_show_err(const char *msg, int err)
{
nvme_show_cmd_err(msg, false, NULL, err);
nvme_show_cmd_err(msg, false, 0, err);
}

void nvme_show_io_cmd_err(const char *msg, struct nvme_passthru_cmd *cmd,
int err)
void nvme_show_io_cmd_err(const char *msg, __u8 opcode, int err)
{
nvme_show_cmd_err(msg, false, cmd, err);
nvme_show_cmd_err(msg, false, opcode, err);
}

void nvme_show_admin_cmd_err(const char *msg, struct nvme_passthru_cmd *cmd,
int err)
void nvme_show_admin_cmd_err(const char *msg, __u8 opcode, int err)
{
nvme_show_cmd_err(msg, true, cmd, err);
nvme_show_cmd_err(msg, true, opcode, err);
}

void nvme_show_opcode_status(int status, bool admin, __u8 opcode)
Expand Down
6 changes: 2 additions & 4 deletions nvme-print.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,8 @@ struct print_ops *nvme_get_binary_print_ops(nvme_print_flags_t flags);

void nvme_show_status(int status);
void nvme_show_err(const char *msg, int err);
void nvme_show_io_cmd_err(const char *msg, struct nvme_passthru_cmd *cmd,
int err);
void nvme_show_admin_cmd_err(const char *msg, struct nvme_passthru_cmd *cmd,
int err);
void nvme_show_io_cmd_err(const char *msg, __u8 opcode, int err);
void nvme_show_admin_cmd_err(const char *msg, __u8 opcode, int err);
void nvme_show_opcode_status(int status, bool admin, __u8 opcode);
void nvme_show_lba_status_info(__u64 result);
void nvme_show_relatives(struct nvme_global_ctx *ctx, const char *name, nvme_print_flags_t flags);
Expand Down
5 changes: 3 additions & 2 deletions nvme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5751,7 +5751,7 @@ static int sanitize_ns_cmd(int argc, char **argv, struct command *acmd,
}
err = nvme_submit_admin_passthru(hdl, &cmd);
if (err) {
nvme_show_admin_cmd_err("sanitize ns", &cmd, err);
nvme_show_admin_cmd_err("sanitize ns", cmd.opcode, err);
return err;
}

Expand Down Expand Up @@ -6995,7 +6995,8 @@ static int set_feature(int argc, char **argv, struct command *acmd, struct plugi
err = nvme_set_features(hdl, cfg.nsid, cfg.fid, cfg.sv, cfg.value, cfg.cdw12,
0, cfg.uidx, 0, buf, cfg.data_len, &result);
if (err) {
nvme_show_err("set-feature", err);
nvme_show_admin_cmd_err("set-feature", nvme_admin_set_features,
err);
return err;
}

Expand Down
Loading