Author: glebius
Date: Wed Jan 16 20:14:16 2019
New Revision: 343100
URL: https://svnweb.freebsd.org/changeset/base/343100
Log:
Do not reserve KVA for paging bufs in vm_ksubmap_init(), since now
they allocate it in pbuf_init(). This should have been done together
with r343030.
Modified:
head/sys/vm/vm_init.c
head/sys/vm/vm_kern.h
head/sys/vm/vm_pager.c
Modified: head/sys/vm/vm_init.c
==============================================================================
--- head/sys/vm/vm_init.c Wed Jan 16 19:20:14 2019 (r343099)
+++ head/sys/vm/vm_init.c Wed Jan 16 20:14:16 2019 (r343100)
@@ -221,11 +221,9 @@ again:
panic("startup: table size inconsistency");
/*
- * Allocate the clean map to hold all of the paging and I/O virtual
- * memory.
+ * Allocate the clean map to hold all of I/O virtual memory.
*/
- size = (long)nbuf * BKVASIZE + (long)nswbuf * MAXPHYS +
- (long)bio_transient_maxcnt * MAXPHYS;
+ size = (long)nbuf * BKVASIZE + (long)bio_transient_maxcnt * MAXPHYS;
kmi->clean_sva = firstaddr = kva_alloc(size);
kmi->clean_eva = firstaddr + size;
@@ -240,13 +238,6 @@ again:
kmi->buffer_eva = kmi->buffer_sva + size;
vmem_init(buffer_arena, "buffer arena", kmi->buffer_sva, size,
PAGE_SIZE, (mp_ncpus > 4) ? BKVASIZE * 8 : 0, 0);
- firstaddr += size;
-
- /*
- * Now swap kva.
- */
- swapbkva = firstaddr;
- size = (long)nswbuf * MAXPHYS;
firstaddr += size;
/*
Modified: head/sys/vm/vm_kern.h
==============================================================================
--- head/sys/vm/vm_kern.h Wed Jan 16 19:20:14 2019 (r343099)
+++ head/sys/vm/vm_kern.h Wed Jan 16 20:14:16 2019 (r343100)
@@ -74,7 +74,6 @@ extern struct vmem *kmem_arena;
extern struct vmem *buffer_arena;
extern struct vmem *transient_arena;
extern struct vmem *memguard_arena;
-extern vm_offset_t swapbkva;
extern u_long vm_kmem_size;
extern u_int exec_map_entries;
extern u_int exec_map_entry_size;
Modified: head/sys/vm/vm_pager.c
==============================================================================
--- head/sys/vm/vm_pager.c Wed Jan 16 19:20:14 2019 (r343099)
+++ head/sys/vm/vm_pager.c Wed Jan 16 20:14:16 2019 (r343100)
@@ -163,16 +163,6 @@ struct pagerops *pagertab[] = {
&mgtdevicepagerops, /* OBJT_MGTDEVICE */
};
-/*
- * Kernel address space for mapping pages.
- * Used by pagers where KVAs are needed for IO.
- *
- * XXX needs to be large enough to support the number of pending async
- * cleaning requests (NPENDINGIO == 64) * the maximum swap cluster size
- * (MAXPHYS == 64k) if you want to get the most efficiency.
- */
-vm_offset_t swapbkva; /* swap buffers kva */
-
void
vm_pager_init(void)
{
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
