Message ID | 20200720113748.322965-8-its@irrelevant.dk |
---|---|
State | New |
Headers | show |
Series | hw/block/nvme: dma handling and address mapping cleanup | expand |
Klaus, On 20-07-20 13:37:39, Klaus Jensen wrote: > From: Klaus Jensen <k.jensen@samsung.com> > > Introduce the nvme_map helper to remove some noise in the main nvme_rw > function. > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> > --- > hw/block/nvme.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > index f1e04608804b..68c33a11c144 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -413,6 +413,15 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len, > return status; > } > > +static uint16_t nvme_map(NvmeCtrl *n, NvmeCmd *cmd, size_t len, > + NvmeRequest *req) Can we specify what is going to be mapped in this function? like nvme_map_dptr? Thanks,
On Thu, 2020-07-30 at 00:52 +0900, Minwoo Im wrote: > Klaus, > > On 20-07-20 13:37:39, Klaus Jensen wrote: > > From: Klaus Jensen <k.jensen@samsung.com> > > > > Introduce the nvme_map helper to remove some noise in the main nvme_rw > > function. > > > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > > Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> > > --- > > hw/block/nvme.c | 13 ++++++++++--- > > 1 file changed, 10 insertions(+), 3 deletions(-) > > > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > > index f1e04608804b..68c33a11c144 100644 > > --- a/hw/block/nvme.c > > +++ b/hw/block/nvme.c > > @@ -413,6 +413,15 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len, > > return status; > > } > > > > +static uint16_t nvme_map(NvmeCtrl *n, NvmeCmd *cmd, size_t len, > > + NvmeRequest *req) > > Can we specify what is going to be mapped in this function? like > nvme_map_dptr? I also once complained about the name, and I do like this idea! Best regards, Maxim Levitsky > > Thanks, >
On Jul 29 21:31, Maxim Levitsky wrote: > On Thu, 2020-07-30 at 00:52 +0900, Minwoo Im wrote: > > Klaus, > > > > On 20-07-20 13:37:39, Klaus Jensen wrote: > > > From: Klaus Jensen <k.jensen@samsung.com> > > > > > > Introduce the nvme_map helper to remove some noise in the main nvme_rw > > > function. > > > > > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > > > Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> > > > --- > > > hw/block/nvme.c | 13 ++++++++++--- > > > 1 file changed, 10 insertions(+), 3 deletions(-) > > > > > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > > > index f1e04608804b..68c33a11c144 100644 > > > --- a/hw/block/nvme.c > > > +++ b/hw/block/nvme.c > > > @@ -413,6 +413,15 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len, > > > return status; > > > } > > > > > > +static uint16_t nvme_map(NvmeCtrl *n, NvmeCmd *cmd, size_t len, > > > + NvmeRequest *req) > > > > Can we specify what is going to be mapped in this function? like > > nvme_map_dptr? > I also once complained about the name, and I do like this idea! > Hehe. I will change it ;) Note that when I post support for metadata, it will have to change again! Because then the function will be mapping both DPTR and MPTR. But lets discuss naming when we get to that ;)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index f1e04608804b..68c33a11c144 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -413,6 +413,15 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len, return status; } +static uint16_t nvme_map(NvmeCtrl *n, NvmeCmd *cmd, size_t len, + NvmeRequest *req) +{ + uint64_t prp1 = le64_to_cpu(cmd->dptr.prp1); + uint64_t prp2 = le64_to_cpu(cmd->dptr.prp2); + + return nvme_map_prp(n, &req->qsg, &req->iov, prp1, prp2, len, req); +} + static void nvme_post_cqes(void *opaque) { NvmeCQueue *cq = opaque; @@ -600,8 +609,6 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, NvmeRwCmd *rw = (NvmeRwCmd *)cmd; uint32_t nlb = le32_to_cpu(rw->nlb) + 1; uint64_t slba = le64_to_cpu(rw->slba); - uint64_t prp1 = le64_to_cpu(rw->dptr.prp1); - uint64_t prp2 = le64_to_cpu(rw->dptr.prp2); uint8_t lba_index = NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas); uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds; @@ -618,7 +625,7 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, return NVME_LBA_RANGE | NVME_DNR; } - if (nvme_map_prp(n, &req->qsg, &req->iov, prp1, prp2, data_size, req)) { + if (nvme_map(n, cmd, data_size, req)) { block_acct_invalid(blk_get_stats(n->conf.blk), acct); return NVME_INVALID_FIELD | NVME_DNR; }