From nobody Wed Oct 23 00:28:25 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1727172299; cv=none; d=zohomail.com; s=zohoarc; b=Wxh/7HJejsxsRxFVDrGksgIQbxo8f1iI4RnGg1DAB05seo00Momx5Y4AtlMcet2TYAWZ2+rPaTNnyrSN5iAslXDBwzqAoI4VGI+mwEkzfpXucdhLgCw0d+4jisOtuT+PjqWSO0BE1zG9Pgcy+fk7n0Lvc4V9JKQsxT7m5ZdGCPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1727172299; 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=awsejfNqiJTGB7bVdBQ+7TGfVln40WtAFHmHDEbWm20=; b=VHtExaJXDdsM1fTaKnAY3z5ps6hMsyNifMXOA3jnZXOaGHskRcVdPckVq87AX/sv/WXcZHlkGKDociI4CQE8yGdHwar4xXa6qnrKNVmSxaOiDWR+eTzXwZ7iin/edh+E63fsxhWa/gzITuAvN4gsJ+tfIVbKCUgWny1YFfQY7tM= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1727172299324737.7396514943894; Tue, 24 Sep 2024 03:04:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1st2Ol-0002nJ-De; Tue, 24 Sep 2024 06:03:59 -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 1st2Oi-0002cr-Ih for qemu-devel@nongnu.org; Tue, 24 Sep 2024 06:03:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1st2Of-00031d-Pn for qemu-devel@nongnu.org; Tue, 24 Sep 2024 06:03:55 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-479-4je3NliENCeY0LVpu_P3Ww-1; Tue, 24 Sep 2024 06:03:51 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8698C18B63F2; Tue, 24 Sep 2024 10:03:50 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.22.16.106]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0BD971956048; Tue, 24 Sep 2024 10:03:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727172232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=awsejfNqiJTGB7bVdBQ+7TGfVln40WtAFHmHDEbWm20=; b=TkfSQvZxSK0wd6DbeyLU4DAMSDKKFMNdH+3uccuzxyguGOOq7CqSH8WlY9cJB+8OUJFIN9 v03FewyP7tTzJ4BHHYyR9UOSH7hbSFSZr2lOM9hKNJKeVxbzE/Un8lcsYQeNSsow+zILwm 3EkdkCffvEsbQ/DEd7iy11DjxQL7zI8= X-MC-Unique: 4je3NliENCeY0LVpu_P3Ww-1 From: David Hildenbrand To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov , Paolo Bonzini , David Hildenbrand , Gavin Shan , Zhenyu Zhang Subject: [PULL 6/6] hostmem: Apply merge property after the memory region is initialized Date: Tue, 24 Sep 2024 12:03:29 +0200 Message-ID: <20240924100329.248738-7-david@redhat.com> In-Reply-To: <20240924100329.248738-1-david@redhat.com> References: <20240924100329.248738-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=170.10.129.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.144, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.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 @redhat.com) X-ZM-MESSAGEID: 1727172300828116600 Content-Type: text/plain; charset="utf-8" From: Gavin Shan The semantic change has been introduced by commit 5becdc0ab0 ("hostmem: simplify the code for merge and dump properties") even it clarifies that no senmatic change has been introduced. After the commit, the merge property can be applied even the corresponding memory region isn't initialized yet. This leads to crash dump by the following command lines. # /home/gavin/sandbox/qemu.main/build/qemu-system-aarch64 \ -accel kvm -machine virt -cpu host \ -object memory-backend-ram,id=3Dmem-memN0,size=3D4096M,merge=3Doff : qemu-system-aarch64: ../system/memory.c:2419: memory_region_get_ram_ptr= : \ Assertion `mr->ram_block' failed. Fix it by applying the merge property only when the memory region is initialized. Message-ID: <20240915233117.478169-1-gshan@redhat.com> Fixes: 5becdc0ab083 ("hostmem: simplify the code for merge and dump propert= ies") Reported-by: Zhenyu Zhang Tested-by: Zhenyu Zhang Signed-off-by: Gavin Shan Signed-off-by: David Hildenbrand --- backends/hostmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backends/hostmem.c b/backends/hostmem.c index 4e5576a4ad..181446626a 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -178,7 +178,7 @@ static void host_memory_backend_set_merge(Object *obj, = bool value, Error **errp) return; } =20 - if (!host_memory_backend_mr_inited(backend) && + if (host_memory_backend_mr_inited(backend) && value !=3D backend->merge) { void *ptr =3D memory_region_get_ram_ptr(&backend->mr); uint64_t sz =3D memory_region_size(&backend->mr); --=20 2.46.1