Print this page
OS-3088 need a lighterweight page invalidation mechanism for zone memcap
OS-750 improve RUSAGESYS_GETVMUSAGE for zoneadmd
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/uts/common/sys/vm_usage.h
+++ new/usr/src/uts/common/sys/vm_usage.h
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License (the "License").
6 6 * You may not use this file except in compliance with the License.
7 7 *
8 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 * or http://www.opensolaris.org/os/licensing.
10 10 * See the License for the specific language governing permissions
11 11 * and limitations under the License.
12 12 *
13 13 * When distributing Covered Code, include this CDDL HEADER in each
|
↓ open down ↓ |
13 lines elided |
↑ open up ↑ |
14 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 * If applicable, add the following below this CDDL HEADER, with the
16 16 * fields enclosed by brackets "[]" replaced with your own identifying
17 17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 18 *
19 19 * CDDL HEADER END
20 20 */
21 21 /*
22 22 * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
23 23 * Use is subject to license terms.
24 + * Copyright 2014 Joyent, Inc. All rights reserved.
24 25 */
25 26
26 27 #ifndef _SYS_VM_USAGE_H
27 28 #define _SYS_VM_USAGE_H
28 29
29 30 #include <sys/types.h>
30 31
31 32 #ifdef __cplusplus
32 33 extern "C" {
33 34 #endif
34 35
35 36 /*
36 37 * The flags passed to getvmusage() request how to aggregate rss/swap results.
37 38 * Results can be aggregated by zone, project, task, ruser, and/or euser.
38 39 *
39 40 * If VMUSAGE_ALL_* or VMUSAGE_COL_* are passed from a non-global-zone, the
40 41 * flag is treated as VMUSAGE_*. For example, VMUSAGE_ALL_ZONES would be
41 42 * treated as VMUSAGE_ZONE.
42 43 *
43 44 * If VMUSAGE_SYSTEM is passed from a non-global zone, a result of type
44 45 * VMUSAGE_SYSTEM will be returned, but it will only reflect the usage
45 46 * of the calling zone.
46 47 *
47 48 * VMUSAGE_* requests results for the calling zone.
48 49 * VMUSAGE_ALL_* requests results for all zones.
49 50 * VMUSAGE_COL_* requests results for all zones, but collapses out the zoneid.
50 51 * For example, VMUSAGE_COL_PROJECTS requests results for all
51 52 * projects in all zones, and project N in ANY zone is treated
52 53 * as the same project.
53 54 */
54 55 #define VMUSAGE_SYSTEM 0x1 /* rss/swap for ALL processes */
55 56 #define VMUSAGE_ZONE 0x2 /* rss/swap for caller's zone */
56 57 #define VMUSAGE_PROJECTS 0x4 /* rss/swap for all projects in */
57 58 /* caller's zone */
58 59 #define VMUSAGE_TASKS 0x8 /* rss/swap for all tasks in */
59 60 /* caller's zones */
60 61 #define VMUSAGE_RUSERS 0x10 /* rss/swap for all users (by process */
61 62 /* ruser) in the caller's zone */
62 63 #define VMUSAGE_EUSERS 0x20 /* same as VMUSAGE_RUSERS, but by */
63 64 /* euser */
64 65
65 66 #define VMUSAGE_ALL_ZONES 0x40 /* rss/swap for all zones */
66 67 #define VMUSAGE_ALL_PROJECTS 0x80 /* rss/swap for all projects in */
67 68 /* all zones */
68 69 #define VMUSAGE_ALL_TASKS 0x100 /* rss/swap for all tasks in all */
69 70 /* zones */
70 71 #define VMUSAGE_ALL_RUSERS 0x200 /* rss/swap for all users (by process */
71 72 /* ruser) in all zones */
|
↓ open down ↓ |
38 lines elided |
↑ open up ↑ |
72 73 #define VMUSAGE_ALL_EUSERS 0x400 /* same as VMUSAGE_ALL_RUSERS, but by */
73 74 /* euser */
74 75
75 76 #define VMUSAGE_COL_PROJECTS 0x800 /* rss/swap for all projects in */
76 77 /* all zones. Collapse zoneid. */
77 78 #define VMUSAGE_COL_RUSERS 0x1000 /* rss/swap for all users (by process */
78 79 /* ruser), in all zones. Collapse */
79 80 /* zoneid */
80 81 #define VMUSAGE_COL_EUSERS 0x2000 /* same as VMUSAGE_COL_RUSERS, but by */
81 82 /* euser */
83 +#define VMUSAGE_A_ZONE 0x4000 /* rss/swap for a specified zone */
82 84
83 -#define VMUSAGE_MASK 0x3fff /* all valid flags for getvmusage() */
85 +#define VMUSAGE_MASK 0x7fff /* all valid flags for getvmusage() */
84 86
85 87 typedef struct vmusage {
86 88 id_t vmu_zoneid; /* zoneid, or ALL_ZONES for */
87 89 /* VMUSAGE_COL_* results */
88 90 /* ALL_ZONES means that the result */
89 91 /* reflects swap and rss usage for */
90 92 /* a projid/uid across all zones */
91 93 uint_t vmu_type; /* Entity type of result. One of: */
92 94 /* VMUSAGE_(SYSTEM|ZONE|PROJECTS| */
93 95 /* TASKS|RUSERS|EUSERS) */
94 96 id_t vmu_id; /* zoneid, projid, taskid, ... */
95 97 size_t vmu_rss_all; /* total resident memory of entity */
96 98 /* in bytes */
97 99 size_t vmu_rss_private; /* total resident private memory */
98 100 size_t vmu_rss_shared; /* total resident shared memory */
99 101 size_t vmu_swap_all; /* total swap reserved, in bytes */
100 102 size_t vmu_swap_private; /* swap reserved for private mappings */
|
↓ open down ↓ |
7 lines elided |
↑ open up ↑ |
101 103 size_t vmu_swap_shared; /* swap reserved for shared mappings */
102 104
103 105 } vmusage_t;
104 106
105 107 extern int getvmusage(uint_t flags, time_t age, vmusage_t *buf, size_t *nres);
106 108
107 109 #ifdef _KERNEL
108 110
109 111 int vm_getusage(uint_t, time_t, vmusage_t *, size_t *, int);
110 112 void vm_usage_init();
113 +int vm_map_inval(pid_t, caddr_t, size_t);
111 114
112 115 #endif /* _KERNEL */
113 116
114 117 #ifdef __cplusplus
115 118 }
116 119 #endif
117 120
118 121 #endif /* _SYS_VM_USAGE_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX