Slightly simplify page queue code.
ClosedPublic
Actions

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

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/

vm_page.h

1 line

vm_page.c

45 lines

vm_pagequeue.h

8 lines

Diff 61055

View Options

sys/vm/vm_page.h

Show First 20 Lines • Show All 491 Lines • ▼ Show 20 Lines	struct l_rt_sigframe {
l_siginfo_t sf_si;		l_siginfo_t sf_si;
struct l_ucontext sf_sc;		struct l_ucontext sf_sc;
l_handler_t sf_handler;		l_handler_t sf_handler;
};		};

extern struct sysentvec linux_sysvec;		extern struct sysentvec linux_sysvec;

/*		/*
* open/fcntl flags		* arch specific open/fcntl flags
*/		*/
#define LINUX_O_RDONLY 00000000
#define LINUX_O_WRONLY 00000001
#define LINUX_O_RDWR 00000002
#define LINUX_O_ACCMODE 00000003
#define LINUX_O_CREAT 00000100
#define LINUX_O_EXCL 00000200
#define LINUX_O_NOCTTY 00000400
#define LINUX_O_TRUNC 00001000
#define LINUX_O_APPEND 00002000
#define LINUX_O_NONBLOCK 00004000
#define LINUX_O_NDELAY LINUX_O_NONBLOCK
#define LINUX_O_SYNC 00010000
#define LINUX_FASYNC 00020000
#define LINUX_O_DIRECT 00040000 /* Direct disk access hint */
#define LINUX_O_LARGEFILE 00100000
#define LINUX_O_DIRECTORY 00200000 /* Must be a directory */
#define LINUX_O_NOFOLLOW 00400000 /* Do not follow links */
#define LINUX_O_NOATIME 01000000
#define LINUX_O_CLOEXEC 02000000

#define LINUX_F_DUPFD 0
#define LINUX_F_GETFD 1
#define LINUX_F_SETFD 2
#define LINUX_F_GETFL 3
#define LINUX_F_SETFL 4
#define LINUX_F_GETLK 5
#define LINUX_F_SETLK 6
#define LINUX_F_SETLKW 7
#define LINUX_F_SETOWN 8
#define LINUX_F_GETOWN 9

#define LINUX_F_GETLK64 12		#define LINUX_F_GETLK64 12
#define LINUX_F_SETLK64 13		#define LINUX_F_SETLK64 13
#define LINUX_F_SETLKW64 14		#define LINUX_F_SETLKW64 14

#define LINUX_F_RDLCK 0
#define LINUX_F_WRLCK 1
#define LINUX_F_UNLCK 2

union l_semun {		union l_semun {
l_int val;		l_int val;
struct l_semid_ds *buf;		struct l_semid_ds *buf;
l_ushort *array;		l_ushort *array;
struct l_seminfo *__buf;		struct l_seminfo *__buf;
void *__pad;		void *__pad;
};		};
▲ Show 20 Lines • Show All 213 Lines • Show Last 20 Lines

View Options

sys/vm/vm_page.c

Show First 20 Lines • Show All 491 Lines • ▼ Show 20 Lines	struct l_rt_sigframe {
l_siginfo_t sf_si;		l_siginfo_t sf_si;
struct l_ucontext sf_sc;		struct l_ucontext sf_sc;
l_handler_t sf_handler;		l_handler_t sf_handler;
};		};

extern struct sysentvec linux_sysvec;		extern struct sysentvec linux_sysvec;

/*		/*
* open/fcntl flags		* arch specific open/fcntl flags
*/		*/
#define LINUX_O_RDONLY 00000000
#define LINUX_O_WRONLY 00000001
#define LINUX_O_RDWR 00000002
#define LINUX_O_ACCMODE 00000003
#define LINUX_O_CREAT 00000100
#define LINUX_O_EXCL 00000200
#define LINUX_O_NOCTTY 00000400
#define LINUX_O_TRUNC 00001000
#define LINUX_O_APPEND 00002000
#define LINUX_O_NONBLOCK 00004000
#define LINUX_O_NDELAY LINUX_O_NONBLOCK
#define LINUX_O_SYNC 00010000
#define LINUX_FASYNC 00020000
#define LINUX_O_DIRECT 00040000 /* Direct disk access hint */
#define LINUX_O_LARGEFILE 00100000
#define LINUX_O_DIRECTORY 00200000 /* Must be a directory */
#define LINUX_O_NOFOLLOW 00400000 /* Do not follow links */
#define LINUX_O_NOATIME 01000000
#define LINUX_O_CLOEXEC 02000000

#define LINUX_F_DUPFD 0
#define LINUX_F_GETFD 1
#define LINUX_F_SETFD 2
#define LINUX_F_GETFL 3
#define LINUX_F_SETFL 4
#define LINUX_F_GETLK 5
#define LINUX_F_SETLK 6
#define LINUX_F_SETLKW 7
#define LINUX_F_SETOWN 8
#define LINUX_F_GETOWN 9

#define LINUX_F_GETLK64 12		#define LINUX_F_GETLK64 12
#define LINUX_F_SETLK64 13		#define LINUX_F_SETLK64 13
#define LINUX_F_SETLKW64 14		#define LINUX_F_SETLKW64 14

#define LINUX_F_RDLCK 0
#define LINUX_F_WRLCK 1
#define LINUX_F_UNLCK 2

union l_semun {		union l_semun {
l_int val;		l_int val;
struct l_semid_ds *buf;		struct l_semid_ds *buf;
l_ushort *array;		l_ushort *array;
struct l_seminfo *__buf;		struct l_seminfo *__buf;
void *__pad;		void *__pad;
};		};
▲ Show 20 Lines • Show All 213 Lines • Show Last 20 Lines

View Options

sys/vm/vm_pagequeue.h

Show First 20 Lines • Show All 491 Lines • ▼ Show 20 Lines	struct l_rt_sigframe {
l_siginfo_t sf_si;		l_siginfo_t sf_si;
struct l_ucontext sf_sc;		struct l_ucontext sf_sc;
l_handler_t sf_handler;		l_handler_t sf_handler;
};		};

extern struct sysentvec linux_sysvec;		extern struct sysentvec linux_sysvec;

/*		/*
* open/fcntl flags		* arch specific open/fcntl flags
*/		*/
#define LINUX_O_RDONLY 00000000
#define LINUX_O_WRONLY 00000001
#define LINUX_O_RDWR 00000002
#define LINUX_O_ACCMODE 00000003
#define LINUX_O_CREAT 00000100
#define LINUX_O_EXCL 00000200
#define LINUX_O_NOCTTY 00000400
#define LINUX_O_TRUNC 00001000
#define LINUX_O_APPEND 00002000
#define LINUX_O_NONBLOCK 00004000
#define LINUX_O_NDELAY LINUX_O_NONBLOCK
#define LINUX_O_SYNC 00010000
#define LINUX_FASYNC 00020000
#define LINUX_O_DIRECT 00040000 /* Direct disk access hint */
#define LINUX_O_LARGEFILE 00100000
#define LINUX_O_DIRECTORY 00200000 /* Must be a directory */
#define LINUX_O_NOFOLLOW 00400000 /* Do not follow links */
#define LINUX_O_NOATIME 01000000
#define LINUX_O_CLOEXEC 02000000

#define LINUX_F_DUPFD 0
#define LINUX_F_GETFD 1
#define LINUX_F_SETFD 2
#define LINUX_F_GETFL 3
#define LINUX_F_SETFL 4
#define LINUX_F_GETLK 5
#define LINUX_F_SETLK 6
#define LINUX_F_SETLKW 7
#define LINUX_F_SETOWN 8
#define LINUX_F_GETOWN 9

#define LINUX_F_GETLK64 12		#define LINUX_F_GETLK64 12
#define LINUX_F_SETLK64 13		#define LINUX_F_SETLK64 13
#define LINUX_F_SETLKW64 14		#define LINUX_F_SETLKW64 14

#define LINUX_F_RDLCK 0
#define LINUX_F_WRLCK 1
#define LINUX_F_UNLCK 2

union l_semun {		union l_semun {
l_int val;		l_int val;
struct l_semid_ds *buf;		struct l_semid_ds *buf;
l_ushort *array;		l_ushort *array;
struct l_seminfo *__buf;		struct l_seminfo *__buf;
void *__pad;		void *__pad;
};		};
▲ Show 20 Lines • Show All 213 Lines • Show Last 20 Lines

Slightly simplify page queue code.ClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 61055

sys/vm/vm_page.h

sys/vm/vm_page.c

sys/vm/vm_pagequeue.h

Slightly simplify page queue code.
ClosedPublic
Actions

Revision Contents
Changeset List