Skip to content

Add MAP_SHARED_VALIDATE & MAP_SYNC #2499

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Sep 15, 2024
+8 −0
Merged

Add MAP_SHARED_VALIDATE & MAP_SYNC #2499

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2b3dd81
Add MAP_SHARED_VALIDATE & MAP_SYNC
sectordistrict Sep 13, 2024
b1a3ab1
fix CI
sectordistrict Sep 13, 2024
9820b6b
fix CI
sectordistrict Sep 13, 2024
2eb2020
add to changelog
sectordistrict Sep 13, 2024
2eea141
do not compile on hurd and uclibc
sectordistrict Sep 13, 2024
de54509
do not compile on freebsdlike
sectordistrict Sep 13, 2024
eed2740
apply requested conditional compilation fixes
sectordistrict Sep 15, 2024
fff62ca
apply requested conditional compilation fixes
sectordistrict Sep 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/2499.added.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added `MAP_SHARED_VALIDATE` & `MAP_SYNC` for x86.
Copy link
Member

Choose a reason for hiding this comment

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

When you apply the suggested changes, changelog should also be updated:)

6 changes: 6 additions & 0 deletions src/sys/mman.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ libc_bitflags! {
MAP_FILE;
/// Share this mapping. Mutually exclusive with `MAP_PRIVATE`.
MAP_SHARED;
/// Force mmap to check and fail on unknown flags. This also enables `MAP_SYNC`.
#[cfg(all(any(target_arch = "x86"), not(linux_android), not(target_os = "hurd"), not(target_env = "uclibc"), not(freebsdlike)))]
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
/// Force mmap to check and fail on unknown flags. This also enables `MAP_SYNC`.
#[cfg(all(any(target_arch = "x86"), not(linux_android), not(target_os = "hurd"), not(target_env = "uclibc"), not(freebsdlike)))]
/// Force mmap to check and fail on unknown flags. This also enables `MAP_SYNC`.
#[cfg(target_os = "linux")]

This flag is available on all the Linux targets.

MAP_SHARED_VALIDATE;
/// Create a private copy-on-write mapping. Mutually exclusive with `MAP_SHARED`.
MAP_PRIVATE;
/// Place the mapping at exactly the address specified in `addr`.
Expand Down Expand Up @@ -142,6 +145,9 @@ libc_bitflags! {
/// Region grows down, like a stack.
#[cfg(any(linux_android, freebsdlike, target_os = "openbsd"))]
MAP_STACK;
/// Do not write through the page caches, write directly to the file. Used for Direct Access (DAX) enabled file systems.
#[cfg(all(any(target_arch = "x86"), not(linux_android), not(target_os = "hurd"), not(target_env = "uclibc"), not(freebsdlike)))]
Copy link
Member

Choose a reason for hiding this comment

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

This flag is not that lucky, uClibc does not have it, for the glibc and musl, seems that they all lack the support for the MIPS target, so this should work for now:

Suggested change
/// Do not write through the page caches, write directly to the file. Used for Direct Access (DAX) enabled file systems.
#[cfg(all(any(target_arch = "x86"), not(linux_android), not(target_os = "hurd"), not(target_env = "uclibc"), not(freebsdlike)))]
/// Do not write through the page caches, write directly to the file. Used for Direct Access (DAX) enabled file systems.
// Available on Linux glibc and musl, MIPS* target excluded.
#[cfg(all(target_os = "linux", not(any(target_arch = "mips", target_arch = "mips64", target_arch = "mipsel", target_arch = "mips64el")), not(target_env = "uclibc")))]

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's great, thanks for the suggestions and apologies again for all the clutter

MAP_SYNC;
/// Pages in this mapping are not retained in the kernel's memory cache.
#[cfg(apple_targets)]
MAP_NOCACHE;
Expand Down
Loading