From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id BF7EB1FF13F for ; Thu, 12 Mar 2026 12:20:55 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E412B11CA5; Thu, 12 Mar 2026 12:20:51 +0100 (CET) Date: Thu, 12 Mar 2026 12:20:14 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= Subject: applied: [PATCH proxmox v5 02/13] shared-memory: add method without tmpfs check for mmap file location To: Christian Ebner , pbs-devel@lists.proxmox.com References: <20260311130823.724888-1-c.ebner@proxmox.com> <20260311130823.724888-3-c.ebner@proxmox.com> In-Reply-To: <20260311130823.724888-3-c.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.17.0 (https://github.com/astroidmail/astroid) Message-Id: <1773313596.wqkmkbf3nf.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1773314381223 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.054 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: WNVWMO7UQRI7R2BHKVKJULSUYBZLN6PN X-Message-ID-Hash: WNVWMO7UQRI7R2BHKVKJULSUYBZLN6PN X-MailFrom: f.gruenbichler@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: and added a follow-up commit dropping the special dir_name handling and switching tests over to the new helper. On March 11, 2026 2:07 pm, Christian Ebner wrote: > For some usecases, e.g. s3 client request counters, the mmapped file > should outlive a reboot and must therefore be placed on persistent > storage, not just a tmpfs. >=20 > Provide a dedicated method which does not perform the check, keeping > the current interface untouched. >=20 > Signed-off-by: Christian Ebner > --- > proxmox-shared-memory/src/lib.rs | 41 ++++++++++++++++++++++++++++++-- > 1 file changed, 39 insertions(+), 2 deletions(-) >=20 > diff --git a/proxmox-shared-memory/src/lib.rs b/proxmox-shared-memory/src= /lib.rs > index b067d1b9..da057366 100644 > --- a/proxmox-shared-memory/src/lib.rs > +++ b/proxmox-shared-memory/src/lib.rs > @@ -80,7 +80,25 @@ fn mmap_file(file: &mut File, initialize: boo= l) -> Result, Erro > } > =20 > impl SharedMemory { > + /// Open and mmap the file given at path, checking if the file resid= es on tmpfs. Further, > + /// checks the size to be multiples of the page size. > + /// Creates the file and path directories with given create options = if they do not exist. > pub fn open(path: &Path, options: CreateOptions) -> Result { > + Self::open_impl(path, options, false) > + } > + > + /// Open and mmap the file given at path, without checking if it is = located on a tmpfs. > + /// Checks the size to be multiples of the page size. > + /// Creates the file and path directories with given create options = if they do not exist. > + pub fn open_non_tmpfs(path: &Path, options: CreateOptions) -> Result= { > + Self::open_impl(path, options, true) > + } > + > + fn open_impl( > + path: &Path, > + options: CreateOptions, > + skip_tmpfs_check: bool, > + ) -> Result { > let size =3D std::mem::size_of::(); > let up_size =3D up_to_page_size(size); > =20 > @@ -92,12 +110,31 @@ impl SharedMemory { > ); > } > =20 > - let mmap =3D Self::open_shmem(path, options)?; > + let mmap =3D Self::open_shmem_impl(path, options, skip_tmpfs_che= ck)?; > =20 > Ok(Self { mmap }) > } > =20 > + /// Open and mmap the file given at path, checking if the file resid= es on tmpfs. > + /// Creates the file and path directories with given create options = if they do not exist. > pub fn open_shmem>(path: P, options: CreateOptions) -= > Result, Error> { > + Self::open_shmem_impl(path, options, false) > + } > + > + /// Open and mmap the file given at path, without checking if it is = located on a tmpfs. > + /// Creates the file and path directories with given create options = if they do not exist. > + pub fn open_shmem_non_tmpfs>( > + path: P, > + options: CreateOptions, > + ) -> Result, Error> { > + Self::open_shmem_impl(path, options, true) > + } > + > + fn open_shmem_impl>( > + path: P, > + options: CreateOptions, > + skip_tmpfs_check: bool, > + ) -> Result, Error> { > let path =3D path.as_ref(); > =20 > let dir_name =3D path > @@ -105,7 +142,7 @@ impl SharedMemory { > .ok_or_else(|| format_err!("bad path {:?}", path))? > .to_owned(); > =20 > - if !dir_name.ends_with("shmemtest") { > + if !(dir_name.ends_with("shmemtest") || skip_tmpfs_check) { > let statfs =3D nix::sys::statfs::statfs(&dir_name)?; > if statfs.filesystem_type() !=3D nix::sys::statfs::TMPFS_MAG= IC { > bail!("path {:?} is not on tmpfs", dir_name); > --=20 > 2.47.3 >=20 >=20 >=20 >=20 >=20 >=20