hw/block/nvme: add support for dulbe
PATCH 1/1 hw/block/nvme: add support for dulbe
From: Klaus Jensen <[email protected]>
This adds support for reporting the Deallocated or Unwritten Logical Block error (DULBE). This requires tracking the allocated/deallocated status of all logical blocks.
Introduce a bitmap that does this. The bitmap is persisted on the new 'state' drive that is associated with a namespace. If no such drive is attached, the controller will not indicate support for DULBE.
Signed-off-by Klaus Jensen <[email protected]>
---
Based-on: <[email protected]> ("[PATCH] hw/block/nvme: make lba data size configurable")
hw/block/nvme-ns.c | 103 +++++++++++++++++++++++++++++++++++++ hw/block/nvme-ns.h | 12 +++++ hw/block/nvme.c | 117 ++++++++++++++++++++++++++++++++++++++++-- hw/block/nvme.h | 4 +- hw/block/trace-events | 3 ++ include/block/nvme.h | 5 ++ 6 files changed, 240 insertions(+), 4 deletions(-)
hw/block/nvme-ns.c +103 -0
@@ -28,6 +28,35 @@#include "nvme.h" #include "nvme-ns.h" +static int nvme_ns_blk_resize (BlockBackend *blk,size_t len,Error **errp) +{ +Error *local_err =NULL ; +int ret; +uint64_t perm, shared_perm; + +blk_get_perm (blk, &perm, &shared_perm); + + ret =blk_set_perm (blk, perm |BLK_PERM_RESIZE , shared_perm, &local_err); +if (ret <0 ) { +error_propagate_prepend (errp, local_err,"blk_set_perm: " ); +return ret; + } + + ret =blk_truncate (blk, len, false,PREALLOC_MODE_OFF ,0 , &local_err); +if (ret <0 ) { +error_propagate_prepend (errp, local_err,"blk_truncate: " ); +return ret; + } + + ret =blk_set_perm (blk, perm, shared_perm, &local_err); +if (ret <0 ) { +error_propagate_prepend (errp, local_err,"blk_set_perm: " ); +return ret; + } + +return 0 ; +} +static void nvme_ns_init (NvmeNamespace *ns) {NvmeIdNs *id_ns = &ns->id_ns;
@@ -41,6 +70,66 @@ static void nvme_ns_init(NvmeNamespace *ns) id_ns->nuse = id_ns->ncap; } +static int nvme_ns_init_blk_state (NvmeNamespace *ns,Error **errp) +{ +BlockBackend *blk = ns->blk_state; +uint64_t perm, shared_perm; +int64_t len, state_len; + +Error *local_err =NULL ; +int ret; + + perm =BLK_PERM_CONSISTENT_READ |BLK_PERM_WRITE ; + shared_perm =BLK_PERM_ALL ; + + ns->utilization =bitmap_new (nvme_ns_nlbas (ns)); + + ret =blk_set_perm (blk, perm, shared_perm, &local_err); +if (ret) { +error_propagate_prepend (errp, local_err,"blk_set_perm: " ); +return ret; + } + + state_len =nvme_ns_blk_state_len (ns); + + len =blk_getlength (blk); +if (len <0 ) { +error_setg_errno (errp, -len,"blk_getlength: " ); +return len; + } + +if (len) { +if (len != state_len) { +error_setg (errp,"state size mismatch " +"(expected %" PRIu64" bytes; was %" PRIu64" bytes)" , + state_len, len); +error_append_hint (errp, +"Did you change the 'lbads' parameter? " +"Or re-formatted the namespace using Format NVM?\n" ); +return -1 ; + } + + ret =blk_pread (blk,0 , ns->utilization, state_len); +if (ret <0 ) { +error_setg_errno (errp, -ret,"blk_pread: " ); +return ret; + }else if (ret != state_len) { +error_setg (errp,"blk_pread: short read" ); +return -1 ; + } + +return 0 ; + } + + ret =nvme_ns_blk_resize (blk, state_len, &local_err); +if (ret <0 ) { +error_propagate_prepend (errp, local_err,"nvme_ns_blk_resize: " ); +return ret; + } + +return 0 ; +} +static int nvme_ns_init_blk (NvmeCtrl *n,NvmeNamespace *ns,NvmeIdCtrl *id,Error **errp) {
@@ -111,6 +200,19 @@ int nvme_ns_setup(NvmeCtrl *n, NvmeNamespace *ns, Error **errp) }nvme_ns_init (ns); + +if (ns->blk_state) { +if (nvme_ns_init_blk_state (ns, errp)) { +return -1 ; + } + +/* +* With a state file in place we can enable the Deallocated or +* Unwritten Logical Block Error feature. +*/ + ns->id_ns.nsfeat |=0x4 ; + } +if (nvme_register_namespace (n, ns, errp)) {return -1 ; }
@@ -136,6 +238,7 @@ static Property nvme_ns_props[] = {DEFINE_PROP_DRIVE ("drive" , NvmeNamespace, blk),DEFINE_PROP_UINT32 ("nsid" , NvmeNamespace, params.nsid,0 ),DEFINE_PROP_UINT8 ("lbads" , NvmeNamespace, params.lbads,BDRV_SECTOR_BITS ), +DEFINE_PROP_DRIVE ("state" , NvmeNamespace, blk_state), DEFINE_PROP_END_OF_LIST(), };
hw/block/nvme-ns.h +12 -0
@@ -27,11 +27,18 @@ typedef struct NvmeNamespaceParams {typedef struct NvmeNamespace {DeviceState parent_obj;BlockBackend *blk; +BlockBackend *blk_state;int32_t bootindex;int64_t size;NvmeIdNs id_ns;NvmeNamespaceParams params; + +unsigned long *utilization; + +struct { +uint32_t err_rec; + } features; }NvmeNamespace ;static inline uint32_t nvme_nsid (NvmeNamespace *ns)
@@ -60,6 +67,11 @@ static inline uint64_t nvme_ns_nlbas(NvmeNamespace *ns)return ns->size >>nvme_ns_lbads (ns); } +static inline size_t nvme_ns_blk_state_len (NvmeNamespace *ns) +{ +return ROUND_UP (DIV_ROUND_UP (nvme_ns_nlbas (ns),8 ),BDRV_SECTOR_SIZE ); +} +typedef struct NvmeCtrl NvmeCtrl ;int nvme_ns_setup (NvmeCtrl *n,NvmeNamespace *ns,Error **errp);
hw/block/nvme.c +114 -3
208 lines not on this page · raw message
hw/block/nvme.h +3 -1
@@ -93,7 +93,8 @@ typedef enum NvmeAIOOp { } NvmeAIOOp;typedef enum NvmeAIOFlags { -NVME_AIO_DMA =1 <<0 , +NVME_AIO_DMA =1 <<0 , +NVME_AIO_INTERNAL =1 <<1 , }NvmeAIOFlags ;typedef struct NvmeAIO NvmeAIO ;
@@ -171,6 +172,7 @@ typedef struct NvmeFeatureVal {static const uint32_t nvme_feature_cap[0x100 ] = { [NVME_TEMPERATURE_THRESHOLD ] =NVME_FEAT_CAP_CHANGE , + [NVME_ERROR_RECOVERY ] =NVME_FEAT_CAP_CHANGE |NVME_FEAT_CAP_NS , [NVME_VOLATILE_WRITE_CACHE ] =NVME_FEAT_CAP_CHANGE , [NVME_NUMBER_OF_QUEUES ] =NVME_FEAT_CAP_CHANGE , [NVME_ASYNCHRONOUS_EVENT_CONF ] =NVME_FEAT_CAP_CHANGE ,
hw/block/trace-events +3 -0
@@ -40,6 +40,8 @@ pci_nvme_map_prp(uint16_t cid, uint64_t trans_len, uint32_t len, uint64_t prp1, pci_nvme_map_sgl(uint16_t cid, uint8_t typ, uint32_t nlb, uint64_t len) "cid %"PRIu16" type 0x%"PRIx8" nlb %"PRIu32" len %"PRIu64"" pci_nvme_req_add_aio(uint16_t cid, void *aio, const char *blkname, uint64_t offset, uint64_t count, const char *opc, void *req) "cid %"PRIu16" aio %p blk \"%s\" offset %"PRIu64" count %"PRIu64" opc \"%s\" req %p" pci_nvme_aio_cb(uint16_t cid, void *aio, const char *blkname, uint64_t offset, const char *opc, void *req) "cid %"PRIu16" aio %p blk \"%s\" offset %"PRIu64" opc \"%s\" req %p" +pci_nvme_aio_discard_cb(uint16_t cid, uint32_t nsid, uint64_t slba, uint32_t nlb) "cid %"PRIu16" nsid %"PRIu32" slba 0x%"PRIx64" nlb %"PRIu32"" +pci_nvme_aio_write_cb(uint16_t cid, uint32_t nsid, uint64_t slba, uint32_t nlb) "cid %"PRIu16" nsid %"PRIu32" slba 0x%"PRIx64" nlb %"PRIu32"" pci_nvme_io_cmd(uint16_t cid, uint32_t nsid, uint16_t sqid, uint8_t opcode) "cid %"PRIu16" nsid %"PRIu32" sqid %"PRIu16" opc 0x%"PRIx8"" pci_nvme_admin_cmd(uint16_t cid, uint16_t sqid, uint8_t opcode) "cid %"PRIu16" sqid %"PRIu16" opc 0x%"PRIx8"" pci_nvme_rw(uint16_t cid, const char *verb, uint32_t nsid, uint32_t nlb, uint64_t count, uint64_t lba) "cid %"PRIu16" %s nsid %"PRIu32" nlb %"PRIu32" count %"PRIu64" lba 0x%"PRIx64""
@@ -75,6 +77,7 @@ pci_nvme_mmio_read(uint64_t addr) "addr 0x%"PRIx64"" pci_nvme_mmio_write(uint64_t addr, uint64_t data) "addr 0x%"PRIx64" data 0x%"PRIx64"" pci_nvme_mmio_doorbell_cq(uint16_t cqid, uint16_t new_head) "cqid %"PRIu16" new_head %"PRIu16"" pci_nvme_mmio_doorbell_sq(uint16_t sqid, uint16_t new_tail) "cqid %"PRIu16" new_tail %"PRIu16"" +pci_nvme_ns_update_util(uint16_t cid, uint32_t nsid) "cid %"PRIu16" nsid %"PRIu32"" pci_nvme_mmio_intm_set(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask set, data=0x%"PRIx64", new_mask=0x%"PRIx64"" pci_nvme_mmio_intm_clr(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask clr, data=0x%"PRIx64", new_mask=0x%"PRIx64"" pci_nvme_mmio_cfg(uint64_t data) "wrote MMIO, config controller config=0x%"PRIx64""
include/block/nvme.h +5 -0
@@ -675,6 +675,7 @@ enum NvmeStatusCodes {NVME_E2E_REF_ERROR =0x0284 ,NVME_CMP_FAILURE =0x0285 ,NVME_ACCESS_DENIED =0x0286 , +NVME_DULB =0x0287 ,NVME_MORE =0x2000 ,NVME_DNR =0x4000 , NVME_NO_COMPLETE = 0xffff,
@@ -890,6 +891,9 @@ enum NvmeIdCtrlLpa {#define NVME_AEC_NS_ATTR (aec) ((aec >> 8) & 0x1)#define NVME_AEC_FW_ACTIVATION (aec) ((aec >> 9) & 0x1) +#define NVME_ERR_REC_TLER (err_rec) (err_rec & 0xffff) +#define NVME_ERR_REC_DULBE (err_rec) (err_rec & 0x10000) +enum NvmeFeatureIds {NVME_ARBITRATION =0x1 ,NVME_POWER_MANAGEMENT =0x2 ,
@@ -1007,6 +1011,7 @@ enum {#define NVME_ID_NS_NSFEAT_THIN (nsfeat) ((nsfeat & 0x1)) +#define NVME_ID_NS_NSFEAT_DULBE (nsfeat) ((nsfeat >> 2) & 0x1)#define NVME_ID_NS_FLBAS_EXTENDED (flbas) ((flbas >> 4) & 0x1)#define NVME_ID_NS_FLBAS_INDEX (flbas) ((flbas & 0xf))#define NVME_ID_NS_MC_SEPARATE (mc) ((mc >> 1) & 0x1)
Signature · 1 line
2.27.0