Page MenuHomeFreeBSD
Differential D51173

amd64: fix physmap entry addition logic
ClosedPublic
Actions

Authored by vexeduxr on Sat, Jul 5, 8:43 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Jul 10, 6:27 AM
Unknown Object (File)
Thu, Jul 10, 6:27 AM
Unknown Object (File)
Thu, Jul 10, 6:27 AM
Unknown Object (File)
Thu, Jul 10, 6:27 AM
Unknown Object (File)
Thu, Jul 10, 6:27 AM
Unknown Object (File)
Sun, Jul 6, 7:54 PM
Subscribers
imp

Details

Reviewers
kib
markj
jhb
Commits
rGefe5907279e1: amd64: fix physmap entry addition logic
Summary

Since physmap_idx points to the next slot, we should make sure both 'i'
and 'insert_idx' are less than physmap_idx, but never equal to it.

Also allow physmap_idx to reach PHYS_AVAIL_ENTRIES so the last slot can
be populated.

Diff Detail

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

Event Timeline

vexeduxr created this revision.Sat, Jul 5, 8:43 PM
Herald added a subscriber: imp. · View Herald TranscriptSat, Jul 5, 8:43 PM
vexeduxr requested review of this revision.Sat, Jul 5, 8:43 PM
Harbormaster completed remote builds in B65233: Diff 158031.Sat, Jul 5, 8:43 PM
kib accepted this revision.Sun, Jul 6, 1:23 PM
kib added inline comments.
sys/amd64/amd64/machdep.c
679

Then would it make sense to move this operation down even more, after the 'move' loop, so that i initialization does not need to '-2'?

This revision is now accepted and ready to land.Sun, Jul 6, 1:23 PM
vexeduxr added inline comments.Sun, Jul 6, 5:30 PM
sys/amd64/amd64/machdep.c
679

Ah, yes it would.

vexeduxr updated this revision to Diff 158054.Sun, Jul 6, 5:32 PM

Move physmap_idx addition further down

This revision now requires review to proceed.Sun, Jul 6, 5:32 PM
Harbormaster completed remote builds in B65236: Diff 158054.Sun, Jul 6, 5:32 PM
markj accepted this revision.Sun, Jul 6, 5:49 PM
This revision is now accepted and ready to land.Sun, Jul 6, 5:49 PM
kib added inline comments.Sun, Jul 6, 5:51 PM
sys/amd64/amd64/machdep.c
673

This statement also needs an adjustment, otherwise when we hit the limit by adding the entry, we still move entries. It should be physmap_idx == PHYL_AVAIL_ENTRIES - 2 (right hand is const).

vexeduxr added inline comments.Sun, Jul 6, 6:00 PM
sys/amd64/amd64/machdep.c
673

I don't think I follow. if physmap_idx is PHYL_AVAIL_ENTRIES - 2, then we still have a free pair.

kib accepted this revision.Sun, Jul 6, 6:10 PM
kib added inline comments.
sys/amd64/amd64/machdep.c
673

Right, sorry.

Closed by commit rGefe5907279e1: amd64: fix physmap entry addition logic (authored by vexeduxr). · Explain WhySun, Jul 6, 7:28 PM
This revision was automatically updated to reflect the committed changes.
vexeduxr added a commit: rGefe5907279e1: amd64: fix physmap entry addition logic.

Revision Contents
Changeset List

PathSize
sys/
amd64/
amd64/
11 lines

Diff 158059

View Options

sys/amd64/amd64/machdep.c

Loading...