Skip to content

Update statx constants and types (Linux 6.8-6.14) #4401

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

Open
rusty-snake wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update statx constants and types (Linux 6.8-6.14) #4401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions libc-test/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4391,6 +4391,14 @@ fn test_linux(target: &str) {
// Not present in glibc
"PR_SME_VL_LEN_MAX" | "PR_SME_SET_VL_INHERIT" | "PR_SME_SET_VL_ONE_EXEC" if gnu => true,

"STATX_DIOALIGN" // Added in linux 6.1
| "STATX_MNT_ID_UNIQUE" // Added in Linux 6.8
| "STATX_SUBVOL" // Added in Linux 6.10
| "STATX_WRITE_ATOMIC" // Added in Linux 6.11
| "STATX_ATTR_WRITE_ATOMIC" // Added in Linux 6.11
| "STATX_DIO_READ_ALIGN" // Added in Linux 6.14
=> true,
Comment on lines 4392 to +4400
Copy link
Contributor

@tgross35 tgross35 Jan 3, 2026

Choose a reason for hiding this comment

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

Add if gnu and something like // FIXME(ci): pinned glibc tests so we can clean these up once CI is resolved


// FIXME(linux): The below is no longer const in glibc 2.34:
// https://github.com/bminor/glibc/commit/5d98a7dae955bafa6740c26eaba9c86060ae0344
"PTHREAD_STACK_MIN" | "SIGSTKSZ" | "MINSIGSTKSZ" if gnu => true,
Expand Down
5 changes: 5 additions & 0 deletions libc-test/semver/linux-gnu.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,20 +418,25 @@ STATX_ATTR_IMMUTABLE
STATX_ATTR_MOUNT_ROOT
STATX_ATTR_NODUMP
STATX_ATTR_VERITY
STATX_ATTR_WRITE_ATOMIC
STATX_BASIC_STATS
STATX_BLOCKS
STATX_BTIME
STATX_CTIME
STATX_DIOALIGN
STATX_DIO_READ_ALIGN
STATX_GID
STATX_INO
STATX_MNT_ID
STATX_MNT_ID_UNIQUE
STATX_MODE
STATX_MTIME
STATX_NLINK
STATX_SIZE
STATX_SUBVOL
STATX_TYPE
STATX_UID
STATX_WRITE_ATOMIC
Comment on lines +421 to +439
Copy link
Contributor

@tgross35 tgross35 Jan 3, 2026

Choose a reason for hiding this comment

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

These are added to linux-gnu, but should be possible to have in linux-like

STATX__RESERVED
STA_CLK
STA_CLOCKERR
Expand Down
12 changes: 11 additions & 1 deletion src/unix/linux_like/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,12 @@ cfg_if! {
pub stx_mnt_id: crate::__u64,
pub stx_dio_mem_align: crate::__u32,
pub stx_dio_offset_align: crate::__u32,
__statx_pad3: Padding<[crate::__u64; 12]>,
pub stx_subvol: crate::__u64,
pub stx_atomic_write_unit_min: crate::__u32,
pub stx_atomic_write_unit_max: crate::__u32,
pub stx_atomic_write_segments_max: crate::__u32,
pub stx_dio_read_offset_align: crate::__u32,
__statx_pad3: Padding<[crate::__u64; 9]>,
}

pub struct statx_timestamp {
Expand Down Expand Up @@ -1683,6 +1688,10 @@ cfg_if! {
pub const STATX_ALL: c_uint = 0x0fff;
pub const STATX_MNT_ID: c_uint = 0x1000;
pub const STATX_DIOALIGN: c_uint = 0x2000;
pub const STATX_MNT_ID_UNIQUE: c_uint = 0x4000;
pub const STATX_SUBVOL: c_uint = 0x_0000_8000;
pub const STATX_WRITE_ATOMIC: c_uint = 0x_0001_0000;
pub const STATX_DIO_READ_ALIGN: c_uint = 0x_0002_0000;
Copy link

@maurer maurer Apr 26, 2025

Choose a reason for hiding this comment

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

This constant is not yet present in bionic, likely because it was introduced to Linux in 6.14, and the latest Android kernel is 6.12.

pub const STATX__RESERVED: c_int = 0x80000000;
pub const STATX_ATTR_COMPRESSED: c_int = 0x0004;
pub const STATX_ATTR_IMMUTABLE: c_int = 0x0010;
Expand All @@ -1693,6 +1702,7 @@ cfg_if! {
pub const STATX_ATTR_MOUNT_ROOT: c_int = 0x2000;
pub const STATX_ATTR_VERITY: c_int = 0x100000;
pub const STATX_ATTR_DAX: c_int = 0x200000;
pub const STATX_ATTR_WRITE_ATOMIC: c_int = 0x400000;
}
}

Expand Down
Loading