hw/block/nvme: add simple copy command
v5 cover hw/block/nvme: add simple copy command
From: Klaus Jensen <[email protected]>
Add support for TP 4065 ("Simple Copy Command").
Changes for v5
* rebased on nvme-next (support for zoned namespaces)
Changes for v4
* merge for-loops (Keith)
Changes for v3
* rebased on nvme-next
* changed the default msrc value to a more reasonable 127 from 255 to better align with the default mcl value of 128.
Changes for v2
* prefer style that aligns with existing NvmeIdCtrl field enums (Minwoo)
* swapped elbat/elbatm fields in copy source range. I've kept the R-b and A-b from Minwoo and Stefan since this is a non-functional change (the device does not use these fields at all).
Klaus Jensen (5):
hw/block/nvme: remove unused parameter in check zone write hw/block/nvme: refactor zone resource management hw/block/nvme: pull write pointer advancement to separate function
nvme: updated shared header for copy command hw/block/nvme: add simple copy command
hw/block/nvme-ns.h | 4 + hw/block/nvme.h | 1 + include/block/nvme.h | 45 +++- hw/block/nvme-ns.c | 8 + hw/block/nvme.c | 494 +++++++++++++++++++++++++++++++----------- hw/block/trace-events | 7 + 6 files changed, 431 insertions(+), 128 deletions(-)
Signature · 1 line
2.30.0
PATCH v5 1/5 hw/block/nvme: remove unused parameter in check zone write
From: Klaus Jensen <[email protected]>
Remove the unused NvmeCtrl parameter in nvme_check_zone_write.
--- hw/block/nvme.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
hw/block/nvme.c +3 -4
@@ -1183,9 +1183,8 @@ static uint16_t nvme_check_zone_state_for_write(NvmeZone *zone) } } -static uint16_t nvme_check_zone_write (NvmeCtrl *n,NvmeNamespace *ns, -NvmeZone *zone,uint64_t slba, -uint32_t nlb) +static uint16_t nvme_check_zone_write (NvmeNamespace *ns,NvmeZone *zone, +uint64_t slba,uint32_t nlb) {uint64_t zcap =nvme_zone_wr_boundary (zone);uint16_t status;
@@ -1748,7 +1747,7 @@ static uint16_t nvme_do_write(NvmeCtrl *n, NvmeRequest *req, bool append, res->slba =cpu_to_le64 (slba); } - status =nvme_check_zone_write (n, ns, zone, slba, nlb); + status =nvme_check_zone_write (ns, zone, slba, nlb);if (status) { goto invalid; }
Signature · 1 line
2.30.0
PATCH v5 2/5 hw/block/nvme: refactor zone resource management
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Zone transition handling and resource management is open coded (and semi-duplicated in the case of open, close and finish).
In preparation for Simple Copy command support (which also needs to open zones for writing), consolidate into a set of 'nvme_zrm' functions and in the process fix a bug with the controller not closing an open zone to allow another zone to be explicitly opened.
--- hw/block/nvme.c | 220 +++++++++++++++++++++++------------------------- 1 file changed, 103 insertions(+), 117 deletions(-)
hw/block/nvme.c +103 -117
@@ -1262,7 +1262,46 @@ static uint16_t nvme_check_zone_read(NvmeNamespace *ns, uint64_t slba,return status; } -static void nvme_auto_transition_zone (NvmeNamespace *ns) +static uint16_t nvme_zrm_finish (NvmeNamespace *ns,NvmeZone *zone) +{ +switch (nvme_get_zone_state (zone)) { +case NVME_ZONE_STATE_FULL : +return NVME_SUCCESS ; + +case NVME_ZONE_STATE_IMPLICITLY_OPEN : +case NVME_ZONE_STATE_EXPLICITLY_OPEN : +nvme_aor_dec_open (ns); +/* fallthrough */ +case NVME_ZONE_STATE_CLOSED : +nvme_aor_dec_active (ns); +/* fallthrough */ +case NVME_ZONE_STATE_EMPTY : +nvme_assign_zone_state (ns, zone,NVME_ZONE_STATE_FULL ); +return NVME_SUCCESS ; + +default : +return NVME_ZONE_INVAL_TRANSITION ; + } +} + +static uint16_t nvme_zrm_close (NvmeNamespace *ns,NvmeZone *zone) +{ +switch (nvme_get_zone_state (zone)) { +case NVME_ZONE_STATE_CLOSED : +return NVME_SUCCESS ; + +case NVME_ZONE_STATE_EXPLICITLY_OPEN : +case NVME_ZONE_STATE_IMPLICITLY_OPEN : +nvme_aor_dec_open (ns); +nvme_assign_zone_state (ns, zone,NVME_ZONE_STATE_CLOSED ); +/* fall through */ + +default : +return NVME_ZONE_INVAL_TRANSITION ; + } +} + +static void nvme_zrm_auto_transition_zone (NvmeNamespace *ns) {NvmeZone *zone;
@@ -1274,34 +1313,74 @@ static void nvme_auto_transition_zone(NvmeNamespace *ns)* Automatically close this implicitly open zone. */ QTAILQ_REMOVE (&ns->imp_open_zones, zone, entry); -nvme_aor_dec_open (ns); -nvme_assign_zone_state (ns, zone,NVME_ZONE_STATE_CLOSED ); +nvme_zrm_close (ns, zone); } } } -static uint16_t nvme_auto_open_zone (NvmeNamespace *ns,NvmeZone *zone) +static uint16_t __nvme_zrm_open (NvmeNamespace *ns,NvmeZone *zone, +bool implicit) { -uint16_t status =NVME_SUCCESS ; -uint8_t zs =nvme_get_zone_state (zone); +int act =0 ; +uint16_t status; -if (zs ==NVME_ZONE_STATE_EMPTY ) { -nvme_auto_transition_zone (ns); - status =nvme_aor_check (ns,1 ,1 ); - }else if (zs ==NVME_ZONE_STATE_CLOSED ) { -nvme_auto_transition_zone (ns); - status =nvme_aor_check (ns,0 ,1 ); +switch (nvme_get_zone_state (zone)) { +case NVME_ZONE_STATE_EMPTY : + act =1 ; + +/* fallthrough */ + +case NVME_ZONE_STATE_CLOSED : +nvme_zrm_auto_transition_zone (ns); + status =nvme_aor_check (ns, act,1 ); +if (status) { +return status; + } + +if (act) { +nvme_aor_inc_active (ns); + } + +nvme_aor_inc_open (ns); + +if (implicit) { +nvme_assign_zone_state (ns, zone,NVME_ZONE_STATE_IMPLICITLY_OPEN ); +return NVME_SUCCESS ; + } + +/* fallthrough */ + +case NVME_ZONE_STATE_IMPLICITLY_OPEN : +if (implicit) { +return NVME_SUCCESS ; + } + +nvme_assign_zone_state (ns, zone,NVME_ZONE_STATE_EXPLICITLY_OPEN ); + +/* fallthrough */ + +case NVME_ZONE_STATE_EXPLICITLY_OPEN : +return NVME_SUCCESS ; + +default : +return NVME_ZONE_INVAL_TRANSITION ; } - -return status; } -static void nvme_finalize_zoned_write (NvmeNamespace *ns,NvmeRequest *req, -bool failed) +static inline uint16_t nvme_zrm_auto (NvmeNamespace *ns,NvmeZone *zone) +{ +return __nvme_zrm_open (ns, zone, true); +} + +static inline uint16_t nvme_zrm_open (NvmeNamespace *ns,NvmeZone *zone) +{ +return __nvme_zrm_open (ns, zone, false); +} + +static void nvme_finalize_zoned_write (NvmeNamespace *ns,NvmeRequest *req) {NvmeRwCmd *rw = (NvmeRwCmd *)&req->cmd;NvmeZone *zone; -NvmeZonedResult *res = (NvmeZonedResult *)&req->cqe;uint64_t slba;uint32_t nlb;
@@ -1311,47 +1390,8 @@ static void nvme_finalize_zoned_write(NvmeNamespace *ns, NvmeRequest *req, zone->d.wp += nlb; -if (failed) { - res->slba =0 ; - } -if (zone->d.wp ==nvme_zone_wr_boundary (zone)) { -switch (nvme_get_zone_state (zone)) { -case NVME_ZONE_STATE_IMPLICITLY_OPEN : -case NVME_ZONE_STATE_EXPLICITLY_OPEN : -nvme_aor_dec_open (ns); -/* fall through */ -case NVME_ZONE_STATE_CLOSED : -nvme_aor_dec_active (ns); -/* fall through */ -case NVME_ZONE_STATE_EMPTY : -nvme_assign_zone_state (ns, zone,NVME_ZONE_STATE_FULL ); -/* fall through */ -case NVME_ZONE_STATE_FULL : -break ; -default : -assert (false); - } - } -} - -static void nvme_advance_zone_wp (NvmeNamespace *ns,NvmeZone *zone, -uint32_t nlb) -{ -uint8_t zs; - - zone->w_ptr += nlb; - -if (zone->w_ptr <nvme_zone_wr_boundary (zone)) { - zs =nvme_get_zone_state (zone); -switch (zs) { -case NVME_ZONE_STATE_EMPTY : -nvme_aor_inc_active (ns); -/* fall through */ -case NVME_ZONE_STATE_CLOSED : -nvme_aor_inc_open (ns); -nvme_assign_zone_state (ns, zone,NVME_ZONE_STATE_IMPLICITLY_OPEN ); - } +nvme_zrm_finish (ns, zone); } }
@@ -1376,7 +1416,7 @@ static void nvme_rw_cb(void *opaque, int ret)trace_pci_nvme_rw_cb (nvme_cid (req),blk_name (blk));if (ns->params.zoned &&nvme_is_write (req)) { -nvme_finalize_zoned_write (ns, req, ret !=0 ); +nvme_finalize_zoned_write (ns, req); }if (!ret) {
@@ -1752,12 +1792,12 @@ static uint16_t nvme_do_write(NvmeCtrl *n, NvmeRequest *req, bool append, goto invalid; } - status =nvme_auto_open_zone (ns, zone); + status =nvme_zrm_auto (ns, zone);if (status) { goto invalid; } -nvme_advance_zone_wp (ns, zone, nlb); + zone->w_ptr += nlb; } data_offset =nvme_l2b (ns, slba);
@@ -1843,73 +1883,19 @@ enum NvmeZoneProcessingMask {static uint16_t nvme_open_zone (NvmeNamespace *ns,NvmeZone *zone,NvmeZoneState state,NvmeRequest *req) { -uint16_t status; - -switch (state) { -case NVME_ZONE_STATE_EMPTY : - status =nvme_aor_check (ns,1 ,0 ); -if (status) { -return status; - } -nvme_aor_inc_active (ns); -/* fall through */ -case NVME_ZONE_STATE_CLOSED : - status =nvme_aor_check (ns,0 ,1 ); -if (status) { -if (state ==NVME_ZONE_STATE_EMPTY ) { -nvme_aor_dec_active (ns); - } -return status; - } -nvme_aor_inc_open (ns); -/* fall through */ -case NVME_ZONE_STATE_IMPLICITLY_OPEN : -nvme_assign_zone_state (ns, zone,NVME_ZONE_STATE_EXPLICITLY_OPEN ); -/* fall through */ -case NVME_ZONE_STATE_EXPLICITLY_OPEN : -return NVME_SUCCESS ; -default : -return NVME_ZONE_INVAL_TRANSITION ; - } +return nvme_zrm_open (ns, zone); }static uint16_t nvme_close_zone (NvmeNamespace *ns,NvmeZone *zone,NvmeZoneState state,NvmeRequest *req) { -switch (state) { -case NVME_ZONE_STATE_EXPLICITLY_OPEN : -case NVME_ZONE_STATE_IMPLICITLY_OPEN : -nvme_aor_dec_open (ns); -nvme_assign_zone_state (ns, zone,NVME_ZONE_STATE_CLOSED ); -/* fall through */ -case NVME_ZONE_STATE_CLOSED : -return NVME_SUCCESS ; -default : -return NVME_ZONE_INVAL_TRANSITION ; - } +return nvme_zrm_close (ns, zone); }static uint16_t nvme_finish_zone (NvmeNamespace *ns,NvmeZone *zone,NvmeZoneState state,NvmeRequest *req) { -switch (state) { -case NVME_ZONE_STATE_EXPLICITLY_OPEN : -case NVME_ZONE_STATE_IMPLICITLY_OPEN : -nvme_aor_dec_open (ns); -/* fall through */ -case NVME_ZONE_STATE_CLOSED : -nvme_aor_dec_active (ns); -/* fall through */ -case NVME_ZONE_STATE_EMPTY : - zone->w_ptr =nvme_zone_wr_boundary (zone); - zone->d.wp = zone->w_ptr; -nvme_assign_zone_state (ns, zone,NVME_ZONE_STATE_FULL ); -/* fall through */ -case NVME_ZONE_STATE_FULL : -return NVME_SUCCESS ; -default : -return NVME_ZONE_INVAL_TRANSITION ; - } +return nvme_zrm_finish (ns, zone); } static uint16_t nvme_reset_zone(NvmeNamespace *ns, NvmeZone *zone,
Signature · 1 line
2.30.0
PATCH v5 3/5 hw/block/nvme: pull write pointer advancement to separate function
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
In preparation for Simple Copy, pull write pointer advancement into a separate function that is independent on an NvmeRequest.
--- hw/block/nvme.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
hw/block/nvme.c +11 -5
@@ -1377,6 +1377,16 @@ static inline uint16_t nvme_zrm_open(NvmeNamespace *ns, NvmeZone *zone)return __nvme_zrm_open (ns, zone, false); } +static void __nvme_advance_zone_wp (NvmeNamespace *ns,NvmeZone *zone, +uint32_t nlb) +{ + zone->d.wp += nlb; + +if (zone->d.wp ==nvme_zone_wr_boundary (zone)) { +nvme_zrm_finish (ns, zone); + } +} +static void nvme_finalize_zoned_write (NvmeNamespace *ns,NvmeRequest *req) {NvmeRwCmd *rw = (NvmeRwCmd *)&req->cmd;
@@ -1388,11 +1398,7 @@ static void nvme_finalize_zoned_write(NvmeNamespace *ns, NvmeRequest *req) nlb =le16_to_cpu (rw->nlb) +1 ; zone =nvme_get_zone_by_slba (ns, slba); - zone->d.wp += nlb; - -if (zone->d.wp ==nvme_zone_wr_boundary (zone)) { -nvme_zrm_finish (ns, zone); - } +__nvme_advance_zone_wp (ns, zone, nlb); }static inline bool nvme_is_write (NvmeRequest *req)
Signature · 1 line
2.30.0
PATCH v5 4/5 nvme: updated shared header for copy command
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Add new data structures and types for the Simple Copy command.
--- include/block/nvme.h | 45 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-)
include/block/nvme.h +43 -2
@@ -579,6 +579,7 @@ enum NvmeIoCommands {NVME_CMD_COMPARE =0x05 ,NVME_CMD_WRITE_ZEROES =0x08 ,NVME_CMD_DSM =0x09 , +NVME_CMD_COPY =0x19 ,NVME_CMD_ZONE_MGMT_SEND =0x79 ,NVME_CMD_ZONE_MGMT_RECV =0x7a , NVME_CMD_ZONE_APPEND = 0x7d,
@@ -724,6 +725,35 @@ typedef struct QEMU_PACKED NvmeDsmRange {uint64_t slba; } NvmeDsmRange; +enum { +NVME_COPY_FORMAT_0 =0x0 , +}; + +typedef struct NvmeCopyCmd { +uint8_t opcode; +uint8_t flags; +uint16_t cid; +uint32_t nsid; +uint32_t rsvd2[4 ]; +NvmeCmdDptr dptr; +uint64_t sdlba; +uint32_t cdw12; +uint32_t cdw13; +uint32_t ilbrt; +uint16_t lbat; +uint16_t lbatm; +}NvmeCopyCmd ; + +typedef struct NvmeCopySourceRange { +uint8_t rsvd0[8 ]; +uint64_t slba; +uint16_t nlb; +uint8_t rsvd18[6 ]; +uint32_t eilbrt; +uint16_t elbat; +uint16_t elbatm; +}NvmeCopySourceRange ; +enum NvmeAsyncEventRequest {NVME_AER_TYPE_ERROR =0 ,NVME_AER_TYPE_SMART =1 ,
@@ -807,6 +837,7 @@ enum NvmeStatusCodes {NVME_CONFLICTING_ATTRS =0x0180 ,NVME_INVALID_PROT_INFO =0x0181 ,NVME_WRITE_TO_RO =0x0182 , +NVME_CMD_SIZE_LIMIT =0x0183 ,NVME_ZONE_BOUNDARY_ERROR =0x01b8 ,NVME_ZONE_FULL =0x01b9 , NVME_ZONE_READ_ONLY = 0x01ba,
@@ -994,7 +1025,7 @@ typedef struct QEMU_PACKED NvmeIdCtrl {uint8_t nvscc;uint8_t rsvd531;uint16_t acwu; -uint8_t rsvd534[2 ]; +uint16_t ocfs;uint32_t sgls;uint8_t rsvd540[228 ];uint8_t subnqn[256 ];
@@ -1022,6 +1053,11 @@ enum NvmeIdCtrlOncs {NVME_ONCS_FEATURES =1 <<4 ,NVME_ONCS_RESRVATIONS =1 <<5 ,NVME_ONCS_TIMESTAMP =1 <<6 , + NVME_ONCS_COPY = 1 << 8, +}; + +enum NvmeIdCtrlOcfs { +NVME_OCFS_COPY_FORMAT_0 =1 <<0 , }; enum NvmeIdCtrlFrmw {
@@ -1171,7 +1207,10 @@ typedef struct QEMU_PACKED NvmeIdNs {uint16_t npdg;uint16_t npda;uint16_t nows; -uint8_t rsvd74[30 ]; +uint16_t mssrl; +uint32_t mcl; +uint8_t msrc; +uint8_t rsvd81[23 ];uint8_t nguid[16 ];uint64_t eui64;NvmeLBAF lbaf[16 ];
@@ -1323,6 +1362,7 @@ static inline void _nvme_check_size(void)QEMU_BUILD_BUG_ON (sizeof (NvmeZonedResult) !=8 );QEMU_BUILD_BUG_ON (sizeof (NvmeCqe) !=16 );QEMU_BUILD_BUG_ON (sizeof (NvmeDsmRange) !=16 ); +QEMU_BUILD_BUG_ON (sizeof (NvmeCopySourceRange) !=32 );QEMU_BUILD_BUG_ON (sizeof (NvmeCmd) !=64 );QEMU_BUILD_BUG_ON (sizeof (NvmeDeleteQ) !=64 );QEMU_BUILD_BUG_ON (sizeof (NvmeCreateCq) !=64 );
@@ -1330,6 +1370,7 @@ static inline void _nvme_check_size(void)QEMU_BUILD_BUG_ON (sizeof (NvmeIdentify) !=64 );QEMU_BUILD_BUG_ON (sizeof (NvmeRwCmd) !=64 );QEMU_BUILD_BUG_ON (sizeof (NvmeDsmCmd) !=64 ); +QEMU_BUILD_BUG_ON (sizeof (NvmeCopyCmd) !=64 );QEMU_BUILD_BUG_ON (sizeof (NvmeRangeType) !=64 );QEMU_BUILD_BUG_ON (sizeof (NvmeErrorLog) !=64 );QEMU_BUILD_BUG_ON (sizeof (NvmeFwSlotInfoLog) !=512 );
Signature · 1 line
2.30.0
Re: [PATCH v5 4/5] nvme: updated shared header for copy command
Quoted 31 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add new data structures and types for the Simple Copy command.
Signed-off-by Klaus Jensen <[email protected]>Reviewed-by Minwoo Im <[email protected]>Acked-by Stefan Hajnoczi <[email protected]>--- include/block/nvme.h | 45 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-)include/block/nvme.h +5
-0@@ -579,6 +579,7 @@ enum NvmeIoCommands {NVME_CMD_COMPARE =0x05 ,NVME_CMD_WRITE_ZEROES =0x08 ,NVME_CMD_DSM =0x09 , +NVME_CMD_COPY =0x19 ,NVME_CMD_ZONE_MGMT_SEND =0x79 ,NVME_CMD_ZONE_MGMT_RECV =0x7a , NVME_CMD_ZONE_APPEND = 0x7d,@@ -724,6 +725,35 @@ typedef struct QEMU_PACKED NvmeDsmRange {uint64_t slba; } NvmeDsmRange; +enum { +NVME_COPY_FORMAT_0 =0x0 , +}; +
include/block/nvme.h typedef struct QEMU_PACKED NvmeDsmRange { · line 741
Quoted 10 lines
include/block/nvme.h +10
-0+typedef struct NvmeCopyCmd { + uint8_t opcode; + uint8_t flags; + uint16_t cid; + uint32_t nsid; + uint32_t rsvd2[4]; + NvmeCmdDptr dptr; + uint64_t sdlba; + uint32_t cdw12; + uint32_t cdw13;
Can we find better names for the fields within cdw's 12 and 13? Something like:
uint8_t nr;
uint8_t control[3];
uint16_t rsvd13;
uint16_t dspec;Re: [PATCH v5 4/5] nvme: updated shared header for copy command
Quoted 46 lines · Keith Busch
Quoted 31 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add new data structures and types for the Simple Copy command.
Signed-off-by Klaus Jensen <[email protected]>Reviewed-by Minwoo Im <[email protected]>Acked-by Stefan Hajnoczi <[email protected]>--- include/block/nvme.h | 45 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-)include/block/nvme.h +5
-0@@ -579,6 +579,7 @@ enum NvmeIoCommands {NVME_CMD_COMPARE =0x05 ,NVME_CMD_WRITE_ZEROES =0x08 ,NVME_CMD_DSM =0x09 , +NVME_CMD_COPY =0x19 ,NVME_CMD_ZONE_MGMT_SEND =0x79 ,NVME_CMD_ZONE_MGMT_RECV =0x7a , NVME_CMD_ZONE_APPEND = 0x7d,@@ -724,6 +725,35 @@ typedef struct QEMU_PACKED NvmeDsmRange {uint64_t slba; } NvmeDsmRange; +enum { +NVME_COPY_FORMAT_0 =0x0 , +}; +include/block/nvme.h typedef struct QEMU_PACKED NvmeDsmRange { · line 741
Quoted 10 lines
include/block/nvme.h +10
-0+typedef struct NvmeCopyCmd { + uint8_t opcode; + uint8_t flags; + uint16_t cid; + uint32_t nsid; + uint32_t rsvd2[4]; + NvmeCmdDptr dptr; + uint64_t sdlba; + uint32_t cdw12; + uint32_t cdw13;Can we find better names for the fields within cdw's 12 and 13? Something like:
Quoted 5 lines
uint8_t nr;
uint8_t control[3];
uint16_t rsvd13;
uint16_t dspec;Absolutely.
I honestly didn't think about doing an array-3 of those control bytes.
PATCH v5 5/5 hw/block/nvme: add simple copy command
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Add support for TP 4065a ("Simple Copy Command"), v2020.05.04 ("Ratified").
The implementation uses a bounce buffer to first read in the source logical blocks, then issue a write of that bounce buffer. The default maximum number of source logical blocks is 128, translating to 512 KiB for 4k logical blocks which aligns with the default value of MDTS.
--- hw/block/nvme-ns.h | 4 + hw/block/nvme.h | 1 + hw/block/nvme-ns.c | 8 ++ hw/block/nvme.c | 253 +++++++++++++++++++++++++++++++++++++++++- hw/block/trace-events | 7 ++ 5 files changed, 272 insertions(+), 1 deletion(-)
hw/block/nvme-ns.h +4 -0
@@ -29,6 +29,10 @@ typedef struct NvmeNamespaceParams {uint32_t nsid;QemuUUID uuid; +uint16_t mssrl; +uint32_t mcl; +uint8_t msrc; +bool zoned;bool cross_zone_read;uint64_t zone_size_bs;
hw/block/nvme.h +1 -0
@@ -68,6 +68,7 @@ static inline const char *nvme_io_opc_str(uint8_t opc)case NVME_CMD_COMPARE :return "NVME_NVM_CMD_COMPARE" ;case NVME_CMD_WRITE_ZEROES :return "NVME_NVM_CMD_WRITE_ZEROES" ;case NVME_CMD_DSM :return "NVME_NVM_CMD_DSM" ; +case NVME_CMD_COPY :return "NVME_NVM_CMD_COPY" ;case NVME_CMD_ZONE_MGMT_SEND :return "NVME_ZONED_CMD_MGMT_SEND" ;case NVME_CMD_ZONE_MGMT_RECV :return "NVME_ZONED_CMD_MGMT_RECV" ;case NVME_CMD_ZONE_APPEND :return "NVME_ZONED_CMD_ZONE_APPEND" ;
hw/block/nvme-ns.c +8 -0
@@ -63,6 +63,11 @@ static int nvme_ns_init(NvmeNamespace *ns, Error **errp) id_ns->npda = id_ns->npdg = npdg -1 ; +/* simple copy */ + id_ns->mssrl =cpu_to_le16 (ns->params.mssrl); + id_ns->mcl =cpu_to_le32 (ns->params.mcl); + id_ns->msrc = ns->params.msrc; +return 0 ; }
@@ -377,6 +382,9 @@ static Property nvme_ns_props[] = {DEFINE_BLOCK_PROPERTIES (NvmeNamespace, blkconf),DEFINE_PROP_UINT32 ("nsid" , NvmeNamespace, params.nsid,0 ),DEFINE_PROP_UUID ("uuid" , NvmeNamespace, params.uuid), +DEFINE_PROP_UINT16 ("mssrl" , NvmeNamespace, params.mssrl,128 ), +DEFINE_PROP_UINT32 ("mcl" , NvmeNamespace, params.mcl,128 ), +DEFINE_PROP_UINT8 ("msrc" , NvmeNamespace, params.msrc,127 ),DEFINE_PROP_BOOL ("zoned" , NvmeNamespace, params.zoned, false),DEFINE_PROP_SIZE ("zoned.zone_size" , NvmeNamespace, params.zone_size_bs, NVME_DEFAULT_ZONE_SIZE),
hw/block/nvme.c +252 -1
291 lines not on this page · raw message
hw/block/trace-events +7 -0
@@ -43,12 +43,18 @@ pci_nvme_admin_cmd(uint16_t cid, uint16_t sqid, uint8_t opcode, const char *opna pci_nvme_read(uint16_t cid, uint32_t nsid, uint32_t nlb, uint64_t count, uint64_t lba) "cid %"PRIu16" nsid %"PRIu32" nlb %"PRIu32" count %"PRIu64" lba 0x%"PRIx64"" pci_nvme_write(uint16_t cid, const char *verb, uint32_t nsid, uint32_t nlb, uint64_t count, uint64_t lba) "cid %"PRIu16" opname '%s' nsid %"PRIu32" nlb %"PRIu32" count %"PRIu64" lba 0x%"PRIx64"" pci_nvme_rw_cb(uint16_t cid, const char *blkname) "cid %"PRIu16" blk '%s'" +pci_nvme_copy(uint16_t cid, uint32_t nsid, uint16_t nr, uint8_t format) "cid %"PRIu16" nsid %"PRIu32" nr %"PRIu16" format 0x%"PRIx8"" +pci_nvme_copy_source_range(uint64_t slba, uint32_t nlb) "slba 0x%"PRIx64" nlb %"PRIu32"" +pci_nvme_copy_in_complete(uint16_t cid) "cid %"PRIu16"" +pci_nvme_copy_cb(uint16_t cid) "cid %"PRIu16"" +pci_nvme_write_zeroes(uint16_t cid, uint32_t nsid, uint64_t slba, uint32_t nlb) "cid %"PRIu16" nsid %"PRIu32" slba %"PRIu64" nlb %"PRIu32"" pci_nvme_block_status(int64_t offset, int64_t bytes, int64_t pnum, int ret, bool zeroed) "offset %"PRId64" bytes %"PRId64" pnum %"PRId64" ret 0x%x zeroed %d" pci_nvme_dsm(uint16_t cid, uint32_t nsid, uint32_t nr, uint32_t attr) "cid %"PRIu16" nsid %"PRIu32" nr %"PRIu32" attr 0x%"PRIx32"" pci_nvme_dsm_deallocate(uint16_t cid, uint32_t nsid, uint64_t slba, uint32_t nlb) "cid %"PRIu16" nsid %"PRIu32" slba %"PRIu64" nlb %"PRIu32"" pci_nvme_compare(uint16_t cid, uint32_t nsid, uint64_t slba, uint32_t nlb) "cid %"PRIu16" nsid %"PRIu32" slba 0x%"PRIx64" nlb %"PRIu32"" pci_nvme_compare_cb(uint16_t cid) "cid %"PRIu16"" pci_nvme_aio_discard_cb(uint16_t cid) "cid %"PRIu16"" +pci_nvme_aio_copy_in_cb(uint16_t cid) "cid %"PRIu16"" pci_nvme_aio_zone_reset_cb(uint16_t cid, uint64_t zslba) "cid %"PRIu16" zslba 0x%"PRIx64"" pci_nvme_create_sq(uint64_t addr, uint16_t sqid, uint16_t cqid, uint16_t qsize, uint16_t qflags) "create submission queue, addr=0x%"PRIx64", sqid=%"PRIu16", cqid=%"PRIu16", qsize=%"PRIu16", qflags=%"PRIu16"" pci_nvme_create_cq(uint64_t addr, uint16_t cqid, uint16_t vector, uint16_t size, uint16_t qflags, int ien) "create completion queue, addr=0x%"PRIx64", cqid=%"PRIu16", vector=%"PRIu16", qsize=%"PRIu16", qflags=%"PRIu16", ien=%d"
@@ -113,6 +119,7 @@ pci_nvme_err_addr_read(uint64_t addr) "addr 0x%"PRIx64"" pci_nvme_err_addr_write(uint64_t addr) "addr 0x%"PRIx64"" pci_nvme_err_cfs(void) "controller fatal status" pci_nvme_err_aio(uint16_t cid, const char *errname, uint16_t status) "cid %"PRIu16" err '%s' status 0x%"PRIx16"" +pci_nvme_err_copy_invalid_format(uint8_t format) "format 0x%"PRIx8"" pci_nvme_err_invalid_sgld(uint16_t cid, uint8_t typ) "cid %"PRIu16" type 0x%"PRIx8"" pci_nvme_err_invalid_num_sgld(uint16_t cid, uint8_t typ) "cid %"PRIu16" type 0x%"PRIx8"" pci_nvme_err_invalid_sgl_excess_length(uint16_t cid) "cid %"PRIu16""
Signature · 1 line
2.30.0
Quoted 24 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add support for TP 4065a ("Simple Copy Command"), v2020.05.04 ("Ratified").
The implementation uses a bounce buffer to first read in the source logical blocks, then issue a write of that bounce buffer. The default maximum number of source logical blocks is 128, translating to 512 KiB for 4k logical blocks which aligns with the default value of MDTS.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme-ns.h | 4 + hw/block/nvme.h | 1 + hw/block/nvme-ns.c | 8 ++ hw/block/nvme.c | 253 +++++++++++++++++++++++++++++++++++++++++- hw/block/trace-events | 7 ++ 5 files changed, 272 insertions(+), 1 deletion(-)hw/block/trace-events +0
-0
hw/block/trace-events pci_nvme_admin_cmd(uint16_t cid, uint16_t sqid, uint8_t opcode, const char *opna · line 50
Quoted 8 lines
hw/block/trace-events +5
-0@@ -43,12 +43,18 @@ pci_nvme_admin_cmd(uint16_t cid, uint16_t sqid, uint8_t opcode, const char *opna pci_nvme_read(uint16_t cid, uint32_t nsid, uint32_t nlb, uint64_t count, uint64_t lba) "cid %"PRIu16" nsid %"PRIu32" nlb %"PRIu32" count %"PRIu64" lba 0x%"PRIx64"" pci_nvme_write(uint16_t cid, const char *verb, uint32_t nsid, uint32_t nlb, uint64_t count, uint64_t lba) "cid %"PRIu16" opname '%s' nsid %"PRIu32" nlb %"PRIu32" count %"PRIu64" lba 0x%"PRIx64"" pci_nvme_rw_cb(uint16_t cid, const char *blkname) "cid %"PRIu16" blk '%s'" +pci_nvme_copy(uint16_t cid, uint32_t nsid, uint16_t nr, uint8_t format) "cid %"PRIu16" nsid %"PRIu32" nr %"PRIu16" format 0x%"PRIx8"" +pci_nvme_copy_source_range(uint64_t slba, uint32_t nlb) "slba 0x%"PRIx64" nlb %"PRIu32"" +pci_nvme_copy_in_complete(uint16_t cid) "cid %"PRIu16"" +pci_nvme_copy_cb(uint16_t cid) "cid %"PRIu16"" +pci_nvme_write_zeroes(uint16_t cid, uint32_t nsid, uint64_t slba, uint32_t nlb) "cid %"PRIu16" nsid %"PRIu32" slba %"PRIu64" nlb %"PRIu32""
Woops. An old trace event ended up in there when rebasing.
Just had the one comment on patch 4, which is really no big deal. I need to integrate tooling and/or kernel support in order to properly test this, but just from code inspection, I think it's good.
Quoted 6 lines · Keith Busch
Just had the one comment on patch 4, which is really no big deal. I need to integrate tooling and/or kernel support in order to properly test this, but just from code inspection, I think it's good.
Reviewed-by Keith Busch <[email protected]>
Thanks Keith!
Actually, nvme-cli already has support ;)
# nvme copy /dev/nvme0n2 --sdlba=0x2000 --slbs=0x0,0x1000 --blocks=0,1
Klaus Jensen
AppliedQuoted 6 lines · Keith Busch
Just had the one comment on patch 4, which is really no big deal. I need to integrate tooling and/or kernel support in order to properly test this, but just from code inspection, I think it's good.
Reviewed-by Keith Busch <[email protected]>
Applied, with the small fix to patch 4.