From nobody Sat May 18 04:46:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=sfc.wide.ad.jp ARC-Seal: i=1; a=rsa-sha256; t=1713877755; cv=none; d=zohomail.com; s=zohoarc; b=jsL+z7zvTHreADfXhNDddmoiIMhum6No/ieeCu7xm0qgBC7S4wMuktUWINllxEpFtBdOei5XUV1A6QhwFOxd6uKm/9GKnGf4Bk63yAvDN7obJcm3asvmbZRqqkVn7XtS1bVjzDfJjnD96F5+ZLVGJ8Io7Q6veWjCtIxxqfn88So= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1713877755; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TLGeLlZBQLaVouQiOUhuhjBJxMfyUeKqt6315eE4Jug=; b=ArT0WJoHBRVYX2cnhENOoSVs1nWr7L8aeknzMzCoVMfEPthcx7lqatvRwS1eS61dvG0bapz8wf4nLrNQ05kg+gijymyBxI1x0qRd32jD2OBc20IzkrVZXFW8tzLUH4CUFitsi9KQ9k80niP43biAMSQTUoiX7JBDQSyiCLhoXKY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1713877755248664.770772134235; Tue, 23 Apr 2024 06:09:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzFsm-0001IL-CN; Tue, 23 Apr 2024 09:08:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rzCDl-00035h-Rc for qemu-devel@nongnu.org; Tue, 23 Apr 2024 05:13:49 -0400 Received: from mail1.sfc.wide.ad.jp ([203.178.142.133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzCDj-0005zv-6R for qemu-devel@nongnu.org; Tue, 23 Apr 2024 05:13:49 -0400 Received: from k8s-worker-01.tail4d807.ts.net (unknown [IPv6:2400:4051:3e03:2d00:1e98:ecff:fe05:4840]) (Authenticated sender: mii) by mail1.sfc.wide.ad.jp (Postfix) with ESMTPSA id 0C56F73C; Tue, 23 Apr 2024 18:13:43 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=sfc.wide.ad.jp; s=mail1; t=1713863623; bh=d5MXOmg56bRqxOY0Neg0l85+8q0471wDoEYPcVDKOY8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sDgFjWFh/0P9e0EpZlbYWGWrXhHIGM+q8vVWiHsvwDaQEEI3rRxdTADN/JPQ2YnGg WsT5PhGBePbDRUApzruKO6FVv5Utvohtzriju/vx23GzprA/nRzOBc/pdDDTmbZvaO ivkCqLDyptIohslrF3j+kgGzk8Dk9ehJd0KQ3wW1UCP0ieCMmE/MYWF1tJA/K/tyJ+ I0QDX4IzOdFmrSCa39RWtM+/Wzqflt3HgN90SQYQsgCr1dGubSoiav6TWV9A6hWZ8R hEC2GkERNwayBEysaUkThKiW7WtHKNqhqgykD44Kd7UW1FWm0CjA6ifOiCMy3UL0Pf J1/4MSixVr7nA== From: Masato Imai To: qemu-devel@nongnu.org Cc: Masato Imai , Hyman Huang , Peter Xu , Fabiano Rosas Subject: [PATCH v2 1/1] migration/dirtyrate: Fix segmentation fault Date: Tue, 23 Apr 2024 09:13:08 +0000 Message-Id: <20240423091306.754432-2-mii@sfc.wide.ad.jp> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240423091306.754432-1-mii@sfc.wide.ad.jp> References: <20240423091306.754432-1-mii@sfc.wide.ad.jp> MIME-Version: 1.0 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=203.178.142.133; envelope-from=mii@sfc.wide.ad.jp; helo=mail1.sfc.wide.ad.jp X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 23 Apr 2024 09:08:17 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sfc.wide.ad.jp) X-ZM-MESSAGEID: 1713877757319100003 Content-Type: text/plain; charset="utf-8" When the KVM acceleration parameter is not set, executing calc_dirty_rate with the -r or -b option results in a segmentation fault due to accessing a null kvm_state pointer in the kvm_dirty_ring_enabled function. This commit adds a check for kvm_enabled to prevent segmentation faults. Signed-off-by: Masato Imai --- migration/dirtyrate.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 1d2e85746f..2a7df52519 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -799,6 +799,13 @@ void qmp_calc_dirty_rate(int64_t calc_time, * dirty ring mode only works when kvm dirty ring is enabled. * on the contrary, dirty bitmap mode is not. */ + if (!kvm_enabled() && + (mode =3D=3D DIRTY_RATE_MEASURE_MODE_DIRTY_RING || + mode =3D=3D DIRTY_RATE_MEASURE_MODE_DIRTY_BITMAP)) { + error_setg(errp, "mode %s requires kvm to be enabled.", + DirtyRateMeasureMode_str(mode)); + return; + } if (((mode =3D=3D DIRTY_RATE_MEASURE_MODE_DIRTY_RING) && !kvm_dirty_ring_enabled()) || ((mode =3D=3D DIRTY_RATE_MEASURE_MODE_DIRTY_BITMAP) && --=20 2.34.1