Skip to content

nvme: Report invalid namespace status code correctly #2516

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

Draft
SrinivasShekar wants to merge 2 commits into
base: main
Choose a base branch
from
+25 −3
Draft

nvme: Report invalid namespace status code correctly #2516

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
085be60
Updated the status of invalid namespaces
SrinivasShekar Dec 2, 2025
c11499c
Clippy and fmt fixes
SrinivasShekar Dec 2, 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
28 changes: 25 additions & 3 deletions vm/devices/storage/nvme/src/workers/admin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,21 @@ impl AdminHandler {
true
}

fn number_of_namespaces(&self) -> u32 {
self.namespaces
.last_key_value()
.map(|(k, _)| *k)
.unwrap_or(0)
}

fn is_valid_namespace(&self, nsid: u32) -> bool {
0 < nsid && nsid <= self.number_of_namespaces()
}

fn _is_active_namespace(&self, nsid: u32) -> bool {
self.namespaces.contains_key(&nsid)
}

async fn next_event(&mut self, state: &mut AdminState) -> Result<Event, QueueError> {
let event = loop {
// Wait for there to be room for a completion for the next
Expand Down Expand Up @@ -567,15 +582,22 @@ impl AdminHandler {
spec::Cns::NAMESPACE => {
if let Some(ns) = self.namespaces.get(&command.nsid) {
ns.identify(buf);
} else if self.is_valid_namespace(command.nsid) {
tracelimit::warn_ratelimited!(nsid = command.nsid, "inactive namespace id");
} else {
tracelimit::warn_ratelimited!(nsid = command.nsid, "unknown namespace id");
tracelimit::warn_ratelimited!(nsid = command.nsid, "invalid namespace id");
return Err(spec::Status::INVALID_NAMESPACE_OR_FORMAT.into());
}
}
spec::Cns::DESCRIPTOR_NAMESPACE => {
if let Some(ns) = self.namespaces.get(&command.nsid) {
ns.namespace_id_descriptor(buf);
} else if self.is_valid_namespace(command.nsid) {
tracelimit::warn_ratelimited!(nsid = command.nsid, "inactive namespace id");
return Err(spec::Status::INVALID_FIELD_IN_COMMAND.into());
} else {
tracelimit::warn_ratelimited!(nsid = command.nsid, "unknown namespace id");
tracelimit::warn_ratelimited!(nsid = command.nsid, "invalid namespace id");
return Err(spec::Status::INVALID_NAMESPACE_OR_FORMAT.into());
}
}
cns => {
Expand All @@ -602,7 +624,7 @@ impl AdminHandler {
.with_min(IOCQES)
.with_max(IOCQES),
frmw: spec::FirmwareUpdates::new().with_ffsro(true).with_nofs(1),
nn: self.namespaces.keys().copied().max().unwrap_or(0),
nn: self.number_of_namespaces(),
ieee: [0x74, 0xe2, 0x8c], // Microsoft
fr: (*b"v1.00000").into(),
mn: (*b"MSFT NVMe Accelerator v1.0 ").into(),
Expand Down