mirrors/reverie
1
0
Fork 0
mirror of https://github.com/facebookexperimental/reverie.git synced 2025-01-23 05:06:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

third-party/rust: vendor a fork of perf-event

Browse source 
Summary:
For https://github.com/jimblandy/perf-event/pull/29 which sets CLOEXEC by
default.

Reviewed By: edward-shen

Differential Revision:
D43983384

Privacy Context Container: L1123788

fbshipit-source-id: 478c0e11bd815e916094b48ce7763b4dfc3e5f79
This commit is contained in:
Thomas Orozco 2023-03-15 10:34:47 -07:00 committed by Facebook GitHub Bot
parent b7afcb19bb
commit e7cdd0db8d
3 changed files with 16 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reverie-ptrace/Cargo.toml
View file

@ -20,7 +20,7 @@ libc = "0.2.139"
nix = "0.25"
num-traits = "0.2"
paste = "1.0"
perf-event-open-sys = "1.0"
perf-event-open-sys = "4.0"
procfs = "0.9"
raw-cpuid = "10.6.0"
reverie = { version = "0.1.0", path = "../reverie" }

24
reverie-ptrace/src/perf.rs
View file

@ -95,22 +95,20 @@ pub struct PerfCounter {
impl Event {
fn attr_type(self) -> u32 {
match self {
Event::Hardware(_) => perf::perf_type_id_PERF_TYPE_HARDWARE,
Event::Software(_) => perf::perf_type_id_PERF_TYPE_SOFTWARE,
Event::Raw(_) => perf::perf_type_id_PERF_TYPE_RAW,
Event::Hardware(_) => perf::PERF_TYPE_HARDWARE,
Event::Software(_) => perf::PERF_TYPE_SOFTWARE,
Event::Raw(_) => perf::PERF_TYPE_RAW,
}
}
fn attr_config(self) -> u64 {
match self {
Event::Raw(x) => x,
Event::Hardware(HardwareEvent::Instructions) => {
perf::perf_hw_id_PERF_COUNT_HW_INSTRUCTIONS.into()
}
Event::Hardware(HardwareEvent::Instructions) => perf::PERF_COUNT_HW_INSTRUCTIONS.into(),
Event::Hardware(HardwareEvent::BranchInstructions) => {
perf::perf_hw_id_PERF_COUNT_HW_BRANCH_INSTRUCTIONS.into()
perf::PERF_COUNT_HW_BRANCH_INSTRUCTIONS.into()
}
Event::Software(SoftwareEvent::Dummy) => perf::perf_sw_ids_PERF_COUNT_SW_DUMMY.into(),
Event::Software(SoftwareEvent::Dummy) => perf::PERF_COUNT_SW_DUMMY.into(),
}
}
}
@ -301,14 +299,8 @@ impl PerfCounter {
// This ioctl shouldn't mutate it's argument per its API. But in case it
// does, create a mutable copy to avoid Rust UB.
let mut ticks = ticks;
Errno::result(unsafe {
libc::ioctl(
self.fd,
perf::perf_event_ioctls_PERIOD as _,
&mut ticks as *mut u64,
)
})
.and(Ok(()))
Errno::result(unsafe { libc::ioctl(self.fd, perf::PERIOD as _, &mut ticks as *mut u64) })
.and(Ok(()))
}
/// Call the `PERF_EVENT_IOC_ID` ioctl. Returns a unique identifier for this

22
reverie-ptrace/src/validation.rs
View file

@ -104,18 +104,14 @@ fn init_perf_event_attr(
/// Create a template perf_event_attr for ticks
fn ticks_attr(precise_ip: bool) -> perf::perf_event_attr {
init_perf_event_attr(
perf::perf_type_id_PERF_TYPE_RAW,
get_rcb_perf_config(),
precise_ip,
)
init_perf_event_attr(perf::PERF_TYPE_RAW, get_rcb_perf_config(), precise_ip)
}
/// Create a template perf_event_attr for cycles
fn cycles_attr(precise_ip: bool) -> perf::perf_event_attr {
init_perf_event_attr(
perf::perf_type_id_PERF_TYPE_HARDWARE,
perf::perf_hw_id_PERF_COUNT_HW_CPU_CYCLES.into(),
perf::PERF_TYPE_HARDWARE,
perf::PERF_COUNT_HW_CPU_CYCLES.into(),
precise_ip,
)
}
@ -163,11 +159,7 @@ fn check_for_ioc_period_bug(precise_ip: bool) -> Result<(), PmuValidationError>
let mut new_period = 1_u64;
let _ioctl = ioctl(
&bug_fd,
perf::perf_event_ioctls_PERIOD.into(),
&mut new_period,
)?;
let _ioctl = ioctl(&bug_fd, perf::PERIOD.into(), &mut new_period)?;
let mut poll_bug_fd = libc::pollfd {
fd: bug_fd.0,
@ -396,7 +388,7 @@ fn check_for_zen_speclockmap() -> Result<(), PmuValidationError> {
// 0x25 == RETIRED_LOCK_INSTRUCTIONS - Counts the number of retired locked instructions
// + 0x08 == SPECLOCKMAPCOMMIT
let mut attr = init_perf_event_attr(perf::perf_type_id_PERF_TYPE_RAW, 0x510825, false);
let mut attr = init_perf_event_attr(perf::PERF_TYPE_RAW, 0x510825, false);
let fd = start_counter(0, -1, &mut attr, None)?;
@ -434,8 +426,8 @@ fn check_for_kvm_in_txcp_bug() -> Result<(), PmuValidationError> {
let mut arg = 0_u64;
if !disabled_txcp {
ioctl(&fd, perf::perf_event_ioctls_DISABLE.into(), &mut arg)?;
ioctl(&fd, perf::perf_event_ioctls_ENABLE.into(), &mut arg)?;
ioctl(&fd, perf::DISABLE.into(), &mut arg)?;
ioctl(&fd, perf::ENABLE.into(), &mut arg)?;
do_branches(NUM_BRANCHES);
count = read_counter(&fd)?;
}