From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 70B73C07E95 for ; Tue, 20 Jul 2021 13:28:05 +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 19525610D2 for ; Tue, 20 Jul 2021 13:28:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 19525610D2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5pn2-00072a-81 for qemu-devel@archiver.kernel.org; Tue, 20 Jul 2021 09:28:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5plL-0004Rn-4K for qemu-devel@nongnu.org; Tue, 20 Jul 2021 09:26:19 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:61086 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5plI-00082q-PU for qemu-devel@nongnu.org; Tue, 20 Jul 2021 09:26:18 -0400 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 16KD4Mdc102854; Tue, 20 Jul 2021 09:26:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=1eBY0tiUYVM0sIbvj7ob32DAyMpLr1p4JnsY6AXIkcw=; b=aofL5TP62NM573zY8cp0O1+aq9im0S9JSTjQiqkfYJJx45A8c1fYG8YgjT9/++l/Afi9 1QN5jZfPqvwwOtOl/Wj71+hdfsTAsv0oiYWtyyUVn/wIONMQBi1/by6Tgy8aG5lHjp0B rDJIJCGhBfMj1fEdQKRZb2Q1zHAifEQtKXdFwNDddo+zWKw9M0ROewl1uxMcxFb3grHD B7tWYPEfJk6Fq/+5dexls/c/P2/yI5CZk7QzmAvZgd3ohPNluHlukvEHL7JsSvzf1es3 NOUQFs/Cxtqhx4ZXN7qNcO8ApEj47F86i6/GvTOiPHcMK6ODr5oWup/IfPv79XQ4JyZG ug== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 39wy0hru93-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 20 Jul 2021 09:26:14 -0400 Received: from m0098413.ppops.net (m0098413.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 16KD4u6X106421; Tue, 20 Jul 2021 09:26:14 -0400 Received: from ppma04dal.us.ibm.com (7a.29.35a9.ip4.static.sl-reverse.com [169.53.41.122]) by mx0b-001b2d01.pphosted.com with ESMTP id 39wy0hru8s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 20 Jul 2021 09:26:14 -0400 Received: from pps.filterd (ppma04dal.us.ibm.com [127.0.0.1]) by ppma04dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 16KDCijA000901; Tue, 20 Jul 2021 13:26:13 GMT Received: from b01cxnp22034.gho.pok.ibm.com (b01cxnp22034.gho.pok.ibm.com [9.57.198.24]) by ppma04dal.us.ibm.com with ESMTP id 39upubvbsm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 20 Jul 2021 13:26:13 +0000 Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp22034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 16KDQCXX30343660 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 20 Jul 2021 13:26:12 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C2A4EAC062; Tue, 20 Jul 2021 13:26:12 +0000 (GMT) Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AA150AC064; Tue, 20 Jul 2021 13:26:12 +0000 (GMT) Received: from [9.47.158.152] (unknown [9.47.158.152]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP; Tue, 20 Jul 2021 13:26:12 +0000 (GMT) Subject: Re: [PATCH resend v2 3/5] softmmu/memory_mapping: never merge ranges accross memory regions To: David Hildenbrand , qemu-devel@nongnu.org References: <20210720130304.26323-1-david@redhat.com> <20210720130304.26323-4-david@redhat.com> From: Stefan Berger Message-ID: <612097d1-bced-4a04-b474-e05d2821e519@linux.ibm.com> Date: Tue, 20 Jul 2021 09:26:12 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210720130304.26323-4-david@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 3vUsOH_88gXUKjppb2bp2xovi28Ebhwm X-Proofpoint-ORIG-GUID: Wh29gHpUfNJXZ_volTlRveMLmxEcU1bx X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790 definitions=2021-07-20_07:2021-07-19, 2021-07-20 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 lowpriorityscore=0 suspectscore=0 priorityscore=1501 malwarescore=0 mlxlogscore=999 spamscore=0 bulkscore=0 phishscore=0 impostorscore=0 clxscore=1015 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2107200085 Received-SPF: pass client-ip=148.163.158.5; envelope-from=stefanb@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_MSPIKE_H2=-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 , Eduardo Habkost , "Michael S. Tsirkin" , "Dr . David Alan Gilbert" , Peter Xu , Alex Williamson , Claudio Fontana , Paolo Bonzini , =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , =?UTF-8?Q?Alex_Benn=c3=a9e?= , Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 7/20/21 9:03 AM, David Hildenbrand wrote: > Let's make sure to not merge when different memory regions are involved. > Unlikely, but theoretically possible. > > Cc: Marc-André Lureau > Cc: Paolo Bonzini > Cc: "Michael S. Tsirkin" > Cc: Eduardo Habkost > Cc: Alex Williamson > Cc: Dr. David Alan Gilbert > Cc: Igor Mammedov > Cc: Claudio Fontana > Cc: Thomas Huth > Cc: "Alex Bennée" > Cc: Peter Xu > Cc: Laurent Vivier > Cc: Stefan Berger > 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 d63f896b30..c149bad44a 100644 > --- a/softmmu/memory_mapping.c > +++ b/softmmu/memory_mapping.c > @@ -229,7 +229,8 @@ static void guest_phys_blocks_region_add(MemoryListener *listener, > > /* we want continuity in both guest-physical and host-virtual memory */ > if (predecessor->target_end < target_start || > - predecessor->host_addr + predecessor_size != host_addr) { > + predecessor->host_addr + predecessor_size != host_addr || > + predecessor->mr != section->mr) { > predecessor = NULL; > } > } Acked-by: Stefan Berger