Skip to content

[pull] master from linux-nvme:master#224

Merged
pull[bot] merged 14 commits into
zengqingfu1442:masterfrom
linux-nvme:master
Jun 1, 2026
Merged

[pull] master from linux-nvme:master#224
pull[bot] merged 14 commits into
zengqingfu1442:masterfrom
linux-nvme:master

Conversation

@pull

@pull pull Bot commented Jun 1, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

bbain and others added 14 commits June 1, 2026 16:29
The bit that reports SID and MSID equality is zero when they are equal and
one when they are not.

Signed-off-by: Brenden Bain <brenden.bain@gmail.com>
Hard coding the default prefix causes issues on windows.
meson's docs says "prefix defaults to C:/ on Windows,
and /usr/local otherwise. You should always override this value.".
There is no value, only downside on Windows, to setting the value here.
If the user want a different value it should be overridden via the command line.

Signed-off-by: Brandon Capener <bcapener@micron.com>
add files to source list that will compile on windows with minimal changes.

Signed-off-by: Brandon Capener <bcapener@micron.com>
Added telemetry configuration version number wildcards, besides
the previous "*" wildcard.

Signed-off-by: Leonardo da Cunha <leonardo.da.cunha@solidigm.com>
A product line changed signature location to accommodate OCP spec.
Propagating header offset in abstract data type.
Fixed broken segment parser because nDescription not being converted to
string.
Fixed warning about Data Area size.

Signed-off-by: Leonardo da Cunha <leonardo.da.cunha@solidigm.com>
Firmware Commit returns the Multiple Update Detected value in the command
completion. nvme-cli currently identifies the controller after the
command completes to decide whether to print that value.

That post-command Identify is fragile for immediate activation. A possible
Linux race looks like:

  nvme-cli thread              nvme driver AEN work
  ---------------              --------------------
  libnvme_exec_admin_passthru()
    -> Firmware Commit succeeds
                               nvme_handle_aen_notice()
                                 -> FW_ACT_STARTING
                                 -> nvme_change_ctrl_state(RESETTING)
                                 -> nvme_fw_act_work()
                                    -> nvme_quiesce_io_queues()
                                    -> wait for activation
  fw_commit_print_mud()
    -> fw_commit_support_mud()
       -> nvme_identify_ctrl()
          -> admin ioctl passthru
          -> nvme_user_cmd*()
          -> blk_mq_alloc_request()
          -> __nvme_check_ready()
             rejects user admin command while resetting

nvme-cli then prints "identify-ctrl: ..." after the successful
fw-commit output. The extra error makes it unclear whether Firmware
Commit itself failed, even though the command completion was already
successful.

The post-command Identify can also observe the wrong capability. MUD is
a bit in the Firmware Commit completion, so it should be interpreted
using the controller capability that applied when that command was
processed. If the old firmware does not report support for firmware
image overlap but the new firmware does, a post-activation Identify can
make nvme-cli interpret the old command completion using the new
firmware capability.

Read and cache SMUD before submitting Firmware Commit, and use the
cached value to decide whether to print the completion MUD value. This
ties MUD reporting to the firmware revision that accepted the command
and avoids a post-success Identify during firmware activation.

Fixes: b447292 ("nvme: Check fw-commit command support MUD")
Reviewed-by: Tokunori Ikegami <ikegami.t@gmail.com>
Signed-off-by: Guzebing <guzebing@bytedance.com>
Rename to nvme_log_telemetry_host_lsp to drop the get.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
This just follows libnvme header files implementation.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
Use snprintf instead of sprintf to avoid potential buffer overflows.

Signed-off-by: orbisai0security <mediratta01.pally@gmail.com>
Fix bash completion for the ocp plugin:
- Correct "clear-pcie-correctable-error-counters" to
  "clear-pcie-correctable-errors"
- Correct "vs-fw-activate-history" to "fw-activate-history"
- Add missing commands: error-recovery-log, unsupported-reqs-log,
  tcg-configuration-log, set-plp-health-check-interval,
  get-plp-health-check-interval, get-enable-ieee1667-silo,
  set-enable-ieee1667-silo, persistent-event-log, get-idle-wakeup-time
- Add "version" and "help" commands

Also fix the misleading description for get-clear-pcie-correctable-errors
in ocp-nvme.h to clarify it retrieves the feature value rather than
clearing the counters.

Signed-off-by: Jim Munn <jlmunn@micron.com>
Update zsh completions for the ocp plugin to include all commands
with descriptions matching the plugin header.

Normalize descriptions across ocp-nvme.h, ocp-nvme.c, and
ocp-clear-features.c:
- Use title case consistently
- Use "Retrieve" for log page commands, "Get/Set" for features
- Remove erroneous "Define" prefix from "Issue Get/Set Feature" strings
- Normalize "FID :" spacing to "FID:"
- Expand abbreviations (Async -> Asynchronous, Config -> Configuration)
- Fix odd phrasings ("Return set of..." -> "Get ... Feature")

Signed-off-by: Jim Munn <jlmunn@micron.com>
Since actually the attribute checked by meson as if supported.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
Still remaining some HAVE_FOO defines used by ccan.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
Since changed from reserved by NVMe specification revision 1.3.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
@pull pull Bot locked and limited conversation to collaborators Jun 1, 2026
@pull pull Bot added the ⤵️ pull label Jun 1, 2026
@pull pull Bot merged commit 8e28a95 into zengqingfu1442:master Jun 1, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants