sys/arm: Fix DTrace trap hook
Needs ReviewPublic
Actions

Authored by freebsd_dev.thsi.be on Sun, Aug 30, 10:51 PM.

Details

Reviewers

andrew
fuz
gnn
markj

Summary

Move the dtrace_trap hook at the start of the abort handler to exit
early when a trap is handled by DTrace.

Fix the type argument to be the actual fault type instead of the value
of the FAR. The latter will need to be added to the trapframe, until
then DTrace will report unmapped addresses as the null address.

Correct the comment of the PUSHFRAMEINSVC assembler macro to reflect
that coming from SVC32 mode is expected for DTrace traps.

PR: 298064
MFC after: 1 month

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 76338
Build 73221: arc lint + arc unit

Event Timeline

freebsd_dev.thsi.be created this revision.Sun, Aug 30, 10:51 PM

Herald added a subscriber: imp. · View Herald TranscriptSun, Aug 30, 10:51 PM

freebsd_dev.thsi.be requested review of this revision.Sun, Aug 30, 10:51 PM

Harbormaster completed remote builds in B76338: Diff 185459.Sun, Aug 30, 10:51 PM

freebsd_dev.thsi.be added a child revision: D59280: dtrace/arm: Fix and de-pessimize dtrace_copy.Sun, Aug 30, 10:51 PM

Also catch FAULT_TRAN_L1.
[edit: comment meant for D59281]

Harbormaster completed remote builds in B76352: Diff 185500.Mon, Aug 31, 5:44 PM

freebsd_dev.thsi.be updated this revision to Diff 185501.Mon, Aug 31, 5:46 PM

Harbormaster completed remote builds in B76353: Diff 185501.Mon, Aug 31, 5:46 PM

Looks good to me, just a small comment.

sys/arm/arm/trap-v6.c
338	I would move the block here, after the FAULT_DEBUG and FAULT_EA_IMPREC checks: dtrace shouldn't be intercepting those in any case. It seems clearer to group the hook with the subsequent pmap_fault() call.