From nobody Thu Nov 20 14:05:11 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1763573402; cv=none; d=zohomail.com; s=zohoarc; b=UyKe/0HNZpgcREwHdQdEq4y4jvyQMJyiXdALcYZ8j8iZeAB8Qx+n4zlxjcwAsxLOAUiaHAtYIfheNjgX9uvrvScVbg5V4HdjVGyM9N/7CyOFaP6wPG6fJzTpoXAhSk8/XqRdOtEShXxR95lKFRLUZ2TMwwPq5wlddRFIxPPoogA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763573402; 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=HNARWf89ihHfn0pXKvgHsMcLrLRhDxLETxm9ccvA2f8=; b=J0fOyEYRnWUuNMGJPVKh8WU3HbOc9aPtplkTtuS2BWI9soR80eJlK7NpniyXiXUC0YZCJcoEfyoNwTsW55Q/qubdDJNa0WqkT/L6odeAp4QqDBuir/Ef9BuKd4l9FOwh4zOuPieoSHj0/P3CmvyzzMfftvQk54edoqvdzDPxcas= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763573402309696.1181240288743; Wed, 19 Nov 2025 09:30:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLm00-000351-JL; Wed, 19 Nov 2025 12:29:44 -0500 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 1vLlzk-00031D-7E for qemu-devel@nongnu.org; Wed, 19 Nov 2025 12:29:32 -0500 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 1vLlzg-0004OC-QF for qemu-devel@nongnu.org; Wed, 19 Nov 2025 12:29:26 -0500 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-593-trbXc8JvMVKlPe486S_b8w-1; Wed, 19 Nov 2025 12:29:21 -0500 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8b2ef6c8340so345370285a.0 for ; Wed, 19 Nov 2025 09:29:21 -0800 (PST) Received: from x1.com ([142.188.210.156]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8b2af042c9csm1444759485a.46.2025.11.19.09.29.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Nov 2025 09:29:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763573363; 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=HNARWf89ihHfn0pXKvgHsMcLrLRhDxLETxm9ccvA2f8=; b=bSjpPR76QrorcKYtbuZ/z+gSu42J4dZXFB/uyJAM3eTBqTFWbOQPtgTZL+ZXQ6h+fz+/uC f6+S2v2EmsPQnoXUu+GgMGcU/dxuPI5aMVb3DtGLpbn4OP8QKoGEaQSkAoPzm4z+rnHo6p 9nuPDkyy3/mGwWKWLg1spPh0Ajkkv6g= X-MC-Unique: trbXc8JvMVKlPe486S_b8w-1 X-Mimecast-MFC-AGG-ID: trbXc8JvMVKlPe486S_b8w_1763573360 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1763573360; x=1764178160; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HNARWf89ihHfn0pXKvgHsMcLrLRhDxLETxm9ccvA2f8=; b=jSsS9x+HFHiyp8RJfX7yUBS2UE2AB3TYg9EsmZeWDpb8vezD43T8QHr5FJ+P7b8bR2 AK9dtTLIGDv7DwhgrYGxDqPsZEAanIQszZNzqUWsSbl2xGjw/2QaztN0yRw+oRrM5v8y 0YCy4Vtf9+l9ajsDfpbQWbL1kYtQ70ATEZ0q2MYBaDKMaEpudMdf+MzMQ1wHFhCdTZ+f SrY62Tm/vMuru7ps0utlDd4MNtsOh//95AUg+KbkVqO5fT54pv7O8Oh/EfJKbZF+AdIs 6wYbynC8FsbcPJkmcLYllYEFJQbde0FGN8Z45xLsID+bKKc/v5z+w7xjo0+ZrSiVY8g4 yhyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763573360; x=1764178160; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=HNARWf89ihHfn0pXKvgHsMcLrLRhDxLETxm9ccvA2f8=; b=L1EAiNWvK/6nDUoCDv2PrtNaBO9SCsOmjBobgftF/TmL/wgT48QrlYzNa02DEG9Tsi mdVI+U0jpe82K2gYdojQPS400VStzR87beKDofXsi452KgWgWISCjkCD6wEeZXOCBfcQ Slb/HTSjaPsNdsxCDyrPoOKv9JaylnWueYBGt7lCo4cnf+j69R6bh2BagxDrCoPxo9u3 gLTyKIz6uScxrFOXmAhV6JxwLBVdnbbUZu20PsvF7HNmRpJ4xstmBcM39aaAKvk+U3tx 8KZlmIL/UfBQW66lDSdMamr1ByGzhBbi+3YGn9K8/9giGisv/qTKacUY04pnO8akeuCH E8NA== X-Gm-Message-State: AOJu0YxPP5Ia1fCZKuVW11zqsiaoWzmUqFNUCu+LoaNK4OZ7abPiR2iQ CjsGtQ4BJqrl9IWdlDhGxIaaW5Ag3ZxuRJRHVl2gJ+rCCQycI56w9HzUshpLFWEEgZRvXRX0wee Zj/+mLmtNdGCtVr8CVfd8z2MFgQIbe6KGlAmMgZX0RpU8qRZwhsOMfhy9B+3vkudLYcKG2R2Bjd 4QTbCzn9dKf5L2/kpSMLFS1Z070GoPpGrLBoJY3g== X-Gm-Gg: ASbGncsfRieg/qWPuQN55ITaTe7ra/M1ICxq0SQ+dw5d2o3RlH+63CRS8fMiY7RZ9EM nUOX5Mp3Y4PLf5Mt/TLSMbsbAJUNBB45RkNQ59L4XLNK4pvWi4yWsQoECvmzsNSCAhBrf0HpMKb gVjAe9abli8oViFiiuAG9FWHj7UkIhbwZGB/S5WQZfbV6N/eYyux1i3x1v63Dmq7OE7fGX/FbM8 Gk10yfVoKsRFBnGxIqVdNdCsut+PoBnQvR251Yrtcn9I2dWJBxkTE7tdSImF7yOHdC2D++fi+7G Ubt0O66OFusL65Lw6yIjDQb8+rzStvEeBgLAsY159q9vb4ZG14mI86pF6N+buG+A8YbQUcUc4bK h X-Received: by 2002:a05:620a:4490:b0:89f:5057:9753 with SMTP id af79cd13be357-8b317e25ff9mr412229685a.41.1763573360036; Wed, 19 Nov 2025 09:29:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IEwciC3La2UKxhS4mc6AQGSAJHYYTOEmB/aHjSPZ+MKdLq5uAqAtb0KbOVQW/799Sj7XrgitQ== X-Received: by 2002:a05:620a:4490:b0:89f:5057:9753 with SMTP id af79cd13be357-8b317e25ff9mr412225085a.41.1763573359404; Wed, 19 Nov 2025 09:29:19 -0800 (PST) From: Peter Xu To: qemu-devel@nongnu.org Cc: Paolo Bonzini , David Hildenbrand , Alexey Kardashevskiy , peterx@redhat.com, Chenyi Qiang , Juraj Marcin , Li Xiaoyao , Fabiano Rosas Subject: [PATCH v2 3/9] memory: Rename RAM_GUEST_MEMFD to RAM_GUEST_MEMFD_PRIVATE Date: Wed, 19 Nov 2025 12:29:07 -0500 Message-ID: <20251119172913.577392-4-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251119172913.577392-1-peterx@redhat.com> References: <20251119172913.577392-1-peterx@redhat.com> MIME-Version: 1.0 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.129.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_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_PASS=-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: 1763573402869018900 Content-Type: text/plain; charset="utf-8" This name is too generic, and can conflict with in-place guest-memfd support. Add a _PRIVATE suffix to show what it really means: it is always silently using an internal guest-memfd to back a shared host backend, rather than used in-place. This paves way for in-place guest-memfd, which means we can have a ramblock that allocates pages completely from guest-memfd (private or shared). Signed-off-by: Peter Xu --- include/system/memory.h | 8 ++++---- include/system/ram_addr.h | 2 +- backends/hostmem-file.c | 2 +- backends/hostmem-memfd.c | 2 +- backends/hostmem-ram.c | 2 +- backends/hostmem-shm.c | 2 +- system/memory.c | 3 ++- system/physmem.c | 8 ++++---- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/system/memory.h b/include/system/memory.h index 3bd5ffa5e0..2c1a5e06b4 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -263,7 +263,7 @@ typedef struct IOMMUTLBEvent { #define RAM_READONLY_FD (1 << 11) =20 /* RAM can be private that has kvm guest memfd backend */ -#define RAM_GUEST_MEMFD (1 << 12) +#define RAM_GUEST_MEMFD_PRIVATE (1 << 12) =20 /* * In RAMBlock creation functions, if MAP_SHARED is 0 in the flags paramet= er, @@ -1401,7 +1401,7 @@ bool memory_region_init_ram_nomigrate(MemoryRegion *m= r, * must be unique within any device * @size: size of the region. * @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_NORESERVE, - * RAM_GUEST_MEMFD. + * RAM_GUEST_MEMFD_PRIVATE. * @errp: pointer to Error*, to store an error if it happens. * * Note that this function does not do anything to cause the data in the @@ -1463,7 +1463,7 @@ bool memory_region_init_resizeable_ram(MemoryRegion *= mr, * (getpagesize()) will be used. * @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM, * RAM_NORESERVE, RAM_PROTECTED, RAM_NAMED_FILE, RAM_READONLY, - * RAM_READONLY_FD, RAM_GUEST_MEMFD + * RAM_READONLY_FD, RAM_GUEST_MEMFD_PRIVATE * @path: the path in which to allocate the RAM. * @offset: offset within the file referenced by path * @errp: pointer to Error*, to store an error if it happens. @@ -1493,7 +1493,7 @@ bool memory_region_init_ram_from_file(MemoryRegion *m= r, * @size: size of the region. * @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM, * RAM_NORESERVE, RAM_PROTECTED, RAM_NAMED_FILE, RAM_READONLY, - * RAM_READONLY_FD, RAM_GUEST_MEMFD + * RAM_READONLY_FD, RAM_GUEST_MEMFD_PRIVATE * @fd: the fd to mmap. * @offset: offset within the file referenced by fd * @errp: pointer to Error*, to store an error if it happens. diff --git a/include/system/ram_addr.h b/include/system/ram_addr.h index 683485980c..930d3824d7 100644 --- a/include/system/ram_addr.h +++ b/include/system/ram_addr.h @@ -92,7 +92,7 @@ static inline unsigned long int ramblock_recv_bitmap_offs= et(void *host_addr, * @resized: callback after calls to qemu_ram_resize * @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM, * RAM_NORESERVE, RAM_PROTECTED, RAM_NAMED_FILE, RAM_READONLY, - * RAM_READONLY_FD, RAM_GUEST_MEMFD + * RAM_READONLY_FD, RAM_GUEST_MEMFD_PRIVATE * @mem_path or @fd: specify the backing file or device * @offset: Offset into target file * @grow: extend file if necessary (but an empty file is always extended). diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c index 8e3219c061..1f20cd8fd6 100644 --- a/backends/hostmem-file.c +++ b/backends/hostmem-file.c @@ -86,7 +86,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Err= or **errp) ram_flags |=3D fb->readonly ? RAM_READONLY_FD : 0; ram_flags |=3D fb->rom =3D=3D ON_OFF_AUTO_ON ? RAM_READONLY : 0; ram_flags |=3D backend->reserve ? 0 : RAM_NORESERVE; - ram_flags |=3D backend->guest_memfd ? RAM_GUEST_MEMFD : 0; + ram_flags |=3D backend->guest_memfd ? RAM_GUEST_MEMFD_PRIVATE : 0; ram_flags |=3D fb->is_pmem ? RAM_PMEM : 0; ram_flags |=3D RAM_NAMED_FILE; return memory_region_init_ram_from_file(&backend->mr, OBJECT(backend),= name, diff --git a/backends/hostmem-memfd.c b/backends/hostmem-memfd.c index 923239f9cf..3f3e485709 100644 --- a/backends/hostmem-memfd.c +++ b/backends/hostmem-memfd.c @@ -60,7 +60,7 @@ have_fd: backend->aligned =3D true; ram_flags =3D backend->share ? RAM_SHARED : RAM_PRIVATE; ram_flags |=3D backend->reserve ? 0 : RAM_NORESERVE; - ram_flags |=3D backend->guest_memfd ? RAM_GUEST_MEMFD : 0; + ram_flags |=3D backend->guest_memfd ? RAM_GUEST_MEMFD_PRIVATE : 0; return memory_region_init_ram_from_fd(&backend->mr, OBJECT(backend), n= ame, backend->size, ram_flags, fd, 0,= errp); } diff --git a/backends/hostmem-ram.c b/backends/hostmem-ram.c index 062b1abb11..96ad29112d 100644 --- a/backends/hostmem-ram.c +++ b/backends/hostmem-ram.c @@ -30,7 +30,7 @@ ram_backend_memory_alloc(HostMemoryBackend *backend, Erro= r **errp) name =3D host_memory_backend_get_name(backend); ram_flags =3D backend->share ? RAM_SHARED : RAM_PRIVATE; ram_flags |=3D backend->reserve ? 0 : RAM_NORESERVE; - ram_flags |=3D backend->guest_memfd ? RAM_GUEST_MEMFD : 0; + ram_flags |=3D backend->guest_memfd ? RAM_GUEST_MEMFD_PRIVATE : 0; return memory_region_init_ram_flags_nomigrate(&backend->mr, OBJECT(bac= kend), name, backend->size, ram_flags, errp); diff --git a/backends/hostmem-shm.c b/backends/hostmem-shm.c index 806e2670e0..e86fb2e0aa 100644 --- a/backends/hostmem-shm.c +++ b/backends/hostmem-shm.c @@ -54,7 +54,7 @@ have_fd: /* Let's do the same as memory-backend-ram,share=3Don would do. */ ram_flags =3D RAM_SHARED; ram_flags |=3D backend->reserve ? 0 : RAM_NORESERVE; - ram_flags |=3D backend->guest_memfd ? RAM_GUEST_MEMFD : 0; + ram_flags |=3D backend->guest_memfd ? RAM_GUEST_MEMFD_PRIVATE : 0; =20 return memory_region_init_ram_from_fd(&backend->mr, OBJECT(backend), backend_name, backend->size, diff --git a/system/memory.c b/system/memory.c index 8b84661ae3..81b7bff42d 100644 --- a/system/memory.c +++ b/system/memory.c @@ -3755,7 +3755,8 @@ bool memory_region_init_ram_guest_memfd(MemoryRegion = *mr, DeviceState *owner_dev; =20 if (!memory_region_init_ram_flags_nomigrate(mr, owner, name, size, - RAM_GUEST_MEMFD, errp)) { + RAM_GUEST_MEMFD_PRIVATE, + errp)) { return false; } /* This will assert if owner is neither NULL nor a DeviceState. diff --git a/system/physmem.c b/system/physmem.c index 3555d2f6f7..25c800c9d3 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2203,7 +2203,7 @@ static void ram_block_add(RAMBlock *new_block, Error = **errp) } } =20 - if (new_block->flags & RAM_GUEST_MEMFD) { + if (new_block->flags & RAM_GUEST_MEMFD_PRIVATE) { int ret; =20 if (!kvm_enabled()) { @@ -2341,7 +2341,7 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, ram= _addr_t max_size, /* Just support these ram flags by now. */ assert((ram_flags & ~(RAM_SHARED | RAM_PMEM | RAM_NORESERVE | RAM_PROTECTED | RAM_NAMED_FILE | RAM_READONLY | - RAM_READONLY_FD | RAM_GUEST_MEMFD | + RAM_READONLY_FD | RAM_GUEST_MEMFD_PRIVATE | RAM_RESIZEABLE)) =3D=3D 0); assert(max_size >=3D size); =20 @@ -2498,7 +2498,7 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ra= m_addr_t max_size, ram_flags &=3D ~RAM_PRIVATE; =20 assert((ram_flags & ~(RAM_SHARED | RAM_RESIZEABLE | RAM_PREALLOC | - RAM_NORESERVE | RAM_GUEST_MEMFD)) =3D=3D 0); + RAM_NORESERVE | RAM_GUEST_MEMFD_PRIVATE)) =3D=3D= 0); assert(!host ^ (ram_flags & RAM_PREALLOC)); assert(max_size >=3D size); =20 @@ -2581,7 +2581,7 @@ RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, vo= id *host, RAMBlock *qemu_ram_alloc(ram_addr_t size, uint32_t ram_flags, MemoryRegion *mr, Error **errp) { - assert((ram_flags & ~(RAM_SHARED | RAM_NORESERVE | RAM_GUEST_MEMFD | + assert((ram_flags & ~(RAM_SHARED | RAM_NORESERVE | RAM_GUEST_MEMFD_PRI= VATE | RAM_PRIVATE)) =3D=3D 0); return qemu_ram_alloc_internal(size, size, NULL, NULL, ram_flags, mr, = errp); } --=20 2.50.1