diff options
| author | James McGregor <james.mcgregor2@arm.com> | 2021-07-13 12:14:26 +0100 |
|---|---|---|
| committer | Jamie Cunliffe <Jamie.Cunliffe@arm.com> | 2021-12-01 12:24:30 +0000 |
| commit | 837cc1687f7c0d35a4e90a2f6bee377b5a2ecfd5 (patch) | |
| tree | 8ce2820cee2ce31a9b54e93791dd8a7b48241039 /compiler/rustc_codegen_llvm/src | |
| parent | 2446a215954a99f9d33019fad7d415ef9c083502 (diff) | |
| download | rust-837cc1687f7c0d35a4e90a2f6bee377b5a2ecfd5.tar.gz rust-837cc1687f7c0d35a4e90a2f6bee377b5a2ecfd5.zip | |
Add codegen option for branch protection and pointer authentication on AArch64
The branch-protection codegen option enables the use of hint-space pointer authentication code for AArch64 targets
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/attributes.rs | 54 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/context.rs | 34 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/declare.rs | 5 |
3 files changed, 91 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/attributes.rs b/compiler/rustc_codegen_llvm/src/attributes.rs index 8e6329a997f..768e03b5ef3 100644 --- a/compiler/rustc_codegen_llvm/src/attributes.rs +++ b/compiler/rustc_codegen_llvm/src/attributes.rs @@ -9,7 +9,7 @@ use rustc_hir::def_id::DefId; use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags; use rustc_middle::ty::layout::HasTyCtxt; use rustc_middle::ty::{self, TyCtxt}; -use rustc_session::config::OptLevel; +use rustc_session::config::{BranchProtection, OptLevel, PAuthKey}; use rustc_session::Session; use rustc_target::spec::abi::Abi; use rustc_target::spec::{FramePointer, SanitizerSet, StackProbeType, StackProtector}; @@ -203,6 +203,58 @@ pub fn non_lazy_bind(sess: &Session, llfn: &'ll Value) { } } +pub fn set_branch_protection(sess: &Session, llfn: &'ll Value) { + // Setting PAC/BTI function attributes is only necessary for LLVM 11 and earlier. + // For LLVM 12 and greater, module-level metadata attributes are set in + // `compiler/rustc_codegen_llvm/src/context.rs`. + if llvm_util::get_version() >= (12, 0, 0) { + return; + } + + let BranchProtection { bti, pac_ret: pac } = sess.opts.cg.branch_protection; + + if bti { + llvm::AddFunctionAttrString( + llfn, + llvm::AttributePlace::Function, + cstr!("branch-target-enforcement"), + ); + } + + if let Some(pac_opts) = pac { + if pac_opts.leaf { + llvm::AddFunctionAttrStringValue( + llfn, + llvm::AttributePlace::Function, + cstr!("sign-return-address"), + cstr!("non-leaf"), + ); + } else { + llvm::AddFunctionAttrStringValue( + llfn, + llvm::AttributePlace::Function, + cstr!("sign-return-address"), + cstr!("all"), + ); + } + + match pac_opts.key { + PAuthKey::A => llvm::AddFunctionAttrStringValue( + llfn, + llvm::AttributePlace::Function, + cstr!("sign-return-address-key"), + cstr!("a_key"), + ), + PAuthKey::B => llvm::AddFunctionAttrStringValue( + llfn, + llvm::AttributePlace::Function, + cstr!("sign-return-address-key"), + cstr!("b_key"), + ), + } + } +} + pub(crate) fn default_optimisation_attrs(sess: &Session, llfn: &'ll Value) { match sess.opts.optimize { OptLevel::Size => { diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs index 613a8df891c..da05b5c0cba 100644 --- a/compiler/rustc_codegen_llvm/src/context.rs +++ b/compiler/rustc_codegen_llvm/src/context.rs @@ -21,7 +21,7 @@ use rustc_middle::ty::layout::{ }; use rustc_middle::ty::{self, Instance, Ty, TyCtxt}; use rustc_middle::{bug, span_bug}; -use rustc_session::config::{CFGuard, CrateType, DebugInfo}; +use rustc_session::config::{BranchProtection, CFGuard, CrateType, DebugInfo, PAuthKey}; use rustc_session::Session; use rustc_span::source_map::Span; use rustc_span::symbol::Symbol; @@ -242,6 +242,38 @@ pub unsafe fn create_module( } } + if sess.target.arch == "aarch64" { + let BranchProtection { bti, pac_ret: pac } = sess.opts.cg.branch_protection; + + llvm::LLVMRustAddModuleFlag( + llmod, + "branch-target-enforcement\0".as_ptr().cast(), + bti.into(), + ); + + if let Some(pac_opts) = pac { + llvm::LLVMRustAddModuleFlag(llmod, "sign-return-address\0".as_ptr().cast(), 1); + llvm::LLVMRustAddModuleFlag( + llmod, + "sign-return-address-all\0".as_ptr().cast(), + pac_opts.leaf.into(), + ); + llvm::LLVMRustAddModuleFlag( + llmod, + "sign-return-address-with-bkey\0".as_ptr().cast(), + if pac_opts.key == PAuthKey::A { 0 } else { 1 }, + ); + } else { + llvm::LLVMRustAddModuleFlag(llmod, "sign-return-address\0".as_ptr().cast(), 0); + llvm::LLVMRustAddModuleFlag(llmod, "sign-return-address-all\0".as_ptr().cast(), 0); + llvm::LLVMRustAddModuleFlag( + llmod, + "sign-return-address-with-bkey\0".as_ptr().cast(), + 0, + ); + } + } + llmod } diff --git a/compiler/rustc_codegen_llvm/src/declare.rs b/compiler/rustc_codegen_llvm/src/declare.rs index 8977fa085b9..f4e754b80c9 100644 --- a/compiler/rustc_codegen_llvm/src/declare.rs +++ b/compiler/rustc_codegen_llvm/src/declare.rs @@ -45,8 +45,13 @@ fn declare_raw_fn( llvm::Attribute::NoRedZone.apply_llfn(Function, llfn); } + if cx.tcx.sess.target.arch == "aarch64" { + attributes::set_branch_protection(cx.tcx.sess, llfn); + } + attributes::default_optimisation_attrs(cx.tcx.sess, llfn); attributes::non_lazy_bind(cx.sess(), llfn); + llfn } |
