From 903dd88c22884a2b5fc420ca421b0e223c2a2db6 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Mon, 7 Feb 2022 16:32:33 +0800 Subject: [PATCH] nvmf/vfio-user: save/restore CSTS register when doing live migration The CSTS register in source VM was left to migrate. Fix #2362. Change-Id: Ieef028578d2897b27a6ff594b16801462eb1b75e Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11418 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Dong Yi Reviewed-by: Thanos Makatos Reviewed-by: Jim Harris --- lib/nvmf/vfio_user.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/nvmf/vfio_user.c b/lib/nvmf/vfio_user.c index 7f51fa38c..1cde116b6 100644 --- a/lib/nvmf/vfio_user.c +++ b/lib/nvmf/vfio_user.c @@ -2470,6 +2470,7 @@ vfio_user_migr_ctrlr_save_data(struct nvmf_vfio_user_ctrlr *vu_ctrlr) regs = (struct spdk_nvme_registers *)&migr_state.bar0; /* Save mandarory registers to bar0 */ + regs->csts.raw = ctrlr->vcprop.csts.raw; regs->cap.raw = ctrlr->vcprop.cap.raw; regs->vs.raw = ctrlr->vcprop.vs.raw; regs->cc.raw = ctrlr->vcprop.cc.raw; @@ -2659,6 +2660,7 @@ vfio_user_migr_ctrlr_restore(struct nvmf_vfio_user_ctrlr *vu_ctrlr) memcpy((void *)vu_ctrlr->doorbells, doorbell_base, NVMF_VFIO_USER_DOORBELLS_SIZE); /* restore controller registers after ADMIN queue connection */ + ctrlr->vcprop.csts.raw = regs->csts.raw; ctrlr->vcprop.cap.raw = regs->cap.raw; ctrlr->vcprop.vs.raw = regs->vs.raw; ctrlr->vcprop.cc.raw = regs->cc.raw;