Mon Apr 13 22:04:44 2015 UTC ()
Limit <sys/rndsource.h> include to kernel.


(riastradh)
diff -r1.65 -r1.66 src/sys/uvm/uvm.h

cvs diff -r1.65 -r1.66 src/sys/uvm/uvm.h (switch to unified diff)

--- src/sys/uvm/uvm.h 2015/04/13 16:46:33 1.65
+++ src/sys/uvm/uvm.h 2015/04/13 22:04:44 1.66
@@ -1,194 +1,195 @@ @@ -1,194 +1,195 @@
1/* $NetBSD: uvm.h,v 1.65 2015/04/13 16:46:33 riastradh Exp $ */ 1/* $NetBSD: uvm.h,v 1.66 2015/04/13 22:04:44 riastradh Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1997 Charles D. Cranor and Washington University. 4 * Copyright (c) 1997 Charles D. Cranor and Washington University.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 * 26 *
27 * from: Id: uvm.h,v 1.1.2.14 1998/02/02 20:07:19 chuck Exp 27 * from: Id: uvm.h,v 1.1.2.14 1998/02/02 20:07:19 chuck Exp
28 */ 28 */
29 29
30#ifndef _UVM_UVM_H_ 30#ifndef _UVM_UVM_H_
31#define _UVM_UVM_H_ 31#define _UVM_UVM_H_
32 32
33#if defined(_KERNEL_OPT) 33#if defined(_KERNEL_OPT)
34#include "opt_lockdebug.h" 34#include "opt_lockdebug.h"
35#include "opt_multiprocessor.h" 35#include "opt_multiprocessor.h"
36#include "opt_uvmhist.h" 36#include "opt_uvmhist.h"
37#include "opt_uvm_page_trkown.h" 37#include "opt_uvm_page_trkown.h"
38#endif 38#endif
39 39
40#include <uvm/uvm_extern.h> 40#include <uvm/uvm_extern.h>
41 41
42#ifdef _KERNEL 42#ifdef _KERNEL
43#include <uvm/uvm_stat.h> 43#include <uvm/uvm_stat.h>
44#endif 44#endif
45 45
46/* 46/*
47 * pull in prototypes 47 * pull in prototypes
48 */ 48 */
49 49
50#include <uvm/uvm_amap.h> 50#include <uvm/uvm_amap.h>
51#include <uvm/uvm_aobj.h> 51#include <uvm/uvm_aobj.h>
52#include <uvm/uvm_fault.h> 52#include <uvm/uvm_fault.h>
53#include <uvm/uvm_glue.h> 53#include <uvm/uvm_glue.h>
54#include <uvm/uvm_km.h> 54#include <uvm/uvm_km.h>
55#include <uvm/uvm_loan.h> 55#include <uvm/uvm_loan.h>
56#include <uvm/uvm_map.h> 56#include <uvm/uvm_map.h>
57#include <uvm/uvm_object.h> 57#include <uvm/uvm_object.h>
58#include <uvm/uvm_page.h> 58#include <uvm/uvm_page.h>
59#include <uvm/uvm_pager.h> 59#include <uvm/uvm_pager.h>
60#include <uvm/uvm_pdaemon.h> 60#include <uvm/uvm_pdaemon.h>
61#include <uvm/uvm_swap.h> 61#include <uvm/uvm_swap.h>
62#include <sys/rndsource.h> 
63 62
64#ifdef _KERNEL 63#ifdef _KERNEL
65 64
 65#include <sys/rndsource.h>
 66
66/* 67/*
67 * pull in VM_NFREELIST 68 * pull in VM_NFREELIST
68 */ 69 */
69#include <machine/vmparam.h> 70#include <machine/vmparam.h>
70 71
71struct workqueue; 72struct workqueue;
72 73
73/* 74/*
74 * per-cpu data 75 * per-cpu data
75 */ 76 */
76 77
77struct uvm_cpu { 78struct uvm_cpu {
78 struct pgfreelist page_free[VM_NFREELIST]; /* unallocated pages */ 79 struct pgfreelist page_free[VM_NFREELIST]; /* unallocated pages */
79 int page_free_nextcolor; /* next color to allocate from */ 80 int page_free_nextcolor; /* next color to allocate from */
80 int page_idlezero_next; /* which color to zero next */ 81 int page_idlezero_next; /* which color to zero next */
81 bool page_idle_zero; /* TRUE if we should try to zero 82 bool page_idle_zero; /* TRUE if we should try to zero
82 pages in the idle loop */ 83 pages in the idle loop */
83 int pages[PGFL_NQUEUES]; /* total of pages in page_free */ 84 int pages[PGFL_NQUEUES]; /* total of pages in page_free */
84 u_int emap_gen; /* emap generation number */ 85 u_int emap_gen; /* emap generation number */
85 86
86 krndsource_t rs; /* entropy source */ 87 krndsource_t rs; /* entropy source */
87}; 88};
88 89
89/* 90/*
90 * uvm structure (vm global state: collected in one structure for ease 91 * uvm structure (vm global state: collected in one structure for ease
91 * of reference...) 92 * of reference...)
92 */ 93 */
93 94
94struct uvm { 95struct uvm {
95 /* vm_page related parameters */ 96 /* vm_page related parameters */
96 97
97 /* vm_page queues */ 98 /* vm_page queues */
98 struct pgfreelist page_free[VM_NFREELIST]; /* unallocated pages */ 99 struct pgfreelist page_free[VM_NFREELIST]; /* unallocated pages */
99 bool page_init_done; /* TRUE if uvm_page_init() finished */ 100 bool page_init_done; /* TRUE if uvm_page_init() finished */
100 101
101 /* page daemon trigger */ 102 /* page daemon trigger */
102 int pagedaemon; /* daemon sleeps on this */ 103 int pagedaemon; /* daemon sleeps on this */
103 struct lwp *pagedaemon_lwp; /* daemon's lid */ 104 struct lwp *pagedaemon_lwp; /* daemon's lid */
104 105
105 /* aiodone daemon */ 106 /* aiodone daemon */
106 struct workqueue *aiodone_queue; 107 struct workqueue *aiodone_queue;
107 108
108 /* aio_done is locked by uvm.pagedaemon_lock and splbio! */ 109 /* aio_done is locked by uvm.pagedaemon_lock and splbio! */
109 TAILQ_HEAD(, buf) aio_done; /* done async i/o reqs */ 110 TAILQ_HEAD(, buf) aio_done; /* done async i/o reqs */
110 111
111 /* per-cpu data */ 112 /* per-cpu data */
112 struct uvm_cpu *cpus[MAXCPUS]; 113 struct uvm_cpu *cpus[MAXCPUS];
113}; 114};
114 115
115/* 116/*
116 * kernel object: to support anonymous pageable kernel memory 117 * kernel object: to support anonymous pageable kernel memory
117 */ 118 */
118extern struct uvm_object *uvm_kernel_object; 119extern struct uvm_object *uvm_kernel_object;
119 120
120/* 121/*
121 * locks (made globals for lockstat). 122 * locks (made globals for lockstat).
122 */ 123 */
123 124
124extern kmutex_t uvm_pageqlock; /* lock for active/inactive page q */ 125extern kmutex_t uvm_pageqlock; /* lock for active/inactive page q */
125extern kmutex_t uvm_fpageqlock; /* lock for free page q */ 126extern kmutex_t uvm_fpageqlock; /* lock for free page q */
126extern kmutex_t uvm_kentry_lock; 127extern kmutex_t uvm_kentry_lock;
127extern kmutex_t uvm_swap_data_lock; 128extern kmutex_t uvm_swap_data_lock;
128 129
129#endif /* _KERNEL */ 130#endif /* _KERNEL */
130 131
131/* 132/*
132 * vm_map_entry etype bits: 133 * vm_map_entry etype bits:
133 */ 134 */
134 135
135#define UVM_ET_OBJ 0x01 /* it is a uvm_object */ 136#define UVM_ET_OBJ 0x01 /* it is a uvm_object */
136#define UVM_ET_SUBMAP 0x02 /* it is a vm_map submap */ 137#define UVM_ET_SUBMAP 0x02 /* it is a vm_map submap */
137#define UVM_ET_COPYONWRITE 0x04 /* copy_on_write */ 138#define UVM_ET_COPYONWRITE 0x04 /* copy_on_write */
138#define UVM_ET_NEEDSCOPY 0x08 /* needs_copy */ 139#define UVM_ET_NEEDSCOPY 0x08 /* needs_copy */
139 140
140#define UVM_ET_ISOBJ(E) (((E)->etype & UVM_ET_OBJ) != 0) 141#define UVM_ET_ISOBJ(E) (((E)->etype & UVM_ET_OBJ) != 0)
141#define UVM_ET_ISSUBMAP(E) (((E)->etype & UVM_ET_SUBMAP) != 0) 142#define UVM_ET_ISSUBMAP(E) (((E)->etype & UVM_ET_SUBMAP) != 0)
142#define UVM_ET_ISCOPYONWRITE(E) (((E)->etype & UVM_ET_COPYONWRITE) != 0) 143#define UVM_ET_ISCOPYONWRITE(E) (((E)->etype & UVM_ET_COPYONWRITE) != 0)
143#define UVM_ET_ISNEEDSCOPY(E) (((E)->etype & UVM_ET_NEEDSCOPY) != 0) 144#define UVM_ET_ISNEEDSCOPY(E) (((E)->etype & UVM_ET_NEEDSCOPY) != 0)
144 145
145#ifdef _KERNEL 146#ifdef _KERNEL
146 147
147/* 148/*
148 * holds all the internal UVM data 149 * holds all the internal UVM data
149 */ 150 */
150extern struct uvm uvm; 151extern struct uvm uvm;
151 152
152/* 153/*
153 * historys 154 * historys
154 */ 155 */
155 156
156#ifdef UVMHIST 157#ifdef UVMHIST
157UVMHIST_DECL(maphist); 158UVMHIST_DECL(maphist);
158UVMHIST_DECL(pdhist); 159UVMHIST_DECL(pdhist);
159UVMHIST_DECL(ubchist); 160UVMHIST_DECL(ubchist);
160UVMHIST_DECL(loanhist); 161UVMHIST_DECL(loanhist);
161#endif 162#endif
162 163
163extern struct evcnt uvm_ra_total; 164extern struct evcnt uvm_ra_total;
164extern struct evcnt uvm_ra_hit; 165extern struct evcnt uvm_ra_hit;
165extern struct evcnt uvm_ra_miss; 166extern struct evcnt uvm_ra_miss;
166 167
167/* 168/*
168 * UVM_UNLOCK_AND_WAIT: atomic unlock+wait... wrapper around the 169 * UVM_UNLOCK_AND_WAIT: atomic unlock+wait... wrapper around the
169 * interlocked tsleep() function. 170 * interlocked tsleep() function.
170 */ 171 */
171 172
172#define UVM_UNLOCK_AND_WAIT(event, slock, intr, msg, timo) \ 173#define UVM_UNLOCK_AND_WAIT(event, slock, intr, msg, timo) \
173do { \ 174do { \
174 (void) mtsleep(event, PVM | PNORELOCK | (intr ? PCATCH : 0), \ 175 (void) mtsleep(event, PVM | PNORELOCK | (intr ? PCATCH : 0), \
175 msg, timo, slock); \ 176 msg, timo, slock); \
176} while (/*CONSTCOND*/ 0) 177} while (/*CONSTCOND*/ 0)
177 178
178void uvm_kick_pdaemon(void); 179void uvm_kick_pdaemon(void);
179 180
180/* 181/*
181 * UVM_PAGE_OWN: track page ownership (only if UVM_PAGE_TRKOWN) 182 * UVM_PAGE_OWN: track page ownership (only if UVM_PAGE_TRKOWN)
182 */ 183 */
183 184
184#if defined(UVM_PAGE_TRKOWN) 185#if defined(UVM_PAGE_TRKOWN)
185#define UVM_PAGE_OWN(PG, TAG) uvm_page_own(PG, TAG) 186#define UVM_PAGE_OWN(PG, TAG) uvm_page_own(PG, TAG)
186#else 187#else
187#define UVM_PAGE_OWN(PG, TAG) /* nothing */ 188#define UVM_PAGE_OWN(PG, TAG) /* nothing */
188#endif /* UVM_PAGE_TRKOWN */ 189#endif /* UVM_PAGE_TRKOWN */
189 190
190#include <uvm/uvm_fault_i.h> 191#include <uvm/uvm_fault_i.h>
191 192
192#endif /* _KERNEL */ 193#endif /* _KERNEL */
193 194
194#endif /* _UVM_UVM_H_ */ 195#endif /* _UVM_UVM_H_ */