From nobody Tue May 7 01:43:42 2024 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=1617696239; cv=none; d=zohomail.com; s=zohoarc; b=QS9V7X368U7hr3awZU240sj8HpW5IH0clENvfy7PR/Hb8nJdeWt2sfuZ8Eo+/V4saPBGKh2c/AEJ+eePZlH4zMjxQYMY4ZenQefimH4baHK9Z/JnyU5cAHdbxeszBimqV/MCvUVDKWZW4S5476GT2imrCaQzdcJtWxzz3ppbsB4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617696239; 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=a1jRk6tqWNEEHu3VxbiQjNIhIzFlToJDr5G35vGaq2U=; b=X34Fk1COqVpje1JFW+2ZeHW0Zd4nDomkzUxrCboUhRltwaJ2oFpmYgAq+jL9Ds4LTwN++3jnPmQ1AQVt5Rds82VdeDFDwROiwdk4TU53pI6rySkVjPHxSz3vBT7LIwSAm5KMQEcuoqzby09QM+SRwebiaANiwqcvlkHGI/h+ms0= 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 1617696239107936.9606636140645; Tue, 6 Apr 2021 01:03:59 -0700 (PDT) Received: from localhost ([::1]:46174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTggn-0001B2-SM for importer@patchew.org; Tue, 06 Apr 2021 04:03:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTgeg-0007vF-VT for qemu-devel@nongnu.org; Tue, 06 Apr 2021 04:01:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51402) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTgeb-0004Av-JH for qemu-devel@nongnu.org; Tue, 06 Apr 2021 04:01:46 -0400 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-348-Q7jaYlyrOg-CF77aUeOdvA-1; Tue, 06 Apr 2021 04:01:39 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76D46800D53; Tue, 6 Apr 2021 08:01:38 +0000 (UTC) Received: from t480s.redhat.com (ovpn-113-79.ams2.redhat.com [10.36.113.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61E8D100239A; Tue, 6 Apr 2021 08:01:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617696100; 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=a1jRk6tqWNEEHu3VxbiQjNIhIzFlToJDr5G35vGaq2U=; b=Z2cIqClqxavOjBNd1xNEQATW8vHJ8N70XBFE5Lzaf6x83LVq9hVh2dmnkyqsj1aoEURr+Z QGOaAXrjMQk1xoY+GjuImaM9g5wwzYCd40m5Qi22gDacRLSI+z+cEtv+poVu2QWJUMGp21 OANpwU8yuurHsOs6vBIOQLzdA2r14Qo= X-MC-Unique: Q7jaYlyrOg-CF77aUeOdvA-1 From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH for-6.0 v1 1/3] softmmu/physmem: Mark shared anonymous memory RAM_SHARED Date: Tue, 6 Apr 2021 10:01:24 +0200 Message-Id: <20210406080126.24010-2-david@redhat.com> In-Reply-To: <20210406080126.24010-1-david@redhat.com> References: <20210406080126.24010-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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=170.10.133.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: David Hildenbrand , Igor Kotrasinski , Richard Henderson , "Dr . David Alan Gilbert" , Peter Xu , Paolo Bonzini 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" Let's drop the "shared" parameter from ram_block_add() and properly store it in the flags of the ram block instead, such that qemu_ram_is_shared() properly succeeds on all ram blocks that were mapped MAP_SHARED. We'll use this information next to fix some cases with shared anonymous memory. Reviewed-by: Igor Kotrasinski Reviewed-by: Richard Henderson Reviewed-by: Peter Xu Signed-off-by: David Hildenbrand --- softmmu/physmem.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 85034d9c11..76bb8e324e 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -1927,8 +1927,9 @@ static void dirty_memory_extend(ram_addr_t old_ram_si= ze, } } =20 -static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared) +static void ram_block_add(RAMBlock *new_block, Error **errp) { + const bool shared =3D qemu_ram_is_shared(new_block); RAMBlock *block; RAMBlock *last_block =3D NULL; ram_addr_t old_ram_size, new_ram_size; @@ -2064,7 +2065,7 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, Mem= oryRegion *mr, return NULL; } =20 - ram_block_add(new_block, &local_err, ram_flags & RAM_SHARED); + ram_block_add(new_block, &local_err); if (local_err) { g_free(new_block); error_propagate(errp, local_err); @@ -2127,10 +2128,13 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, = ram_addr_t max_size, if (host) { new_block->flags |=3D RAM_PREALLOC; } + if (share) { + new_block->flags |=3D RAM_SHARED; + } if (resizeable) { new_block->flags |=3D RAM_RESIZEABLE; } - ram_block_add(new_block, &local_err, share); + ram_block_add(new_block, &local_err); if (local_err) { g_free(new_block); error_propagate(errp, local_err); --=20 2.30.2 From nobody Tue May 7 01:43:42 2024 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=1617696363; cv=none; d=zohomail.com; s=zohoarc; b=fZfhJPv1qeN6glp2FMAUEFTbpG2t+8QjD32+nM4A6fFFwgmvR7VbV5hVFJAlgOZfuX6egmPEgaQafbLg3roflvgCKAhBuDIIom5OYhBX6hMEPx1XNvnSXgDZHJaUOtV3gpP389yHEbGy3xJyxs7dDcfk1cCd0op8cjcINcQ4rcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617696363; 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=Zea6hc3YjtSyoECwOf14Hjy8OihHLytzuxBGcrhq66A=; b=gV6c/Y5tnaj+6bZvHWjuwCGGN5t+xQ78Os5C4xkSrd/K+eE6tkNO76vz+mwNlY+ajoKRHN5OyhW13s40KjFUyMxpTIhSKkyU/0t8IAhZMDZLfmKwwhbSg3eE+BsQfv8Q73omS66fCwOroP1wmNINS1SteDI4HAd0M1WSDcDtWQ8= 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 1617696363659204.35823493700263; Tue, 6 Apr 2021 01:06:03 -0700 (PDT) Received: from localhost ([::1]:51052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTgio-00038R-K8 for importer@patchew.org; Tue, 06 Apr 2021 04:06:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTgei-0007wO-1W for qemu-devel@nongnu.org; Tue, 06 Apr 2021 04:01:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34664) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTgeg-0004D6-3t for qemu-devel@nongnu.org; Tue, 06 Apr 2021 04:01:47 -0400 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-245--oeuT6K1PzOT59LjI-Dz5Q-1; Tue, 06 Apr 2021 04:01:42 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ADB5F8189C6; Tue, 6 Apr 2021 08:01:40 +0000 (UTC) Received: from t480s.redhat.com (ovpn-113-79.ams2.redhat.com [10.36.113.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id D102B100239A; Tue, 6 Apr 2021 08:01:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617696105; 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=Zea6hc3YjtSyoECwOf14Hjy8OihHLytzuxBGcrhq66A=; b=GEYqjePALYhUIl8A0fHDMOa5en9O7awJ9OXxDZs34/0DOcetR62xc3A+3elc0IXoUphBD/ ms1Zd7Is8VjHsRDFwZNQb2C+qbzwYhinQo/aGoFE/vROHezsHB3srMf3J8yt/nnpz8v5Ly MqUuqZMkXZzNvSym+EyiwLEwkELhFYU= X-MC-Unique: -oeuT6K1PzOT59LjI-Dz5Q-1 From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH for-6.0 v1 2/3] softmmu/physmem: Fix ram_block_discard_range() to handle shared anonymous memory Date: Tue, 6 Apr 2021 10:01:25 +0200 Message-Id: <20210406080126.24010-3-david@redhat.com> In-Reply-To: <20210406080126.24010-1-david@redhat.com> References: <20210406080126.24010-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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=216.205.24.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: David Hildenbrand , Igor Kotrasinski , Richard Henderson , "Dr . David Alan Gilbert" , Peter Xu , Paolo Bonzini 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" We can create shared anonymous memory via "-object memory-backend-ram,share=3Don,..." which is, for example, required by PVRDMA for mremap() to work. Shared anonymous memory is weird, though. Instead of MADV_DONTNEED, we have to use MADV_REMOVE: MADV_DONTNEED will only remove / zap all relevant page table entries of the current process, the backend storage will not get removed, resulting in no reduced memory consumption and a repopulation of previous content on next access. Shared anonymous memory is internally really just shmem, but without a fd exposed. As we cannot use fallocate() without the fd to discard the backing storage, MADV_REMOVE gets the same job done without a fd as documented in "man 2 madvise". Removing backing storage implicitly invalidates all page table entries with relevant mappings - an additional MADV_DONTNEED is not required. Fixes: 06329ccecfa0 ("mem: add share parameter to memory-backend-ram") Reviewed-by: Peter Xu Reviewed-by: Dr. David Alan Gilbert Signed-off-by: David Hildenbrand --- softmmu/physmem.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 76bb8e324e..afff96a6dc 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -3506,6 +3506,7 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t st= art, size_t length) /* The logic here is messy; * madvise DONTNEED fails for hugepages * fallocate works on hugepages and shmem + * shared anonymous memory requires madvise REMOVE */ need_madvise =3D (rb->page_size =3D=3D qemu_host_page_size); need_fallocate =3D rb->fd !=3D -1; @@ -3539,7 +3540,11 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t s= tart, size_t length) * fallocate'd away). */ #if defined(CONFIG_MADVISE) - ret =3D madvise(host_startaddr, length, MADV_DONTNEED); + if (qemu_ram_is_shared(rb) && rb->fd < 0) { + ret =3D madvise(host_startaddr, length, MADV_REMOVE); + } else { + ret =3D madvise(host_startaddr, length, MADV_DONTNEED); + } if (ret) { ret =3D -errno; error_report("ram_block_discard_range: Failed to discard r= ange " --=20 2.30.2 From nobody Tue May 7 01:43:42 2024 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=1617696239; cv=none; d=zohomail.com; s=zohoarc; b=VwvkbOSPaMmxV3hQCeF3AsfF3Cj00G9zQCFtHceQksL7B0+ebB+b4L11BOZxTY+/SbZlZPbhHElBnWM3hOwxCTh5svr7EpG/dBe2EgmsQ/dQsn2BKJSYF4R30flzT09yI56VOchr+SyKCXniAu7l/9WoP7xuM/T94uoSQI5zyck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617696239; 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=yx/0yaO36khW0VZuC3D4J71nRl1ugzpY0V2ZYDkaOiA=; b=ZKMPHrEjquTUx8VHSy2A3XksXE+2/zp7xYv/+EbeUMW4ESvrPaSZ6TLidgHMPaic98nQgCOh8CLJ5L1dlYCsHhJvcdYKHsbKHdqyxYsRRbOD1ZQxhPxeTKWCO+AFcfooKyr1UfPtL726V4Snf+YGgAueDOuM72/0kaFUOr+AcCM= 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 1617696239898394.05247052512277; Tue, 6 Apr 2021 01:03:59 -0700 (PDT) Received: from localhost ([::1]:46234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTggo-0001CY-PT for importer@patchew.org; Tue, 06 Apr 2021 04:03:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTgei-0007wx-Cq for qemu-devel@nongnu.org; Tue, 06 Apr 2021 04:01:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:58241) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTgeg-0004D5-BT for qemu-devel@nongnu.org; Tue, 06 Apr 2021 04:01:48 -0400 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-459-sPD1GBXkMMWEKvEPAmudIg-1; Tue, 06 Apr 2021 04:01:43 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C33FB107B7C3; Tue, 6 Apr 2021 08:01:42 +0000 (UTC) Received: from t480s.redhat.com (ovpn-113-79.ams2.redhat.com [10.36.113.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id F204F100239A; Tue, 6 Apr 2021 08:01:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617696105; 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=yx/0yaO36khW0VZuC3D4J71nRl1ugzpY0V2ZYDkaOiA=; b=bRQmIXEnPpzRoJ/95kJSkjvaNm21wspdhWsnUDBLSCrK7Q/JtYCPiKfWO/Vas7qmSbeJVk IZaNrRbVCJDf5K7bLIFQC+kdRz5cjt5SKxGMejMK+hKhzSq6KNzxWcEWktNXS0uObTcDty i+pJ6hc6gJX0nfZnWAHvFqrtYQV5cu0= X-MC-Unique: sPD1GBXkMMWEKvEPAmudIg-1 From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH for-6.0 v1 3/3] softmmu/physmem: Fix qemu_ram_remap() to handle shared anonymous memory Date: Tue, 6 Apr 2021 10:01:26 +0200 Message-Id: <20210406080126.24010-4-david@redhat.com> In-Reply-To: <20210406080126.24010-1-david@redhat.com> References: <20210406080126.24010-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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=216.205.24.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: David Hildenbrand , Igor Kotrasinski , Richard Henderson , "Dr . David Alan Gilbert" , Peter Xu , Paolo Bonzini 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") Reviewed-by: Peter Xu 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 afff96a6dc..cc59f05593 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.30.2