From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecCvl-00037z-3j for qemu-devel@nongnu.org; Thu, 18 Jan 2018 11:20:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecCvh-000641-50 for qemu-devel@nongnu.org; Thu, 18 Jan 2018 11:20:45 -0500 Date: Thu, 18 Jan 2018 17:20:34 +0100 From: Cornelia Huck Message-ID: <20180118172034.3dda2622.cohuck@redhat.com> In-Reply-To: <1516035122-7617-1-git-send-email-imbrenda@linux.vnet.ibm.com> References: <1516035122-7617-1-git-send-email-imbrenda@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v1 1/1] s390x: fix storage attributes migration for non-small guests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Claudio Imbrenda Cc: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, Christian Borntraeger On Mon, 15 Jan 2018 17:52:02 +0100 Claudio Imbrenda wrote: > Fix storage attribute migration so that it does not fail for guests > with more than a few GB of RAM. Migration itself was successful, but > storage attributes were not migrated completely. > > This patch fixes the migration of all storage attributes, even when the > guest have large amounts of memory. > > Signed-off-by: Claudio Imbrenda > Fixes: 903fd80b03243476 ("s390x/migration: Storage attributes device") > --- > hw/s390x/s390-stattrib-kvm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/s390x/s390-stattrib-kvm.c b/hw/s390x/s390-stattrib-kvm.c > index 41770a7..480551c 100644 > --- a/hw/s390x/s390-stattrib-kvm.c > +++ b/hw/s390x/s390-stattrib-kvm.c > @@ -116,7 +116,7 @@ static void kvm_s390_stattrib_synchronize(S390StAttribState *sa) > for (cx = 0; cx + len <= max; cx += len) { > clog.start_gfn = cx; > clog.count = len; > - clog.values = (uint64_t)(sas->incoming_buffer + cx * len); Hm, doesn't that even imply that you reference an area beyond the buffer, as the <= max check does not catch this? > + clog.values = (uint64_t)(sas->incoming_buffer + cx); > r = kvm_vm_ioctl(kvm_state, KVM_S390_SET_CMMA_BITS, &clog); > if (r) { > error_report("KVM_S390_SET_CMMA_BITS failed: %s", strerror(-r)); > @@ -126,7 +126,7 @@ static void kvm_s390_stattrib_synchronize(S390StAttribState *sa) > if (cx < max) { > clog.start_gfn = cx; > clog.count = max - cx; > - clog.values = (uint64_t)(sas->incoming_buffer + cx * len); > + clog.values = (uint64_t)(sas->incoming_buffer + cx); > r = kvm_vm_ioctl(kvm_state, KVM_S390_SET_CMMA_BITS, &clog); > if (r) { > error_report("KVM_S390_SET_CMMA_BITS failed: %s", strerror(-r));