Skip to content

Commit 146fd7c

Browse files
kovdan01atrosinenko
kovdan01
and
atrosinenko
authored
[PAC][Driver] Support pauthtest ABI for AArch64 Linux triples (#97237)
When `pauthtest` is either passed as environment part of AArch64 Linux triple or passed via `-mabi=`, enable the following ptrauth flags: - `intrinsics`; - `calls`; - `returns`; - `auth-traps`; - `vtable-pointer-address-discrimination`; - `vtable-pointer-type-discrimination`; - `init-fini`. Some related stuff is still subject to change, and the ABI itself might be changed, so end users are not expected to use this and the ABI name has 'test' suffix. If `-mabi=pauthtest` option is used, it's normalized to effective triple. When the environment part of the effective triple is `pauthtest`, try to use `aarch64-linux-pauthtest` as multilib directory. The following is not supported: - combination of `pauthtest` ABI with any branch protection scheme except BTI; - explicit set of environment part of the triple to a value different from `pauthtest` in combination with `-mabi=pauthtest`; - usage on non-Linux OS. --------- Co-authored-by: Anatoly Trosinenko <[email protected]>
1 parent bee2654 commit 146fd7c

File tree

15 files changed

+191
-17
lines changed

15 files changed

+191
-17
lines changed

‎clang/lib/Basic/Targets/AArch64.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ AArch64TargetInfo::AArch64TargetInfo(const llvm::Triple &Triple,
204204
StringRef AArch64TargetInfo::getABI() const { return ABI; }
205205

206206
bool AArch64TargetInfo::setABI(const std::string &Name) {
207-
if (Name != "aapcs" && Name != "aapcs-soft" && Name != "darwinpcs")
207+
if (Name != "aapcs" && Name != "aapcs-soft" && Name != "darwinpcs" &&
208+
Name != "pauthtest")
208209
return false;
209210

210211
ABI = Name;
@@ -218,6 +219,12 @@ bool AArch64TargetInfo::validateTarget(DiagnosticsEngine &Diags) const {
218219
Diags.Report(diag::err_target_unsupported_abi_with_fpu) << ABI;
219220
return false;
220221
}
222+
if (getTriple().getEnvironment() == llvm::Triple::PAuthTest &&
223+
getTriple().getOS() != llvm::Triple::Linux) {
224+
Diags.Report(diag::err_target_unsupported_abi_for_triple)
225+
<< getTriple().getEnvironmentName() << getTriple().getTriple();
226+
return false;
227+
}
221228
return true;
222229
}
223230

‎clang/lib/CodeGen/CodeGenModule.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ createTargetCodeGenInfo(CodeGenModule &CGM) {
149149
return createWindowsAArch64TargetCodeGenInfo(CGM, AArch64ABIKind::Win64);
150150
else if (Target.getABI() == "aapcs-soft")
151151
Kind = AArch64ABIKind::AAPCSSoft;
152+
else if (Target.getABI() == "pauthtest")
153+
Kind = AArch64ABIKind::PAuthTest;
152154

153155
return createAArch64TargetCodeGenInfo(CGM, Kind);
154156
}

‎clang/lib/CodeGen/TargetInfo.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,7 @@ enum class AArch64ABIKind {
437437
DarwinPCS,
438438
Win64,
439439
AAPCSSoft,
440+
PAuthTest,
440441
};
441442

442443
std::unique_ptr<TargetCodeGenInfo>

‎clang/lib/Driver/ToolChain.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,11 +1031,12 @@ std::string ToolChain::ComputeLLVMTriple(const ArgList &Args,
10311031
}
10321032
case llvm::Triple::aarch64: {
10331033
llvm::Triple Triple = getTriple();
1034+
tools::aarch64::setPAuthABIInTriple(getDriver(), Args, Triple);
10341035
if (!Triple.isOSBinFormatMachO())
1035-
return getTripleString();
1036+
return Triple.getTriple();
10361037

10371038
if (Triple.isArm64e())
1038-
return getTripleString();
1039+
return Triple.getTriple();
10391040

10401041
// FIXME: older versions of ld64 expect the "arm64" component in the actual
10411042
// triple string and query it to determine whether an LTO file can be

‎clang/lib/Driver/ToolChains/Arch/AArch64.cpp

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,3 +449,24 @@ void aarch64::getAArch64TargetFeatures(const Driver &D,
449449
if (Args.getLastArg(options::OPT_mno_bti_at_return_twice))
450450
Features.push_back("+no-bti-at-return-twice");
451451
}
452+
453+
void aarch64::setPAuthABIInTriple(const Driver &D, const ArgList &Args,
454+
llvm::Triple &Triple) {
455+
Arg *ABIArg = Args.getLastArg(options::OPT_mabi_EQ);
456+
bool HasPAuthABI =
457+
ABIArg ? (StringRef(ABIArg->getValue()) == "pauthtest") : false;
458+
459+
switch (Triple.getEnvironment()) {
460+
case llvm::Triple::UnknownEnvironment:
461+
if (HasPAuthABI)
462+
Triple.setEnvironment(llvm::Triple::PAuthTest);
463+
break;
464+
case llvm::Triple::PAuthTest:
465+
break;
466+
default:
467+
if (HasPAuthABI)
468+
D.Diag(diag::err_drv_unsupported_opt_for_target)
469+
<< ABIArg->getAsString(Args) << Triple.getTriple();
470+
break;
471+
}
472+
}

‎clang/lib/Driver/ToolChains/Arch/AArch64.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ void getAArch64TargetFeatures(const Driver &D, const llvm::Triple &Triple,
2828
std::string getAArch64TargetCPU(const llvm::opt::ArgList &Args,
2929
const llvm::Triple &Triple, llvm::opt::Arg *&A);
3030

31+
void setPAuthABIInTriple(const Driver &D, const llvm::opt::ArgList &Args,
32+
llvm::Triple &triple);
33+
3134
} // end namespace aarch64
3235
} // end namespace target
3336
} // end namespace driver

‎clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 57 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,6 +1486,41 @@ void AddUnalignedAccessWarning(ArgStringList &CmdArgs) {
14861486
}
14871487
}
14881488

1489+
// Each combination of options here forms a signing schema, and in most cases
1490+
// each signing schema is its own incompatible ABI. The default values of the
1491+
// options represent the default signing schema.
1492+
static void handlePAuthABI(const ArgList &DriverArgs, ArgStringList &CC1Args) {
1493+
if (!DriverArgs.hasArg(options::OPT_fptrauth_intrinsics,
1494+
options::OPT_fno_ptrauth_intrinsics))
1495+
CC1Args.push_back("-fptrauth-intrinsics");
1496+
1497+
if (!DriverArgs.hasArg(options::OPT_fptrauth_calls,
1498+
options::OPT_fno_ptrauth_calls))
1499+
CC1Args.push_back("-fptrauth-calls");
1500+
1501+
if (!DriverArgs.hasArg(options::OPT_fptrauth_returns,
1502+
options::OPT_fno_ptrauth_returns))
1503+
CC1Args.push_back("-fptrauth-returns");
1504+
1505+
if (!DriverArgs.hasArg(options::OPT_fptrauth_auth_traps,
1506+
options::OPT_fno_ptrauth_auth_traps))
1507+
CC1Args.push_back("-fptrauth-auth-traps");
1508+
1509+
if (!DriverArgs.hasArg(
1510+
options::OPT_fptrauth_vtable_pointer_address_discrimination,
1511+
options::OPT_fno_ptrauth_vtable_pointer_address_discrimination))
1512+
CC1Args.push_back("-fptrauth-vtable-pointer-address-discrimination");
1513+
1514+
if (!DriverArgs.hasArg(
1515+
options::OPT_fptrauth_vtable_pointer_type_discrimination,
1516+
options::OPT_fno_ptrauth_vtable_pointer_type_discrimination))
1517+
CC1Args.push_back("-fptrauth-vtable-pointer-type-discrimination");
1518+
1519+
if (!DriverArgs.hasArg(options::OPT_fptrauth_init_fini,
1520+
options::OPT_fno_ptrauth_init_fini))
1521+
CC1Args.push_back("-fptrauth-init-fini");
1522+
}
1523+
14891524
static void CollectARMPACBTIOptions(const ToolChain &TC, const ArgList &Args,
14901525
ArgStringList &CmdArgs, bool isAArch64) {
14911526
const Arg *A = isAArch64
@@ -1548,16 +1583,30 @@ static void CollectARMPACBTIOptions(const ToolChain &TC, const ArgList &Args,
15481583

15491584
CmdArgs.push_back(
15501585
Args.MakeArgString(Twine("-msign-return-address=") + Scope));
1551-
if (Scope != "none")
1586+
if (Scope != "none") {
1587+
if (Triple.getEnvironment() == llvm::Triple::PAuthTest)
1588+
D.Diag(diag::err_drv_unsupported_opt_for_target)
1589+
<< A->getAsString(Args) << Triple.getTriple();
15521590
CmdArgs.push_back(
15531591
Args.MakeArgString(Twine("-msign-return-address-key=") + Key));
1554-
if (BranchProtectionPAuthLR)
1592+
}
1593+
if (BranchProtectionPAuthLR) {
1594+
if (Triple.getEnvironment() == llvm::Triple::PAuthTest)
1595+
D.Diag(diag::err_drv_unsupported_opt_for_target)
1596+
<< A->getAsString(Args) << Triple.getTriple();
15551597
CmdArgs.push_back(
15561598
Args.MakeArgString(Twine("-mbranch-protection-pauth-lr")));
1599+
}
15571600
if (IndirectBranches)
15581601
CmdArgs.push_back("-mbranch-target-enforce");
1559-
if (GuardedControlStack)
1602+
// GCS is currently untested with PAuthABI, but enabling this could be allowed
1603+
// in future after testing with a suitable system.
1604+
if (GuardedControlStack) {
1605+
if (Triple.getEnvironment() == llvm::Triple::PAuthTest)
1606+
D.Diag(diag::err_drv_unsupported_opt_for_target)
1607+
<< A->getAsString(Args) << Triple.getTriple();
15601608
CmdArgs.push_back("-mguarded-control-stack");
1609+
}
15611610
}
15621611

15631612
void Clang::AddARMTargetArgs(const llvm::Triple &Triple, const ArgList &Args,
@@ -1701,6 +1750,8 @@ void RenderAArch64ABI(const llvm::Triple &Triple, const ArgList &Args,
17011750
ABIName = A->getValue();
17021751
else if (Triple.isOSDarwin())
17031752
ABIName = "darwinpcs";
1753+
else if (Triple.getEnvironment() == llvm::Triple::PAuthTest)
1754+
ABIName = "pauthtest";
17041755
else
17051756
ABIName = "aapcs";
17061757

@@ -1737,6 +1788,9 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args,
17371788
// Enable/disable return address signing and indirect branch targets.
17381789
CollectARMPACBTIOptions(getToolChain(), Args, CmdArgs, true /*isAArch64*/);
17391790

1791+
if (Triple.getEnvironment() == llvm::Triple::PAuthTest)
1792+
handlePAuthABI(Args, CmdArgs);
1793+
17401794
// Handle -msve_vector_bits=<bits>
17411795
if (Arg *A = Args.getLastArg(options::OPT_msve_vector_bits_EQ)) {
17421796
StringRef Val = A->getValue();

‎clang/lib/Driver/ToolChains/Linux.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ std::string Linux::getMultiarchTriple(const Driver &D,
8686
case llvm::Triple::aarch64:
8787
if (IsAndroid)
8888
return "aarch64-linux-android";
89+
if (hasEffectiveTriple() &&
90+
getEffectiveTriple().getEnvironment() == llvm::Triple::PAuthTest)
91+
return "aarch64-linux-pauthtest";
8992
return "aarch64-linux-gnu";
9093
case llvm::Triple::aarch64_be:
9194
return "aarch64_be-linux-gnu";

‎clang/test/Driver/Inputs/multilib_aarch64_linux_tree/usr/include/aarch64-linux-gnu/.keep

Whitespace-only changes.

‎clang/test/Driver/Inputs/multilib_aarch64_linux_tree/usr/include/aarch64-linux-pauthtest/.keep

Whitespace-only changes.

0 commit comments

Comments
 (0)