Differential D21341

Slightly simplify page queue code.
ClosedPublic
Actions

Authored by markj on Aug 20 2019, 2:36 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Wed, Jul 9, 11:34 AM

	Unknown Object (File)
	Mon, Jul 7, 10:16 AM

	Unknown Object (File)
	Sun, Jul 6, 7:54 AM

	Unknown Object (File)
	Sun, Jul 6, 6:53 AM

	Unknown Object (File)
	Fri, Jul 4, 5:19 PM

	Unknown Object (File)
	Sat, Jun 21, 9:34 PM

	Unknown Object (File)
	Tue, Jun 17, 6:14 PM

	Unknown Object (File)
	Tue, Jun 17, 4:05 PM

View All 100 Files

Subscribers

Details

Reviewers

alc
jeff
kib
dougm

Commits

rS351333: Simplify vm_page_dequeue() and fix an assertion.

Summary

Add vm_pagequeue_remove(), which updates page queue state as required when removing a page.
Get rid of vm_page_pagequeue_lockptr(). When I added it I planned to use it more widely, but it is only used in vm_page_dequeue(). Modify vm_page_pagequeue() to handle a queue index of PQ_NONE, and use it instead. Make it local to vm_page.c; there are no external consumers and page queue management should be limited to vm_page.c and vm_pageout.c.

No functional change intended.

Diff Detail

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 25985
Build 24540: arc lint + arc unit

Event Timeline

markj created this revision.Aug 20 2019, 2:36 PM

Harbormaster completed remote builds in B25977: Diff 61044.Aug 20 2019, 2:36 PM

markj added reviewers: alc, jeff, kib, dougm.Aug 20 2019, 2:44 PM

alc added inline comments.Aug 20 2019, 3:12 PM

sys/vm/vm_page.c
3327	I'm not sure that I see the point of this assignment or the variable pq1, since the very first statement within this loop will replace the value assigned here.

Remove pq1.
Fix an assertion added in r338276. I meant to assert that either the page lock is held or that vm_page_dequeue() is being called from the page allocator. But testing m->order is not right, we have m->order == VM_NFREEORDER for any allocated page, so the assertion didn't really test anything.

Harbormaster completed remote builds in B25978: Diff 61046.Aug 20 2019, 3:21 PM

Re-add pq1, and reload the page queue pointer only once if a mismatch
is detected after locking the page queue.

Harbormaster completed remote builds in B25985: Diff 61055.Aug 20 2019, 4:46 PM

kib accepted this revision.Aug 20 2019, 7:23 PM

This revision is now accepted and ready to land.Aug 20 2019, 7:23 PM

Closed by commit rS351333: Simplify vm_page_dequeue() and fix an assertion. (authored by markj). · Explain WhyAug 21 2019, 4:11 PM

This revision was automatically updated to reflect the committed changes.

markj added a commit: rS351333: Simplify vm_page_dequeue() and fix an assertion..

Herald added a subscriber: imp. · View Herald TranscriptAug 21 2019, 4:11 PM

Revision Contents
Changeset List

Path

Size

sys/

vm/

1 line

45 lines

8 lines

Diff 61055

sys/vm/vm_page.h

Loading...

sys/vm/vm_page.c

Loading...

sys/vm/vm_pagequeue.h

Loading...