From patchwork Tue Jun 20 09:15:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 9798921 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 DC6B5601BC for ; Tue, 20 Jun 2017 09:17:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D418C2810E for ; Tue, 20 Jun 2017 09:17:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C8E3F2847B; Tue, 20 Jun 2017 09:17:19 +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 5E6642810E for ; Tue, 20 Jun 2017 09:17:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752915AbdFTJP6 (ORCPT ); Tue, 20 Jun 2017 05:15:58 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:33044 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751989AbdFTJPy (ORCPT ); Tue, 20 Jun 2017 05:15:54 -0400 Received: by mail-pg0-f68.google.com with SMTP id u62so14466227pgb.0; Tue, 20 Jun 2017 02:15:53 -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=6h6lJbBHkCA3XqAXe2DZkCql54xEdqH+8hsl0mTN37k=; b=Tz4t/zfnS9KenH5yliqOm1CfDkL7cFWLeFJt1g11PmanN8SZBF/iSvsC57LowKYSIp I4mvyCKRkWw4ftYiP/50qQbe/2E+PXRHyviiUBW8aHlfuaB++GmvA6ikVAsZBgMIArlt u64mCFADy5yOLfpPYkYd8Ba1hzbDle+5XsOfJT4uUNdgzrMSDttRR/tbms66lt9YmXgc dJV0O0o1awhyAaifLixA+fptvDJfkC2E4SlvfqyCfcdUrCTbErr90cFkg17jeSKmJ046 FKacuQl3ylwlufEiYYDcICPxwMwuJEzJSrtvpVGcBtDqnvKYcWmJuN3AyI0mXPpQpG+m GZTQ== 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=6h6lJbBHkCA3XqAXe2DZkCql54xEdqH+8hsl0mTN37k=; b=W3GsXkmfi7nyoa20BpmNk7WpOfG+NJl7suE595jVK9JYJ2JjU3Gq/Cp1ynrdbYGred RJ0VCQYF0ocynAoPUkOtiiwckGv2953+oICBY8HrEevf/nUxMZKEr8Bm0G245UkgeJm1 9Sc35khclUMOsdUiZ+mchvW5YYXAFBXn7pGKaQAdbAsCGIeqCqn8GwzWmm2gReJP3ecz 0EFnabTpW96mQz4lrufBNh7xJoR1m3SVUu509K4BriWoz/myjAwjRxBRQmcM42x9QZ6P OE7WwbMTxNkN5ADaOSNwHg3ekh1B/crtpYHV5KhiDh0rSmzVveyGrNYscfWk2c5HNvBM XT8g== X-Gm-Message-State: AKS2vOwxb+HXh1OU42/AtWG7YoUgILYQ7HcavJJO9Ttz0Wcl9ZTFKEDX gRwW1R6MLky3ag== X-Received: by 10.99.104.136 with SMTP id d130mr30378377pgc.236.1497950153428; Tue, 20 Jun 2017 02:15:53 -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.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Jun 2017 02:15:53 -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 4/7] KVM: MMU: enable KVM_WRITE_PROTECT_ALL_MEM Date: Tue, 20 Jun 2017 17:15:23 +0800 Message-Id: <20170620091526.4287-5-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 The functionality of write protection for all guest memory is ready, it is the time to make its usable for userspace which is indicated by KVM_CAP_X86_WRITE_PROTECT_ALL_MEM Signed-off-by: Xiao Guangrong --- arch/x86/kvm/x86.c | 21 +++++++++++++++++++++ include/uapi/linux/kvm.h | 2 ++ 2 files changed, 23 insertions(+) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index a2cd099..ad62c44 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2723,6 +2723,17 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) case KVM_CAP_X2APIC_API: r = KVM_X2APIC_API_VALID_FLAGS; break; + case KVM_CAP_X86_WRITE_PROTECT_ALL_MEM: + /* + * do not enable it if PML is supported, this is also the + * hint to tell userspace write-protect is not needed for + * dirty log. + */ + if (kvm_x86_ops->slot_enable_log_dirty) + r = 0; + else + r = 1; + break; default: r = 0; break; @@ -4208,6 +4219,16 @@ long kvm_arch_vm_ioctl(struct file *filp, r = 0; break; } + case KVM_WRITE_PROTECT_ALL_MEM: { + if (kvm_x86_ops->slot_enable_log_dirty) { + r = -EINVAL; + break; + } + + kvm_mmu_write_protect_all_pages(kvm, !!arg); + r = 0; + break; + } case KVM_ENABLE_CAP: { struct kvm_enable_cap cap; diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 577429a..7d4a395 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -895,6 +895,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_SPAPR_TCE_VFIO 142 #define KVM_CAP_X86_GUEST_MWAIT 143 #define KVM_CAP_ARM_USER_IRQ 144 +#define KVM_CAP_X86_WRITE_PROTECT_ALL_MEM 145 #ifdef KVM_CAP_IRQ_ROUTING @@ -1144,6 +1145,7 @@ struct kvm_vfio_spapr_tce { struct kvm_userspace_memory_region) #define KVM_SET_TSS_ADDR _IO(KVMIO, 0x47) #define KVM_SET_IDENTITY_MAP_ADDR _IOW(KVMIO, 0x48, __u64) +#define KVM_WRITE_PROTECT_ALL_MEM _IO(KVMIO, 0x49) /* enable ucontrol for s390 */ struct kvm_s390_ucas_mapping {