Add Minimal Std implementation for UEFI #105861

Ayush1325 · 2022-12-18T10:01:50Z

Implemented modules:

alloc
os_str
env
math

Additional Information

This was originally part of #100316. Since that PR was becoming too unwieldy and cluttered, and with suggestion from @dvdhrm, I have extracted a minimal std implementation to this PR.

The example in src/doc/rustc/src/platform-support/unknown-uefi.md has been tested for x86_64-unknown-uefi and i686-unknown-uefi in OVMF. It would be great if someone more familiar with AARCH64 can help with testing for that target.

Signed-off-by: Ayush Singh ayushsingh1325@gmail.com

rustbot · 2022-12-18T10:01:58Z

r? @m-ou-se

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2022-12-18T10:02:01Z

These commits modify compiler targets.
(See the Target Tier Policy.)

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

Stabilizing library features
Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
Changing public documentation in ways that create new stability guarantees
Changing observable runtime behavior of library APIs

dvdhrm

Thanks a lot! This looks so much easier to review! A few initial comments inline, and I will see whether I can give this a thorough review over the next week.

compiler/rustc_codegen_ssa/src/base.rs

src/tools/tidy/src/deps.rs

library/std/src/sys/uefi/mod.rs

bors · 2023-01-08T05:17:31Z

☔ The latest upstream changes (presumably #104658) made this pull request unmergeable. Please resolve the merge conflicts.

Ayush1325 · 2023-01-08T16:22:56Z

@m-ou-se So is there anything I should do or any changes to this PR? Alternatively, maybe @thomcc should be assigned to this since he was assigned to the previous PR, and thus is more familiar with this work.

Ayush1325 · 2023-01-17T13:35:15Z

@dvdhrm ping

thomcc · 2023-01-26T03:51:53Z

Alternatively, maybe @thomcc should be assigned to this since he was assigned to the previous #100316, and thus is more familiar with this work.

I don't have as much time for reviews as I used to, but do have more context and a shorter review backlog than @m-ou-se, so sure, I don't mind taking it. I probably won't get to it for a week or two though, FYI.

r? @thomcc

library/std/src/os/uefi/env.rs

library/std/src/sys/uefi/common.rs

library/std/src/sys/uefi/alloc.rs

joboet

io::Error should always use the unpacked representation, because the packed representation assumes that error codes are always 32-bits, which they are not in 64-bit UEFI.

joboet · 2023-08-03T10:21:35Z

library/std/src/io/error/repr_bitpacked.rs

-// `RawOsError` must be an alias for `i32`.
-const _: fn(RawOsError) -> i32 = |os| os;
-


Bitpacking needs the bit size of the OS error to be smaller than the pointer size to be able to add a tag value (that's why I added this assertion). Hence UEFI must use the unpacked representation for io::Error.

library/std/src/os/mod.rs

bors · 2023-09-21T21:51:51Z

☔ The latest upstream changes (presumably #115230) made this pull request unmergeable. Please resolve the merge conflicts.

workingjubilee · 2023-09-21T22:07:29Z

augh.

@dvdhrm

Implemented modules: 1. alloc 2. os_str 3. env 4. math Tracking Issue: rust-lang#100499 API Change Proposal: rust-lang/libs-team#87 This was originally part of rust-lang#100316. Since that PR was becoming too unwieldy and cluttered, and with suggestion from @dvdhrm, I have extracted a minimal std implementation to this PR. Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>

Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>

- Make BootServices unavailable if ExitBootServices event is signaled. - Use thread locals for SystemTable and ImageHandle Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>

Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>

- Some comment fixes. - Make some functions unsafe. - Make helpers module private. - Rebase on master - Update r-efi to v4.2.0 Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>

Some changes from this commit will probably be converted to its own PR. Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>

- Update Example - Add thread_parking to sys::uefi - Fix unsafe in unsafe errors - Improve docs - Improve os/exit - Some asserts - Switch back to atomics Signed-off-by: Ayush Singh <ayushdevel1325@gmail.com>

- Hide Docs - Use repr_unpacked error Signed-off-by: Ayush Singh <ayushdevel1325@gmail.com>

Ayush1325 · 2023-09-22T18:28:55Z

Well, I mistakenly pushed master after the last rebase, which closed the PR due to 0 delta.

workingjubilee · 2023-09-24T08:52:33Z

Mmmkay. Took another look. Apologies, again.

@bors r+

bors · 2023-09-24T08:52:35Z

📌 Commit 984ecef has been approved by workingjubilee

It is now in the queue for this repository.

bors · 2023-09-24T09:47:33Z

⌛ Testing commit 984ecef with merge c7224e3...

bors · 2023-09-24T11:34:01Z

☀️ Test successful - checks-actions
Approved by: workingjubilee
Pushing c7224e3 to master...

rust-timer · 2023-09-24T13:20:54Z

Finished benchmarking commit (c7224e3): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	3.7%	[3.7%, 3.7%]	1
Regressions ❌ (secondary)	2.5%	[1.1%, 4.9%]	5
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.9%	[-1.0%, -0.7%]	3
All ❌✅ (primary)	3.7%	[3.7%, 3.7%]	1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 630.239s -> 629.545s (-0.11%)
Artifact size: 317.10 MiB -> 317.31 MiB (0.07%)

rustbot assigned m-ou-se Dec 18, 2022

dvdhrm reviewed Dec 18, 2022

View reviewed changes

compiler/rustc_codegen_ssa/src/base.rs Outdated Show resolved Hide resolved

compiler/rustc_codegen_ssa/src/base.rs Show resolved Hide resolved

src/tools/tidy/src/deps.rs Outdated Show resolved Hide resolved

Ayush1325 force-pushed the uefi-std-minimial branch 2 times, most recently from 22f8692 to 3472331 Compare December 18, 2022 11:31

Ayush1325 mentioned this pull request Dec 19, 2022

Add Rust std support for x86_64-unknown-uefi #100316

Closed

Ayush1325 force-pushed the uefi-std-minimial branch 2 times, most recently from ce514e8 to 798515a Compare December 19, 2022 04:51

This comment has been minimized.

Sign in to view

Ayush1325 force-pushed the uefi-std-minimial branch 2 times, most recently from 955ff41 to 84031f3 Compare December 19, 2022 11:11

teg reviewed Dec 19, 2022

View reviewed changes

library/std/src/sys/uefi/mod.rs Outdated Show resolved Hide resolved

teg reviewed Dec 19, 2022

View reviewed changes

library/std/src/sys/uefi/mod.rs Outdated Show resolved Hide resolved

Ayush1325 force-pushed the uefi-std-minimial branch from 84031f3 to 2cf8c6b Compare December 19, 2022 13:57

Ayush1325 requested a review from dvdhrm December 30, 2022 16:12

Ayush1325 force-pushed the uefi-std-minimial branch from 2cf8c6b to 64a3788 Compare January 8, 2023 16:20

rustbot assigned thomcc and unassigned m-ou-se Jan 26, 2023

joboet reviewed Jan 28, 2023

View reviewed changes

library/std/src/os/uefi/env.rs Outdated Show resolved Hide resolved

library/std/src/sys/uefi/common.rs Outdated Show resolved Hide resolved

library/std/src/sys/uefi/alloc.rs Outdated Show resolved Hide resolved

library/std/src/sys/uefi/alloc.rs Outdated Show resolved Hide resolved

Ayush1325 force-pushed the uefi-std-minimial branch from 64a3788 to 1355e15 Compare January 28, 2023 18:10

Ayush1325 force-pushed the uefi-std-minimial branch from a6ea7c0 to 2b1cdf8 Compare September 21, 2023 09:57

Ayush1325 requested a review from workingjubilee September 21, 2023 10:03

joboet requested changes Sep 21, 2023

View reviewed changes

Ayush1325 added 7 commits September 22, 2023 17:23

Fixes from PR

8e56b33

Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>

Handle ExitBootServices

032e376

- Make BootServices unavailable if ExitBootServices event is signaled. - Use thread locals for SystemTable and ImageHandle Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>

Add support for building std::os::uefi docs

5df24d1

Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>

Fixes from PR

7a95644

- Some comment fixes. - Make some functions unsafe. - Make helpers module private. - Rebase on master - Update r-efi to v4.2.0 Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>

Use RawOsError for UEFI

40c3dac

Some changes from this commit will probably be converted to its own PR. Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>

Rebase to master

c7e5f3c

- Update Example - Add thread_parking to sys::uefi - Fix unsafe in unsafe errors - Improve docs - Improve os/exit - Some asserts - Switch back to atomics Signed-off-by: Ayush Singh <ayushdevel1325@gmail.com>

Ayush1325 closed this Sep 22, 2023

Ayush1325 force-pushed the uefi-std-minimial branch from 2b1cdf8 to 5a4e47e Compare September 22, 2023 17:48

Fixes from PR

984ecef

- Hide Docs - Use repr_unpacked error Signed-off-by: Ayush Singh <ayushdevel1325@gmail.com>

Ayush1325 reopened this Sep 22, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 24, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 24, 2023

bors merged commit c7224e3 into rust-lang:master Sep 24, 2023
15 of 23 checks passed

rustbot added this to the 1.74.0 milestone Sep 24, 2023

Ayush1325 deleted the uefi-std-minimial branch September 25, 2023 13:20

Ayush1325 mentioned this pull request Jan 10, 2024

Rust Support in Zephyr zephyrproject-rtos/zephyr#65837

Open

Ayush1325 mentioned this pull request Jul 6, 2024

Tracking Issue for uefi-std #100499

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Minimal Std implementation for UEFI #105861

Add Minimal Std implementation for UEFI #105861

Ayush1325 commented Dec 18, 2022

rustbot commented Dec 18, 2022

rustbot commented Dec 18, 2022

dvdhrm left a comment

This comment has been minimized.

bors commented Jan 8, 2023

Ayush1325 commented Jan 8, 2023

Ayush1325 commented Jan 17, 2023

thomcc commented Jan 26, 2023

joboet left a comment

joboet Aug 3, 2023

bors commented Sep 21, 2023

workingjubilee commented Sep 21, 2023

Ayush1325 commented Sep 22, 2023

workingjubilee commented Sep 24, 2023

bors commented Sep 24, 2023

bors commented Sep 24, 2023

bors commented Sep 24, 2023

rust-timer commented Sep 24, 2023

		// `RawOsError` must be an alias for `i32`.
		const _: fn(RawOsError) -> i32 = \|os\| os;

Add Minimal Std implementation for UEFI #105861

Add Minimal Std implementation for UEFI #105861

Conversation

Ayush1325 commented Dec 18, 2022

Implemented modules:

Related Links

Additional Information

rustbot commented Dec 18, 2022

rustbot commented Dec 18, 2022

dvdhrm left a comment

Choose a reason for hiding this comment

This comment has been minimized.

bors commented Jan 8, 2023

Ayush1325 commented Jan 8, 2023

Ayush1325 commented Jan 17, 2023

thomcc commented Jan 26, 2023

joboet left a comment

Choose a reason for hiding this comment

joboet Aug 3, 2023

Choose a reason for hiding this comment

bors commented Sep 21, 2023

workingjubilee commented Sep 21, 2023

Ayush1325 commented Sep 22, 2023

workingjubilee commented Sep 24, 2023

bors commented Sep 24, 2023

bors commented Sep 24, 2023

bors commented Sep 24, 2023

rust-timer commented Sep 24, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size