From nobody Sat May 18 11:46:55 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=1713877762; cv=none; d=zohomail.com; s=zohoarc; b=k3gS9V4UgeaWjyjFIo3EX70AWm6y3gGEbik+FwWPLiNq/4pyPasKWGDzMFG5B493BEbrwSTkdOHXNKHTKWUa+ADxh5qEEEOeOgNliMTytSQ4MD7s/XmwW+6mQBF2EmXstWEhPOaDbYylJzclyT08UaHE0111GnHsoz8tWk7EWgQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1713877762; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yGX93mJDfjOhN5RgmVa7aGchfBQXKQPG/Q30q5gEsdg=; b=ek1oV8DAOVNQHNKf7cK//lpWGUh8ij/l7A0hN0pajAld1alEvCIi6iNu/x8y4wRp8/CV9tsACin/9JENC3kjZAKk+LtuF9rdjv9iq8VjiPzj/Yx8pUg2Gwx/BYrmpd7wOMq6wFfq55Q1cvohwBBcAgC5p4iwhvklQZO8ZhLZ4Ts= 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 1713877762268556.7802256318762; Tue, 23 Apr 2024 06:09:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzFsl-0001Gk-Ou; Tue, 23 Apr 2024 09:08:23 -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 1rz9Vx-0003Mq-Go for qemu-devel@nongnu.org; Tue, 23 Apr 2024 02:20:27 -0400 Received: from mail1.sfc.wide.ad.jp ([2001:200:0:8803: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 1rz9Vp-0000pv-GE for qemu-devel@nongnu.org; Tue, 23 Apr 2024 02:20:21 -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 593A373C; Tue, 23 Apr 2024 15:19:53 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=sfc.wide.ad.jp; s=mail1; t=1713853193; bh=iLgfuzBLOT/ymiieytEdCw3BXsG+02NpZNhpnVVpgeQ=; h=From:To:Cc:Subject:Date:From; b=VL2553Ab8jR0VTL1icDMIdFCETfP/NNAfIy19KvMnnOIOIoj9PXstJ+V8w9itOTgt nkvDESoXRZpMoruoj7wt/USOR3vzeq/ci7LhjVsvVYwuSYk6njYwBts/rFIg6TIeNq tOigm5AYze9Mlx3EtN+bJoN+5nLFqUXVwSFVHeAeOvCiHTTBs2Bl3NEOXJgMQUWzC0 tjW4s+ZzuvKkmxJVZ1KqAtnwyYV4AoTMhb3EgXfx22LztKAabfRJ8Brx4KzQuu+HVs Sl5VZOAwwTPq/fp6YWyLkbvrq4vNU2gXxV/YGcBIepWD7ZsX/a/1udOkwySbMliWqT m4YqiBLnL++dA== From: Masato Imai To: qemu-devel@nongnu.org Cc: Masato Imai , Hyman Huang , Peter Xu , Fabiano Rosas Subject: [PATCH] migration/dirtyrate: Fix segmentation fault Date: Tue, 23 Apr 2024 06:19:25 +0000 Message-Id: <20240423061925.254941-1-mii@sfc.wide.ad.jp> X-Mailer: git-send-email 2.34.1 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=2001:200:0:8803:203:178:142:133; envelope-from=mii@sfc.wide.ad.jp; helo=mail1.sfc.wide.ad.jp X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: 1713877764522100001 Content-Type: text/plain; charset="utf-8" When the KVM acceleration parameter is not set, executing calc_dirty_rate with the -r option results in a segmentation fault due to accessing a null kvm_state pointer in the kvm_dirty_rate_enabled function. This commit adds a check for kvm_enabled to prevent segmentation faults. Signed-off-by: Masato Imai --- migration/dirtyrate.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 1d2e85746f..4c1579c6e9 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -800,6 +800,8 @@ void qmp_calc_dirty_rate(int64_t calc_time, * on the contrary, dirty bitmap mode is not. */ if (((mode =3D=3D DIRTY_RATE_MEASURE_MODE_DIRTY_RING) && + !kvm_enabled()) || + ((mode =3D=3D DIRTY_RATE_MEASURE_MODE_DIRTY_RING) && !kvm_dirty_ring_enabled()) || ((mode =3D=3D DIRTY_RATE_MEASURE_MODE_DIRTY_BITMAP) && kvm_dirty_ring_enabled())) { --=20 2.34.1