Page MenuHomeFreeBSD
Differential D51676

amd64/pmap: include opt_kstack_pages.h
ClosedPublic
Actions

Authored by khng on Aug 1 2025, 4:00 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Oct 10, 4:56 AM
Unknown Object (File)
Fri, Oct 10, 4:56 AM
Unknown Object (File)
Fri, Oct 10, 4:56 AM
Unknown Object (File)
Fri, Oct 10, 4:56 AM
Unknown Object (File)
Thu, Oct 9, 11:32 PM
Unknown Object (File)
Fri, Oct 3, 2:15 AM
Unknown Object (File)
Sun, Sep 28, 1:13 PM
Unknown Object (File)
Sun, Sep 28, 4:15 AM
View All 31 Files
Subscribers
des
imp

Details

Reviewers
markj
Commits
rGd5ec97156d33: amd64: include opt_kstack_pages.h
Summary

This fixes an early KASAN initialization panic in pmap_san_enter_early_alloc_4k, when a non-default value
is specified for KSTACK_PAGES in the build config file.

Sponsored by: Juniper Networks, Inc.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

khng created this revision.Aug 1 2025, 4:00 PM
Herald added a subscriber: imp. · View Herald TranscriptAug 1 2025, 4:00 PM
khng requested review of this revision.Aug 1 2025, 4:00 PM
Harbormaster completed remote builds in B65893: Diff 159576.Aug 1 2025, 4:00 PM
khng edited the summary of this revision. (Show Details)Aug 1 2025, 4:03 PM
markj added a comment.Aug 1 2025, 4:08 PM

But that use of KSTACK_PAGES matches the definition of BOOTSTACK_SIZE in amd64/locore.S, which also doesn't include opt_kstack_pages.h. So both files should include it.

khng added a comment.Aug 1 2025, 4:13 PM
In D51676#1180379, @markj wrote:

But that use of KSTACK_PAGES matches the definition of BOOTSTACK_SIZE in amd64/locore.S, which also doesn't include opt_kstack_pages.h. So both files should include it.

It should be fine. KSTACK_PAGES is defined in ${OBJTOP}/sys/GENERIC-KASAN/assym.inc rather.

markj accepted this revision.Aug 1 2025, 4:24 PM
In D51676#1180380, @khng wrote:
In D51676#1180379, @markj wrote:

But that use of KSTACK_PAGES matches the definition of BOOTSTACK_SIZE in amd64/locore.S, which also doesn't include opt_kstack_pages.h. So both files should include it.

It should be fine. KSTACK_PAGES is defined in ${OBJTOP}/sys/GENERIC-KASAN/assym.inc rather.

Ok. It still doesn't hurt to include it explicitly, like arm64/locore.S does.

This revision is now accepted and ready to land.Aug 1 2025, 4:24 PM
khng updated this revision to Diff 159585.Aug 1 2025, 4:37 PM

markj's suggestion.

This revision now requires review to proceed.Aug 1 2025, 4:37 PM
Harbormaster completed remote builds in B65900: Diff 159585.Aug 1 2025, 4:37 PM
markj accepted this revision.Aug 1 2025, 4:38 PM

Seems ok to me. The tag in the commit title should just be "amd64: ..." now.

This revision is now accepted and ready to land.Aug 1 2025, 4:38 PM
Closed by commit rGd5ec97156d33: amd64: include opt_kstack_pages.h (authored by khng). · Explain WhyAug 1 2025, 4:41 PM
This revision was automatically updated to reflect the committed changes.
khng added a commit: rGd5ec97156d33: amd64: include opt_kstack_pages.h.
des added a subscriber: des.Aug 2 2025, 4:36 PM
In D51676#1180433, @markj wrote:

Ok. It still doesn't hurt to include it explicitly, like arm64/locore.S does.

It absolutely does hurt. Breaks the build, actually. Please revert.

khng added a reverting change: rGee09ce3f1f2e: Revert "amd64: include opt_kstack_pages.h".Aug 2 2025, 5:58 PM

Revision Contents
Changeset List

PathSize
sys/
amd64/
amd64/
5 lines
1 line

Diff 159587

View Options

sys/amd64/amd64/locore.S

Loading...
View Options

sys/amd64/amd64/pmap.c

Loading...