From patchwork Tue Jun 27 09:50:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Perevalov X-Patchwork-Id: 9811255 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3F71760351 for ; Tue, 27 Jun 2017 09:56:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 31A7F28543 for ; Tue, 27 Jun 2017 09:56:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 260C328619; Tue, 27 Jun 2017 09:56:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6D6A728543 for ; Tue, 27 Jun 2017 09:56:10 +0000 (UTC) Received: from localhost ([::1]:51498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPnE9-0000A6-Hx for patchwork-qemu-devel@patchwork.kernel.org; Tue, 27 Jun 2017 05:56:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPnBm-0007Sm-GV for qemu-devel@nongnu.org; Tue, 27 Jun 2017 05:53:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dPnBj-0001V7-CQ for qemu-devel@nongnu.org; Tue, 27 Jun 2017 05:53:42 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:19444) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dPnBj-0001RN-3I for qemu-devel@nongnu.org; Tue, 27 Jun 2017 05:53:39 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OS700ACMA5AEV90@mailout1.w1.samsung.com> for qemu-devel@nongnu.org; Tue, 27 Jun 2017 10:53:34 +0100 (BST) Received: from eusmges2.samsung.com (unknown [203.254.199.241]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170627095333eucas1p1aa101a6bd5ad7379efcc194ba6917d6e~L8die-RiA1136711367eucas1p1T; Tue, 27 Jun 2017 09:53:33 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2.samsung.com (EUCPMTA) with SMTP id 08.C1.04459.D1B22595; Tue, 27 Jun 2017 10:53:33 +0100 (BST) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170627095333eucas1p28a2d86104f8df64c05758cd08f1a48df~L8dh3BWmf2434424344eucas1p2D; Tue, 27 Jun 2017 09:53:33 +0000 (GMT) X-AuditID: cbfec7f1-f796e6d00000116b-27-59522b1d8922 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id DF.3C.17452.C1B22595; Tue, 27 Jun 2017 10:53:33 +0100 (BST) Received: from minion.rnd.samsung.ru ([106.109.131.134]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OS70042MA4ZGZB0@eusync1.samsung.com>; Tue, 27 Jun 2017 10:53:32 +0100 (BST) From: Alexey Perevalov To: qemu-devel@nongnu.org Date: Tue, 27 Jun 2017 05:50:27 -0400 Message-id: <1498557027-18143-4-git-send-email-a.perevalov@samsung.com> X-Mailer: git-send-email 1.8.3.1 In-reply-to: <1498557027-18143-1-git-send-email-a.perevalov@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsWy7djP87qy2kGRBqdWSVvMvXuexaJ32z12 iyvtP9kttuz/xm5xvHcHi8WdLX1MDmweT65tZvJ4v+8qm0ffllWMAcxRXDYpqTmZZalF+nYJ XBl9y3tYCq46VizZ8521gfGXYRcjJ4eEgInE/q9f2CFsMYkL99azdTFycQgJLGWU2NGyihnC +cwocb3nKjNMx6I9V6GqljFK3F/RyAThNDBJLH7WAVTFwcEmYCCx754tSIOIgKTE767TYJOY BVoZJdr7HoFNEhawl/i/rYcNxGYRUJU4c30KI4jNK+Auce38BzaIbQoSUx6+B6vnFPCQWDdh F9gyCYH7bBK/Oy8ygSyTEJCV2HQA6joXic1fHrFC2MISr45vgfpNRqKz4yBUbzujRPfOTlYI ZwKjxJnpf6Gq7CVO3bzKBGIzC/BJTNo2nRliAa9ER5sQRImHxI8dx6CWOUps7bvLCvH9bEaJ zk3TGScwyixgZFjFKJJaWpybnlpspFecmFtcmpeul5yfu4kRGKmn/x3/uIPx/QmrQ4wCHIxK PLw/mQIjhVgTy4orcw8xSnAwK4nw/mYOihTiTUmsrEotyo8vKs1JLT7EKM3BoiTOy3XqWoSQ QHpiSWp2ampBahFMlomDU6qB8ejkz2dYPbJvml3OVm2IE9x56rKD5Qz2dZPbZRbNjZ5tfeJj 5OkjUrGWO16lbJ+T6/T73p11Oy2X3Fu4bMaurd5CLEpq3wtq3VTcQmaycHmUalZ8vb3R8L6L Uv3sSfah0T9PPl+43Sxs82qLiy6/Tgqk9QienFDm8Hb/ImWlBtPf8gVPmK5mpymxFGckGmox FxUnAgCuYkYW0AIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNLMWRmVeSWpSXmKPExsVy+t/xy7qy2kGRBpO7GS3m3j3PYtG77R67 xZX2n+wWW/Z/Y7c43ruDxeLOlj4mBzaPJ9c2M3m833eVzaNvyyrGAOYoN5uM1MSU1CKF1Lzk /JTMvHRbpdAQN10LJYW8xNxUW6UIXd+QICWFssScUiDPyAANODgHuAcr6dsluGX0Le9hKbjq WLFkz3fWBsZfhl2MnBwSAiYSi/ZcZYOwxSQu3FsPZHNxCAksYZTou7IEymliknjTc5u1i5GD g03AQGLfPVuQBhEBSYnfXaeZQWqYBVoZJZ40zmIHSQgL2Ev839YDNpVFQFXizPUpjCA2r4C7 xLXzH6C2KUhMefieGcTmFPCQWDdhFxOILQRU0718McsERt4FjAyrGEVSS4tz03OLDfWKE3OL S/PS9ZLzczcxAgN227Gfm3cwXtoYfIhRgINRiYf3B1NgpBBrYllxZe4hRgkOZiUR3t/MQZFC vCmJlVWpRfnxRaU5qcWHGE2BjprILCWanA+MprySeEMTQ3NLQyNjCwtzIyMlcd6SD1fChQTS E0tSs1NTC1KLYPqYODilGhhjr5TJNP8MqCsvyXh785Q3W7J7l9vbItkMe1b5hS2bznQtnvZu Rc9By6mTPFJ+zAp6u8HzTkU/Z+QBnoCjn/3Kwz669WofUH98I+1C+VVTQc8tZdvlr6SUiE9Y MGF21ivNQI7KiwtmfxBN3VR6jHNXjcnujpYWZ9ZJNhGm/GE/756Wm3HqboASS3FGoqEWc1Fx IgChpeN4bgIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170627095333eucas1p28a2d86104f8df64c05758cd08f1a48df X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?QWxleGV5IFBlcmV2YWxvdhtTUlItVmlydHVhbGl6YXRpb24g?= =?UTF-8?B?TGFiG+yCvOyEseyghOyekBtTZW5pb3IgRW5naW5lZXI=?= X-Global-Sender: =?UTF-8?B?QWxleGV5IFBlcmV2YWxvdhtTUlItVmlydHVhbGl6YXRpb24g?= =?UTF-8?B?TGFiG1NhbXN1bmcgRWxlY3Ryb25pY3MbU2VuaW9yIEVuZ2luZWVy?= X-Sender-Code: =?UTF-8?B?QzEwG0NJU0hRG0MxMEdEMDFHRDAxMDE1NA==?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170627095333eucas1p28a2d86104f8df64c05758cd08f1a48df X-RootMTR: 20170627095333eucas1p28a2d86104f8df64c05758cd08f1a48df References: <1498557027-18143-1-git-send-email-a.perevalov@samsung.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 210.118.77.11 Subject: [Qemu-devel] [PATCH v5 3/3] migration: add bitmap for received page 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: i.maximets@samsung.com, dgilbert@redhat.com, Alexey Perevalov , peterx@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch adds ability to track down already received pages, it's necessary for calculation vCPU block time in postcopy migration feature, maybe for restore after postcopy migration failure. Also it's necessary to solve shared memory issue in postcopy livemigration. Information about received pages will be transferred to the software virtual bridge (e.g. OVS-VSWITCHD), to avoid fallocate (unmap) for already received pages. fallocate syscall is required for remmaped shared memory, due to remmaping itself blocks ioctl(UFFDIO_COPY, ioctl in this case will end with EEXIT error (struct page is exists after remmap). Bitmap is placed into RAMBlock as another postcopy/precopy related bitmaps. Signed-off-by: Alexey Perevalov --- include/exec/ram_addr.h | 10 ++++++++++ migration/migration.c | 1 + migration/postcopy-ram.c | 16 +++++++++++----- migration/ram.c | 42 +++++++++++++++++++++++++++++++++++++++--- migration/ram.h | 6 ++++++ 5 files changed, 67 insertions(+), 8 deletions(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 140efa8..4170656 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -47,6 +47,8 @@ struct RAMBlock { * of the postcopy phase */ unsigned long *unsentmap; + /* bitmap of already received pages in postcopy */ + unsigned long *receivedmap; }; static inline bool offset_in_ramblock(RAMBlock *b, ram_addr_t offset) @@ -60,6 +62,14 @@ static inline void *ramblock_ptr(RAMBlock *block, ram_addr_t offset) return (char *)block->host + offset; } +static inline unsigned long int ramblock_recv_bitmap_offset(void *host_addr, + RAMBlock *rb) +{ + uint64_t host_addr_offset = + (uint64_t)(uintptr_t)(host_addr - (void *)rb->host); + return host_addr_offset >> TARGET_PAGE_BITS; +} + long qemu_getrampagesize(void); unsigned long last_ram_page(void); RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, diff --git a/migration/migration.c b/migration/migration.c index 71e38bc..53fbd41 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -143,6 +143,7 @@ MigrationIncomingState *migration_incoming_get_current(void) qemu_mutex_init(&mis_current.rp_mutex); qemu_event_init(&mis_current.main_thread_load_event, false); once = true; + ramblock_recv_map_init(); } return &mis_current; } diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 293db97..f980d93 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -562,22 +562,27 @@ int postcopy_ram_enable_notify(MigrationIncomingState *mis) } static int qemu_ufd_copy_ioctl(int userfault_fd, void *host_addr, - void *from_addr, uint64_t pagesize) + void *from_addr, uint64_t pagesize, RAMBlock *rb) { + int ret; if (from_addr) { struct uffdio_copy copy_struct; copy_struct.dst = (uint64_t)(uintptr_t)host_addr; copy_struct.src = (uint64_t)(uintptr_t)from_addr; copy_struct.len = pagesize; copy_struct.mode = 0; - return ioctl(userfault_fd, UFFDIO_COPY, ©_struct); + ret = ioctl(userfault_fd, UFFDIO_COPY, ©_struct); } else { struct uffdio_zeropage zero_struct; zero_struct.range.start = (uint64_t)(uintptr_t)host_addr; zero_struct.range.len = pagesize; zero_struct.mode = 0; - return ioctl(userfault_fd, UFFDIO_ZEROPAGE, &zero_struct); + ret = ioctl(userfault_fd, UFFDIO_ZEROPAGE, &zero_struct); + } + if (!ret) { + ramblock_recv_bitmap_set(host_addr, rb); } + return ret; } /* @@ -594,7 +599,7 @@ int postcopy_place_page(MigrationIncomingState *mis, void *host, void *from, * which would be slightly cheaper, but we'd have to be careful * of the order of updating our page state. */ - if (qemu_ufd_copy_ioctl(mis->userfault_fd, host, from, pagesize)) { + if (qemu_ufd_copy_ioctl(mis->userfault_fd, host, from, pagesize, rb)) { int e = errno; error_report("%s: %s copy host: %p from: %p (size: %zd)", __func__, strerror(e), host, from, pagesize); @@ -616,7 +621,8 @@ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host, trace_postcopy_place_page_zero(host); if (qemu_ram_pagesize(rb) == getpagesize()) { - if (qemu_ufd_copy_ioctl(mis->userfault_fd, host, NULL, getpagesize())) { + if (qemu_ufd_copy_ioctl(mis->userfault_fd, host, NULL, getpagesize(), + rb)) { int e = errno; error_report("%s: %s zero host: %p", __func__, strerror(e), host); diff --git a/migration/ram.c b/migration/ram.c index f50479d..95962a0 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -151,6 +151,32 @@ out: return ret; } +void ramblock_recv_map_init(void) +{ + RAMBlock *rb; + + RAMBLOCK_FOREACH(rb) { + assert(!rb->receivedmap); + rb->receivedmap = bitmap_new(rb->max_length >> TARGET_PAGE_BITS); + } +} + +int ramblock_recv_bitmap_test(void *host_addr, RAMBlock *rb) +{ + return test_bit(ramblock_recv_bitmap_offset(host_addr, rb), + rb->receivedmap); +} + +void ramblock_recv_bitmap_set(void *host_addr, RAMBlock *rb) +{ + set_bit_atomic(ramblock_recv_bitmap_offset(host_addr, rb), rb->receivedmap); +} + +void ramblock_recv_bitmap_clear(void *host_addr, RAMBlock *rb) +{ + clear_bit(ramblock_recv_bitmap_offset(host_addr, rb), rb->receivedmap); +} + /* * An outstanding page request, on the source, having been received * and queued @@ -1797,6 +1823,8 @@ int ram_discard_range(const char *rbname, uint64_t start, size_t length) goto err; } + bitmap_clear(rb->receivedmap, start >> TARGET_PAGE_BITS, + length >> TARGET_PAGE_BITS); ret = ram_block_discard_range(rb, start, length); err: @@ -2324,8 +2352,14 @@ static int ram_load_setup(QEMUFile *f, void *opaque) static int ram_load_cleanup(void *opaque) { + RAMBlock *rb; xbzrle_load_cleanup(); compress_threads_load_cleanup(); + + RAMBLOCK_FOREACH(rb) { + g_free(rb->receivedmap); + rb->receivedmap = NULL; + } return 0; } @@ -2513,6 +2547,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) ram_addr_t addr, total_ram_bytes; void *host = NULL; uint8_t ch; + RAMBlock *rb = NULL; addr = qemu_get_be64(f); flags = addr & ~TARGET_PAGE_MASK; @@ -2520,15 +2555,16 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) if (flags & (RAM_SAVE_FLAG_ZERO | RAM_SAVE_FLAG_PAGE | RAM_SAVE_FLAG_COMPRESS_PAGE | RAM_SAVE_FLAG_XBZRLE)) { - RAMBlock *block = ram_block_from_stream(f, flags); + rb = ram_block_from_stream(f, flags); - host = host_from_ram_block_offset(block, addr); + host = host_from_ram_block_offset(rb, addr); if (!host) { error_report("Illegal RAM offset " RAM_ADDR_FMT, addr); ret = -EINVAL; break; } - trace_ram_load_loop(block->idstr, (uint64_t)addr, flags, host); + ramblock_recv_bitmap_set(host, rb); + trace_ram_load_loop(rb->idstr, (uint64_t)addr, flags, host); } switch (flags & ~RAM_SAVE_FLAG_CONTINUE) { diff --git a/migration/ram.h b/migration/ram.h index c081fde..98d68df 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -52,4 +52,10 @@ int ram_discard_range(const char *block_name, uint64_t start, size_t length); int ram_postcopy_incoming_init(MigrationIncomingState *mis); void ram_handle_compressed(void *host, uint8_t ch, uint64_t size); + +void ramblock_recv_map_init(void); +int ramblock_recv_bitmap_test(void *host_addr, RAMBlock *rb); +void ramblock_recv_bitmap_set(void *host_addr, RAMBlock *rb); +void ramblock_recv_bitmap_clear(void *host_addr, RAMBlock *rb); + #endif