From owner-svn-src-all@freebsd.org Fri Aug 11 16:29:24 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A98ADD95F9;
Fri, 11 Aug 2017 16:29:24 +0000 (UTC)
(envelope-from markj@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 mx1.freebsd.org (Postfix) with ESMTPS id 1655E7CD30;
Fri, 11 Aug 2017 16:29:24 +0000 (UTC)
(envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7BGTNxA072671;
Fri, 11 Aug 2017 16:29:23 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7BGTMpO072666;
Fri, 11 Aug 2017 16:29:22 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201708111629.v7BGTMpO072666@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Fri, 11 Aug 2017 16:29:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r322405 - in head/sys: kern sparc64/sparc64 vm
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: in head/sys: kern sparc64/sparc64 vm
X-SVN-Commit-Revision: 322405
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Aug 2017 16:29:24 -0000
Author: markj
Date: Fri Aug 11 16:29:22 2017
New Revision: 322405
URL: https://svnweb.freebsd.org/changeset/base/322405
Log:
Modify vm_page_grab_pages() to handle VM_ALLOC_NOWAIT.
This will allow its use in sendfile_swapin().
Reviewed by: alc, kib
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D11942
Modified:
head/sys/kern/vfs_bio.c
head/sys/sparc64/sparc64/pmap.c
head/sys/vm/vm_glue.c
head/sys/vm/vm_page.c
head/sys/vm/vm_page.h
Modified: head/sys/kern/vfs_bio.c
==============================================================================
--- head/sys/kern/vfs_bio.c Fri Aug 11 16:27:54 2017 (r322404)
+++ head/sys/kern/vfs_bio.c Fri Aug 11 16:29:22 2017 (r322405)
@@ -2746,7 +2746,7 @@ vfs_vmio_extend(struct buf *bp, int desiredpages, int
* deadlocks once allocbuf() is called after
* pages are vfs_busy_pages().
*/
- vm_page_grab_pages(obj,
+ (void)vm_page_grab_pages(obj,
OFF_TO_IDX(bp->b_offset) + bp->b_npages,
VM_ALLOC_SYSTEM | VM_ALLOC_IGN_SBUSY |
VM_ALLOC_NOBUSY | VM_ALLOC_WIRED,
Modified: head/sys/sparc64/sparc64/pmap.c
==============================================================================
--- head/sys/sparc64/sparc64/pmap.c Fri Aug 11 16:27:54 2017 (r322404)
+++ head/sys/sparc64/sparc64/pmap.c Fri Aug 11 16:29:22 2017 (r322405)
@@ -1248,7 +1248,7 @@ pmap_pinit(pmap_t pm)
CPU_ZERO(&pm->pm_active);
VM_OBJECT_WLOCK(pm->pm_tsb_obj);
- vm_page_grab_pages(pm->pm_tsb_obj, 0, VM_ALLOC_NORMAL |
+ (void)vm_page_grab_pages(pm->pm_tsb_obj, 0, VM_ALLOC_NORMAL |
VM_ALLOC_NOBUSY | VM_ALLOC_WIRED | VM_ALLOC_ZERO, ma, TSB_PAGES);
VM_OBJECT_WUNLOCK(pm->pm_tsb_obj);
for (i = 0; i < TSB_PAGES; i++)
Modified: head/sys/vm/vm_glue.c
==============================================================================
--- head/sys/vm/vm_glue.c Fri Aug 11 16:27:54 2017 (r322404)
+++ head/sys/vm/vm_glue.c Fri Aug 11 16:29:22 2017 (r322405)
@@ -391,7 +391,7 @@ vm_thread_new(struct thread *td, int pages)
* page of stack.
*/
VM_OBJECT_WLOCK(ksobj);
- vm_page_grab_pages(ksobj, 0, VM_ALLOC_NORMAL | VM_ALLOC_NOBUSY |
+ (void)vm_page_grab_pages(ksobj, 0, VM_ALLOC_NORMAL | VM_ALLOC_NOBUSY |
VM_ALLOC_WIRED, ma, pages);
for (i = 0; i < pages; i++)
ma[i]->valid = VM_PAGE_BITS_ALL;
@@ -568,7 +568,7 @@ vm_thread_swapin(struct thread *td)
pages = td->td_kstack_pages;
ksobj = td->td_kstack_obj;
VM_OBJECT_WLOCK(ksobj);
- vm_page_grab_pages(ksobj, 0, VM_ALLOC_NORMAL | VM_ALLOC_WIRED, ma,
+ (void)vm_page_grab_pages(ksobj, 0, VM_ALLOC_NORMAL | VM_ALLOC_WIRED, ma,
pages);
for (int i = 0; i < pages;) {
int j, a, count, rv;
Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c Fri Aug 11 16:27:54 2017 (r322404)
+++ head/sys/vm/vm_page.c Fri Aug 11 16:29:22 2017 (r322405)
@@ -3173,13 +3173,15 @@ retrylookup:
* optional allocation flags:
* VM_ALLOC_IGN_SBUSY do not sleep on soft busy pages
* VM_ALLOC_NOBUSY do not exclusive busy the page
+ * VM_ALLOC_NOWAIT do not sleep
* VM_ALLOC_SBUSY set page to sbusy state
* VM_ALLOC_WIRED wire the pages
* VM_ALLOC_ZERO zero and validate any invalid pages
*
- * This routine may sleep.
+ * If VM_ALLOC_NOWAIT is not specified, this routine may sleep. Otherwise, it
+ * may return a partial prefix of the requested range.
*/
-void
+int
vm_page_grab_pages(vm_object_t object, vm_pindex_t pindex, int allocflags,
vm_page_t *ma, int count)
{
@@ -3197,7 +3199,7 @@ vm_page_grab_pages(vm_object_t object, vm_pindex_t pin
(allocflags & VM_ALLOC_IGN_SBUSY) != 0,
("vm_page_grab_pages: VM_ALLOC_SBUSY/IGN_SBUSY mismatch"));
if (count == 0)
- return;
+ return (0);
i = 0;
retrylookup:
m = vm_page_lookup(object, pindex + i);
@@ -3206,6 +3208,8 @@ retrylookup:
sleep = (allocflags & VM_ALLOC_IGN_SBUSY) != 0 ?
vm_page_xbusied(m) : vm_page_busied(m);
if (sleep) {
+ if ((allocflags & VM_ALLOC_NOWAIT) != 0)
+ break;
/*
* Reference the page before unlocking and
* sleeping so that the page daemon is less
@@ -3233,6 +3237,8 @@ retrylookup:
m = vm_page_alloc(object, pindex + i, (allocflags &
~VM_ALLOC_IGN_SBUSY) | VM_ALLOC_COUNT(count - i));
if (m == NULL) {
+ if ((allocflags & VM_ALLOC_NOWAIT) != 0)
+ break;
VM_OBJECT_WUNLOCK(object);
VM_WAIT;
VM_OBJECT_WLOCK(object);
@@ -3247,6 +3253,7 @@ retrylookup:
ma[i] = m;
m = vm_page_next(m);
}
+ return (i);
}
/*
Modified: head/sys/vm/vm_page.h
==============================================================================
--- head/sys/vm/vm_page.h Fri Aug 11 16:27:54 2017 (r322404)
+++ head/sys/vm/vm_page.h Fri Aug 11 16:29:22 2017 (r322405)
@@ -419,7 +419,7 @@ vm_page_t PHYS_TO_VM_PAGE(vm_paddr_t pa);
#define VM_ALLOC_IGN_SBUSY 0x1000 /* (gp) Ignore shared busy flag */
#define VM_ALLOC_NODUMP 0x2000 /* (ag) don't include in dump */
#define VM_ALLOC_SBUSY 0x4000 /* (acgp) Shared busy the page */
-#define VM_ALLOC_NOWAIT 0x8000 /* (g) Do not sleep, return NULL */
+#define VM_ALLOC_NOWAIT 0x8000 /* (gp) Do not sleep */
#define VM_ALLOC_COUNT_SHIFT 16
#define VM_ALLOC_COUNT(count) ((count) << VM_ALLOC_COUNT_SHIFT)
@@ -470,7 +470,7 @@ vm_page_t vm_page_alloc_contig(vm_object_t object, vm_
vm_paddr_t boundary, vm_memattr_t memattr);
vm_page_t vm_page_alloc_freelist(int, int);
vm_page_t vm_page_grab (vm_object_t, vm_pindex_t, int);
-void vm_page_grab_pages(vm_object_t object, vm_pindex_t pindex, int allocflags,
+int vm_page_grab_pages(vm_object_t object, vm_pindex_t pindex, int allocflags,
vm_page_t *ma, int count);
int vm_page_try_to_free (vm_page_t);
void vm_page_deactivate (vm_page_t);