Skip to content
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

misc: Upgrade to latest version of zerocopy #639

Merged
merged 1 commit into from
Dec 25, 2023
Merged

misc: Upgrade to latest version of zerocopy #639

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: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cc-measurement/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2021"
[dependencies]
sha2 = { version = "0.10.6", default-features = false, features = ["force-soft"], optional = true }
ring = { version = "0.17.6", default-features = false, features = ["alloc"], optional = true }
zerocopy = "0.6.0"
zerocopy = { version = "0.7.31", features = ["derive"] }

[features]
default = ["sha2"]
16 changes: 8 additions & 8 deletions cc-measurement/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ extern crate alloc;

use alloc::{vec, vec::Vec};
use core::mem::size_of;
use zerocopy::{AsBytes, FromBytes};
use zerocopy::{AsBytes, FromBytes, FromZeroes};

pub const SHA384_DIGEST_SIZE: usize = 48;
pub const TPML_ALG_SHA384: u16 = 0xc;
Expand All @@ -35,7 +35,7 @@ const VENDOR_INFO: &[u8; VENDOR_INFO_SIZE] = b"td-shim";
/// Defined in TCG PC Client Platform Firmware Profile Specification:
/// 'Table 20 TCG_EfiSpecIdEvent'
#[repr(C, packed)]
#[derive(AsBytes, FromBytes)]
#[derive(AsBytes, FromBytes, FromZeroes)]
pub struct TcgEfiSpecIdevent {
pub signature: [u8; 16],
pub platform_class: u32,
Expand Down Expand Up @@ -81,7 +81,7 @@ impl Default for TcgEfiSpecIdevent {
}

#[repr(C, packed)]
#[derive(AsBytes, FromBytes)]
#[derive(AsBytes, FromBytes, FromZeroes)]
pub struct TcgEfiSpecIdEventAlgorithmSize {
algorithm_id: u16,
digest_size: u16,
Expand Down Expand Up @@ -121,7 +121,7 @@ impl UefiPlatformFirmwareBlob2 {
}

#[repr(C, packed)]
#[derive(Default, FromBytes, AsBytes)]
#[derive(Default, FromBytes, AsBytes, FromZeroes)]
pub struct CcEventHeader {
pub mr_index: u32,
pub event_type: u32,
Expand Down Expand Up @@ -149,7 +149,7 @@ impl core::fmt::Display for CcEventHeader {
}

#[repr(C, packed)]
#[derive(Default, FromBytes, AsBytes)]
#[derive(Default, FromBytes, AsBytes, FromZeroes)]
pub struct TpmlDigestValues {
pub count: u32,
pub digests: [TpmtHa; PCR_DIGEST_NUM],
Expand All @@ -171,14 +171,14 @@ impl core::fmt::Display for TpmlDigestValues {
}

#[repr(C, packed)]
#[derive(Default, FromBytes, AsBytes)]
#[derive(Default, FromBytes, AsBytes, FromZeroes)]
pub struct TpmtHa {
pub hash_alg: u16,
pub digest: TpmuHa,
}

#[repr(C, packed)]
#[derive(FromBytes, AsBytes)]
#[derive(FromBytes, AsBytes, FromZeroes)]
pub struct TpmuHa {
pub sha384: [u8; SHA384_DIGEST_SIZE],
}
Expand All @@ -192,7 +192,7 @@ impl Default for TpmuHa {
}

#[repr(C, packed)]
#[derive(Default, FromBytes, AsBytes)]
#[derive(Default, FromBytes, AsBytes, FromZeroes)]
pub struct TcgPcrEventHeader {
pub mr_index: u32,
pub event_type: u32,
Expand Down
2 changes: 1 addition & 1 deletion td-payload/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ x86 = "0.47.0"
x86_64 = "0.14"
td-benchmark = { path = "../devtools/td-benchmark", optional = true }
tdx-tdcall = { path = "../tdx-tdcall", optional = true }
zerocopy = "0.6.0"
zerocopy = { version = "0.7.31", features = ["derive"] }

minicov = { version = "0.2", default-features = false, optional = true }

Expand Down
2 changes: 1 addition & 1 deletion td-shim/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ scroll = { version = "0.10", default-features = false, features = ["derive"] }
td-layout = { path = "../td-layout" }
td-uefi-pi = { path = "../td-uefi-pi" }
cc-measurement = { path = "../cc-measurement" }
zerocopy = "0.6.0"
zerocopy = { version = "0.7.31", features = ["derive"] }

td-loader = { path = "../td-loader", optional = true }
linked_list_allocator = { version = "0.10", optional = true }
Expand Down
10 changes: 5 additions & 5 deletions td-shim/src/acpi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// SPDX-License-Identifier: BSD-2-Clause-Patent
use core::mem::size_of;
use zerocopy::{AsBytes, FromBytes};
use zerocopy::{AsBytes, FromBytes, FromZeroes};

pub const ACPI_TABLES_MAX_NUM: usize = 20;
pub const ACPI_RSDP_REVISION: u8 = 2;
Expand All @@ -19,7 +19,7 @@
}

#[repr(packed)]
#[derive(Default, AsBytes, FromBytes)]
#[derive(Default, AsBytes, FromBytes, FromZeroes)]
pub struct Rsdp {
pub signature: [u8; 8],
pub checksum: u8,
Expand Down Expand Up @@ -61,7 +61,7 @@
}

#[repr(C, packed)]
#[derive(Default, AsBytes, FromBytes)]
#[derive(Default, AsBytes, FromBytes, FromZeroes)]
pub struct GenericSdtHeader {
pub signature: [u8; 4],
pub length: u32,
Expand Down Expand Up @@ -95,7 +95,7 @@
}

#[repr(C, packed)]
#[derive(Default, AsBytes, FromBytes)]
#[derive(Default, AsBytes, FromBytes, FromZeroes)]
pub struct Xsdt {
pub header: GenericSdtHeader,
pub tables: [u64; ACPI_TABLES_MAX_NUM],
Expand Down Expand Up @@ -134,7 +134,7 @@
}

#[repr(C, packed)]
#[derive(Default, AsBytes, FromBytes)]
#[derive(Default, AsBytes, FromBytes, FromZeroes)]
pub struct Ccel {
pub header: GenericSdtHeader,
pub cc_type: u8,
Expand Down Expand Up @@ -210,19 +210,19 @@
let mut xsdt = Xsdt::new();
assert_eq!(xsdt.header.length as usize, size_of::<GenericSdtHeader>());
for idx in 0..ACPI_TABLES_MAX_NUM {
xsdt.add_table(idx as u64);

Check warning on line 213 in td-shim/src/acpi.rs

View workflow job for this annotation

GitHub Actions / Compile the final.bin file (ubuntu-20.04) 

unused `Result` that must be used

Check warning on line 213 in td-shim/src/acpi.rs

View workflow job for this annotation

GitHub Actions / Compile the final.bin file (windows-2019) 

unused `Result` that must be used
assert_eq!(
xsdt.header.length as usize,
size_of::<GenericSdtHeader>() + (idx + 1) * 8
);
}

xsdt.add_table(100);

Check warning on line 220 in td-shim/src/acpi.rs

View workflow job for this annotation

GitHub Actions / Compile the final.bin file (ubuntu-20.04) 

unused `Result` that must be used

Check warning on line 220 in td-shim/src/acpi.rs

View workflow job for this annotation

GitHub Actions / Compile the final.bin file (windows-2019) 

unused `Result` that must be used
assert_eq!(
xsdt.header.length as usize,
size_of::<GenericSdtHeader>() + ACPI_TABLES_MAX_NUM * 8
);
xsdt.add_table(101);

Check warning on line 225 in td-shim/src/acpi.rs

View workflow job for this annotation

GitHub Actions / Compile the final.bin file (ubuntu-20.04) 

unused `Result` that must be used

Check warning on line 225 in td-shim/src/acpi.rs

View workflow job for this annotation

GitHub Actions / Compile the final.bin file (windows-2019) 

unused `Result` that must be used
assert_eq!(
xsdt.header.length as usize,
size_of::<GenericSdtHeader>() + ACPI_TABLES_MAX_NUM * 8
Expand Down
4 changes: 2 additions & 2 deletions td-shim/src/bin/td-shim/linux/kernel_param.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// SPDX-License-Identifier: BSD-2-Clause-Patent

use core::mem::size_of;
use zerocopy::{AsBytes, FromBytes};
use zerocopy::{AsBytes, FromBytes, FromZeroes};

use td_shim::e820::E820Entry;

Expand All @@ -18,7 +18,7 @@ pub const HDR_TYPE_LOADER: u8 = 0xff;
pub const HDR_LOAD_HIGH: u8 = 0x01;
pub const HDR_MIN_VERSION: u16 = 0x0200;

#[derive(Clone, Copy, Default, Debug, AsBytes, FromBytes)]
#[derive(Clone, Copy, Default, Debug, AsBytes, FromBytes, FromZeroes)]
#[repr(C, packed)]
pub struct SetupHeader {
pub setup_sects: u8,
Expand Down
6 changes: 3 additions & 3 deletions td-shim/src/bin/td-shim/mp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use core::convert::TryInto;
use core::mem::size_of;
use zerocopy::{AsBytes, FromBytes};
use zerocopy::{AsBytes, FromBytes, FromZeroes};

use td_shim::acpi::{self, GenericSdtHeader};

Expand Down Expand Up @@ -49,7 +49,7 @@ impl Madt {
}

#[repr(packed)]
#[derive(Default, AsBytes, FromBytes)]
#[derive(Default, AsBytes, FromBytes, FromZeroes)]
struct LocalApic {
pub r#type: u8,
pub length: u8,
Expand All @@ -59,7 +59,7 @@ struct LocalApic {
}

#[repr(packed)]
#[derive(Default, AsBytes, FromBytes)]
#[derive(Default, AsBytes, FromBytes, FromZeroes)]
struct MadtMpwkStruct {
r#type: u8,
length: u8,
Expand Down
4 changes: 2 additions & 2 deletions td-shim/src/e820.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: BSD-2-Clause-Patent

use zerocopy::{AsBytes, FromBytes};
use zerocopy::{AsBytes, FromBytes, FromZeroes};

#[derive(Clone, Copy, Debug, PartialEq, Eq)]
#[repr(u32)]
Expand Down Expand Up @@ -51,7 +51,7 @@ impl From<u32> for E820Type {
}
}

#[derive(Clone, Copy, Debug, Default, FromBytes, AsBytes, PartialEq)]
#[derive(Clone, Copy, Debug, Default, FromBytes, AsBytes, FromZeroes, PartialEq)]
#[repr(C, packed)]
pub struct E820Entry {
pub addr: u64,
Expand Down
4 changes: 2 additions & 2 deletions tests/test-td-payload/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ x86 = { version = "0.47.0" }
ring = { version = "0.17.6", default-features = false, features = ["alloc"] }
td-shim = { path = "../../td-shim" }
td-payload = { path = "../../td-payload", features = ["tdx","cet-shstk","stack-guard"] }
zerocopy = "0.6.0"
zerocopy = { version = "0.7.31", features = ["derive"] }

minicov = { version = "0.2", default-features = false, optional = true }

Expand All @@ -39,4 +39,4 @@ map-physical-memory = true
[features]
tdx = ["tdx-tdcall", "td-logger/tdx"]
main = []
coverage = ["minicov"]
coverage = ["minicov"]
Loading