Add new cfg gnu_file_offset_bits64 corresponding to _FILE_OFFSET_BITS=64 by snogge · Pull Request #4345 · rust-lang/libc

snogge · 2025-03-20T14:18:44Z

Description

Add a new cfg gnu_file_offset_bits64 corresponding to
-D_FILE_OFFSET_BITS=64.
The cfg can also be enabled by setting the environment variable
RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS64=1.

This is the second part of what was #3175 .

Sources

Checklist

Relevant tests in libc-test/semver have been updated
No placeholder or unstable values like *LAST or *MAX are
included (see #3131)
Tested locally (cd libc-test && cargo test --target mytarget);
especially relevant for platforms that may not be checked in CI

I've tested this as widely as possible, but I have not been able to
run the sparc tests. mips and powerpc tests have been run on rust
1.85 using the yocto project, but it's not a fully compatible
environment for some reason.

rustbot · 2025-03-20T14:18:50Z

r? @tgross35

rustbot has assigned @tgross35.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

tgross35

I haven't checked the type changes in detail but this looks pretty good to me. Left a handful of comments mostly related to configuration.

Thank you so much for working on this!

build.rs

.github/workflows/ci.yaml

ci/run-docker.sh

libc-test/build.rs

src/unix/linux_like/linux/arch/mips/mod.rs

src/unix/linux_like/linux/gnu/b32/arm/mod.rs

build.rs

src/unix/mod.rs

snogge · 2025-03-24T13:30:16Z

@rustbot ready

tgross35

I left one nit and I think it needs a rebase, but overall this looks great to me.

tgross35 · 2025-04-03T22:05:27Z

build.rs

+                set_cfg("gnu_file_offset_bits64");
+            }
+        }
+        _ => {}


Could you add something like Ok(val) if val != "32" => panic!("RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS may only be set to '32' or '64'),?

I've added that check for both build.rs and libc-test/build.rs.

snogge · 2025-04-07T12:44:57Z

@rustbot ready

tgross35

Thanks for moving this along!

tgross35 · 2025-04-08T03:38:47Z

...I have no idea why ctest is suddenly failing on musl. Probably not related to this PR.

Less commands makes for a cleaner `set -x` log. And it is more efficient.

Variables set with `env` in the matrix never propagated into the environment. Add a step in test_tier1 and test_tier2 that reads the env context from the matrix and adds the variables to the environment used by later steps.

The `Create I artifacts` step is always run, whether earlier steps succeeds or not. But the upload step would only run if all preceeding steps wer successfull. Add a conditional to always run except if artifact creation failed.

safinaskar · 2025-04-11T16:23:42Z

Discussion about off_t and time_t in 32-bit archs happens here right now: https://rust-lang.zulipchat.com/#narrow/channel/219381-t-libs/topic/Questions.20and.20polls.20about.20.60libc.60.201.2E0

Less commands makes for a cleaner `set -x` log. And it is more efficient. (backport <rust-lang#4345>) (cherry picked from commit afa5c65)

Variables set with `env` in the matrix never propagated into the environment. Add a step in test_tier1 and test_tier2 that reads the env context from the matrix and adds the variables to the environment used by later steps. (backport <rust-lang#4345>) (cherry picked from commit 84a04a1)

The `Create I artifacts` step is always run, whether earlier steps succeeds or not. But the upload step would only run if all preceeding steps wer successfull. Add a conditional to always run except if artifact creation failed. (backport <rust-lang#4345>) (cherry picked from commit f10e8e4)

(backport <rust-lang#4345>) (cherry picked from commit a184436)

Add new jobs for i686 in test_tier1 and arm and powerpc in test_tier2 where RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS=64. Use artifact-tag to avoid artifact name collisions. (backport <rust-lang#4345>) (cherry picked from commit 874e399)

Set the basic types correctly for gnu_file_offset_bits64 (_FILE_OFFSET_BITS=64). (backport <rust-lang#4345>) (cherry picked from commit f44fdc1)

gnu_file_offset_bits64 means _FILE_OFFSET_BITS=64. (backport <rust-lang#4345>) (cherry picked from commit 862ba8a)

(backport <rust-lang#4345>) (cherry picked from commit 6ed2bc8)

(backport <rust-lang#4345>) (cherry picked from commit 5c5c364)

When _FILE_OFFSET_BITS=64, glibc redirects some function calls to 64 bit versions. These symbols are sometimes the public LFS variants, sometimes hidden variants. (backport <rust-lang#4345>) (cherry picked from commit 2b4fafb)

Like mips, the stat struct will become different once support for gnu_file_offset_bits64 is added. (backport <rust-lang#4345>) (cherry picked from commit 0c6d56c)

Like mips and powerpc, the stat struct will become different once support for gnu_file_offset_bits64 is added. (backport <rust-lang#4345>) (cherry picked from commit e134959)

Change the __padX members in b32/mod.rs from short to uint even though they are actually unsigned short in C. Using unsigned int will give the same alignment, and make the struct equivalent to stat64 when gnu_file_offset_bits64 is set. (backport <rust-lang#4345>) (cherry picked from commit 5a5abc2)

(backport <rust-lang#4345>) (cherry picked from commit 96e81e7)

(backport <rust-lang#4345>) (cherry picked from commit 169d50b)

Struct stat and stat64 needs to match when gnu_file_offset_bits64 is set. (backport <rust-lang#4345>) (cherry picked from commit 22ac02c)

The __f_unused field should be the same in statvfs and statvfs64 (where it was already included) as can be seen in https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/bits/statvfs.h;h=1aed2f54aa86e43ac1c1d3a33197b3232be76580;hb=HEAD (backport <rust-lang#4345>) (cherry picked from commit 131efe9)

(backport <rust-lang#4345>) (cherry picked from commit c1e4812)

(backport <rust-lang#4345>) (cherry picked from commit 872642a)

(backport <rust-lang#4345>) (cherry picked from commit 7ba56f2)

(backport <rust-lang#4345>) (cherry picked from commit 4a7c9a9)

rustbot assigned tgross35 Mar 20, 2025

rustbot added A-CI Area: CI-related items O-arm O-gnu O-linux O-linux-like O-mips O-sparc O-unix O-x86 S-waiting-on-review labels Mar 20, 2025

tgross35 requested changes Mar 22, 2025

View reviewed changes

rustbot added S-waiting-on-author and removed S-waiting-on-review labels Mar 22, 2025

tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Mar 22, 2025

snogge force-pushed the gnu-file-offset-64 branch from aba1e20 to cf9c316 Compare March 24, 2025 13:24

rustbot added S-waiting-on-review and removed S-waiting-on-author labels Mar 24, 2025

tgross35 approved these changes Apr 3, 2025

View reviewed changes

snogge force-pushed the gnu-file-offset-64 branch from cf9c316 to 125f4bf Compare April 7, 2025 12:23

tgross35 approved these changes Apr 7, 2025

View reviewed changes

tgross35 enabled auto-merge April 7, 2025 20:49

snogge added 4 commits April 9, 2025 12:32

ci: Use $PWD instead of $(pwd) in run-docker

afa5c65

Less commands makes for a cleaner `set -x` log. And it is more efficient.

ci: Add matrix env variables to the environment

84a04a1

Variables set with `env` in the matrix never propagated into the environment. Add a step in test_tier1 and test_tier2 that reads the env context from the matrix and adds the variables to the environment used by later steps.

ci: Always upload successfully created artifacts

f10e8e4

The `Create I artifacts` step is always run, whether earlier steps succeeds or not. But the upload step would only run if all preceeding steps wer successfull. Add a conditional to always run except if artifact creation failed.

gnu: build settings for _FILE_OFFSET_BITS=64

a184436

tgross35 force-pushed the gnu-file-offset-64 branch from 125f4bf to 4a7c9a9 Compare April 9, 2025 17:32

tgross35 added this pull request to the merge queue Apr 9, 2025

Merged via the queue into rust-lang:main with commit 1a54496 Apr 9, 2025
46 of 47 checks passed

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Apr 11, 2025

ci: Use $PWD instead of $(pwd) in run-docker

232dabc

Less commands makes for a cleaner `set -x` log. And it is more efficient. (backport <rust-lang#4345>) (cherry picked from commit afa5c65)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Apr 11, 2025

gnu: build settings for _FILE_OFFSET_BITS=64

aed5b56

(backport <rust-lang#4345>) (cherry picked from commit a184436)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Apr 11, 2025

gnu: Update F_GETLK for gnu_file_offset_bits64

c2501a6

gnu_file_offset_bits64 means _FILE_OFFSET_BITS=64. (backport <rust-lang#4345>) (cherry picked from commit 862ba8a)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Apr 11, 2025

gnu: Update F_SETLK and F_SETLKW for gnu_file_offset_bits64

d788f3a

(backport <rust-lang#4345>) (cherry picked from commit 6ed2bc8)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Apr 11, 2025

gnu: Set RLIM_INFINITY for mips with gnu_file_offset_bits64

d4fe9e6

(backport <rust-lang#4345>) (cherry picked from commit 5c5c364)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Apr 11, 2025

gnu: Adapt stat64 for gnu_file_offset_bits64

0789132

(backport <rust-lang#4345>) (cherry picked from commit 96e81e7)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Apr 11, 2025

gnu: Correct the struct stat64 padding for 32bit mips

4c67438

(backport <rust-lang#4345>) (cherry picked from commit 169d50b)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Apr 11, 2025

gnu: Correct struct stat64 for sparc

b6ad135

Struct stat and stat64 needs to match when gnu_file_offset_bits64 is set. (backport <rust-lang#4345>) (cherry picked from commit 22ac02c)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Apr 11, 2025

gnu: Add missing f_flags field to struct statfs for sparc

f5dc070

(backport <rust-lang#4345>) (cherry picked from commit c1e4812)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Apr 11, 2025

gnu: Add proper structs for fpos_t and fpos64_t

394f97f

(backport <rust-lang#4345>) (cherry picked from commit 872642a)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Apr 11, 2025

gnu: Update struct aiocb for gnu_file_offset_bits64

c553ad5

(backport <rust-lang#4345>) (cherry picked from commit 7ba56f2)

tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Apr 11, 2025

gnu: Adapt struct flock on mips for gnu_file_offset_bits64

dca8f09

(backport <rust-lang#4345>) (cherry picked from commit 4a7c9a9)

tgross35 mentioned this pull request Apr 11, 2025

[0.2] Backports #4393

Merged

tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Apr 11, 2025

tgross35 mentioned this pull request Aug 10, 2025

Switch to 64 bit file and time APIs on GNU libc for 32bit systems #3175

Closed

Conversation

snogge commented Mar 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Sources

Checklist

Uh oh!

rustbot commented Mar 20, 2025

Uh oh!

tgross35 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

snogge commented Mar 24, 2025

Uh oh!

tgross35 left a comment

Choose a reason for hiding this comment

Uh oh!

tgross35 Apr 3, 2025

Choose a reason for hiding this comment

Uh oh!

snogge Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

snogge commented Apr 7, 2025

Uh oh!

tgross35 left a comment

Choose a reason for hiding this comment

Uh oh!

tgross35 commented Apr 8, 2025

Uh oh!

Uh oh!

safinaskar commented Apr 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

snogge commented Mar 20, 2025 •

edited

Loading