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=ham 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 51219C3F2CE for ; Wed, 4 Mar 2020 17:50:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29FD821D56 for ; Wed, 4 Mar 2020 17:50:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XsKXAVLh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388397AbgCDRu1 (ORCPT ); Wed, 4 Mar 2020 12:50:27 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:51657 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388378AbgCDRuY (ORCPT ); Wed, 4 Mar 2020 12:50:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583344223; 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=Thxl5wIjIKH5B5NXRPkB8aLAOUeG1jEuoKaVSkWq1z8=; b=XsKXAVLhISj+RiObLcLeKcLTjfbYbz+d7CYjtuGb1bntfmxSZQwkCMjPqOvq0xvDF2F/xo DlNTuoqA+GyheesFWpcK+Xfy1DMPMljnN8V4qkvXi2xZ28YyKA0NkxlxIeSuqw4Chl/Asc mg09M2UpbjzH/Xi66d8f/bf1viAcCNA= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-156-BXl2AcMOOMOpRCOsnTG_5A-1; Wed, 04 Mar 2020 12:50:22 -0500 X-MC-Unique: BXl2AcMOOMOpRCOsnTG_5A-1 Received: by mail-qk1-f198.google.com with SMTP id n6so1847916qkk.11 for ; Wed, 04 Mar 2020 09:50:21 -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=Thxl5wIjIKH5B5NXRPkB8aLAOUeG1jEuoKaVSkWq1z8=; b=aR/iKdOANIOiH3wRZnNlOUCaM45UNiClXKqUgLb3MMtfHd5sK3WfdVL9LJaDh/LM/K PfN03LQH4WAFenKDJxCwc6bANuU/U3YviiudN5rj99ntivDlYbgr8fjG68MIM99Oj71V +biLgO8/CqWb3kwqPzHtuckcb4dshk0Izp0Svq1QWIEeu0dmxBdetLc3WUT2Y7kO5QdJ d5GfJe1zfUydksdaH9roy95Z/7YKn/emMLl1GXiZVlPUNg4cpE8jmbSt+gTAR9RAeG4d 8cibRpjlXTql3NI1MXN1cCtOgMn4Ss/QhykXNJppEFqePW8uILCbpNfLVtUJAXFAT+B+ 2Udw== X-Gm-Message-State: ANhLgQ1CqNkfOxUJCXwLjyKAb8n6QeSGWO7NjZ6dZ2JcZ/1zBSoX/tnI 9vH5k3MtXF5gEx0UGX7cuuZTfCAHJM14hBD474K5+Rer8JqJUIArPnHu4W3P4K0RYJ3mAVgp0kU DJM4SYcp1+IFfkicxEP/baJcM X-Received: by 2002:a37:a38b:: with SMTP id m133mr4006217qke.418.1583344221057; Wed, 04 Mar 2020 09:50:21 -0800 (PST) X-Google-Smtp-Source: ADFU+vuIqOLXAjTIseX/1wpACTFkqf8S628dua+pQStSDFhdsTp5TywiNGVu9CXRRDz1KWYlmxRKpg== X-Received: by 2002:a37:a38b:: with SMTP id m133mr4006190qke.418.1583344220813; Wed, 04 Mar 2020 09:50:20 -0800 (PST) Received: from xz-x1.redhat.com ([2607:9880:19c0:32::2]) by smtp.gmail.com with ESMTPSA id z8sm1805606qtq.11.2020.03.04.09.50.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 09:50:20 -0800 (PST) From: Peter Xu To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Yan Zhao , peterx@redhat.com, Vitaly Kuznetsov , "Michael S . Tsirkin" , Alex Williamson , Sean Christopherson , "Dr . David Alan Gilbert" , Jason Wang , Kevin Tian , Paolo Bonzini , Christophe de Dinechin Subject: [PATCH v5 09/14] KVM: selftests: Sync uapi/linux/kvm.h to tools/ Date: Wed, 4 Mar 2020 12:49:42 -0500 Message-Id: <20200304174947.69595-10-peterx@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200304174947.69595-1-peterx@redhat.com> References: <20200304174947.69595-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 This will be needed to extend the kvm selftest program. Signed-off-by: Peter Xu --- tools/include/uapi/linux/kvm.h | 44 ++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h index 4b95f9a31a2f..50bf39d24f17 100644 --- a/tools/include/uapi/linux/kvm.h +++ b/tools/include/uapi/linux/kvm.h @@ -236,6 +236,7 @@ struct kvm_hyperv_exit { #define KVM_EXIT_IOAPIC_EOI 26 #define KVM_EXIT_HYPERV 27 #define KVM_EXIT_ARM_NISV 28 +#define KVM_EXIT_DIRTY_RING_FULL 29 /* For KVM_EXIT_INTERNAL_ERROR */ /* Emulate instruction failed. */ @@ -1010,6 +1011,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_ARM_NISV_TO_USER 177 #define KVM_CAP_ARM_INJECT_EXT_DABT 178 #define KVM_CAP_S390_VCPU_RESETS 179 +#define KVM_CAP_DIRTY_LOG_RING 180 #ifdef KVM_CAP_IRQ_ROUTING @@ -1478,6 +1480,9 @@ struct kvm_enc_region { #define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3) #define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4) +/* Available with KVM_CAP_DIRTY_LOG_RING */ +#define KVM_RESET_DIRTY_RINGS _IO(KVMIO, 0xc5) + /* Secure Encrypted Virtualization command */ enum sev_cmd_id { /* Guest initialization commands */ @@ -1628,4 +1633,43 @@ struct kvm_hyperv_eventfd { #define KVM_HYPERV_CONN_ID_MASK 0x00ffffff #define KVM_HYPERV_EVENTFD_DEASSIGN (1 << 0) +/* + * KVM dirty GFN flags, defined as: + * + * |---------------+---------------+--------------| + * | bit 1 (reset) | bit 0 (dirty) | Status | + * |---------------+---------------+--------------| + * | 0 | 0 | Invalid GFN | + * | 0 | 1 | Dirty GFN | + * | 1 | X | GFN to reset | + * |---------------+---------------+--------------| + * + * Lifecycle of a dirty GFN goes like: + * + * dirtied collected reset + * 00 -----------> 01 -------------> 1X -------+ + * ^ | + * | | + * +------------------------------------------+ + * + * The userspace program is only responsible for the 01->1X state + * conversion (to collect dirty bits). Also, it must not skip any + * dirty bits so that dirty bits are always collected in sequence. + */ +#define KVM_DIRTY_GFN_F_DIRTY BIT(0) +#define KVM_DIRTY_GFN_F_RESET BIT(1) +#define KVM_DIRTY_GFN_F_MASK 0x3 + +/* + * KVM dirty rings should be mapped at KVM_DIRTY_LOG_PAGE_OFFSET of + * per-vcpu mmaped regions as an array of struct kvm_dirty_gfn. The + * size of the gfn buffer is decided by the first argument when + * enabling KVM_CAP_DIRTY_LOG_RING. + */ +struct kvm_dirty_gfn { + __u32 flags; + __u32 slot; + __u64 offset; +}; + #endif /* __LINUX_KVM_H */ -- 2.24.1