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=-13.6 required=3.0 tests=BAYES_00,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 CB8B4C41604 for ; Wed, 7 Oct 2020 20:54:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C3B22083B for ; Wed, 7 Oct 2020 20:54:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="UQ0aXsG+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728804AbgJGUyu (ORCPT ); Wed, 7 Oct 2020 16:54:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:45736 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728524AbgJGUx4 (ORCPT ); Wed, 7 Oct 2020 16:53:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602104034; 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=Au/x+RXVuLpmMW71l+r09X+SFEaNcEAnQSW0uHVuybA=; b=UQ0aXsG+erApOfN0sWFHXP4y/JSeEc8vMJHA62QLRQlyhWRzHYvQzyAm6WEfpApdiwKvLK VViISKg1a5LWvd3Lv8K/OWbf08xur8u2Vv/oIIhLvYjBSYoK41KnFFW2YNBvVWGjU4Jwx8 PZuguYpWk2DtrWXOvtY4n4Yp/3POC+M= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-512-4uFKhjjtOFS0BTucDk-j3w-1; Wed, 07 Oct 2020 16:53:53 -0400 X-MC-Unique: 4uFKhjjtOFS0BTucDk-j3w-1 Received: by mail-qv1-f71.google.com with SMTP id z12so2195153qvp.11 for ; Wed, 07 Oct 2020 13:53:52 -0700 (PDT) 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=Au/x+RXVuLpmMW71l+r09X+SFEaNcEAnQSW0uHVuybA=; b=o9MyPwLW5tSnTpDNWOh8dx9YZCv1g3pvISFN0/2HGzGEH7jgdH7kzBRYDoeiQh0rto fhFa9gHod9jZuhcoGRvCeU8MInOWSn51qIBQzApoiQnWHmhGpzkd5eaUHhJOf9cLkeh4 lk+T67MkzZeDxIATNEwUzKBzBniLYWd0zZ/sxdkoRn0EBrAwQSFCYAlYdnr3qZp8ByM0 wAZreeXaae8KlriOPVuMAvv1qqmTZ1dPsjCfCx9OvvDd/u9PdxhsmWlk0f06BfF8xD7d fqfDpfY2W5rF5VOuSrZnEv0LOTVha1x/JUd1P5/33uCDjvFs+h6piCJBl+DiQlxSpai4 d1mQ== X-Gm-Message-State: AOAM532gNMogD3144BhScfTjkaZtG3fa/20DF0meEg34HPaBN2JtDSm/ kN6txSkdGdlj0WjM6rerRvyma73Au28QJ5OSOOQvlX4+dCGdNNpIzlR21LvNhDKUlrdEb64/Y0x ZY0OjdSp97X1YUfCw9sBjtWOM X-Received: by 2002:a37:2795:: with SMTP id n143mr4886008qkn.321.1602104032396; Wed, 07 Oct 2020 13:53:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjiRn3BZwVOTtMSBQsF9SY0fXdQh4OPcMgYkzG4Qar3b7Jv3xvbepa2hKiWkVOG1qQ5jByeA== X-Received: by 2002:a37:2795:: with SMTP id n143mr4885994qkn.321.1602104032161; Wed, 07 Oct 2020 13:53:52 -0700 (PDT) Received: from xz-x1.redhat.com (toroon474qw-lp140-04-174-95-215-133.dsl.bell.ca. [174.95.215.133]) by smtp.gmail.com with ESMTPSA id j24sm2390695qkg.107.2020.10.07.13.53.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 13:53:51 -0700 (PDT) From: Peter Xu To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: peterx@redhat.com, Paolo Bonzini , Sean Christopherson , Andrew Jones , "Dr . David Alan Gilbert" Subject: [PATCH v14 06/14] KVM: Make dirty ring exclusive to dirty bitmap log Date: Wed, 7 Oct 2020 16:53:34 -0400 Message-Id: <20201007205342.295402-7-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201007205342.295402-1-peterx@redhat.com> References: <20201007205342.295402-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.rst | 7 +++++++ virt/kvm/kvm_main.c | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index 6c41cc7eed77..eb628cc59b93 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -6490,3 +6490,10 @@ make sure all the existing dirty gfns are flushed to the dirty rings. The dirty ring can gets full. When it happens, the KVM_RUN of the vcpu will return with exit reason KVM_EXIT_DIRTY_LOG_FULL. + +NOTE: the capability KVM_CAP_DIRTY_LOG_RING and the corresponding +ioctl KVM_RESET_DIRTY_RINGS are mutual exclusive to the existing ioctl +KVM_GET_DIRTY_LOG. After enabling KVM_CAP_DIRTY_LOG_RING with an +acceptable dirty ring size, the virtual machine will switch to the +dirty ring tracking mode. Further ioctls to either KVM_GET_DIRTY_LOG +or KVM_CLEAR_DIRTY_LOG will fail. diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index aefea6ebe132..f32f9fc60d0e 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1430,6 +1430,10 @@ int kvm_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log, unsigned long n; unsigned long any = 0; + /* Dirty ring tracking is exclusive to dirty log tracking */ + if (kvm->dirty_ring_size) + return -EINVAL; + *memslot = NULL; *is_dirty = 0; @@ -1491,6 +1495,10 @@ static int kvm_get_dirty_log_protect(struct kvm *kvm, struct kvm_dirty_log *log) unsigned long *dirty_bitmap_buffer; bool flush; + /* 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) @@ -1599,6 +1607,10 @@ static int kvm_clear_dirty_log_protect(struct kvm *kvm, unsigned long *dirty_bitmap_buffer; bool flush; + /* 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.26.2