diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-11-21 20:57:34 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-11-21 20:57:34 +0300 |
| commit | ec9b3ac6e5630e320d926ea13a06d86d2a6bdde1 (patch) | |
| tree | 01392da6ce6e987b1c980bf1d522b098ca0be409 /include/linux | |
| parent | 766a71ef65bb217ed8bf1c068ac14c7d3c15d487 (diff) | |
| parent | 029cc98dec2eadb5d0978b5fea9ae6c427f2a020 (diff) | |
| download | linux-ec9b3ac6e5630e320d926ea13a06d86d2a6bdde1.tar.xz | |
Merge tag 'nvme-6.13-2024-11-21' of git://git.infradead.org/nvme into for-6.13/block
Pull NVMe updates from Keith:
"nvme updates for Linux 6.13
- Use correct srcu list traversal (Breno)
- Scatter-gather support for metadata (Keith)
- Fabrics shutdown race condition fix (Nilay)
- Persistent reservations updates (Guixin)"
* tag 'nvme-6.13-2024-11-21' of git://git.infradead.org/nvme:
nvme: tuning pr code by using defined structs and macros
nvme: introduce change ptpl and iekey definition
nvme-fabrics: fix kernel crash while shutting down controller
Revert "nvme: make keep-alive synchronous operation"
nvme-pci: use sgls for all user requests if possible
nvme: define the remaining used sgls constants
nvme-pci: add support for sgl metadata
nvme/multipath: Fix RCU list traversal to use SRCU primitive
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nvme.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 0a6e22038ce3..13377dde4527 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -389,6 +389,11 @@ enum { NVME_CTRL_CTRATT_PREDICTABLE_LAT = 1 << 5, NVME_CTRL_CTRATT_NAMESPACE_GRANULARITY = 1 << 7, NVME_CTRL_CTRATT_UUID_LIST = 1 << 9, + NVME_CTRL_SGLS_BYTE_ALIGNED = 1, + NVME_CTRL_SGLS_DWORD_ALIGNED = 2, + NVME_CTRL_SGLS_KSDBDS = 1 << 2, + NVME_CTRL_SGLS_MSDS = 1 << 19, + NVME_CTRL_SGLS_SAOS = 1 << 20, }; struct nvme_lbaf { @@ -2166,4 +2171,13 @@ enum nvme_pr_release_action { NVME_PR_RELEASE_ACT_CLEAR = 1, }; +enum nvme_pr_change_ptpl { + NVME_PR_CPTPL_NO_CHANGE = 0, + NVME_PR_CPTPL_RESV = 1 << 30, + NVME_PR_CPTPL_CLEARED = 2 << 30, + NVME_PR_CPTPL_PERSIST = 3 << 30, +}; + +#define NVME_PR_IGNORE_KEY (1 << 3) + #endif /* _LINUX_NVME_H */ |