Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/aarch64/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ pub const VVAR_PAGES: usize = 5;
pub enum ClockMode {
None,
Cntvct,
}
}
3 changes: 2 additions & 1 deletion src/aarch64/mod.rs
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@

pub mod config;
pub mod vdso_data;
32 changes: 21 additions & 11 deletions src/aarch64/vdso_data.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
use axplat::time::{
NANOS_PER_SEC, current_ticks, monotonic_time_nanos, nanos_to_ticks, wall_time_nanos,
};

use super::config::ClockMode;
use crate::{
update::{clocks_calc_mult_shift, update_vdso_clock},
vdso::VdsoClock,
};

#[repr(C)]
#[repr(align(4096))]
pub struct VdsoData {
Expand Down Expand Up @@ -37,28 +47,28 @@ impl VdsoData {
let mult_shift = clocks_calc_mult_shift(ticks_per_sec, NANOS_PER_SEC, 10);
let cycle_now = current_ticks();

data.clock_page0.write_seqcount_begin();
data.clock_page0.clock_mode = ClockMode::Cntvct as i32;
data.clock_page0.mask = u64::MAX;
self.clock_page0.write_seqcount_begin();
self.clock_page0.clock_mode = ClockMode::Cntvct as i32;
self.clock_page0.mask = u64::MAX;
update_vdso_clock(
&mut data.clock_page0,
&mut self.clock_page0,
cycle_now,
wall_ns,
mono_ns,
mult_shift,
);
data.clock_page0.write_seqcount_end();
self.clock_page0.write_seqcount_end();

data.clock_page1.write_seqcount_begin();
data.clock_page1.clock_mode = ClockMode::Cntvct as i32;
data.clock_page1.mask = u64::MAX;
self.clock_page1.write_seqcount_begin();
self.clock_page1.clock_mode = ClockMode::Cntvct as i32;
self.clock_page1.mask = u64::MAX;
update_vdso_clock(
&mut data.clock_page1,
&mut self.clock_page1,
cycle_now,
wall_ns,
mono_ns,
mult_shift,
);
data.clock_page1.write_seqcount_end();
self.clock_page1.write_seqcount_end();
}
}
}
2 changes: 1 addition & 1 deletion src/embed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cfg_if::cfg_if! {
if #[cfg(target_arch = "x86_64")] {
global_asm!(include_vdso!("x86_64"));
} else if #[cfg(target_arch = "riscv64")] {
global_asm!(include_vdso!("riscv"));
global_asm!(include_vdso!("riscv64"));
} else if #[cfg(target_arch = "aarch64")]{
global_asm!(include_vdso!("aarch64"));
} else if #[cfg(any(target_arch = "loongarch64"))] {
Expand Down
2 changes: 1 addition & 1 deletion src/loongarch64/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ pub const VVAR_PAGES: usize = 44;
pub enum ClockMode {
None,
Csr,
}
}
3 changes: 2 additions & 1 deletion src/loongarch64/mod.rs
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@

pub mod config;
pub mod vdso_data;
13 changes: 11 additions & 2 deletions src/loongarch64/vdso_data.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
use axplat::time::{
NANOS_PER_SEC, current_ticks, monotonic_time_nanos, nanos_to_ticks, wall_time_nanos,
};

use crate::{
update::{clocks_calc_mult_shift, update_vdso_clock},
vdso::VdsoClock,
};

#[repr(C)]
#[repr(align(4096))]
#[derive(Default)]
Expand Down Expand Up @@ -28,10 +37,10 @@ impl VdsoData {
let ticks_per_sec = nanos_to_ticks(NANOS_PER_SEC);
let mult_shift = clocks_calc_mult_shift(ticks_per_sec, NANOS_PER_SEC, 10);

for clk in &mut data.clocks {
for clk in &mut self.clocks {
clk.write_seqcount_begin();
update_vdso_clock(clk, cycle_now, wall_ns, mono_ns, mult_shift);
clk.write_seqcount_end();
}
}
}
}
2 changes: 1 addition & 1 deletion src/riscv64/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ pub const VVAR_PAGES: usize = 2;
pub enum ClockMode {
None,
Csr,
}
}
3 changes: 2 additions & 1 deletion src/riscv64/mod.rs
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@

pub mod config;
pub mod vdso_data;
13 changes: 11 additions & 2 deletions src/riscv64/vdso_data.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
use axplat::time::{
NANOS_PER_SEC, current_ticks, monotonic_time_nanos, nanos_to_ticks, wall_time_nanos,
};

use crate::{
update::{clocks_calc_mult_shift, update_vdso_clock},
vdso::VdsoClock,
};

#[repr(C)]
#[repr(align(4096))]
#[derive(Default)]
Expand Down Expand Up @@ -26,10 +35,10 @@ impl VdsoData {
let ticks_per_sec = nanos_to_ticks(NANOS_PER_SEC);
let mult_shift = clocks_calc_mult_shift(ticks_per_sec, NANOS_PER_SEC, 10);

for clk in &mut data.clocks {
for clk in &mut self.clocks {
clk.write_seqcount_begin();
update_vdso_clock(clk, cycle_now, wall_ns, mono_ns, mult_shift);
clk.write_seqcount_end();
}
}
}
}