Differential D55250

arm64: Have a common call to userret
ClosedPublic
Actions

Authored by andrew on Feb 11 2026, 6:13 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Wed, Jul 15, 7:07 AM

	Unknown Object (File)
	Wed, Jul 15, 7:07 AM

	Unknown Object (File)
	Mon, Jul 13, 1:22 PM

	Unknown Object (File)
	Sat, Jul 4, 11:38 AM

	Unknown Object (File)
	Sat, Jul 4, 4:30 AM

	Unknown Object (File)
	Wed, Jul 1, 11:24 PM

	Unknown Object (File)
	Wed, Jul 1, 11:24 PM

	Unknown Object (File)
	Sun, Jun 28, 2:37 PM

View All 92 Files

Subscribers

Details

Reviewers

kib
manu

Group Reviewers

Commits

rGf6f5d927bf75: arm64: Have a common call to userret
rG14e97448fceb: arm64: Have a common call to userret

Summary

Rather than each exception calling userret use a common copy. As
syscallret already calls userret we need to skip it in that case.

Sponsored by: Arm Ltd

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 71453
Build 68336: arc lint + arc unit

Event Timeline

andrew created this revision.Feb 11 2026, 6:13 PM

Herald added a reviewer: manu. · View Herald TranscriptFeb 11 2026, 6:13 PM

Herald added subscribers: emaste, imp. · View Herald Transcript

andrew requested review of this revision.Feb 11 2026, 6:13 PM

Harbormaster completed remote builds in B70624: Diff 171772.Feb 11 2026, 6:13 PM

IMHO the control flow could be made less confusing. Right now it is 'break' -> userret, and in one place it is goto no_userret. I suggest to add a control variable like 'use_userret', set to true, assigned from svc_handler() return value. Then instead of goto no userret. check the value of use_userret around userret() call. Hope it is understandable.

This revision is now accepted and ready to land.Feb 12 2026, 6:37 AM

Set a variable to check if we need to skip userret

This revision now requires review to proceed.Mar 5 2026, 3:42 PM

Harbormaster completed remote builds in B71199: Diff 173200.Mar 5 2026, 3:42 PM

kib added inline comments.Mar 6 2026, 1:20 AM

sys/arm64/arm64/trap.c
700	Should this be false?

Fix the initial value of skip_userret

Harbormaster completed remote builds in B71453: Diff 173798.Mar 17 2026, 9:51 AM

Remove userret from EXCP_MOE. Was missed in a rebase.

Harbormaster completed remote builds in B71457: Diff 173806.Mar 17 2026, 1:59 PM

kib accepted this revision.Mar 17 2026, 2:30 PM

This revision is now accepted and ready to land.Mar 17 2026, 2:30 PM

Closed by commit rG14e97448fceb: arm64: Have a common call to userret (authored by andrew). · Explain WhyMar 17 2026, 5:12 PM

This revision was automatically updated to reflect the committed changes.

andrew added a commit: rG14e97448fceb: arm64: Have a common call to userret.

andrew added a commit: rGf6f5d927bf75: arm64: Have a common call to userret.Apr 8 2026, 2:02 PM

Revision Contents
Changeset List

Path

Size

sys/

arm64/

arm64/

29 lines

Diff 173798

sys/arm64/arm64/trap.c

Loading...