SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sort of fix core affinity on mac arm64 (#873)

Browse Source 
* sort of fix core affinity on mac arm64
we can t pin to a coreid however we can at least choose the performance
cores for our thread.

* using other cores as well

* Fix CI yml (#871)

* Fix CI again (#872)

* Fix CI yml

* Fix CI

* Add dump_register/write_crash for freebsd arm64 (#870)

Co-authored-by: Dominik Maier <domenukk@gmail.com>

* Remove QEMU-Nyx & packer submodules

Co-authored-by: Dominik Maier <domenukk@gmail.com>
Co-authored-by: Dongjia "toka" Zhang <tokazerkje@outlook.com>
This commit is contained in:
David CARLIER 2022-11-05 12:52:43 +00:00 committed by GitHub
parent dddfaf3f55
commit b9bd0dd6b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libafl/src/bolts/core_affinity.rs
View File

@ -528,23 +528,32 @@ fn set_for_current_helper(core_id: CoreId) -> Result<(), Error> {
#[cfg(target_vendor = "apple")] #[cfg(target_vendor = "apple")]
mod apple { mod apple {
use alloc::vec::Vec; use alloc::vec::Vec;
#[cfg(target_arch = "x86_64")]
use core::ptr::addr_of_mut; use core::ptr::addr_of_mut;
use std::thread::available_parallelism; use std::thread::available_parallelism;
#[cfg(target_arch = "x86_64")]
use libc::{ use libc::{
integer_t, kern_return_t, mach_msg_type_number_t, pthread_mach_thread_np, pthread_self, integer_t, kern_return_t, mach_msg_type_number_t, pthread_mach_thread_np, pthread_self,
thread_policy_flavor_t, thread_policy_t, thread_t, KERN_NOT_SUPPORTED, KERN_SUCCESS, thread_policy_flavor_t, thread_policy_t, thread_t, KERN_SUCCESS, THREAD_AFFINITY_POLICY,
THREAD_AFFINITY_POLICY, THREAD_AFFINITY_POLICY_COUNT, THREAD_AFFINITY_POLICY_COUNT,
};
#[cfg(target_arch = "aarch64")]
use libc::{
pthread_set_qos_class_self_np, qos_class_t::QOS_CLASS_BACKGROUND,
qos_class_t::QOS_CLASS_USER_INITIATED,
}; };
use super::CoreId; use super::CoreId;
use crate::Error; use crate::Error;
#[cfg(target_arch = "x86_64")]
#[repr(C)] #[repr(C)]
struct thread_affinity_policy_data_t { struct thread_affinity_policy_data_t {
affinity_tag: integer_t, affinity_tag: integer_t,
} }
#[cfg(target_arch = "x86_64")]
#[link(name = "System", kind = "framework")] #[link(name = "System", kind = "framework")]
extern "C" { extern "C" {
fn thread_policy_set( fn thread_policy_set(
@ -563,6 +572,7 @@ mod apple {
.collect::<Vec<_>>()) .collect::<Vec<_>>())
} }
#[cfg(target_arch = "x86_64")]
pub fn set_for_current(core_id: CoreId) -> Result<(), Error> { pub fn set_for_current(core_id: CoreId) -> Result<(), Error> {
let mut info = thread_affinity_policy_data_t { let mut info = thread_affinity_policy_data_t {
affinity_tag: core_id.id.try_into().unwrap(), affinity_tag: core_id.id.try_into().unwrap(),
@ -579,16 +589,30 @@ mod apple {
// 0 == KERN_SUCCESS // 0 == KERN_SUCCESS
if result == KERN_SUCCESS { if result == KERN_SUCCESS {
Ok(()) Ok(())
} else if result == KERN_NOT_SUPPORTED { } else {
// 46 == KERN_NOT_SUPPORTED Err(Error::unknown(format!(
// Seting a core affinity is not supported on aarch64 apple... "Failed to set_for_current {:?}",
// We won't report this as an error to the user, a there's nothing they could do about it. result
// Error codes, see <https://opensource.apple.com/source/xnu/xnu-792/osfmk/mach/kern_return.h> )))
//|| (cfg!(all(target_vendor = "apple", target_arch = "aarch64")) }
// && result == KERN_NOT_SUPPORTED) }
Err(Error::unsupported( }
"Setting a core affinity is not supported on this platform (KERN_NOT_SUPPORTED)",
)) #[cfg(target_arch = "aarch64")]
pub fn set_for_current(core_id: CoreId) -> Result<(), Error> {
unsafe {
// This is the best we can do, unlike on intel architecture
// the system does not allow to pin a process/thread to specific cpu
// but instead choosing at best between the two available groups
// energy consumption's efficient one and the other focusing more on performance.
let mut qos_class = QOS_CLASS_USER_INITIATED;
if core_id.id % 2 != 0 {
qos_class = QOS_CLASS_BACKGROUND;
}
let result = pthread_set_qos_class_self_np(qos_class, 0);
if result == 0 {
Ok(())
} else { } else {
Err(Error::unknown(format!( Err(Error::unknown(format!(
"Failed to set_for_current {:?}", "Failed to set_for_current {:?}",