From owner-svn-src-user@freebsd.org Sat Mar 10 23:04:04 2018
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72CA4F3D49C
for <svn-src-user@mailman.ysv.freebsd.org>;
Sat, 10 Mar 2018 23:04:04 +0000 (UTC)
(envelope-from jeff@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 216FE6A1B2;
Sat, 10 Mar 2018 23:04:04 +0000 (UTC)
(envelope-from jeff@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 037E714420;
Sat, 10 Mar 2018 23:04:04 +0000 (UTC)
(envelope-from jeff@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2AN43R7027935;
Sat, 10 Mar 2018 23:04:03 GMT (envelope-from jeff@FreeBSD.org)
Received: (from jeff@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2AN43WG027933;
Sat, 10 Mar 2018 23:04:03 GMT (envelope-from jeff@FreeBSD.org)
Message-Id: <201803102304.w2AN43WG027933@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jeff set sender to
jeff@FreeBSD.org using -f
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Sat, 10 Mar 2018 23:04:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r330748 - user/jeff/numa/sys/vm
X-SVN-Group: user
X-SVN-Commit-Author: jeff
X-SVN-Commit-Paths: user/jeff/numa/sys/vm
X-SVN-Commit-Revision: 330748
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Mar 2018 23:04:04 -0000
Author: jeff
Date: Sat Mar 10 23:04:03 2018
New Revision: 330748
URL: https://svnweb.freebsd.org/changeset/base/330748
Log:
Review feedback from D14612
Modified:
user/jeff/numa/sys/vm/vm_page.c
user/jeff/numa/sys/vm/vm_pageout.c
Modified: user/jeff/numa/sys/vm/vm_page.c
==============================================================================
--- user/jeff/numa/sys/vm/vm_page.c Sat Mar 10 22:52:39 2018 (r330747)
+++ user/jeff/numa/sys/vm/vm_page.c Sat Mar 10 23:04:03 2018 (r330748)
@@ -147,8 +147,8 @@ struct vm_domain vm_dom[MAXMEMDOM];
struct mtx_padalign __exclusive_cache_line pa_lock[PA_LOCK_COUNT];
-/* The following fields are protected by the domainset lock. */
struct mtx_padalign __exclusive_cache_line vm_domainset_lock;
+/* The following fields are protected by the domainset lock. */
domainset_t __exclusive_cache_line vm_min_domains;
domainset_t __exclusive_cache_line vm_severe_domains;
static int vm_min_waiters;
@@ -779,7 +779,7 @@ vm_page_startup(vm_offset_t vaddr)
vm_domain_free_lock(vmd);
vm_phys_free_contig(m, pagecount);
vm_domain_free_unlock(vmd);
- vm_domain_freecnt_inc(vmd, (int)pagecount);
+ vm_domain_freecnt_inc(vmd, pagecount);
vm_cnt.v_page_count += (u_int)pagecount;
vmd = VM_DOMAIN(seg->domain);;
@@ -2816,8 +2816,9 @@ vm_domain_clear(struct vm_domain *vmd)
wakeup(&vm_severe_domains);
}
}
+
/*
- * if pageout daemon needs pages, then tell it that there are
+ * If pageout daemon needs pages, then tell it that there are
* some free.
*/
if (vmd->vmd_pageout_pages_needed &&
@@ -2826,7 +2827,7 @@ vm_domain_clear(struct vm_domain *vmd)
vmd->vmd_pageout_pages_needed = 0;
}
- /* See comments in vm_wait(); */
+ /* See comments in vm_wait_doms(). */
if (vm_pageproc_waiters) {
vm_pageproc_waiters = 0;
wakeup(&vm_pageproc_waiters);
Modified: user/jeff/numa/sys/vm/vm_pageout.c
==============================================================================
--- user/jeff/numa/sys/vm/vm_pageout.c Sat Mar 10 22:52:39 2018 (r330747)
+++ user/jeff/numa/sys/vm/vm_pageout.c Sat Mar 10 23:04:03 2018 (r330748)
@@ -1895,7 +1895,7 @@ vm_pageout_worker(void *arg)
while (TRUE) {
vm_domain_pageout_lock(vmd);
/*
- * Wwe need to clear wanted before we check the limits. This
+ * We need to clear wanted before we check the limits. This
* prevents races with wakers who will check wanted after they
* reach the limit.
*/
@@ -1923,7 +1923,7 @@ vm_pageout_worker(void *arg)
"psleep", hz / VM_INACT_SCAN_RATE) == 0)
VM_CNT_INC(v_pdwakeups);
}
- /* Prevent spurior wakeups by ensuring that wanted is set. */
+ /* Prevent spurious wakeups by ensuring that wanted is set. */
atomic_store_int(&vmd->vmd_pageout_wanted, 1);
/*
@@ -2103,7 +2103,7 @@ pagedaemon_wakeup(int domain)
vmd = VM_DOMAIN(domain);
vm_domain_pageout_assert_unlocked(vmd);
- if (curthread->td_proc == pageproc)
+ if (curproc == pageproc)
return;
if (atomic_fetchadd_int(&vmd->vmd_pageout_wanted, 1) == 0) {