arm64: Have a common call to userret
Needs ReviewPublic
Actions

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

Details

Reviewers

kib
manu

Group Reviewers

arm64

Summary

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

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 70624
Build 67507: 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.Thu, Mar 5, 3:42 PM

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

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

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

Revision Contents
Changeset List

Path

Size

sys/

arm64/

trap.c

28 lines

Diff 171772

View Options

arm64: Have a common call to userretNeeds ReviewPublicActions