Page MenuHomeFreeBSD
Differential D1045

Add a functione for converting wait options.
ClosedPublic
Actions

Authored by dchagin on Oct 31 2014, 6:39 AM.
Tags
None
Referenced Files
F114892495: D1045.diff
Fri, Apr 18, 5:30 AM
F114878056: D1045.id5611.diff
Fri, Apr 18, 12:52 AM
Unknown Object (File)
Mon, Apr 14, 6:09 AM
Unknown Object (File)
Mon, Apr 14, 6:04 AM
Unknown Object (File)
Mon, Apr 14, 5:55 AM
Unknown Object (File)
Mon, Apr 14, 5:35 AM
Unknown Object (File)
Mon, Apr 14, 3:28 AM
Unknown Object (File)
Sat, Apr 5, 6:32 AM
View All Files
Subscribers
emaste
trasz

Details

Reviewers
trasz
Group Reviewers
Linux Emulation
Commits
rS283390: Add a function for converting wait options.

Diff Detail

Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

dchagin updated this revision to Diff 2175.Oct 31 2014, 6:39 AM
dchagin retitled this revision from to Add a functione for converting wait options..
dchagin added a reviewer: Linux Emulation.Oct 31 2014, 6:57 AM
trasz added a subscriber: trasz.Dec 8 2014, 10:56 AM
trasz added inline comments.
sys/compat/linux/linux_misc.h
123

What's the purpose of WNOTHREAD and WALL? The diff below doesn't use those. Also, why not LINUX prefix, __LINUX_WNOWAIT, perhaps?

emaste added a subscriber: emaste.Dec 15 2014, 7:35 PM

s/functione/function/

dchagin added inline comments.Dec 27 2014, 2:24 PM
sys/compat/linux/linux_misc.h
123

Mostly for the future. Possible i'm broke LinuxThreads support (pre NPTL threads library) by switch to native threads.

dchagin updated this revision to Diff 2944.Jan 1 2015, 5:42 PM

Removed WALL, WNOTHREAD.

dchagin added a comment.Jan 1 2015, 9:53 PM

whoops, they are used, so it is wrong to remove it.

trasz accepted this revision.Mar 21 2015, 6:12 PM
trasz added a reviewer: trasz.
This revision is now accepted and ready to land.Mar 21 2015, 6:12 PM
Closed by commit rS283390: Add a function for converting wait options. (authored by dchagin). · Explain WhyMay 24 2015, 3:00 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
sys/
compat/
linux/
12 lines
20 lines

Diff 2175

View Options

sys/compat/linux/linux_misc.h

Show First 20 Lines • Show All 2,037 Lines • ▼ Show 20 Lines
* *
* optional allocation flags: * optional allocation flags:
* VM_ALLOC_COUNT(number) the number of additional pages that the caller * VM_ALLOC_COUNT(number) the number of additional pages that the caller
* intends to allocate * intends to allocate
* VM_ALLOC_WIRED wire the allocated page * VM_ALLOC_WIRED wire the allocated page
* VM_ALLOC_ZERO prefer a zeroed page * VM_ALLOC_ZERO prefer a zeroed page
*/ */
vm_page_t vm_page_t
vm_page_alloc_freelist(int flind, int req) vm_page_alloc_freelist(int freelist, int req)
{ {
struct vm_domain_iterator vi; struct vm_domain_iterator vi;
vm_page_t m; vm_page_t m;
int domain, wait; int domain, wait;
m = NULL; m = NULL;
vm_policy_iterator_init(&vi); vm_policy_iterator_init(&vi);
wait = req & (VM_ALLOC_WAITFAIL | VM_ALLOC_WAITOK); wait = req & (VM_ALLOC_WAITFAIL | VM_ALLOC_WAITOK);
req &= ~wait; req &= ~wait;
while (vm_domain_iterator_run(&vi, &domain) == 0) { while (vm_domain_iterator_run(&vi, &domain) == 0) {
if (vm_domain_iterator_isdone(&vi)) if (vm_domain_iterator_isdone(&vi))
req |= wait; req |= wait;
m = vm_page_alloc_freelist_domain(domain, flind, req); m = vm_page_alloc_freelist_domain(domain, freelist, req);
if (m != NULL) if (m != NULL)
break; break;
} }
vm_policy_iterator_finish(&vi); vm_policy_iterator_finish(&vi);
return (m); return (m);
} }
vm_page_t vm_page_t
vm_page_alloc_freelist_domain(int domain, int flind, int req) vm_page_alloc_freelist_domain(int domain, int freelist, int req)
{ {
vm_page_t m; vm_page_t m;
u_int flags, free_count; u_int flags, free_count;
int req_class; int req_class;
req_class = req & VM_ALLOC_CLASS_MASK; req_class = req & VM_ALLOC_CLASS_MASK;
/* /*
* The page daemon is allowed to dig deeper into the free page list. * The page daemon is allowed to dig deeper into the free page list.
*/ */
if (curproc == pageproc && req_class != VM_ALLOC_INTERRUPT) if (curproc == pageproc && req_class != VM_ALLOC_INTERRUPT)
req_class = VM_ALLOC_SYSTEM; req_class = VM_ALLOC_SYSTEM;
/* /*
* Do not allocate reserved pages unless the req has asked for it. * Do not allocate reserved pages unless the req has asked for it.
*/ */
again: again:
mtx_lock(&vm_page_queue_free_mtx); mtx_lock(&vm_page_queue_free_mtx);
if (vm_cnt.v_free_count > vm_cnt.v_free_reserved || if (vm_cnt.v_free_count > vm_cnt.v_free_reserved ||
(req_class == VM_ALLOC_SYSTEM && (req_class == VM_ALLOC_SYSTEM &&
vm_cnt.v_free_count > vm_cnt.v_interrupt_free_min) || vm_cnt.v_free_count > vm_cnt.v_interrupt_free_min) ||
(req_class == VM_ALLOC_INTERRUPT && (req_class == VM_ALLOC_INTERRUPT &&
vm_cnt.v_free_count > 0)) vm_cnt.v_free_count > 0))
m = vm_phys_alloc_freelist_pages(domain, flind, m = vm_phys_alloc_freelist_pages(domain, freelist,
VM_FREEPOOL_DIRECT, 0); VM_FREEPOOL_DIRECT, 0);
if (m == NULL) { if (m == NULL) {
if (vm_page_alloc_fail(NULL, req)) if (vm_page_alloc_fail(NULL, req))
goto again; goto again;
return (NULL); return (NULL);
} }
free_count = vm_phys_freecnt_adj(m, -1); free_count = vm_phys_freecnt_adj(m, -1);
mtx_unlock(&vm_page_queue_free_mtx); mtx_unlock(&vm_page_queue_free_mtx);
▲ Show 20 Lines • Show All 1,905 Lines • Show Last 20 Lines
View Options

sys/compat/linux/linux_misc.c

Show First 20 Lines • Show All 2,037 Lines • ▼ Show 20 Lines
* *
* optional allocation flags: * optional allocation flags:
* VM_ALLOC_COUNT(number) the number of additional pages that the caller * VM_ALLOC_COUNT(number) the number of additional pages that the caller
* intends to allocate * intends to allocate
* VM_ALLOC_WIRED wire the allocated page * VM_ALLOC_WIRED wire the allocated page
* VM_ALLOC_ZERO prefer a zeroed page * VM_ALLOC_ZERO prefer a zeroed page
*/ */
vm_page_t vm_page_t
vm_page_alloc_freelist(int flind, int req) vm_page_alloc_freelist(int freelist, int req)
{ {
struct vm_domain_iterator vi; struct vm_domain_iterator vi;
vm_page_t m; vm_page_t m;
int domain, wait; int domain, wait;
m = NULL; m = NULL;
vm_policy_iterator_init(&vi); vm_policy_iterator_init(&vi);
wait = req & (VM_ALLOC_WAITFAIL | VM_ALLOC_WAITOK); wait = req & (VM_ALLOC_WAITFAIL | VM_ALLOC_WAITOK);
req &= ~wait; req &= ~wait;
while (vm_domain_iterator_run(&vi, &domain) == 0) { while (vm_domain_iterator_run(&vi, &domain) == 0) {
if (vm_domain_iterator_isdone(&vi)) if (vm_domain_iterator_isdone(&vi))
req |= wait; req |= wait;
m = vm_page_alloc_freelist_domain(domain, flind, req); m = vm_page_alloc_freelist_domain(domain, freelist, req);
if (m != NULL) if (m != NULL)
break; break;
} }
vm_policy_iterator_finish(&vi); vm_policy_iterator_finish(&vi);
return (m); return (m);
} }
vm_page_t vm_page_t
vm_page_alloc_freelist_domain(int domain, int flind, int req) vm_page_alloc_freelist_domain(int domain, int freelist, int req)
{ {
vm_page_t m; vm_page_t m;
u_int flags, free_count; u_int flags, free_count;
int req_class; int req_class;
req_class = req & VM_ALLOC_CLASS_MASK; req_class = req & VM_ALLOC_CLASS_MASK;
/* /*
* The page daemon is allowed to dig deeper into the free page list. * The page daemon is allowed to dig deeper into the free page list.
*/ */
if (curproc == pageproc && req_class != VM_ALLOC_INTERRUPT) if (curproc == pageproc && req_class != VM_ALLOC_INTERRUPT)
req_class = VM_ALLOC_SYSTEM; req_class = VM_ALLOC_SYSTEM;
/* /*
* Do not allocate reserved pages unless the req has asked for it. * Do not allocate reserved pages unless the req has asked for it.
*/ */
again: again:
mtx_lock(&vm_page_queue_free_mtx); mtx_lock(&vm_page_queue_free_mtx);
if (vm_cnt.v_free_count > vm_cnt.v_free_reserved || if (vm_cnt.v_free_count > vm_cnt.v_free_reserved ||
(req_class == VM_ALLOC_SYSTEM && (req_class == VM_ALLOC_SYSTEM &&
vm_cnt.v_free_count > vm_cnt.v_interrupt_free_min) || vm_cnt.v_free_count > vm_cnt.v_interrupt_free_min) ||
(req_class == VM_ALLOC_INTERRUPT && (req_class == VM_ALLOC_INTERRUPT &&
vm_cnt.v_free_count > 0)) vm_cnt.v_free_count > 0))
m = vm_phys_alloc_freelist_pages(domain, flind, m = vm_phys_alloc_freelist_pages(domain, freelist,
VM_FREEPOOL_DIRECT, 0); VM_FREEPOOL_DIRECT, 0);
if (m == NULL) { if (m == NULL) {
if (vm_page_alloc_fail(NULL, req)) if (vm_page_alloc_fail(NULL, req))
goto again; goto again;
return (NULL); return (NULL);
} }
free_count = vm_phys_freecnt_adj(m, -1); free_count = vm_phys_freecnt_adj(m, -1);
mtx_unlock(&vm_page_queue_free_mtx); mtx_unlock(&vm_page_queue_free_mtx);
▲ Show 20 Lines • Show All 1,905 Lines • Show Last 20 Lines