From nobody Mon Feb 9 01:30:44 2026 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=1612978095; cv=none; d=zohomail.com; s=zohoarc; b=TjN1NHbAJT22+V6pHVus3UVDkRjQjriLhV9o+UL4t4UbtO7VwlNdC+/dRdUn7HrBH8ReUFf6r9yCh3+y6gDvHpixM7ptXxS8Ey7V1L3xUPI0jkslrWxtsDBFp+QQsiJDkIjZwL7nslV1+nZI19QDVF63nR1oeOArc8xebzpcWdA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612978095; 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=N3Od6yn4E5nItU4s+EnNaNhzybF0mIJWT0TgDHE67Jk=; b=QTxdu2Mm87jFJlw2HXsSCBdJ+pck+5Z3UZ17aqc35Wozni/lPRA2NZNpIyqJphmI2dMpDPh1JLK0qIBy0KyFYRO/aXNkHZfIVVI/DGCd3eIbSGEd3xRBtbtGa4SRbbdT5hBHie3wiAGNG/+52DdLIpHYO5cLRohIwmGe/o/SGog= 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 161297809466491.79362346059679; Wed, 10 Feb 2021 09:28:14 -0800 (PST) Received: from localhost ([::1]:36024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9tHh-00060n-Ib for importer@patchew.org; Wed, 10 Feb 2021 12:28:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9t6N-0003UJ-L7 for qemu-devel@nongnu.org; Wed, 10 Feb 2021 12:16:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58548) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l9t6H-0001e2-QM for qemu-devel@nongnu.org; Wed, 10 Feb 2021 12:16:30 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-271-2ZksoJg-N2y-G_vpe68CZw-1; Wed, 10 Feb 2021 12:16:20 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0592C80197B; Wed, 10 Feb 2021 17:16:19 +0000 (UTC) Received: from t480s.redhat.com (ovpn-113-218.ams2.redhat.com [10.36.113.218]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7509850C0B; Wed, 10 Feb 2021 17:16:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612977384; 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=N3Od6yn4E5nItU4s+EnNaNhzybF0mIJWT0TgDHE67Jk=; b=GzGJ5otasMbt333XCSv5DYBNC00z/tL0IPMMioV2+y33flJA4/9mHj7fgAH8SFBg1aaTAU W/InBdolQBvN7j5RW7XLFIGphL70Y8OEy4ovnc1UlrMjnj0LZZatKj03xtyHX+DR1fcb63 MBXRtSIXQwCnG1NbhRnSNYHFcou06Ak= X-MC-Unique: 2ZksoJg-N2y-G_vpe68CZw-1 From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH v1 3/5] softmmu/memory_mapping: never merge ranges accross memory regions Date: Wed, 10 Feb 2021 18:15:35 +0100 Message-Id: <20210210171537.32932-4-david@redhat.com> In-Reply-To: <20210210171537.32932-1-david@redhat.com> References: <20210210171537.32932-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.568, 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: Laurent Vivier , Thomas Huth , "Michael S. Tsirkin" , David Hildenbrand , "Dr . David Alan Gilbert" , Peter Xu , Alex Williamson , Claudio Fontana , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Let's make sure to not merge when different memory regions are involved. Unlikely, but theoretically possible. Cc: Marc-Andr=C3=A9 Lureau Cc: Paolo Bonzini Cc: "Michael S. Tsirkin" Cc: Alex Williamson Cc: Dr. David Alan Gilbert Cc: Igor Mammedov Cc: Claudio Fontana Cc: Thomas Huth Cc: "Alex Benn=C3=A9e" Cc: Peter Xu Cc: Laurent Vivier Signed-off-by: David Hildenbrand --- softmmu/memory_mapping.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/softmmu/memory_mapping.c b/softmmu/memory_mapping.c index 2677392de7..ad4911427a 100644 --- a/softmmu/memory_mapping.c +++ b/softmmu/memory_mapping.c @@ -230,7 +230,8 @@ static void guest_phys_blocks_region_add(MemoryListener= *listener, =20 /* we want continuity in both guest-physical and host-virtual memo= ry */ if (predecessor->target_end < target_start || - predecessor->host_addr + predecessor_size !=3D host_addr) { + predecessor->host_addr + predecessor_size !=3D host_addr || + predecessor->mr !=3D section->mr) { predecessor =3D NULL; } } --=20 2.29.2