From nobody Tue Feb 10 12:58:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1501229477124582.2851942500487; Fri, 28 Jul 2017 01:11:17 -0700 (PDT) Received: from localhost ([::1]:46671 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1db0Md-0004YE-Nh for importer@patchew.org; Fri, 28 Jul 2017 04:11:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1db0IQ-0000TS-9L for qemu-devel@nongnu.org; Fri, 28 Jul 2017 04:06:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1db0IP-0000pX-BG for qemu-devel@nongnu.org; Fri, 28 Jul 2017 04:06:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38130) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1db0IP-0000pC-51 for qemu-devel@nongnu.org; Fri, 28 Jul 2017 04:06:53 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 17E68D3D4A; Fri, 28 Jul 2017 08:06:52 +0000 (UTC) Received: from pxdev.xzpeter.org.com (dhcp-15-224.nay.redhat.com [10.66.15.224]) by smtp.corp.redhat.com (Postfix) with ESMTP id D5E046031D; Fri, 28 Jul 2017 08:06:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 17E68D3D4A Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=peterx@redhat.com From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 28 Jul 2017 16:06:10 +0800 Message-Id: <1501229198-30588-2-git-send-email-peterx@redhat.com> In-Reply-To: <1501229198-30588-1-git-send-email-peterx@redhat.com> References: <1501229198-30588-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 28 Jul 2017 08:06:52 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC 01/29] migration: fix incorrect postcopy recved_bitmap X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Andrea Arcangeli , Juan Quintela , Alexey Perevalov , peterx@redhat.com, "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The bitmap setup during postcopy is incorrectly when the pgaes are huge pages. Fix it. Signed-off-by: Peter Xu --- migration/postcopy-ram.c | 2 +- migration/ram.c | 8 ++++++++ migration/ram.h | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 276ce12..952b73a 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -578,7 +578,7 @@ static int qemu_ufd_copy_ioctl(int userfault_fd, void *= host_addr, ret =3D ioctl(userfault_fd, UFFDIO_ZEROPAGE, &zero_struct); } if (!ret) { - ramblock_recv_bitmap_set(host_addr, rb); + ramblock_recv_bitmap_set_range(rb, host_addr, pagesize / getpagesi= ze()); } return ret; } diff --git a/migration/ram.c b/migration/ram.c index 107ee9d..c93973c 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -168,6 +168,14 @@ void ramblock_recv_bitmap_set(void *host_addr, RAMBloc= k *rb) set_bit_atomic(ramblock_recv_bitmap_offset(host_addr, rb), rb->receive= dmap); } =20 +void ramblock_recv_bitmap_set_range(RAMBlock *rb, void *host_addr, + size_t len) +{ + bitmap_set(rb->receivedmap, + ramblock_recv_bitmap_offset(host_addr, rb), + len); +} + void ramblock_recv_bitmap_clear(void *host_addr, RAMBlock *rb) { clear_bit(ramblock_recv_bitmap_offset(host_addr, rb), rb->receivedmap); diff --git a/migration/ram.h b/migration/ram.h index b711552..84e8623 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -55,6 +55,8 @@ void ram_handle_compressed(void *host, uint8_t ch, uint64= _t size); =20 int ramblock_recv_bitmap_test(void *host_addr, RAMBlock *rb); void ramblock_recv_bitmap_set(void *host_addr, RAMBlock *rb); +void ramblock_recv_bitmap_set_range(RAMBlock *rb, void *host_addr, + size_t len); void ramblock_recv_bitmap_clear(void *host_addr, RAMBlock *rb); =20 #endif --=20 2.7.4