[llvm-branch-commits] [llvm] [AArch64][MTE] Tag dynamic allocas in AArch64StackTagging (PR #236278)
Andrew Haberlandt via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Tue Nov 10 18:02:06 PST 2026
================
@@ -431,10 +441,135 @@ static Value *getSlotPtr(const AArch64Options &CLOpts, IRBuilder<> &IRB,
return nullptr;
}
+void AArch64StackTagging::createDynamicAllocasInitStorage() {
+ IRBuilder<> IRB(&*F->getEntryBlock().getFirstInsertionPt());
+ Type *IntptrTy = IRB.getIntPtrTy(*DL);
+ DynamicAllocaLayout =
+ IRB.CreateAlloca(IntptrTy, nullptr, "dynamic.alloca.layout");
+ // 0 means that no alloca has been made.
+ IRB.CreateStore(Constant::getNullValue(IntptrTy), DynamicAllocaLayout);
+ // Its address is the end of the memory untagged on return, which must be
+ // granule aligned.
+ DynamicAllocaLayout->setAlignment(kTagGranuleSize);
+}
+
+// Replace the dynamic alloca with one whose size is a multiple of the tag
+// granule, and tag the memory it returns.
+void AArch64StackTagging::handleDynamicAllocaCall(memtag::AllocaInfo &Info,
+ Value *Base, unsigned Tag) {
+ AllocaInst *AI = Info.AI;
+ IRBuilder<> IRB(AI);
+ Type *IntptrTy = IRB.getIntPtrTy(*DL);
+ const uint64_t Granule = kTagGranuleSize.value();
+ Value *Size = IRB.CreateAllocationSize(IntptrTy, AI);
+ // Rounded up to a multiple of the granule.
+ Value *PaddedSize = IRB.CreateAnd(
+ IRB.CreateAdd(Size, ConstantInt::get(IntptrTy, Granule - 1)),
+ ConstantInt::get(IntptrTy, ~(Granule - 1)));
+
+ AllocaInst *NewAI =
+ IRB.CreateAlloca(IRB.getInt8Ty(), AI->getAddressSpace(), PaddedSize);
+ NewAI->setAlignment(std::max(AI->getAlign(), kTagGranuleSize));
+ NewAI->takeName(AI);
+ NewAI->copyMetadata(*AI);
+ AI->replaceAllUsesWith(NewAI);
+ AI->eraseFromParent();
+ Info.AI = NewAI;
+
+ // Replace alloca with tagp(alloca).
+ IRB.SetInsertPoint(NewAI->getNextNode());
+ Instruction *TagPCall = IRB.CreateIntrinsicWithoutFolding(
+ Intrinsic::aarch64_tagp, {NewAI->getType()},
+ {Constant::getNullValue(NewAI->getType()), Base, IRB.getInt64(Tag)});
+ if (NewAI->hasName())
+ TagPCall->setName(NewAI->getName() + ".tag");
+ // Does not replace metadata, so we don't have to handle DbgVariableRecords.
+ NewAI->replaceUsesWithIf(TagPCall, [&](const Use &U) {
+ return !isa<LifetimeIntrinsic>(U.getUser());
+ });
+ TagPCall->setOperand(0, NewAI);
+
+ // Store the last alloca's address to DynamicAllocaLayout. This points to the
+ // most recently executed dynamic alloca, which is used when untagging. It is
+ // granule aligned.
+ IRB.CreateStore(IRB.CreatePtrToInt(NewAI, IntptrTy), DynamicAllocaLayout);
+
+ // Tag the memory at llvm.lifetime.start if there is one, and untag it at
+ // llvm.lifetime.end. NewAI, and so TagPCall, is granule aligned, and TagSize
+ // is a multiple of the granule.
+ Value *TagSize = IRB.CreateZExtOrTrunc(PaddedSize, IRB.getInt64Ty());
+ SmallVector<LifetimeIntrinsic *, 4> Lifetimes;
+ for (User *U : NewAI->users())
+ if (auto *II = dyn_cast<LifetimeIntrinsic>(U))
+ Lifetimes.push_back(II);
+ if (none_of(Lifetimes, [](LifetimeIntrinsic *II) {
+ return II->getIntrinsicID() == Intrinsic::lifetime_start;
+ }))
+ IRB.CreateCall(SetTagFunc, {TagPCall, TagSize});
+ for (LifetimeIntrinsic *II : Lifetimes) {
+ if (II->getIntrinsicID() == Intrinsic::lifetime_start) {
+ IRB.SetInsertPoint(II->getNextNode());
+ IRB.CreateCall(SetTagFunc, {TagPCall, TagSize});
+ } else {
+ // NewAI has tag 0.
+ IRB.SetInsertPoint(II);
+ IRB.CreateCall(SetTagFunc, {NewAI, TagSize});
+ }
+ }
+}
+
+// Untag the memory from the most recent dynamic alloca up to End, a granule
+// aligned address, unless the range is empty or no alloca has been made.
+void AArch64StackTagging::untagDynamicAllocasBeforeInst(Instruction *InstBefore,
+ Value *End) {
+ IRBuilder<> IRB(InstBefore);
+ Type *IntptrTy = IRB.getIntPtrTy(*DL);
+ // Only 0 or the address of an alloca is stored to DynamicAllocaLayout, so
+ // this is granule aligned, and the size a multiple of the granule.
+ Value *LastAlloca =
+ IRB.CreateLoad(IntptrTy, DynamicAllocaLayout, "last.alloca");
+ Value *Zero = Constant::getNullValue(IntptrTy);
+ Value *NonZero = IRB.CreateICmpNE(LastAlloca, Zero);
+ Value *InRange = IRB.CreateICmpULE(LastAlloca, End);
+ Value *Cond = IRB.CreateAnd(NonZero, InRange);
+ Value *Size = IRB.CreateSelect(Cond, IRB.CreateSub(End, LastAlloca), Zero,
+ "untag.size");
+ // Tag 0.
+ IRB.CreateCall(SetTagFunc, {IRB.CreateIntToPtr(LastAlloca, IRB.getPtrTy()),
+ IRB.CreateZExtOrTrunc(Size, IRB.getInt64Ty())});
+}
+
+// Untag dynamic allocas.
+void AArch64StackTagging::untagDynamicAllocas(const memtag::StackInfo &SInfo) {
----------------
ndrewh wrote:
Yeah, I wrote in the PR description that we were updating `DynamicAllocaLayout` on stackrestores, but the change clearly wasn't. It's interesting that ASAN keeps a very similar variable but then doesn't seem to update it on stackrestores either -- I wonder if there's a good reason for that which I'm overlooking. I will test this change out and see if anything goes sideways.
https://github.com/llvm/llvm-project/pull/236278
More information about the llvm-branch-commits
mailing list