From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98D37C43603 for ; Fri, 20 Dec 2019 21:17:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A498218AC for ; Fri, 20 Dec 2019 21:17:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Kqq5Or5C" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727722AbfLTVRG (ORCPT ); Fri, 20 Dec 2019 16:17:06 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:41946 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727639AbfLTVQx (ORCPT ); Fri, 20 Dec 2019 16:16:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576876612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G5ujQPtmC0gFSTE7FNk323KNrK3wygZRxxl448+O6gM=; b=Kqq5Or5Ca4y7fLoiHXmXPE1a8JXoEcOuk1o9swE2bOL9yaOXOmMfhlh0G8JtM644vtlJMl dTTCURUHlQUEndboDnjJZ7tfi2/PjUu3QTNxL8A4v3ORIGPlCLJuKNOxULMn5pmpvyfmU2 miYIzckBcXMiyb5/6DaNZjOl3DoHPPo= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-176-dVP8v3ryOZC_FBJuw0Rilg-1; Fri, 20 Dec 2019 16:16:51 -0500 X-MC-Unique: dVP8v3ryOZC_FBJuw0Rilg-1 Received: by mail-qv1-f72.google.com with SMTP id r9so6739270qvs.19 for ; Fri, 20 Dec 2019 13:16:51 -0800 (PST) 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:mime-version:content-transfer-encoding; bh=G5ujQPtmC0gFSTE7FNk323KNrK3wygZRxxl448+O6gM=; b=IZhuFrWqM/oRCVLjs4lKiBQsyzJk4BYZWJKN7DFsevvi+Hc8lH5aCKs2FiURWcoR/R tFb1vfLDk3122wpCdW9d/XO7nwpugVsTk/MgHMfFmi9PY8nsmtE3zYGY8zUl1teJdYgX /NVsjXZCH8Yj7HelL88Iruar5hTMg+8vn/vaWBCmxc1VmQ2pqPoF+pFblS0pOFgjG9DQ Wg+YHX+qxx5Fea2Z0cCUBIXWKWK65dir0/9DWxI/CCIfJQbasgDby5ObGPl1+JAATLVE FtDNBC0/25Bw4e4BYBGBCogbrs0OqAxpmuIFHSqLB9MVbT0k+79cqVreLse6/3waXUil MrhA== X-Gm-Message-State: APjAAAXSZ1V3A6i+RgDdm8GBWmx5gEpOXB+pWqfphr/ZSQXUttUPNL4R qto/tz1QWm2RmcqlEHhOGU2XoD0y3ysBofu5hWONS+HGh2ceMNZQfmYUknHgOJl4I9Bp7zjz3zs De4roBXD/mEomYiRqdMgK35+Z X-Received: by 2002:ac8:3490:: with SMTP id w16mr13210716qtb.56.1576876611533; Fri, 20 Dec 2019 13:16:51 -0800 (PST) X-Google-Smtp-Source: APXvYqzSrZAmXC/1u4+R+RuRj9JXAORp5RlHPuTigmYzCZAtc9v6Xy+S4ykD1fOWMTcCwtA4xfb2Rg== X-Received: by 2002:ac8:3490:: with SMTP id w16mr13210693qtb.56.1576876611302; Fri, 20 Dec 2019 13:16:51 -0800 (PST) Received: from xz-x1.redhat.com ([104.156.64.74]) by smtp.gmail.com with ESMTPSA id d25sm3385231qtq.11.2019.12.20.13.16.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2019 13:16:50 -0800 (PST) From: Peter Xu To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Michael S . Tsirkin" , "Dr . David Alan Gilbert" , Sean Christopherson , Paolo Bonzini , peterx@redhat.com, Jason Wang , Vitaly Kuznetsov , Christophe de Dinechin Subject: [PATCH v2 09/17] KVM: Make dirty ring exclusive to dirty bitmap log Date: Fri, 20 Dec 2019 16:16:26 -0500 Message-Id: <20191220211634.51231-10-peterx@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191220211634.51231-1-peterx@redhat.com> References: <20191220211634.51231-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There's no good reason to use both the dirty bitmap logging and the new dirty ring buffer to track dirty bits. We should be able to even support both of them at the same time, but it could complicate things which could actually help little. Let's simply make it the rule before we enable dirty ring on any arch, that we don't allow these two interfaces to be used together. The big world switch would be KVM_CAP_DIRTY_LOG_RING capability enablement. That's where we'll switch from the default dirty logging way to the dirty ring way. As long as kvm->dirty_ring_size is setup correctly, we'll once and for all switch to the dirty ring buffer mode for the current virtual machine. Signed-off-by: Peter Xu --- Documentation/virt/kvm/api.txt | 7 +++++++ virt/kvm/kvm_main.c | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/Documentation/virt/kvm/api.txt b/Documentation/virt/kvm/api.txt index c141b285e673..b507b966f9f1 100644 --- a/Documentation/virt/kvm/api.txt +++ b/Documentation/virt/kvm/api.txt @@ -5411,3 +5411,10 @@ all the existing dirty gfns are flushed to the dirty rings. If one of the ring buffers is full, the guest will exit to userspace with the exit reason set to KVM_EXIT_DIRTY_LOG_FULL, and the KVM_RUN ioctl will return to userspace with zero. + +NOTE: the KVM_CAP_DIRTY_LOG_RING capability and the new ioctl +KVM_RESET_DIRTY_RINGS are exclusive to the existing KVM_GET_DIRTY_LOG +interface. After enabling KVM_CAP_DIRTY_LOG_RING with an acceptable +dirty ring size, the virtual machine will switch to the dirty ring +tracking mode, and KVM_GET_DIRTY_LOG, KVM_CLEAR_DIRTY_LOG ioctls will +stop working. diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 4050631d05f3..b69d34425f8d 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1204,6 +1204,10 @@ int kvm_get_dirty_log(struct kvm *kvm, unsigned long n; unsigned long any = 0; + /* Dirty ring tracking is exclusive to dirty log tracking */ + if (kvm->dirty_ring_size) + return -EINVAL; + as_id = log->slot >> 16; id = (u16)log->slot; if (as_id >= KVM_ADDRESS_SPACE_NUM || id >= KVM_USER_MEM_SLOTS) @@ -1261,6 +1265,10 @@ int kvm_get_dirty_log_protect(struct kvm *kvm, unsigned long *dirty_bitmap; unsigned long *dirty_bitmap_buffer; + /* Dirty ring tracking is exclusive to dirty log tracking */ + if (kvm->dirty_ring_size) + return -EINVAL; + as_id = log->slot >> 16; id = (u16)log->slot; if (as_id >= KVM_ADDRESS_SPACE_NUM || id >= KVM_USER_MEM_SLOTS) @@ -1332,6 +1340,10 @@ int kvm_clear_dirty_log_protect(struct kvm *kvm, unsigned long *dirty_bitmap; unsigned long *dirty_bitmap_buffer; + /* Dirty ring tracking is exclusive to dirty log tracking */ + if (kvm->dirty_ring_size) + return -EINVAL; + as_id = log->slot >> 16; id = (u16)log->slot; if (as_id >= KVM_ADDRESS_SPACE_NUM || id >= KVM_USER_MEM_SLOTS) -- 2.24.1