hw/nvme: fix copy cmd for pi enabled namespaces

[PATCH v2] hw/nvme: fix copy cmd for pi enabled namespaces

Dmitry Tikhov posted 1 patch 2 years ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220421105158.ufd3wzivaougxokx@localhost.localdomain

Maintainers: Keith Busch <kbusch@kernel.org>, Klaus Jensen <its@irrelevant.dk>

hw/nvme/ctrl.c | 4 ++++
1 file changed, 4 insertions(+)

Expand all Fold all

[PATCH v2] hw/nvme: fix copy cmd for pi enabled namespaces

Posted by Dmitry Tikhov 2 years ago

Current implementation have problem in the read part of copy command.
Because there is no metadata mangling before nvme_dif_check invocation,
reftag error could be thrown for blocks of namespace that have not been
previously written to.

Signed-off-by: Dmitry Tikhov <d.tihov@yadro.com>
---
v2:
    * remove refactoring
    * remove write part fix
---
 hw/nvme/ctrl.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 74540a03d5..08574c4dcb 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -2787,6 +2787,10 @@ static void nvme_copy_in_completed_cb(void *opaque, int ret)
         size_t mlen = nvme_m2b(ns, nlb);
         uint8_t *mbounce = iocb->bounce + nvme_l2b(ns, nlb);
 
+        status = nvme_dif_mangle_mdata(ns, mbounce, mlen, slba);
+        if (status) {
+            goto invalid;
+        }
         status = nvme_dif_check(ns, iocb->bounce, len, mbounce, mlen, prinfor,
                                 slba, apptag, appmask, &reftag);
         if (status) {
-- 
2.35.1

Re: [PATCH v2] hw/nvme: fix copy cmd for pi enabled namespaces

Posted by Klaus Jensen 2 years ago

On Apr 21 13:51, Dmitry Tikhov wrote:
> Current implementation have problem in the read part of copy command.
> Because there is no metadata mangling before nvme_dif_check invocation,
> reftag error could be thrown for blocks of namespace that have not been
> previously written to.
> 
> Signed-off-by: Dmitry Tikhov <d.tihov@yadro.com>
> ---
> v2:
>     * remove refactoring
>     * remove write part fix
> ---
>  hw/nvme/ctrl.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
> index 74540a03d5..08574c4dcb 100644
> --- a/hw/nvme/ctrl.c
> +++ b/hw/nvme/ctrl.c
> @@ -2787,6 +2787,10 @@ static void nvme_copy_in_completed_cb(void *opaque, int ret)
>          size_t mlen = nvme_m2b(ns, nlb);
>          uint8_t *mbounce = iocb->bounce + nvme_l2b(ns, nlb);
>  
> +        status = nvme_dif_mangle_mdata(ns, mbounce, mlen, slba);
> +        if (status) {
> +            goto invalid;
> +        }
>          status = nvme_dif_check(ns, iocb->bounce, len, mbounce, mlen, prinfor,
>                                  slba, apptag, appmask, &reftag);
>          if (status) {
> -- 
> 2.35.1
> 

Thanks Dmitry,

Applied to nvme-next.