From patchwork Tue Jun 20 09:15:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 9798925 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 3476C601BC for ; Tue, 20 Jun 2017 09:17:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B7212810E for ; Tue, 20 Jun 2017 09:17:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 205232847B; Tue, 20 Jun 2017 09:17:48 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9BB742810E for ; Tue, 20 Jun 2017 09:17:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753028AbdFTJR1 (ORCPT ); Tue, 20 Jun 2017 05:17:27 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35662 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752896AbdFTJP5 (ORCPT ); Tue, 20 Jun 2017 05:15:57 -0400 Received: by mail-pf0-f195.google.com with SMTP id s66so21598580pfs.2; Tue, 20 Jun 2017 02:15:56 -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=L+ukj6vj49gt5KP/rV1mFnBwb+Bt0idyQ3CL8s/2G+o=; b=FWynM/TVVnHR5oMLGxm9fphD80amgvnFiqCHyT8RlNc2NND/RD4/plobcKbpgW71BR 6pkqg0YQfLYebJ9+ergCDYVUELAsFydupvod0riKP5zjlaNSrY4IIfPKHNtI1eqo25Mh 5LXyydTWw+vva/jkuylkhV82Owd3xVz40RbHdj8s/4CFcT6AArWFSwWCPB1AkuhEJzvJ aZee8uhzUJs6td4jsZRfXrHzylJNytaNxmrDD9HortYFoAiVwe9IhSKHGFDkLpAuuO3W HYSc+MMP7UWbOlut6WsnNIy0sWCxvArNGIZKqZZIqpJhbuG11doCRIjj4iRpq7GmP07o JHeg== 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=L+ukj6vj49gt5KP/rV1mFnBwb+Bt0idyQ3CL8s/2G+o=; b=rVglkMgOQtj7bB+4MkAAhizM6EyvoXjPJ0VcLYYmCoPdAC4j2ueumXL66kwCQLvP5z Mny9AcA6/BaqlZuU4cmB+KuvTAmvMQ0xogUHs6znMPJwNv0vPxoC7d6B3ikodsqPKPD3 7G4JXkgI+lelIcDLggwiW6v52YbR8aBqUIyIprs/xpXo3CsaEngFt5NaxT1UKRBnMpZa TaTM3/Zx6mAn+t8Te2LWlKg3qYzlbTu8C+F6uW/CafPJhk1W9rqMrL6XWF2Haspk+6JA IudbdeoeeJH3AAF3F3Xby9yLillK4htFelY2P3BxdG/IA5ydgqKKuLwZkFxqpaQFCKBl vANw== X-Gm-Message-State: AKS2vOxeQ6kXTe84sVNPA4X2l3olRwxKBiPNwsuwCkys+bOjfhTqOjrJ wI3gq6YqV9sO4Q== X-Received: by 10.84.143.162 with SMTP id 31mr34238093plz.277.1497950156244; Tue, 20 Jun 2017 02:15:56 -0700 (PDT) Received: from eric.tencent.com ([203.205.141.35]) by smtp.gmail.com with ESMTPSA id o12sm26343810pfi.9.2017.06.20.02.15.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Jun 2017 02:15:55 -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 Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong Subject: [PATCH v2 5/7] KVM: MMU: allow dirty log without write protect Date: Tue, 20 Jun 2017 17:15:24 +0800 Message-Id: <20170620091526.4287-6-xiaoguangrong@tencent.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170620091526.4287-1-xiaoguangrong@tencent.com> References: <20170620091526.4287-1-xiaoguangrong@tencent.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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 ad62c44..6343e5c 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2677,6 +2677,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) case KVM_CAP_SET_BOOT_CPU_ID: case KVM_CAP_SPLIT_IRQCHIP: case KVM_CAP_IMMEDIATE_EXIT: + 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 f0fe9d0..8b29462 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1157,6 +1157,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; @@ -1184,11 +1190,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, @@ -3140,7 +3149,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);