From nobody Wed Nov 19 10:07:28 2025 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=1615216215; cv=none; d=zohomail.com; s=zohoarc; b=PnJTeo3HUhgt3HZb5C0YDmI+cJ0BEd5VS5eX6eTh5BpA9GNtaVcvjGKFdmQp1hsa18xW6oGgd9cTR/A9GhcQCfEv6Sd1eeb+NqZ6rRhd5zjlBjvHlcD2waRnEbzND5gV2XEComeRK93UXiZWtIobVhu51ze592ZU5T7r92TMDjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615216215; 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=/aG0pcc0FOFeRWr3hFrUde4Cr4zAlrIzsgtRsPw+ebc=; b=lvi6myCufbKeaFyg8ilg6orXMeSvYMxYbMpLmvdFFsUOI+0k6Zcvcfdl3GzYGVhPb7PpVScz/KfCs9HhT09hSRskxH9Ycu+/QVdh2lM/r+XblZqxMqVOoIQDH0mMc0LwULoOxnTjVJjyEAxXyjrzK10P3AxNGJS1YcxRdI+cmJM= 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 161521621589958.58975667755885; Mon, 8 Mar 2021 07:10:15 -0800 (PST) Received: from localhost ([::1]:53514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJHWQ-00027g-SX for importer@patchew.org; Mon, 08 Mar 2021 10:10:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJHTJ-0005os-20 for qemu-devel@nongnu.org; Mon, 08 Mar 2021 10:07:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49990) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lJHTB-0001Je-NW for qemu-devel@nongnu.org; Mon, 08 Mar 2021 10:07:00 -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-324-gNXSfTH0NlqEr2FXTswGqg-1; Mon, 08 Mar 2021 10:06:47 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id EB7BE801814; Mon, 8 Mar 2021 15:06:44 +0000 (UTC) Received: from t480s.redhat.com (ovpn-113-123.ams2.redhat.com [10.36.113.123]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECBEF5D9D3; Mon, 8 Mar 2021 15:06:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615216011; 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=/aG0pcc0FOFeRWr3hFrUde4Cr4zAlrIzsgtRsPw+ebc=; b=XtuSuuegUcrPsG/oceGsstHStxyCbyCYCl57bXrOBKBxS27UtB1IYcw+yd9O2D5/SXFd2b uuzvy/vtUGork8lFvRLi/T1ZOobx0Paj5DvVDOB4A3hqvtYdzDSbq3x7n2IYt0UpV/yK+a 6bEcnCpMZKsXHR90twP2+MBncZJ7qc4= X-MC-Unique: gNXSfTH0NlqEr2FXTswGqg-1 From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH v3 03/12] softmmu/physmem: Fix qemu_ram_remap() to handle shared anonymous memory Date: Mon, 8 Mar 2021 16:05:51 +0100 Message-Id: <20210308150600.14440-4-david@redhat.com> In-Reply-To: <20210308150600.14440-1-david@redhat.com> References: <20210308150600.14440-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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-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=63.128.21.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.251, 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_H4=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: Marcel Apfelbaum , Murilo Opsfelder Araujo , Cornelia Huck , Eduardo Habkost , "Michael S. Tsirkin" , Stefan Weil , David Hildenbrand , Richard Henderson , "Dr. David Alan Gilbert" , Peter Xu , Greg Kurz , Halil Pasic , Christian Borntraeger , Stefan Hajnoczi , Igor Mammedov , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Kotrasinski , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" RAM_SHARED now also properly indicates shared anonymous memory. Let's check that flag for anonymous memory as well, to restore the proper mapping. Fixes: 06329ccecfa0 ("mem: add share parameter to memory-backend-ram") Signed-off-by: David Hildenbrand --- softmmu/physmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 2ba815fec6..d0a0027a16 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -2222,13 +2222,13 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t len= gth) abort(); } else { flags =3D MAP_FIXED; + flags |=3D block->flags & RAM_SHARED ? + MAP_SHARED : MAP_PRIVATE; if (block->fd >=3D 0) { - flags |=3D (block->flags & RAM_SHARED ? - MAP_SHARED : MAP_PRIVATE); area =3D mmap(vaddr, length, PROT_READ | PROT_WRITE, flags, block->fd, offset); } else { - flags |=3D MAP_PRIVATE | MAP_ANONYMOUS; + flags |=3D MAP_ANONYMOUS; area =3D mmap(vaddr, length, PROT_READ | PROT_WRITE, flags, -1, 0); } --=20 2.29.2