From patchwork Wed May 3 10:52:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 9709439 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 BD2DB6021C for ; Wed, 3 May 2017 10:58:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0F01284E3 for ; Wed, 3 May 2017 10:58:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5F75285E9; Wed, 3 May 2017 10:58:39 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 590AE285E8 for ; Wed, 3 May 2017 10:58:39 +0000 (UTC) Received: from localhost ([::1]:35785 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5rzR-0000ho-Tv for patchwork-qemu-devel@patchwork.kernel.org; Wed, 03 May 2017 06:58:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5ruK-0005NB-UJ for qemu-devel@nongnu.org; Wed, 03 May 2017 06:53:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5ruJ-0006k7-T8 for qemu-devel@nongnu.org; Wed, 03 May 2017 06:53:21 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:35287) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d5ruJ-0006iv-N0 for qemu-devel@nongnu.org; Wed, 03 May 2017 06:53:19 -0400 Received: by mail-pf0-x243.google.com with SMTP id o68so3793192pfj.2 for ; Wed, 03 May 2017 03:53:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8L3Vhcz/fxvtNQWwsG1o1Ckcrnn854Hjb5jecgpiJuE=; b=BnqH/AZGeNZz8cvyousJl4XtILFQKdQwwsXbGry7PZAjNB7Q/4ocYQAAhI26MXrBIF ij4uL1VO65qZBzJODJMrJ/h+0SvrSKb5HMc7uxGNC8xlTD9JP+j/j0/ctsslLA61JvWA aBVY5Dgi0gto1t78iGHO11Lw4exh4gohQdPM9Oae1tDBEIdjYfducahWv4DCjl6bTRxz S0fjN4KLoNLOALOU+R95W4HdATWYygYMDX9m6fODK6j7yVgQa5mYAp6N+y+u3VruiQtU pNACP+U7KhHBvUoL3Khi7AxHaRdFvjJQ3r9seY1FRU5xTIjJ8WRbWgCTQZL2rZ7xQbP1 rGcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8L3Vhcz/fxvtNQWwsG1o1Ckcrnn854Hjb5jecgpiJuE=; b=RZHCm43FxAuGMeXuCoZQF11mS8Z6vCXwMOTCDqfABk/seKzipHL1gdEn3ixCSjsU2X uCC9kOf7PktiIM0J6Br5x4QHByi/1LiKSBwGO2kD7KMmkTMShkDslNBhtUkrXwtYFz2E N9B5pibt0D3K4xNotOERhUQoVXD78XN1WK2Nl+mzlctwrHKwHuALBNi5LW9mi1sDsQwF kdT03EZC7NrqokCnnifEFr8uXgRvObEAhuSWLEgUiMb1ejjxz2H3uU6iw2N2mJhVghcU ENSessbJqwptqqb3pvGbuEoQ/y3lKU/xfRy9hPNcC+zVICtGKd4qwzc37eHZulLD7xRX nM8g== X-Gm-Message-State: AN3rC/6P9odzEEbRY1CLKFyLyACMls9gz6FZzC+bEER51JklpBnnHOW1 eh+wwELPV5Duvw== X-Received: by 10.99.60.21 with SMTP id j21mr23665203pga.99.1493808798733; Wed, 03 May 2017 03:53:18 -0700 (PDT) Received: from eric.tencent.com ([203.205.141.35]) by smtp.gmail.com with ESMTPSA id d24sm4395561pfb.97.2017.05.03.03.53.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 May 2017 03:53:18 -0700 (PDT) From: guangrong.xiao@gmail.com X-Google-Original-From: xiaoguangrong@tencent.com To: pbonzini@redhat.com, mtosatti@redhat.com, avi.kivity@gmail.com, rkrcmar@redhat.com Date: Wed, 3 May 2017 18:52:22 +0800 Message-Id: <20170503105224.19049-6-xiaoguangrong@tencent.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170503105224.19049-1-xiaoguangrong@tencent.com> References: <20170503105224.19049-1-xiaoguangrong@tencent.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH 5/7] KVM: MMU: allow dirty log without write protect 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: Xiao Guangrong , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Xiao Guangrong A new flag, KVM_DIRTY_LOG_WITHOUT_WRITE_PROTECT, is introduced which indicates the userspace just wants to get the snapshot of dirty bitmap During live migration, after all snapshot of dirty bitmap is fetched from KVM, the guest memory can be write protected by calling KVM_WRITE_PROTECT_ALL_MEM Signed-off-by: Xiao Guangrong --- arch/x86/kvm/x86.c | 1 + include/uapi/linux/kvm.h | 6 +++++- virt/kvm/kvm_main.c | 15 ++++++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index dcbeaf4..524c96b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2670,6 +2670,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) case KVM_CAP_SPLIT_IRQCHIP: case KVM_CAP_IMMEDIATE_EXIT: case KVM_CAP_X86_WRITE_PROTECT_ALL_MEM: + case KVM_CAP_X86_DIRTY_LOG_WITHOUT_WRITE_PROTECT: r = 1; break; case KVM_CAP_ADJUST_CLOCK: diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 7d4a395..e0f348c 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -443,9 +443,12 @@ struct kvm_interrupt { }; /* for KVM_GET_DIRTY_LOG */ + +#define KVM_DIRTY_LOG_WITHOUT_WRITE_PROTECT 0x1 + struct kvm_dirty_log { __u32 slot; - __u32 padding1; + __u32 flags; union { void __user *dirty_bitmap; /* one bit per page */ __u64 padding2; @@ -896,6 +899,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_X86_GUEST_MWAIT 143 #define KVM_CAP_ARM_USER_IRQ 144 #define KVM_CAP_X86_WRITE_PROTECT_ALL_MEM 145 +#define KVM_CAP_X86_DIRTY_LOG_WITHOUT_WRITE_PROTECT 146 #ifdef KVM_CAP_IRQ_ROUTING diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 035bc51..c82e4d1 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1169,6 +1169,12 @@ int kvm_get_dirty_log_protect(struct kvm *kvm, unsigned long n; unsigned long *dirty_bitmap; unsigned long *dirty_bitmap_buffer; + bool write_protect; + + if (log->flags & ~KVM_DIRTY_LOG_WITHOUT_WRITE_PROTECT) + return -EINVAL; + + write_protect = !(log->flags & KVM_DIRTY_LOG_WITHOUT_WRITE_PROTECT); as_id = log->slot >> 16; id = (u16)log->slot; @@ -1196,11 +1202,14 @@ int kvm_get_dirty_log_protect(struct kvm *kvm, if (!dirty_bitmap[i]) continue; - *is_dirty = true; - mask = xchg(&dirty_bitmap[i], 0); dirty_bitmap_buffer[i] = mask; + if (!write_protect) + continue; + + *is_dirty = true; + if (mask) { offset = i * BITS_PER_LONG; kvm_arch_mmu_enable_log_dirty_pt_masked(kvm, memslot, @@ -3155,7 +3164,7 @@ static long kvm_vm_compat_ioctl(struct file *filp, sizeof(compat_log))) return -EFAULT; log.slot = compat_log.slot; - log.padding1 = compat_log.padding1; + log.flags = compat_log.padding1; log.padding2 = compat_log.padding2; log.dirty_bitmap = compat_ptr(compat_log.dirty_bitmap);