Page MenuHomeFreeBSD
Files F133680606

D51249.id161770.diff
No OneTemporary
Actions

D51249.id161770.diff
View Options

diff --git a/sys/vm/vm_domainset.h b/sys/vm/vm_domainset.h
--- a/sys/vm/vm_domainset.h
+++ b/sys/vm/vm_domainset.h
@@ -33,11 +33,15 @@
struct vm_domainset_iter {
struct domainset *di_domain;
unsigned int *di_iter;
+ /* Initialized from 'di_domain', initial value after reset. */
domainset_t di_valid_mask;
+ /* Domains to browse in the current phase. */
+ domainset_t di_remain_mask;
+ /* Domains skipped in phase 1 because under 'v_free_min'. */
+ domainset_t di_min_mask;
vm_pindex_t di_offset;
int di_flags;
uint16_t di_policy;
- domainid_t di_n;
bool di_minskip;
};
diff --git a/sys/vm/vm_domainset.c b/sys/vm/vm_domainset.c
--- a/sys/vm/vm_domainset.c
+++ b/sys/vm/vm_domainset.c
@@ -131,7 +131,8 @@
vm_domainset_iter_next(struct vm_domainset_iter *di, int *domain)
{
- KASSERT(di->di_n > 0, ("%s: Invalid n %d", __func__, di->di_n));
+ KASSERT(!DOMAINSET_EMPTY(&di->di_remain_mask),
+ ("%s: Already iterated on all domains", __func__));
switch (di->di_policy) {
case DOMAINSET_POLICY_FIRSTTOUCH:
/*
@@ -161,37 +162,39 @@
switch (di->di_policy) {
case DOMAINSET_POLICY_FIRSTTOUCH:
*domain = PCPU_GET(domain);
- if (DOMAINSET_ISSET(*domain, &di->di_valid_mask)) {
- /*
- * Add an extra iteration because we will visit the
- * current domain a second time in the rr iterator.
- */
- di->di_n = di->di_domain->ds_cnt + 1;
+ if (DOMAINSET_ISSET(*domain, &di->di_valid_mask))
break;
- }
/*
* To prevent impossible allocations we convert an invalid
* first-touch to round-robin.
*/
/* FALLTHROUGH */
case DOMAINSET_POLICY_ROUNDROBIN:
- di->di_n = di->di_domain->ds_cnt;
vm_domainset_iter_rr(di, domain);
break;
case DOMAINSET_POLICY_PREFER:
*domain = di->di_domain->ds_prefer;
- di->di_n = di->di_domain->ds_cnt;
break;
case DOMAINSET_POLICY_INTERLEAVE:
vm_domainset_iter_interleave(di, domain);
- di->di_n = di->di_domain->ds_cnt;
break;
default:
panic("%s: Unknown policy %d", __func__, di->di_policy);
}
- KASSERT(di->di_n > 0, ("%s: Invalid n %d", __func__, di->di_n));
KASSERT(*domain < vm_ndomains,
("%s: Invalid domain %d", __func__, *domain));
+
+ /* Initialize the mask of domains to visit. */
+ if (di->di_minskip) {
+ /* Phase 1: Skip domains under 'v_free_min'. */
+ DOMAINSET_COPY(&di->di_valid_mask, &di->di_remain_mask);
+ DOMAINSET_ZERO(&di->di_min_mask);
+ } else
+ /* Phase 2: Browse domains that were under 'v_free_min'. */
+ DOMAINSET_COPY(&di->di_min_mask, &di->di_remain_mask);
+
+ /* Mark first domain as seen. */
+ DOMAINSET_CLR(*domain, &di->di_remain_mask);
}
void
@@ -225,12 +228,15 @@
if (__predict_false(DOMAINSET_EMPTY(&di->di_valid_mask)))
return (ENOMEM);
- /* If there are more domains to visit we run the iterator. */
- while (--di->di_n != 0) {
+ /* If there are more domains to visit in this phase, run the iterator. */
+ while (!DOMAINSET_EMPTY(&di->di_remain_mask)) {
vm_domainset_iter_next(di, domain);
- if (DOMAINSET_ISSET(*domain, &di->di_valid_mask) &&
- (!di->di_minskip || !vm_page_count_min_domain(*domain)))
- return (0);
+ if (DOMAINSET_ISSET(*domain, &di->di_remain_mask)) {
+ DOMAINSET_CLR(*domain, &di->di_remain_mask);
+ if (!di->di_minskip || !vm_page_count_min_domain(*domain))
+ return (0);
+ DOMAINSET_SET(*domain, &di->di_min_mask);
+ }
}
/* If we skipped domains below min restart the search. */
@@ -298,12 +304,15 @@
if (DOMAINSET_EMPTY(&di->di_valid_mask))
return (ENOMEM);
- /* If there are more domains to visit we run the iterator. */
- while (--di->di_n != 0) {
+ /* If there are more domains to visit in this phase, run the iterator. */
+ while (!DOMAINSET_EMPTY(&di->di_remain_mask)) {
vm_domainset_iter_next(di, domain);
- if (DOMAINSET_ISSET(*domain, &di->di_valid_mask) &&
- (!di->di_minskip || !vm_page_count_min_domain(*domain)))
- return (0);
+ if (DOMAINSET_ISSET(*domain, &di->di_remain_mask)) {
+ DOMAINSET_CLR(*domain, &di->di_remain_mask);
+ if (!di->di_minskip || !vm_page_count_min_domain(*domain))
+ return (0);
+ DOMAINSET_SET(*domain, &di->di_min_mask);
+ }
}
/* If we skipped domains below min restart the search. */

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 28, 1:22 PM (57 m, 10 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
22290368
Default Alt Text
D51249.id161770.diff (4 KB)

Event Timeline