Revert "hw/block/nvme: add support for sgl bit bucket descriptor"
PATCH 1/1 Revert "hw/block/nvme: add support for sgl bit bucket descriptor"
From: Klaus Jensen <[email protected]>
This reverts commit d97eee64fef35655bd06f5c44a07fdb83a6274ae.
The emulated controller correctly accounts for not including bit buckets in the controller-to-host data transfer, however it doesn't correctly account for the holes for the on-disk data offsets.
Reported-by Keith Busch <[email protected]>
Signed-off-by Klaus Jensen <[email protected]>
--- hw/nvme/ctrl.c | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-)
hw/nvme/ctrl.c +6 -23
@@ -808,10 +808,6 @@ static uint16_t nvme_map_sgl_data(NvmeCtrl *n, NvmeSg *sg,uint8_t type =NVME_SGL_TYPE (segment[i].type);switch (type) { -case NVME_SGL_DESCR_TYPE_BIT_BUCKET : -if (cmd->opcode ==NVME_CMD_WRITE ) { -continue ; - }case NVME_SGL_DESCR_TYPE_DATA_BLOCK :break ;case NVME_SGL_DESCR_TYPE_SEGMENT :
@@ -844,10 +840,6 @@ static uint16_t nvme_map_sgl_data(NvmeCtrl *n, NvmeSg *sg, trans_len =MIN (*len, dlen); -if (type ==NVME_SGL_DESCR_TYPE_BIT_BUCKET ) { - goto next; - } - addr =le64_to_cpu (segment[i].addr);if (UINT64_MAX - addr < dlen) {
@@ -859,7 +851,6 @@ static uint16_t nvme_map_sgl_data(NvmeCtrl *n, NvmeSg *sg,return status; } -next: *len -= trans_len; }
@@ -917,8 +908,7 @@ static uint16_t nvme_map_sgl(NvmeCtrl *n, NvmeSg *sg, NvmeSglDescriptor sgl, seg_len =le32_to_cpu (sgld->len);/* check the length of the (Last) Segment descriptor */ -if ((!seg_len || seg_len &0xf ) && - (NVME_SGL_TYPE (sgld->type) !=NVME_SGL_DESCR_TYPE_BIT_BUCKET )) { +if (!seg_len || seg_len &0xf ) {return NVME_INVALID_SGL_SEG_DESCR |NVME_DNR ; }
@@ -956,26 +946,20 @@ static uint16_t nvme_map_sgl(NvmeCtrl *n, NvmeSg *sg, NvmeSglDescriptor sgl, last_sgld = &segment[nsgld -1 ];/* -* If the segment ends with a Data Block or Bit Bucket Descriptor Type, -* then we are done. +* If the segment ends with a Data Block, then we are done. */ -switch (NVME_SGL_TYPE (last_sgld->type)) { -case NVME_SGL_DESCR_TYPE_DATA_BLOCK : -case NVME_SGL_DESCR_TYPE_BIT_BUCKET : +if (NVME_SGL_TYPE (last_sgld->type) ==NVME_SGL_DESCR_TYPE_DATA_BLOCK ) { status =nvme_map_sgl_data (n, sg, segment, nsgld, &len, cmd);if (status) { goto unmap; } goto out; - -default : -break ; }/* -* If the last descriptor was not a Data Block or Bit Bucket, then the -* current segment must not be a Last Segment. +* If the last descriptor was not a Data Block, then the current +* segment must not be a Last Segment. */ if (NVME_SGL_TYPE (sgld->type) ==NVME_SGL_DESCR_TYPE_LAST_SEGMENT ) { status =NVME_INVALID_SGL_SEG_DESCR |NVME_DNR ;
@@ -6773,8 +6757,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev) id->vwc =NVME_VWC_NSID_BROADCAST_SUPPORT |NVME_VWC_PRESENT ; id->ocfs =cpu_to_le16 (NVME_OCFS_COPY_FORMAT_0 |NVME_OCFS_COPY_FORMAT_1 ); - id->sgls =cpu_to_le32 (NVME_CTRL_SGLS_SUPPORT_NO_ALIGN | -NVME_CTRL_SGLS_BITBUCKET ); + id->sgls =cpu_to_le32 (NVME_CTRL_SGLS_SUPPORT_NO_ALIGN );nvme_init_subnqn (n);
Signature · 1 line
2.36.1