From nobody Sat May 4 04:34:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508146957253377.40923927416554; Mon, 16 Oct 2017 02:42:37 -0700 (PDT) Received: from localhost ([::1]:60202 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e41up-00051b-4D for importer@patchew.org; Mon, 16 Oct 2017 05:42:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e41tq-0004af-3m for qemu-devel@nongnu.org; Mon, 16 Oct 2017 05:41:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e41tm-0008HR-7B for qemu-devel@nongnu.org; Mon, 16 Oct 2017 05:41:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35868) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e41tm-0008Gz-0b for qemu-devel@nongnu.org; Mon, 16 Oct 2017 05:41:26 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 14C02882FF for ; Mon, 16 Oct 2017 09:41:25 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0AC515D9CC; Mon, 16 Oct 2017 09:41:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 14C02882FF Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=david@redhat.com From: David Hildenbrand To: qemu-devel@nongnu.org Date: Mon, 16 Oct 2017 11:41:21 +0200 Message-Id: <20171016094121.16455-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 16 Oct 2017 09:41:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v1] kvm: tolerate non-existing slot for log_start and log_stop X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , thuth@redhat.com, David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" log_start might be called by memory.c just before registering the section. So we can actually get a log_start without a region_add, which we can silently ignore. This makes current KVM code trigger an assertion ("kvm_section_update_flags: error finding slot"). Also, if we want to trap every access to a section, we might not have a slot. So let's just tolerate if we don't have a slot. Fixes: 343562e8fa22 ("kvm: kvm_log_start/stop are only called with known se= ctions") Reported-by: Thomas Huth Signed-off-by: David Hildenbrand --- accel/kvm/kvm-all.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 90c88b517d..64de8461e0 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -394,8 +394,11 @@ static int kvm_section_update_flags(KVMMemoryListener = *kml, =20 mem =3D kvm_lookup_matching_slot(kml, start_addr, size); if (!mem) { - fprintf(stderr, "%s: error finding slot\n", __func__); - abort(); + /* + * log_start() might be called before region_add(), and sometimes + * we don't have a slot as we want to trap every access. + */ + return 0; } =20 return kvm_slot_update_flags(kml, mem, section->mr); --=20 2.13.5