public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Christian Ebner <c.ebner@proxmox.com>, pbs-devel@lists.proxmox.com
Subject: applied: [PATCH proxmox v5 02/13] shared-memory: add method without tmpfs check for mmap file location
Date: Thu, 12 Mar 2026 12:20:14 +0100	[thread overview]
Message-ID: <1773313596.wqkmkbf3nf.astroid@yuna.none> (raw)
In-Reply-To: <20260311130823.724888-3-c.ebner@proxmox.com>

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.
> 
> Provide a dedicated method which does not perform the check, keeping
> the current interface untouched.
> 
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> ---
>  proxmox-shared-memory/src/lib.rs | 41 ++++++++++++++++++++++++++++++--
>  1 file changed, 39 insertions(+), 2 deletions(-)
> 
> 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<T: Init>(file: &mut File, initialize: bool) -> Result<Mmap<T>, Erro
>  }
>  
>  impl<T: Sized + Init> SharedMemory<T> {
> +    /// Open and mmap the file given at path, checking if the file resides 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, Error> {
> +        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, Error> {
> +        Self::open_impl(path, options, true)
> +    }
> +
> +    fn open_impl(
> +        path: &Path,
> +        options: CreateOptions,
> +        skip_tmpfs_check: bool,
> +    ) -> Result<Self, Error> {
>          let size = std::mem::size_of::<T>();
>          let up_size = up_to_page_size(size);
>  
> @@ -92,12 +110,31 @@ impl<T: Sized + Init> SharedMemory<T> {
>              );
>          }
>  
> -        let mmap = Self::open_shmem(path, options)?;
> +        let mmap = Self::open_shmem_impl(path, options, skip_tmpfs_check)?;
>  
>          Ok(Self { mmap })
>      }
>  
> +    /// Open and mmap the file given at path, checking if the file resides on tmpfs.
> +    /// Creates the file and path directories with given create options if they do not exist.
>      pub fn open_shmem<P: AsRef<Path>>(path: P, options: CreateOptions) -> Result<Mmap<T>, 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<P: AsRef<Path>>(
> +        path: P,
> +        options: CreateOptions,
> +    ) -> Result<Mmap<T>, Error> {
> +        Self::open_shmem_impl(path, options, true)
> +    }
> +
> +    fn open_shmem_impl<P: AsRef<Path>>(
> +        path: P,
> +        options: CreateOptions,
> +        skip_tmpfs_check: bool,
> +    ) -> Result<Mmap<T>, Error> {
>          let path = path.as_ref();
>  
>          let dir_name = path
> @@ -105,7 +142,7 @@ impl<T: Sized + Init> SharedMemory<T> {
>              .ok_or_else(|| format_err!("bad path {:?}", path))?
>              .to_owned();
>  
> -        if !dir_name.ends_with("shmemtest") {
> +        if !(dir_name.ends_with("shmemtest") || skip_tmpfs_check) {
>              let statfs = nix::sys::statfs::statfs(&dir_name)?;
>              if statfs.filesystem_type() != nix::sys::statfs::TMPFS_MAGIC {
>                  bail!("path {:?} is not on tmpfs", dir_name);
> -- 
> 2.47.3
> 
> 
> 
> 
> 
> 




  reply	other threads:[~2026-03-12 11:20 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-11 13:07 [PATCH proxmox{,-backup} v5 00/33] partially fix #6563: add s3 request and traffic counter statistics Christian Ebner
2026-03-11 13:07 ` [PATCH proxmox v5 01/13] proxmox-sys: expose msync to flush mmapped contents to filesystem Christian Ebner
2026-03-12 11:20   ` applied: " Fabian Grünbichler
2026-03-11 13:07 ` [PATCH proxmox v5 02/13] shared-memory: add method without tmpfs check for mmap file location Christian Ebner
2026-03-12 11:20   ` Fabian Grünbichler [this message]
2026-03-11 13:07 ` [PATCH proxmox v5 03/13] shared-memory: expose msync to flush in-memory contents to filesystem Christian Ebner
2026-03-12 11:20   ` applied: " Fabian Grünbichler
2026-03-11 13:07 ` [PATCH proxmox v5 04/13] s3-client: add persistent shared request counters for client Christian Ebner
2026-03-11 13:07 ` [PATCH proxmox v5 05/13] s3-client: add counters for upload/download traffic Christian Ebner
2026-03-12 14:28   ` Hannes Laimer
2026-03-12 14:40     ` Christian Ebner
2026-03-11 13:07 ` [PATCH proxmox v5 06/13] s3-client: account for upload traffic on successful request sending Christian Ebner
2026-03-11 13:07 ` [PATCH proxmox v5 07/13] s3-client: account for downloaded bytes in incoming response body Christian Ebner
2026-03-12 14:14   ` Hannes Laimer
2026-03-12 14:42     ` Christian Ebner
2026-03-11 13:07 ` [PATCH proxmox v5 08/13] s3-client: request counters: periodically persist counters to file Christian Ebner
2026-03-13 14:16   ` Hannes Laimer
2026-03-11 13:07 ` [PATCH proxmox v5 09/13] s3-client: sync flush request counters on client instance drop Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox v5 10/13] pbs-api-types: define api type for s3 request statistics Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox v5 11/13] s3-client: api-types: define request counter thresholds Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox v5 12/13] pbs-api-types: add notification thresholds to datastore config Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox v5 13/13] s3-client: implement request counter threshold and exceeding callback Christian Ebner
2026-03-12 14:11   ` Hannes Laimer
2026-03-13 14:27   ` Hannes Laimer
2026-03-13 14:56     ` Christian Ebner
2026-03-16 10:36       ` Hannes Laimer
2026-03-16 10:38         ` Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 01/20] metrics: split common module imports into individual use statements Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 02/20] datastore: collect request statistics for s3 backed datastores Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 03/20] datastore: expose request counters " Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 04/20] api: s3: add endpoint to reset s3 request counters Christian Ebner
2026-03-12 14:08   ` Hannes Laimer
2026-03-12 14:43     ` Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 05/20] bin: s3: expose request counter reset method as cli command Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 06/20] datastore: add helper method to get datastore backend type Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 07/20] ui: improve variable name indirectly fixing typo Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 08/20] ui: datastore summary: move store to be part of summary panel Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 09/20] ui: expose s3 request counter statistics in the datastore summary Christian Ebner
2026-03-16 14:02   ` Hannes Laimer
2026-03-11 13:08 ` [PATCH proxmox-backup v5 10/20] metrics: collect s3 datastore statistics as rrd metrics Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 11/20] api: admin: expose s3 statistics in datastore rrd data Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 12/20] partially fix #6563: ui: expose s3 rrd charts in datastore summary Christian Ebner
2026-03-13 14:45   ` Hannes Laimer
2026-03-11 13:08 ` [PATCH proxmox-backup v5 13/20] datastore: refactor shared request counter loading into helper Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 14/20] api: config: update notification thresholds for config and counters Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 15/20] ui: utils: add helper to render notification threshold property string Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 16/20] ui: add notification thresholds edit window Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 17/20] notifications: template data: fix typos in docstrings Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 18/20] notification: define templates and template data for thresholds Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 19/20] datastore: add thresholds notification callback on datastore lookup Christian Ebner
2026-03-11 13:08 ` [PATCH proxmox-backup v5 20/20] api/ui: notifications: add 'thresholds' as notification type value Christian Ebner
2026-03-16 14:04 ` [PATCH proxmox{,-backup} v5 00/33] partially fix #6563: add s3 request and traffic counter statistics Hannes Laimer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1773313596.wqkmkbf3nf.astroid@yuna.none \
    --to=f.gruenbichler@proxmox.com \
    --cc=c.ebner@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal