mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-10 21:53:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

libct: retry with nr_inodes=2 to fix Focal mount errors

Browse Source 
Given that the majority of reviewers favor the 'nr_inodes=2' retry logic,
we propose reverting #5353 and implementing the new approach.

1. Revert "libct: add a fallback for nr_inodes=2"
This reverts commit 79ac57770f.

2. Revert "libct: Enforce nr_inodes=2 to fix Focal mount errors"
This reverts commit feea25820e.

3. The new approach:
On most kernels `nr_inodes=1` works fine. However, Ubuntu 20.04 (Focal) with
the official 5.4 kernel carries a private patch in "mm/shmem.c" that rejects
`nr_inodes<2`, so retry with `nr_inodes=2` here.
For reference, search for "case Opt_nr_inodes" in:
https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/focal/plain/mm/shmem.c?h=Ubuntu-5.4.0-216.236

Signed-off-by: lifubang <lifubang@acmcoder.com>
(cherry picked from commit a5690a084d)
Signed-off-by: lifubang <lifubang@acmcoder.com>
This commit is contained in:
lifubang
2026-07-01 10:13:23 +00:00
parent 79cf0d60ce
commit 6dc94f9a4c
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/rootfs_linux.go
+8 -10
View File
@@ -1323,16 +1323,14 @@ func verifyDevNull(f *os.File) error {
// maskDir mounts a read-only tmpfs on top of the specified path. // maskDir mounts a read-only tmpfs on top of the specified path.
func maskDir(path, mountLabel string) error { func maskDir(path, mountLabel string) error {
// On most kernels `nr_inodes=1` works fine. However, Ubuntu 20.04 (Focal) with err := mount("tmpfs", path, "tmpfs", unix.MS_RDONLY, label.FormatMountLabel("nr_blocks=1,nr_inodes=1", mountLabel))
// the official 5.4 kernel carries a private patch in mm/shmem.c that rejects if err != nil {
// "nr_inodes<2", so let's keep `nr_inodes=2` here! // On most kernels `nr_inodes=1` works fine. However, Ubuntu 20.04 (Focal) with
// For reference, search for "case Opt_nr_inodes" in: // the official 5.4 kernel carries a private patch in "mm/shmem.c" that rejects
// https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/focal/plain/mm/shmem.c?h=Ubuntu-5.4.0-216.236 // `nr_inodes<2`, so retry with `nr_inodes=2` here.
err := mount("tmpfs", path, "tmpfs", unix.MS_RDONLY, label.FormatMountLabel("nr_blocks=1,nr_inodes=2", mountLabel)) // For reference, search for "case Opt_nr_inodes" in:
// We don't know whether some kernels will fail with "nr_inodes=2", // https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/focal/plain/mm/shmem.c?h=Ubuntu-5.4.0-216.236
// so let's fall back to mount a tmpfs without this option. err = mount("tmpfs", path, "tmpfs", unix.MS_RDONLY, label.FormatMountLabel("nr_blocks=1,nr_inodes=2", mountLabel))
if errors.Is(err, unix.EINVAL) {
err = mount("tmpfs", path, "tmpfs", unix.MS_RDONLY, label.FormatMountLabel("nr_blocks=1", mountLabel))
} }
return err return err
} }