From: Mirian Shilakadze <mirian.shilakadze@virtuozzo.com>
To: khorenko@virtuozzo.com, ptikhomirov@virtuozzo.com
Cc: devel@openvz.org
Subject: [Devel] [PATCH vz10 5/6] fs: give the mount relaxations of a pseudosuper VE only to setup tasks
Date: Mon, 16 Nov 2026 14:45:48 +0400 [thread overview]
Message-ID: <20261116104552.102938-6-mirian.shilakadze@virtuozzo.com> (raw)
In-Reply-To: <20261116104552.102938-1-mirian.shilakadze@virtuozzo.com>
While a VE is pseudosuper, any task in it skips the device mount option
filter and the VE mount limit, including the container's own binaries
that vzctl and CRIU run.
Use ve_current_is_pseudosuper() instead. The mount limit also lets
through a host task that joined the VE after it started, such as the
CRIU helper that mounts proc for a nested pid namespace during restore.
Without that, restoring such a container near its mount limit fails.
Feature: ve: CRIU support
https://virtuozzo.atlassian.net/browse/VSTOR-151265
Signed-off-by: Mirian Shilakadze <mirian.shilakadze@virtuozzo.com>
---
fs/namespace.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/fs/namespace.c b/fs/namespace.c
index d622d9b72d32..20a03419bc0c 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -3230,7 +3230,7 @@ int ve_devmnt_process(struct ve_struct *ve, dev_t dev, void **data_pp, int remou
* we don't check for allowed options filtering, since
* restore mode is special.
*/
- if (ve->is_pseudosuper)
+ if (ve_current_is_pseudosuper(ve))
err = 0;
if (!err && !remount)
@@ -3255,7 +3255,7 @@ int ve_devmnt_process(struct ve_struct *ve, dev_t dev, void **data_pp, int remou
* the way userspace tool restore container
* it might be nonempty as well.
*/
- if (ve->is_pseudosuper) {
+ if (ve_current_is_pseudosuper(ve)) {
err = 0;
} else if (((char *)*data_pp)[0] == '\0') {
err = 0;
@@ -3330,7 +3330,7 @@ int ve_devmnt_verify(struct ve_struct *ve, dev_t dev, char *opts, bool new_mount
bool found = false;
int err = 0;
- if (ve->is_pseudosuper)
+ if (ve_current_is_pseudosuper(ve))
return 0;
mutex_lock(&ve->devmnt_mutex);
@@ -3367,8 +3367,16 @@ int ve_devmnt_verify(struct ve_struct *ve, dev_t dev, char *opts, bool new_mount
static inline int ve_try_reserve_mount(struct ve_struct *ve)
{
- int ret = ve_is_super(ve) || ve->is_pseudosuper ||
- ve_is_super(get_exec_env());
+ struct mm_struct *mm = current->mm;
+ /*
+ * A host task that joined @ve after it started, such as the CRIU
+ * helper that mounts proc for a nested pid namespace, is not a setup
+ * task but still skips the limit while @ve is pseudosuper.
+ */
+ bool host_entered = ve->is_pseudosuper && task_ve(current) == ve &&
+ mm && mm->vps_dumpable == VD_VE_ENTER_TASK;
+ int ret = ve_is_super(ve) || ve_current_is_pseudosuper(ve) ||
+ ve_is_super(get_exec_env()) || host_entered;
/* Ignore limits in ve0 and pseudosuper cases, but still count. */
if (ret)
atomic_dec(&ve->mnt_avail_nr);
--
2.43.0
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
next prev parent reply other threads:[~2026-11-16 10:47 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 10:45 [Devel] [PATCH vz10 0/6] ve: give the pseudosuper privileges only to the tasks setting up a VE Mirian Shilakadze
2026-11-16 10:45 ` [Devel] [PATCH vz10 1/6] ve: tell ve_setup_task() which VE the task comes from Mirian Shilakadze
2026-11-16 10:50 ` no-reply
2026-11-16 10:45 ` [Devel] [PATCH vz10 2/6] ve: hide only the tasks the host sends into a VE Mirian Shilakadze
2026-11-16 10:50 ` no-reply
2026-11-16 17:17 ` Konstantin Khorenko
2026-11-16 10:45 ` [Devel] [PATCH vz10 3/6] ve: hide the tasks that set up a starting VE from the rest of it Mirian Shilakadze
2026-11-16 10:55 ` no-reply
2026-11-16 17:17 ` Konstantin Khorenko
2026-11-16 10:45 ` [Devel] [PATCH vz10 4/6] cgroup: give the CT root file writes and hidden roots only to setup tasks Mirian Shilakadze
2026-11-16 10:53 ` no-reply
2026-11-16 17:17 ` Konstantin Khorenko
2026-11-16 10:45 ` Mirian Shilakadze [this message]
2026-11-16 10:56 ` [Devel] [PATCH vz10 5/6] fs: give the mount relaxations of a pseudosuper VE " no-reply
2026-11-16 17:17 ` Konstantin Khorenko
2026-11-16 10:45 ` [Devel] [PATCH vz10 6/6] ve: give the remaining pseudosuper relaxations " Mirian Shilakadze
2026-11-16 10:56 ` no-reply
2026-11-16 17:17 ` Konstantin Khorenko
2026-11-16 17:17 ` [Devel] [PATCH vz10 0/6] ve: give the pseudosuper privileges only to the tasks setting up a VE Konstantin Khorenko
2026-11-17 10:21 ` Mirian Shilakadze
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=20261116104552.102938-6-mirian.shilakadze@virtuozzo.com \
--to=mirian.shilakadze@virtuozzo.com \
--cc=devel@openvz.org \
--cc=khorenko@virtuozzo.com \
--cc=ptikhomirov@virtuozzo.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.