This is an archive of the discontinued LLVM Phabricator instance.

Paths

Table of Contentst

-
compiler-rt/lib/hwasan/
-
lib/
-
hwasan/
1/1
hwasan_fuchsia.cpp

Differential D129318

[hwasan][fuchsia] Fix features bitmask checking
ClosedPublic

Authored by leonardchan on Jul 7 2022, 12:00 PM.

Download Raw Diff

Details

Reviewers

phosek
mcgrathr

Commits

rGc21104180266: [hwasan][fuchsia] Fix features bitmask checking

Summary

Update the address tagging bitmask check to just see if ZX_ARM64_FEATURE_ADDRESS_TAGGING_TBI is enabled rather than checking if it's the only thing that's enabled.

Diff Detail

Repository: rG LLVM Github Monorepo

Unit TestsFailed

	Time	Test
	2,470 ms	x64 debian > XRay-x86_64-linux.TestCases/Posix::fdr-mode.cpp

Event Timeline

leonardchan created this revision.Jul 7 2022, 12:00 PM

Herald added a project: Restricted Project. · View Herald TranscriptJul 7 2022, 12:00 PM

Herald added subscribers: Enna1, abrachet, kristof.beyls. · View Herald Transcript

leonardchan requested review of this revision.Jul 7 2022, 12:00 PM

leonardchan mentioned this in D127262: [compiler-rt][hwasan] Check address tagging mode in InitializeOsSupport on Fuchsia.

lgtm

compiler-rt/lib/hwasan/hwasan_fuchsia.cpp
196	It might be clearer to just say `requires ZX_ARM64_FEATURE_ADDRESS_TAGGING_TBI` here.

This revision is now accepted and ready to land.Jul 7 2022, 12:12 PM

Harbormaster completed remote builds in B174231: Diff 443019.Jul 7 2022, 12:39 PM

This revision was landed with ongoing or failed builds.Jul 7 2022, 2:43 PM

Closed by commit rGc21104180266: [hwasan][fuchsia] Fix features bitmask checking (authored by leonardchan). · Explain Why

This revision was automatically updated to reflect the committed changes.

leonardchan marked an inline comment as done.

leonardchan added a commit: rGc21104180266: [hwasan][fuchsia] Fix features bitmask checking.

Revision Contents

Path

Size

compiler-rt/

lib/

hwasan/

hwasan_fuchsia.cpp

2 lines

Diff 443019

compiler-rt/lib/hwasan/hwasan_fuchsia.cpp

	Show First 20 Lines • Show All 184 Lines • ▼ Show 20 Lines

	void HwasanInstallAtForkHandler() {}			void HwasanInstallAtForkHandler() {}

	void InitializeOsSupport() {			void InitializeOsSupport() {
	#ifdef __aarch64__			#ifdef __aarch64__
	uint32_t features = 0;			uint32_t features = 0;
	CHECK_EQ(zx_system_get_features(ZX_FEATURE_KIND_ADDRESS_TAGGING, &features),			CHECK_EQ(zx_system_get_features(ZX_FEATURE_KIND_ADDRESS_TAGGING, &features),
	ZX_OK);			ZX_OK);
	if (features != ZX_ARM64_FEATURE_ADDRESS_TAGGING_TBI &&			if (!(features & ZX_ARM64_FEATURE_ADDRESS_TAGGING_TBI) &&
	flags()->fail_without_syscall_abi) {			flags()->fail_without_syscall_abi) {
	Printf(			Printf(
	"FATAL: HWAddressSanitizer requires a kernel with tagged address "			"FATAL: HWAddressSanitizer requires a kernel with tagged address "
				mcgrathrUnsubmitted Done Reply Inline Actions It might be clearer to just say `requires ZX_ARM64_FEATURE_ADDRESS_TAGGING_TBI` here. mcgrathr: It might be clearer to just say `requires ZX_ARM64_FEATURE_ADDRESS_TAGGING_TBI` here.
	"ABI.\n");			"ABI.\n");
	Die();			Die();
	}			}
	#endif			#endif
	}			}

	} // namespace __hwasan			} // namespace __hwasan

	Show All 25 Lines