Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.2] dmz: overlay: minor fixups #4530

Merged
merged 4 commits into from
Nov 15, 2024

Conversation

lifubang
Copy link
Member

@lifubang lifubang commented Nov 13, 2024

Backport: #4509 and #4525


In addition to some documentation fixes, fix the xino dmesg log issue.


If /run/runc and /usr/bin are on different filesystems, overlayfs may
enable the xino feature which results in the following log message:

kernel: overlayfs: "xino" feature enabled using 3 upper inode bits.

Each time we have to protect /proc/self/exe. So disable xino to remove
the log message (we don't care about the inode numbers of the files
anyway).

Fixes #4508
Closes #4506
Signed-off-by: Aleksa Sarai cyphar@cyphar.com


Arguably these docs should live elsewhere (especially if we plan to
remove memfd-bind in the future), but for now this is the only place
that fully explains this issue.

Suggested-by: Rodrigo Campos rodrigoca@microsoft.com
Signed-off-by: Aleksa Sarai cyphar@cyphar.com

@lifubang lifubang added the backport/1.2-pr A backport PR to release-1.2 label Nov 13, 2024
@lifubang lifubang added this to the 1.2.2 milestone Nov 13, 2024
@cyphar
Copy link
Member

cyphar commented Nov 13, 2024

If we want to include the docs changes, can you also include #4525?

@lifubang
Copy link
Member Author

If we want to include the docs changes, can you also include #4525?

Yes, will be in after it is merged.

@kolyshkin
Copy link
Contributor

If we want to include the docs changes, can you also include #4525?

Yes, will be in after it is merged.

@lifubang now it is :)

@kolyshkin kolyshkin mentioned this pull request Nov 13, 2024
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

If /run/runc and /usr/bin are on different filesystems, overlayfs may
enable the xino feature which results in the following log message:

  kernel: overlayfs: "xino" feature enabled using 3 upper inode bits.

Each time we have to protect /proc/self/exe. So disable xino to remove
the log message (we don't care about the inode numbers of the files
anyway).

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
(cherry picked from commit 9bc42d6)
Signed-off-by: lfbzhm <lifubang@acmcoder.com>
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
(cherry picked from commit aa505bf)
Signed-off-by: lfbzhm <lifubang@acmcoder.com>
Fixes: 871057d ("drop runc-dmz solution according to overlay solution")
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
(cherry picked from commit b9dfb22)
Signed-off-by: lfbzhm <lifubang@acmcoder.com>
Arguably these docs should live elsewhere (especially if we plan to
remove memfd-bind in the future), but for now this is the only place
that fully explains this issue.

Suggested-by: Rodrigo Campos <rodrigoca@microsoft.com>
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
(cherry picked from commit ac43589)
Signed-off-by: lfbzhm <lifubang@acmcoder.com>
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kolyshkin kolyshkin merged commit 24591c0 into opencontainers:release-1.2 Nov 15, 2024
40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.2-pr A backport PR to release-1.2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants