From nobody Mon Dec 15 02:54:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615408846; cv=none; d=zohomail.com; s=zohoarc; b=YdAZ/YlKTo9GmE3a5KE+N8gL2RmiQokIPphzkp7c7sYCwxRvTpSjUJXEC87EIMd/OflakSdHiP+PhshekGsJAaSAo2Qwo0xlS4unJ0QX/XZqGESk2W7h2GdEVIyGCvbLBCTKmdxraqieNYvMW1mnq76zQboVRvXu+5CZMYH1lLI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615408846; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KIrk7YST/OerGKiVr8D/f35rg2J/3wCy+F9CoZg4Yx0=; b=ZActathhbP9OoInCnayoFW3SCGsiprEB4FQhjMACgy80E1MB60G712vH91ro3H56lpGhNQqhy1D5Q03bSoXI0jR6z8cVF5GPcPzx4iDYOlVgaATrj/yEus+2fxNwO933BgGv4mAHzaNcUAKePmNifFPvbDtJKdcNy11JL9CUDmc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16154088462111016.4237903145107; Wed, 10 Mar 2021 12:40:46 -0800 (PST) Received: from localhost ([::1]:52194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK5dM-0004kD-O6 for importer@patchew.org; Wed, 10 Mar 2021 15:40:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK5WA-0005yZ-SN for qemu-devel@nongnu.org; Wed, 10 Mar 2021 15:33:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58112) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lK5W8-0000fn-6b for qemu-devel@nongnu.org; Wed, 10 Mar 2021 15:33:18 -0500 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-265-zM-cWhMSNZOHt6Vb_WYftA-1; Wed, 10 Mar 2021 15:33:14 -0500 Received: by mail-qv1-f71.google.com with SMTP id bt20so4685327qvb.0 for ; Wed, 10 Mar 2021 12:33:14 -0800 (PST) Received: from xz-x1.redhat.com ([142.126.89.138]) by smtp.gmail.com with ESMTPSA id z89sm306746qtd.5.2021.03.10.12.33.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 12:33:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615408395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KIrk7YST/OerGKiVr8D/f35rg2J/3wCy+F9CoZg4Yx0=; b=VP0hy5bOfhkITmecyN8aEVB7qNxp/0tVBT43dHddciZXm3V4b5y7FoWN/yp/2UxFqZwGKE Hf9+G5T1pWmJpnvL0aToCrBw2okR1u47TmtVomW0xTP8Op6Chb1imV0mPo53ARbvJdjIlT p9PJWI9EXbva3C1nXIzDzN8hiGeio+k= X-MC-Unique: zM-cWhMSNZOHt6Vb_WYftA-1 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=KIrk7YST/OerGKiVr8D/f35rg2J/3wCy+F9CoZg4Yx0=; b=gYqwYT4m2ivdREG0PWM0k+FazJbJXDPaHNMK+FX3+Sqogo7ehFl7KNl0HyeEs0JkLO 3sluQ/IUix0aBabuIE22303tHLSSHG7IfjbcdhEccNY1MFQCSi9j5CCOzaD/6xfTYPun Lt4qvVjRtr0+PWSxrnneB62v5XLNk4rjDfLJYT78JeGF2lS4U7o7LYACmWzriHoZwPcp 6iSVcDXv1R2UaD9/RaAXVSl8NqjSgTaRY0li6mloYYj7gBmcdsCzvvbBcdB7sh146S48 1llqUPjeiEJg2cCyFDA3mV4z31N90ygVJMFHijFYJ6OD7oawMJxXRqZzapMQ44rImp/x ntAg== X-Gm-Message-State: AOAM532hh1Dmu/blggRySryEK3tnwjtTrH9ZFOVa+/uhGQOWM+hc6NNv CRdHCcWxytDhVYLKSy+EtU6Qld2LpwTN2aOZzIcVB69cvY3htMuU69Sndp5CBo6IgAm4b1+eFbV b5fpCMYkPkIP1/1/YOlNiCI081CYKBGq3frki1VSV8XBO8bVTE2cS0Smdyj/wFh1z X-Received: by 2002:a37:a9cf:: with SMTP id s198mr4337643qke.143.1615408392899; Wed, 10 Mar 2021 12:33:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzUax1DDG5wtxEpWhatITs/OD8Dt8NoXwrS/r2/G8q0EtTqVhftK+swU8cYRic+31w/GBz/KA== X-Received: by 2002:a37:a9cf:: with SMTP id s198mr4337606qke.143.1615408392501; Wed, 10 Mar 2021 12:33:12 -0800 (PST) From: Peter Xu To: qemu-devel@nongnu.org Subject: [PATCH v5 08/10] KVM: Add dirty-gfn-count property Date: Wed, 10 Mar 2021 15:32:59 -0500 Message-Id: <20210310203301.194842-9-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210310203301.194842-1-peterx@redhat.com> References: <20210310203301.194842-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Hyman , "Dr . David Alan Gilbert" , peterx@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Add a parameter for dirty gfn count for dirty rings. If zero, dirty ring is disabled. Otherwise dirty ring will be enabled with the per-vcpu gfn count= as specified. If dirty ring cannot be enabled due to unsupported kernel or illegal parameter, it'll fallback to dirty logging. By default, dirty ring is not enabled (dirty-gfn-count default to 0). Signed-off-by: Peter Xu --- accel/kvm/kvm-all.c | 72 +++++++++++++++++++++++++++++++++++++++++++++ qemu-options.hx | 12 ++++++++ 2 files changed, 84 insertions(+) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index a1e7b1332a1..10137b6af11 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -128,6 +128,9 @@ struct KVMState KVMMemoryListener *ml; AddressSpace *as; } *as; + bool kvm_dirty_ring_enabled; /* Whether KVM dirty ring is enabled */ + uint64_t kvm_dirty_ring_size; /* Size of the per-vcpu dirty ring */ + uint32_t kvm_dirty_gfn_count; /* Number of dirty GFNs per ring */ }; =20 KVMState *kvm_state; @@ -2136,6 +2139,40 @@ static int kvm_init(MachineState *ms) s->coalesced_pio =3D s->coalesced_mmio && kvm_check_extension(s, KVM_CAP_COALESCED_PIO); =20 + /* + * Enable KVM dirty ring if supported, otherwise fall back to + * dirty logging mode + */ + if (s->kvm_dirty_gfn_count > 0) { + uint64_t ring_size; + + ring_size =3D s->kvm_dirty_gfn_count * sizeof(struct kvm_dirty_gfn= ); + + /* Read the max supported pages */ + ret =3D kvm_vm_check_extension(s, KVM_CAP_DIRTY_LOG_RING); + if (ret > 0) { + if (ring_size > ret) { + error_report("KVM dirty GFN count %" PRIu32 " too big " + "(maximum is %ld). Please use a smaller valu= e.", + s->kvm_dirty_gfn_count, + ret / sizeof(struct kvm_dirty_gfn)); + ret =3D -EINVAL; + goto err; + } + + ret =3D kvm_vm_enable_cap(s, KVM_CAP_DIRTY_LOG_RING, 0, ring_s= ize); + if (ret) { + error_report("Enabling of KVM dirty ring failed: %d. " + "Suggested mininum value is 1024. " + "Please also make sure it's a power of two.",= ret); + goto err; + } + + s->kvm_dirty_ring_size =3D ring_size; + s->kvm_dirty_ring_enabled =3D true; + } + } + dirty_log_manual_caps =3D kvm_check_extension(s, KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2); dirty_log_manual_caps &=3D (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE | @@ -3179,6 +3216,33 @@ bool kvm_kernel_irqchip_split(void) return kvm_state->kernel_irqchip_split =3D=3D ON_OFF_AUTO_ON; } =20 +static void kvm_get_dirty_gfn_count(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) +{ + KVMState *s =3D KVM_STATE(obj); + uint32_t value =3D s->kvm_dirty_gfn_count; + + visit_type_uint32(v, name, &value, errp); +} + +static void kvm_set_dirty_gfn_count(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) +{ + KVMState *s =3D KVM_STATE(obj); + Error *error =3D NULL; + uint32_t value; + + visit_type_uint32(v, name, &value, &error); + if (error) { + error_propagate(errp, error); + return; + } + + s->kvm_dirty_gfn_count =3D value; +} + static void kvm_accel_instance_init(Object *obj) { KVMState *s =3D KVM_STATE(obj); @@ -3186,6 +3250,8 @@ static void kvm_accel_instance_init(Object *obj) s->kvm_shadow_mem =3D -1; s->kernel_irqchip_allowed =3D true; s->kernel_irqchip_split =3D ON_OFF_AUTO_AUTO; + /* KVM dirty ring is by default off */ + s->kvm_dirty_gfn_count =3D 0; } =20 static void kvm_accel_class_init(ObjectClass *oc, void *data) @@ -3207,6 +3273,12 @@ static void kvm_accel_class_init(ObjectClass *oc, vo= id *data) NULL, NULL); object_class_property_set_description(oc, "kvm-shadow-mem", "KVM shadow MMU size"); + + object_class_property_add(oc, "dirty-gfn-count", "uint32", + kvm_get_dirty_gfn_count, kvm_set_dirty_gfn_count, + NULL, NULL); + object_class_property_set_description(oc, "dirty-gfn-count", + "KVM dirty GFN count (=3D0 to disable dirty ring)"); } =20 static const TypeInfo kvm_accel_type =3D { diff --git a/qemu-options.hx b/qemu-options.hx index 90801286c6e..08becce4ad0 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -141,6 +141,7 @@ DEF("accel", HAS_ARG, QEMU_OPTION_accel, " kvm-shadow-mem=3Dsize of KVM shadow MMU in bytes\n" " split-wx=3Don|off (enable TCG split w^x mapping)\n" " tb-size=3Dn (TCG translation block cache size)\n" + " dirty-gfn-count=3Dn (KVM dirty ring GFN count, defaul= t 0)\n" " thread=3Dsingle|multi (enable multi-threaded TCG)\n",= QEMU_ARCH_ALL) SRST ``-accel name[,prop=3Dvalue[,...]]`` @@ -181,6 +182,17 @@ SRST where both the back-end and front-ends support it and no incompatible TCG features have been enabled (e.g. icount/replay). + + ``dirty-gfn-count=3Dn`` + When KVM accelerator is used, it controls the per-vcpu KVM dirty r= ing + size (number of entries one dirty ring contains, per-vcpu). It sho= uld + be a value that is power of two, and it should be 1024 or bigger (= but + still less than the maximum value that the kernel supports). 4096 + could be a good initial value if you have no idea which is the bes= t. + Set this value to 0 to disable the feature. By default, this feat= ure + is disabled (dirty-gfn-count=3D0). When enabled, it'll automatica= lly + replace the kvm get dirty log feature. + ERST =20 DEF("smp", HAS_ARG, QEMU_OPTION_smp, --=20 2.26.2