From patchwork Fri Jan 8 19:08:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hyman Huang X-Patchwork-Id: 12007345 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 50A11C433DB for ; Fri, 8 Jan 2021 19:24:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 32FB723AAA for ; Fri, 8 Jan 2021 19:24:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 32FB723AAA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=chinatelecom.cn Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxxMd-0001yv-4l for qemu-devel@archiver.kernel.org; Fri, 08 Jan 2021 14:23:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxx7w-0000le-SK for qemu-devel@nongnu.org; Fri, 08 Jan 2021 14:08:48 -0500 Received: from prt-mail.chinatelecom.cn ([42.123.76.220]:50846 helo=chinatelecom.cn) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxx7s-0006fx-DW for qemu-devel@nongnu.org; Fri, 08 Jan 2021 14:08:48 -0500 HMM_SOURCE_IP: 172.18.0.48:17829.1062543948 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP Received: from clientip-203.57.249.251?logid-4904171397564a909bb6e26728d4a894 (unknown [172.18.0.48]) by chinatelecom.cn (HERMES) with SMTP id 02260280072; Sat, 9 Jan 2021 03:08:34 +0800 (CST) X-189-SAVE-TO-SEND: +huangy81@chinatelecom.cn Received: from ([172.18.0.48]) by App0024 with ESMTP id 4904171397564a909bb6e26728d4a894 for qemu-devel@nongnu.org; Sat Jan 9 03:08:36 2021 X-Transaction-ID: 4904171397564a909bb6e26728d4a894 X-filter-score: filter<0> X-Real-From: huangy81@chinatelecom.cn X-Receive-IP: 172.18.0.48 X-MEDUSA-Status: 0 From: huangy81@chinatelecom.cn To: qemu-devel Subject: [PATCH] kvm: mirror "-machine dirty_gfn_count" to the accelerator property Date: Sat, 9 Jan 2021 03:08:31 +0800 Message-Id: <1610132911-33839-1-git-send-email-huangy81@chinatelecom.cn> X-Mailer: git-send-email 1.8.3.1 Received-SPF: pass client-ip=42.123.76.220; envelope-from=huangy81@chinatelecom.cn; helo=chinatelecom.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 08 Jan 2021 14:20:53 -0500 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 , peterx Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" QEMU enable the dirty ring feature by specifing the "-accel" sub-parameter. https://lore.kernel.org/qemu-devel/20210108165050.406906-10-peterx@redhat.com/ Libvirt use "-machine accel=kvm" option to specify the accelerator by default, which is incompatible with above option. This patch introduce the "dirty_gfn_count" sub-parameter of the "-machine" in the way that the commit "23b089" has done. So that Libvirt can enable this feature by adding "-machine dirty_gfn_count=xxx" to the QEMU command line. Signed-off-by: Hyman --- softmmu/vl.c | 3 ++- util/qemu-config.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index 7ddf405..d8e3dec 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1666,7 +1666,8 @@ static int machine_set_property(void *opaque, object_register_sugar_prop(ACCEL_CLASS_NAME("xen"), qom_name, value); return 0; } - if (g_str_equal(qom_name, "kvm-shadow-mem")) { + if (g_str_equal(qom_name, "kvm-shadow-mem") || + g_str_equal(qom_name, "dirty-gfn-count")) { object_register_sugar_prop(ACCEL_CLASS_NAME("kvm"), qom_name, value); return 0; } diff --git a/util/qemu-config.c b/util/qemu-config.c index e2a700b..70f1b50 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -234,6 +234,10 @@ static QemuOptsList machine_opts = { .help = "Up to 8 chars in set of [A-Za-z0-9. ](lower case chars" " converted to upper case) to pass to machine" " loader, boot manager, and guest kernel", + },{ + .name = "dirty_gfn_count", + .type = QEMU_OPT_NUMBER, + .help = "KVM dirty ring GFN count", }, { /* End of list */ } }