Skip to content

Commit e1683b5

Browse files
phil-oppphil-opp
committed
Merge branch 'main' into load_ramdisk_feature
2 parents 26fcf07 + e2477a0 commit e1683b5

File tree

13 files changed

+280
-222
lines changed

13 files changed

+280
-222
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@ jobs:
6262
- name: Run integration tests
6363
run: cargo test
6464

65+
# test feature gates (only on one OS is enough)
66+
- name: Test with only UEFI feature
67+
if: runner.os == 'Linux'
68+
run: cargo test --no-default-features --features uefi
69+
- name: Test with only BIOS feature
70+
if: runner.os == 'Linux'
71+
run: cargo test --no-default-features --features bios
72+
6573
fmt:
6674
name: Check Formatting
6775
runs-on: ubuntu-latest

‎Cargo.toml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,17 @@ bootloader_api = { version = "0.11.0", path = "api" }
3838
bootloader-x86_64-common = { version = "0.11.0", path = "common" }
3939
bootloader-x86_64-bios-common = { version = "0.11.0", path = "bios/common" }
4040

41+
[features]
42+
default = ["bios", "uefi"]
43+
bios = ["dep:mbrman", "bootloader_test_runner/bios"]
44+
uefi = ["dep:gpt", "bootloader_test_runner/uefi"]
45+
4146
[dependencies]
4247
anyhow = "1.0.32"
4348
fatfs = "0.3.4"
44-
gpt = "3.0.0"
45-
mbrman = "0.5.1"
4649
tempfile = "3.3.0"
50+
mbrman = { version = "0.5.1", optional = true }
51+
gpt = { version = "3.0.0", optional = true }
4752

4853
[dev-dependencies]
4954
bootloader_test_runner = { path = "tests/runner" }

‎api/src/info.rs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,14 @@ impl FrameBuffer {
192192
unsafe { self.create_buffer_mut() }
193193
}
194194

195+
/// Converts the frame buffer to a raw byte slice.
196+
///
197+
/// The same as `buffer_mut()` but takes the ownership and returns the
198+
/// mutable buffer with a `'static` lifetime.
199+
pub fn into_buffer(self) -> &'static mut [u8] {
200+
unsafe { self.create_buffer_mut() }
201+
}
202+
195203
unsafe fn create_buffer<'a>(&self) -> &'a [u8] {
196204
unsafe { slice::from_raw_parts(self.buffer_start as *const u8, self.info.byte_len) }
197205
}

‎build.rs‎

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,49 @@ use std::{
33
process::Command,
44
};
55

6-
const BOOTLOADER_X86_64_UEFI_VERSION: &str = env!("CARGO_PKG_VERSION");
7-
8-
const BOOTLOADER_X86_64_BIOS_BOOT_SECTOR_VERSION: &str = env!("CARGO_PKG_VERSION");
9-
const BOOTLOADER_X86_64_BIOS_STAGE_2_VERSION: &str = env!("CARGO_PKG_VERSION");
10-
const BOOTLOADER_X86_64_BIOS_STAGE_3_VERSION: &str = env!("CARGO_PKG_VERSION");
11-
const BOOTLOADER_X86_64_BIOS_STAGE_4_VERSION: &str = env!("CARGO_PKG_VERSION");
6+
const BOOTLOADER_VERSION: &str = env!("CARGO_PKG_VERSION");
127

138
fn main() {
149
let out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap());
1510

16-
let uefi_path = build_uefi_bootloader(&out_dir);
17-
println!(
18-
"cargo:rustc-env=UEFI_BOOTLOADER_PATH={}",
19-
uefi_path.display()
20-
);
11+
#[cfg(feature = "uefi")]
12+
{
13+
let uefi_path = build_uefi_bootloader(&out_dir);
14+
println!(
15+
"cargo:rustc-env=UEFI_BOOTLOADER_PATH={}",
16+
uefi_path.display()
17+
);
18+
}
2119

22-
let bios_boot_sector_path = build_bios_boot_sector(&out_dir);
23-
println!(
24-
"cargo:rustc-env=BIOS_BOOT_SECTOR_PATH={}",
25-
bios_boot_sector_path.display()
26-
);
27-
let bios_stage_2_path = build_bios_stage_2(&out_dir);
28-
println!(
29-
"cargo:rustc-env=BIOS_STAGE_2_PATH={}",
30-
bios_stage_2_path.display()
31-
);
20+
#[cfg(feature = "bios")]
21+
{
22+
let bios_boot_sector_path = build_bios_boot_sector(&out_dir);
23+
println!(
24+
"cargo:rustc-env=BIOS_BOOT_SECTOR_PATH={}",
25+
bios_boot_sector_path.display()
26+
);
27+
let bios_stage_2_path = build_bios_stage_2(&out_dir);
28+
println!(
29+
"cargo:rustc-env=BIOS_STAGE_2_PATH={}",
30+
bios_stage_2_path.display()
31+
);
3232

33-
let bios_stage_3_path = build_bios_stage_3(&out_dir);
34-
println!(
35-
"cargo:rustc-env=BIOS_STAGE_3_PATH={}",
36-
bios_stage_3_path.display()
37-
);
33+
let bios_stage_3_path = build_bios_stage_3(&out_dir);
34+
println!(
35+
"cargo:rustc-env=BIOS_STAGE_3_PATH={}",
36+
bios_stage_3_path.display()
37+
);
3838

39-
let bios_stage_4_path = build_bios_stage_4(&out_dir);
40-
println!(
41-
"cargo:rustc-env=BIOS_STAGE_4_PATH={}",
42-
bios_stage_4_path.display()
43-
);
39+
let bios_stage_4_path = build_bios_stage_4(&out_dir);
40+
println!(
41+
"cargo:rustc-env=BIOS_STAGE_4_PATH={}",
42+
bios_stage_4_path.display()
43+
);
44+
}
4445
}
4546

4647
#[cfg(not(docsrs_dummy_build))]
48+
#[cfg(feature = "uefi")]
4749
fn build_uefi_bootloader(out_dir: &Path) -> PathBuf {
4850
let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".into());
4951
let mut cmd = Command::new(cargo);
@@ -53,7 +55,7 @@ fn build_uefi_bootloader(out_dir: &Path) -> PathBuf {
5355
cmd.arg("--path").arg("uefi");
5456
println!("cargo:rerun-if-changed=uefi");
5557
} else {
56-
cmd.arg("--version").arg(BOOTLOADER_X86_64_UEFI_VERSION);
58+
cmd.arg("--version").arg(BOOTLOADER_VERSION);
5759
}
5860
cmd.arg("--locked");
5961
cmd.arg("--target").arg("x86_64-unknown-uefi");
@@ -78,6 +80,7 @@ fn build_uefi_bootloader(out_dir: &Path) -> PathBuf {
7880
}
7981

8082
#[cfg(not(docsrs_dummy_build))]
83+
#[cfg(feature = "bios")]
8184
fn build_bios_boot_sector(out_dir: &Path) -> PathBuf {
8285
let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".into());
8386
let mut cmd = Command::new(cargo);
@@ -90,8 +93,7 @@ fn build_bios_boot_sector(out_dir: &Path) -> PathBuf {
9093
cmd.arg("--path").arg(&local_path);
9194
println!("cargo:rerun-if-changed={}", local_path.display());
9295
} else {
93-
cmd.arg("--version")
94-
.arg(BOOTLOADER_X86_64_BIOS_BOOT_SECTOR_VERSION);
96+
cmd.arg("--version").arg(BOOTLOADER_VERSION);
9597
}
9698
cmd.arg("--locked");
9799
cmd.arg("--target").arg("i386-code16-boot-sector.json");
@@ -121,6 +123,7 @@ fn build_bios_boot_sector(out_dir: &Path) -> PathBuf {
121123
}
122124

123125
#[cfg(not(docsrs_dummy_build))]
126+
#[cfg(feature = "bios")]
124127
fn build_bios_stage_2(out_dir: &Path) -> PathBuf {
125128
let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".into());
126129
let mut cmd = Command::new(cargo);
@@ -133,8 +136,7 @@ fn build_bios_stage_2(out_dir: &Path) -> PathBuf {
133136
cmd.arg("--path").arg(&local_path);
134137
println!("cargo:rerun-if-changed={}", local_path.display());
135138
} else {
136-
cmd.arg("--version")
137-
.arg(BOOTLOADER_X86_64_BIOS_STAGE_2_VERSION);
139+
cmd.arg("--version").arg(BOOTLOADER_VERSION);
138140
}
139141
cmd.arg("--locked");
140142
cmd.arg("--target").arg("i386-code16-stage-2.json");
@@ -162,6 +164,7 @@ fn build_bios_stage_2(out_dir: &Path) -> PathBuf {
162164
}
163165

164166
#[cfg(not(docsrs_dummy_build))]
167+
#[cfg(feature = "bios")]
165168
fn build_bios_stage_3(out_dir: &Path) -> PathBuf {
166169
let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".into());
167170
let mut cmd = Command::new(cargo);
@@ -174,8 +177,7 @@ fn build_bios_stage_3(out_dir: &Path) -> PathBuf {
174177
cmd.arg("--path").arg(&local_path);
175178
println!("cargo:rerun-if-changed={}", local_path.display());
176179
} else {
177-
cmd.arg("--version")
178-
.arg(BOOTLOADER_X86_64_BIOS_STAGE_3_VERSION);
180+
cmd.arg("--version").arg(BOOTLOADER_VERSION);
179181
}
180182
cmd.arg("--locked");
181183
cmd.arg("--target").arg("i686-stage-3.json");
@@ -203,6 +205,7 @@ fn build_bios_stage_3(out_dir: &Path) -> PathBuf {
203205
}
204206

205207
#[cfg(not(docsrs_dummy_build))]
208+
#[cfg(feature = "bios")]
206209
fn build_bios_stage_4(out_dir: &Path) -> PathBuf {
207210
let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".into());
208211
let mut cmd = Command::new(cargo);
@@ -215,8 +218,7 @@ fn build_bios_stage_4(out_dir: &Path) -> PathBuf {
215218
cmd.arg("--path").arg(&local_path);
216219
println!("cargo:rerun-if-changed={}", local_path.display());
217220
} else {
218-
cmd.arg("--version")
219-
.arg(BOOTLOADER_X86_64_BIOS_STAGE_4_VERSION);
221+
cmd.arg("--version").arg(BOOTLOADER_VERSION);
220222
}
221223
cmd.arg("--locked");
222224
cmd.arg("--target").arg("x86_64-stage-4.json");
@@ -244,6 +246,7 @@ fn build_bios_stage_4(out_dir: &Path) -> PathBuf {
244246
convert_elf_to_bin(elf_path)
245247
}
246248

249+
#[cfg(feature = "bios")]
247250
fn convert_elf_to_bin(elf_path: PathBuf) -> PathBuf {
248251
let flat_binary_path = elf_path.with_extension("bin");
249252

‎common/src/legacy_memory_region.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ where
6868
self.next_frame = start_frame;
6969
}
7070

71-
if self.next_frame < end_frame {
71+
if self.next_frame <= end_frame {
7272
let ret = self.next_frame;
7373
self.next_frame += 1;
7474
Some(ret)

‎src/mbr.rs‎ renamed to ‎src/bios/mbr.rs‎

File renamed without changes.

‎src/bios/mod.rs‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
use crate::fat;
2+
use anyhow::Context;
3+
use std::{
4+
collections::BTreeMap,
5+
path::{Path, PathBuf},
6+
};
7+
use tempfile::NamedTempFile;
8+
9+
mod mbr;
10+
11+
const BIOS_STAGE_3: &str = "boot-stage-3";
12+
const BIOS_STAGE_4: &str = "boot-stage-4";
13+
14+
/// Create disk images for booting on legacy BIOS systems.
15+
pub struct BiosBoot {
16+
kernel: PathBuf,
17+
ramdisk: Option<PathBuf>,
18+
}
19+
20+
impl BiosBoot {
21+
/// Start creating a disk image for the given bootloader ELF executable.
22+
pub fn new(kernel_path: &Path) -> Self {
23+
Self {
24+
kernel: kernel_path.to_owned(),
25+
ramdisk: None,
26+
}
27+
}
28+
29+
/// Add a ramdisk file to the image
30+
pub fn set_ramdisk(&mut self, ramdisk_path: &Path) -> &mut Self {
31+
self.ramdisk = Some(ramdisk_path.to_owned());
32+
self
33+
}
34+
35+
/// Create a bootable BIOS disk image at the given path.
36+
pub fn create_disk_image(&self, out_path: &Path) -> anyhow::Result<()> {
37+
let bootsector_path = Path::new(env!("BIOS_BOOT_SECTOR_PATH"));
38+
let stage_2_path = Path::new(env!("BIOS_STAGE_2_PATH"));
39+
40+
let fat_partition = self
41+
.create_fat_partition()
42+
.context("failed to create FAT partition")?;
43+
44+
mbr::create_mbr_disk(
45+
bootsector_path,
46+
stage_2_path,
47+
fat_partition.path(),
48+
out_path,
49+
)
50+
.context("failed to create BIOS MBR disk image")?;
51+
52+
fat_partition
53+
.close()
54+
.context("failed to delete FAT partition after disk image creation")?;
55+
56+
Ok(())
57+
}
58+
59+
/// Creates an BIOS-bootable FAT partition with the kernel.
60+
fn create_fat_partition(&self) -> anyhow::Result<NamedTempFile> {
61+
let stage_3_path = Path::new(env!("BIOS_STAGE_3_PATH"));
62+
let stage_4_path = Path::new(env!("BIOS_STAGE_4_PATH"));
63+
64+
let mut files = BTreeMap::new();
65+
files.insert(crate::KERNEL_FILE_NAME, self.kernel.as_path());
66+
files.insert(BIOS_STAGE_3, stage_3_path);
67+
files.insert(BIOS_STAGE_4, stage_4_path);
68+
if let Some(ramdisk_path) = &self.ramdisk {
69+
files.insert(crate::RAMDISK_FILE_NAME, ramdisk_path);
70+
}
71+
72+
let out_file = NamedTempFile::new().context("failed to create temp file")?;
73+
fat::create_fat_filesystem(files, out_file.path())
74+
.context("failed to create BIOS FAT filesystem")?;
75+
76+
Ok(out_file)
77+
}
78+
}

0 commit comments

Comments
 (0)