Print this page
OS-4277 lx procfs /proc/{pid}/environ always empty
OS-3463 expose process argv through procfs
OS-3207 in lx zone, 'ps auxww' does not show full cmdline for processes
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/uts/common/fs/proc/prdata.h
+++ new/usr/src/uts/common/fs/proc/prdata.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
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
|
↓ open down ↓ |
19 lines elided |
↑ open up ↑ |
20 20 */
21 21 /*
22 22 * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
23 23 * Use is subject to license terms.
24 24 */
25 25
26 26 /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
27 27 /* All Rights Reserved */
28 28
29 29 /*
30 - * Copyright (c) 2013, Joyent, Inc. All rights reserved.
30 + * Copyright 2015, Joyent, Inc.
31 31 */
32 32
33 33 #ifndef _SYS_PROC_PRDATA_H
34 34 #define _SYS_PROC_PRDATA_H
35 35
36 36 #include <sys/isa_defs.h>
37 37 #include <sys/proc.h>
38 38 #include <sys/vnode.h>
39 39 #include <sys/prsystm.h>
40 40 #include <sys/model.h>
41 41 #include <sys/poll.h>
42 42 #include <sys/list.h>
43 43
44 44 #ifdef __cplusplus
45 45 extern "C" {
46 46 #endif
47 47
48 48 /*
49 49 * Test for thread being stopped, not on an event of interest,
50 50 * but with a directed stop in effect.
51 51 */
52 52 #define DSTOPPED(t) \
53 53 ((t)->t_state == TS_STOPPED && \
54 54 ((t)->t_proc_flag & TP_PRSTOP))
55 55
56 56 #define round4(r) (((r) + 3) & (~3))
57 57 #define round8(r) (((r) + 7) & (~7))
58 58 #define round16(r) (((r) + 15) & (~15))
59 59 #define roundlong(r) (((r) + sizeof (long) - 1) & (~(sizeof (long) - 1)))
60 60
61 61 #define PNSIZ 10 /* max size of /proc name entries */
62 62 #define PLNSIZ 10 /* max size of /proc lwp name entries */
63 63
64 64 /*
65 65 * Common file object to which all /proc vnodes for a specific process
66 66 * or lwp refer. One for the process, one for each lwp.
67 67 */
68 68 typedef struct prcommon {
69 69 kmutex_t prc_mutex; /* to wait for the proc/lwp to stop */
70 70 kcondvar_t prc_wait; /* to wait for the proc/lwp to stop */
71 71 ushort_t prc_flags; /* flags */
72 72 uint_t prc_writers; /* number of write opens of prnodes */
73 73 uint_t prc_selfopens; /* number of write opens by self */
74 74 pid_t prc_pid; /* process id */
75 75 model_t prc_datamodel; /* data model of the process */
76 76 proc_t *prc_proc; /* process being traced */
77 77 kthread_t *prc_thread; /* thread (lwp) being traced */
78 78 int prc_slot; /* procdir slot number */
79 79 id_t prc_tid; /* thread (lwp) id */
80 80 int prc_tslot; /* lwpdir slot number, -1 if reaped */
81 81 int prc_refcnt; /* this structure's reference count */
82 82 struct pollhead prc_pollhead; /* list of all pollers */
83 83 } prcommon_t;
84 84
85 85 /* prc_flags */
86 86 #define PRC_DESTROY 0x01 /* process or lwp is being destroyed */
87 87 #define PRC_LWP 0x02 /* structure refers to an lwp */
88 88 #define PRC_SYS 0x04 /* process is a system process */
89 89 #define PRC_POLL 0x08 /* poll() in progress on this process/lwp */
90 90 #define PRC_EXCL 0x10 /* exclusive access granted (old /proc) */
91 91
92 92 /*
93 93 * Macros for mapping between i-numbers and pids.
94 94 */
95 95 #define pmkino(tslot, pslot, nodetype) \
96 96 (((((ino_t)(tslot) << nproc_highbit) | \
97 97 (ino_t)(pslot)) << 6) | \
98 98 (nodetype) + 2)
99 99
100 100 /* for old /proc interface */
101 101 #define PRBIAS 64
102 102 #define ptoi(n) ((int)(((n) + PRBIAS))) /* pid to i-number */
103 103
104 104 /*
105 105 * Node types for /proc files (directories and files contained therein).
106 106 */
107 107 typedef enum prnodetype {
108 108 PR_PROCDIR, /* /proc */
109 109 PR_SELF, /* /proc/self */
110 110 PR_PIDDIR, /* /proc/<pid> */
111 111 PR_AS, /* /proc/<pid>/as */
112 112 PR_CTL, /* /proc/<pid>/ctl */
113 113 PR_STATUS, /* /proc/<pid>/status */
114 114 PR_LSTATUS, /* /proc/<pid>/lstatus */
115 115 PR_PSINFO, /* /proc/<pid>/psinfo */
|
↓ open down ↓ |
75 lines elided |
↑ open up ↑ |
116 116 PR_LPSINFO, /* /proc/<pid>/lpsinfo */
117 117 PR_MAP, /* /proc/<pid>/map */
118 118 PR_RMAP, /* /proc/<pid>/rmap */
119 119 PR_XMAP, /* /proc/<pid>/xmap */
120 120 PR_CRED, /* /proc/<pid>/cred */
121 121 PR_SIGACT, /* /proc/<pid>/sigact */
122 122 PR_AUXV, /* /proc/<pid>/auxv */
123 123 #if defined(__i386) || defined(__amd64)
124 124 PR_LDT, /* /proc/<pid>/ldt */
125 125 #endif
126 + PR_ARGV, /* /proc/<pid>/argv */
126 127 PR_USAGE, /* /proc/<pid>/usage */
127 128 PR_LUSAGE, /* /proc/<pid>/lusage */
128 129 PR_PAGEDATA, /* /proc/<pid>/pagedata */
129 130 PR_WATCH, /* /proc/<pid>/watch */
130 131 PR_CURDIR, /* /proc/<pid>/cwd */
131 132 PR_ROOTDIR, /* /proc/<pid>/root */
132 133 PR_FDDIR, /* /proc/<pid>/fd */
133 134 PR_FD, /* /proc/<pid>/fd/nn */
134 135 PR_OBJECTDIR, /* /proc/<pid>/object */
135 136 PR_OBJECT, /* /proc/<pid>/object/xxx */
136 137 PR_LWPDIR, /* /proc/<pid>/lwp */
137 138 PR_LWPIDDIR, /* /proc/<pid>/lwp/<lwpid> */
138 139 PR_LWPCTL, /* /proc/<pid>/lwp/<lwpid>/lwpctl */
139 140 PR_LWPSTATUS, /* /proc/<pid>/lwp/<lwpid>/lwpstatus */
140 141 PR_LWPSINFO, /* /proc/<pid>/lwp/<lwpid>/lwpsinfo */
141 142 PR_LWPUSAGE, /* /proc/<pid>/lwp/<lwpid>/lwpusage */
142 143 PR_XREGS, /* /proc/<pid>/lwp/<lwpid>/xregs */
143 144 PR_TMPLDIR, /* /proc/<pid>/lwp/<lwpid>/templates */
144 145 PR_TMPL, /* /proc/<pid>/lwp/<lwpid>/templates/<id> */
145 146 PR_SPYMASTER, /* /proc/<pid>/lwp/<lwpid>/spymaster */
146 147 #if defined(__sparc)
147 148 PR_GWINDOWS, /* /proc/<pid>/lwp/<lwpid>/gwindows */
148 149 PR_ASRS, /* /proc/<pid>/lwp/<lwpid>/asrs */
149 150 #endif
150 151 PR_PRIV, /* /proc/<pid>/priv */
151 152 PR_PATHDIR, /* /proc/<pid>/path */
152 153 PR_PATH, /* /proc/<pid>/path/xxx */
153 154 PR_CTDIR, /* /proc/<pid>/contracts */
154 155 PR_CT, /* /proc/<pid>/contracts/<ctid> */
155 156 PR_PIDFILE, /* old process file */
156 157 PR_LWPIDFILE, /* old lwp file */
157 158 PR_OPAGEDATA, /* old page data file */
158 159 PR_NFILES /* number of /proc node types */
159 160 } prnodetype_t;
160 161
161 162 typedef struct prnode {
162 163 vnode_t *pr_next; /* list of all vnodes for process */
163 164 uint_t pr_flags; /* private flags */
164 165 kmutex_t pr_mutex; /* locks pr_files and child pr_flags */
165 166 prnodetype_t pr_type; /* node type */
166 167 mode_t pr_mode; /* file mode */
167 168 ino_t pr_ino; /* node id (for stat(2)) */
168 169 uint_t pr_hatid; /* hat layer id for page data files */
169 170 prcommon_t *pr_common; /* common data structure */
170 171 prcommon_t *pr_pcommon; /* process common data structure */
171 172 vnode_t *pr_parent; /* parent directory */
172 173 vnode_t **pr_files; /* contained files array (directory) */
173 174 uint_t pr_index; /* position within parent */
174 175 vnode_t *pr_pidfile; /* substitute vnode for old /proc */
175 176 vnode_t *pr_realvp; /* real vnode, file in object,fd dirs */
176 177 proc_t *pr_owner; /* the process that created this node */
177 178 vnode_t *pr_vnode; /* pointer to vnode */
178 179 struct contract *pr_contract; /* contract pointer */
179 180 int pr_cttype; /* active template type */
180 181 } prnode_t;
181 182
182 183 /*
183 184 * Values for pr_flags.
184 185 */
185 186 #define PR_INVAL 0x01 /* vnode is invalidated */
186 187 #define PR_ISSELF 0x02 /* vnode is a self-open */
187 188 #define PR_AOUT 0x04 /* vnode is for an a.out path */
188 189 #define PR_OFFMAX 0x08 /* vnode is a large file open */
189 190
190 191 /*
191 192 * Conversion macros.
192 193 */
193 194 #define VTOP(vp) ((struct prnode *)(vp)->v_data)
194 195 #define PTOV(pnp) ((pnp)->pr_vnode)
195 196
196 197 /*
197 198 * Flags to prlock().
198 199 */
199 200 #define ZNO 0 /* Fail on encountering a zombie process. */
200 201 #define ZYES 1 /* Allow zombies. */
201 202
202 203 /*
203 204 * Assign one set to another (possible different sizes).
204 205 *
205 206 * Assigning to a smaller set causes members to be lost.
206 207 * Assigning to a larger set causes extra members to be cleared.
207 208 */
208 209 #define prassignset(ap, sp) \
209 210 { \
210 211 register int _i_ = sizeof (*(ap))/sizeof (uint32_t); \
211 212 while (--_i_ >= 0) \
212 213 ((uint32_t *)(ap))[_i_] = \
213 214 (_i_ >= sizeof (*(sp))/sizeof (uint32_t)) ? \
214 215 0 : ((uint32_t *)(sp))[_i_]; \
215 216 }
216 217
217 218 /*
218 219 * Determine whether or not a set (of arbitrary size) is empty.
219 220 */
220 221 #define prisempty(sp) \
221 222 setisempty((uint32_t *)(sp), \
222 223 (uint_t)(sizeof (*(sp)) / sizeof (uint32_t)))
223 224
224 225 /*
225 226 * Resource usage with times as hrtime_t rather than timestruc_t.
226 227 * Each member exactly matches the corresponding member in prusage_t.
227 228 * This is for convenience of internal computation.
228 229 */
229 230 typedef struct prhusage {
230 231 id_t pr_lwpid; /* lwp id. 0: process or defunct */
231 232 int pr_count; /* number of contributing lwps */
232 233 hrtime_t pr_tstamp; /* current time stamp */
233 234 hrtime_t pr_create; /* process/lwp creation time stamp */
234 235 hrtime_t pr_term; /* process/lwp termination time stamp */
235 236 hrtime_t pr_rtime; /* total lwp real (elapsed) time */
236 237 hrtime_t pr_utime; /* user level CPU time */
237 238 hrtime_t pr_stime; /* system call CPU time */
238 239 hrtime_t pr_ttime; /* other system trap CPU time */
239 240 hrtime_t pr_tftime; /* text page fault sleep time */
240 241 hrtime_t pr_dftime; /* data page fault sleep time */
241 242 hrtime_t pr_kftime; /* kernel page fault sleep time */
242 243 hrtime_t pr_ltime; /* user lock wait sleep time */
243 244 hrtime_t pr_slptime; /* all other sleep time */
244 245 hrtime_t pr_wtime; /* wait-cpu (latency) time */
245 246 hrtime_t pr_stoptime; /* stopped time */
246 247 hrtime_t filltime[6]; /* filler for future expansion */
247 248 uint64_t pr_minf; /* minor page faults */
248 249 uint64_t pr_majf; /* major page faults */
249 250 uint64_t pr_nswap; /* swaps */
250 251 uint64_t pr_inblk; /* input blocks */
251 252 uint64_t pr_oublk; /* output blocks */
252 253 uint64_t pr_msnd; /* messages sent */
253 254 uint64_t pr_mrcv; /* messages received */
254 255 uint64_t pr_sigs; /* signals received */
255 256 uint64_t pr_vctx; /* voluntary context switches */
256 257 uint64_t pr_ictx; /* involuntary context switches */
257 258 uint64_t pr_sysc; /* system calls */
258 259 uint64_t pr_ioch; /* chars read and written */
259 260 uint64_t filler[10]; /* filler for future expansion */
260 261 } prhusage_t;
261 262
262 263 #if defined(_KERNEL)
263 264
264 265 /* Exclude system processes from this test */
265 266 #define PROCESS_NOT_32BIT(p) \
266 267 (!((p)->p_flag & SSYS) && (p)->p_as != &kas && \
267 268 (p)->p_model != DATAMODEL_ILP32)
268 269
269 270 extern int prnwatch; /* number of supported watchpoints */
270 271 extern int nproc_highbit; /* highbit(v.v_nproc) */
271 272
272 273 extern struct vnodeops *prvnodeops;
273 274
274 275 /*
275 276 * Generic chained copyout buffers for procfs use.
276 277 * In order to prevent procfs from making huge oversize kmem_alloc calls,
277 278 * a list of smaller buffers can be concatenated and copied to userspace in
278 279 * sequence.
279 280 *
280 281 * The implementation is opaque.
281 282 *
282 283 * A user of this will perform the following steps:
283 284 *
284 285 * list_t listhead;
285 286 * struct my *mp;
286 287 *
287 288 * pr_iol_initlist(&listhead, sizeof (*mp), n);
288 289 * while (whatever) {
289 290 * mp = pr_iol_newbuf(&listhead, sizeof (*mp);
290 291 * ...
291 292 * error = ...
292 293 * }
293 294 *
294 295 * When done, depending on whether copyout() or uiomove() is supposed to
295 296 * be used for transferring the buffered data to userspace, call either:
296 297 *
297 298 * error = pr_iol_copyout_and_free(&listhead, &cmaddr, error);
298 299 *
299 300 * or else:
300 301 *
301 302 * error = pr_iol_uiomove_and_free(&listhead, uiop, error);
302 303 *
303 304 * These two functions will in any case kmem_free() all list items, but
304 305 * if an error occurred before they will not perform the copyout/uiomove.
305 306 * If copyout/uiomove are done, the passed target address / uio_t
306 307 * are updated. The error returned will either be the one passed in, or
307 308 * the error that occurred during copyout/uiomove.
308 309 */
309 310
310 311 extern void pr_iol_initlist(list_t *head, size_t itemsize, int nitems);
311 312 extern void * pr_iol_newbuf(list_t *head, size_t itemsize);
312 313 extern int pr_iol_copyout_and_free(list_t *head, caddr_t *tgt, int errin);
313 314 extern int pr_iol_uiomove_and_free(list_t *head, uio_t *uiop, int errin);
314 315
315 316 #if defined(_SYSCALL32_IMPL)
316 317
317 318 extern int prwritectl32(vnode_t *, struct uio *, cred_t *);
318 319 extern void prgetaction32(proc_t *, user_t *, uint_t, struct sigaction32 *);
319 320 extern void prcvtusage32(struct prhusage *, prusage32_t *);
320 321
321 322 #endif /* _SYSCALL32_IMPL */
322 323
323 324 /* kludge to support old /proc interface */
324 325 #if !defined(_SYS_OLD_PROCFS_H)
325 326 extern int prgetmap(proc_t *, int, list_t *);
326 327 extern int prgetxmap(proc_t *, list_t *);
327 328 #if defined(_SYSCALL32_IMPL)
328 329 extern int prgetmap32(proc_t *, int, list_t *);
329 330 extern int prgetxmap32(proc_t *, list_t *);
330 331 #endif /* _SYSCALL32_IMPL */
331 332 #endif /* !_SYS_OLD_PROCFS_H */
332 333
333 334 extern proc_t *pr_p_lock(prnode_t *);
334 335 extern kthread_t *pr_thread(prnode_t *);
335 336 extern void pr_stop(prnode_t *);
336 337 extern int pr_wait_stop(prnode_t *, time_t);
337 338 extern int pr_setrun(prnode_t *, ulong_t);
338 339 extern int pr_wait(prcommon_t *, timestruc_t *, int);
339 340 extern void pr_wait_die(prnode_t *);
|
↓ open down ↓ |
204 lines elided |
↑ open up ↑ |
340 341 extern int pr_setsig(prnode_t *, siginfo_t *);
341 342 extern int pr_kill(prnode_t *, int, cred_t *);
342 343 extern int pr_unkill(prnode_t *, int);
343 344 extern int pr_nice(proc_t *, int, cred_t *);
344 345 extern void pr_setentryexit(proc_t *, sysset_t *, int);
345 346 extern int pr_set(proc_t *, long);
346 347 extern int pr_unset(proc_t *, long);
347 348 extern void pr_sethold(prnode_t *, sigset_t *);
348 349 extern void pr_setfault(proc_t *, fltset_t *);
349 350 extern int prusrio(proc_t *, enum uio_rw, struct uio *, int);
351 +extern int prreadargv(proc_t *, char *, size_t, size_t *);
352 +extern int prreadenvv(proc_t *, char *, size_t, size_t *);
350 353 extern int prwritectl(vnode_t *, struct uio *, cred_t *);
351 354 extern int prlock(prnode_t *, int);
352 355 extern void prunmark(proc_t *);
353 356 extern void prunlock(prnode_t *);
354 357 extern size_t prpdsize(struct as *);
355 358 extern int prpdread(proc_t *, uint_t, struct uio *);
356 359 extern size_t oprpdsize(struct as *);
357 360 extern int oprpdread(struct as *, uint_t, struct uio *);
358 361 extern void prgetaction(proc_t *, user_t *, uint_t, struct sigaction *);
359 362 extern void prgetusage(kthread_t *, struct prhusage *);
360 363 extern void praddusage(kthread_t *, struct prhusage *);
361 364 extern void prcvtusage(struct prhusage *, prusage_t *);
362 365 extern void prscaleusage(prhusage_t *);
363 366 extern kthread_t *prchoose(proc_t *);
364 367 extern void allsetrun(proc_t *);
365 368 extern int setisempty(uint32_t *, uint_t);
366 369 extern int pr_u32tos(uint32_t, char *, int);
367 370 extern vnode_t *prlwpnode(prnode_t *, uint_t);
368 371 extern prnode_t *prgetnode(vnode_t *, prnodetype_t);
369 372 extern void prfreenode(prnode_t *);
370 373 extern void pr_object_name(char *, vnode_t *, struct vattr *);
371 374 extern int set_watched_area(proc_t *, struct watched_area *);
372 375 extern int clear_watched_area(proc_t *, struct watched_area *);
373 376 extern void pr_free_watchpoints(proc_t *);
374 377 extern proc_t *pr_cancel_watch(prnode_t *);
375 378 extern struct seg *break_seg(proc_t *);
376 379
377 380 /*
378 381 * Machine-dependent routines (defined in prmachdep.c).
379 382 */
380 383 extern void prgetprregs(klwp_t *, prgregset_t);
381 384 extern void prsetprregs(klwp_t *, prgregset_t, int);
382 385
383 386 #if defined(_SYSCALL32_IMPL)
384 387 extern void prgetprregs32(klwp_t *, prgregset32_t);
385 388 extern void prgregset_32ton(klwp_t *, prgregset32_t, prgregset_t);
386 389 extern void prgetprfpregs32(klwp_t *, prfpregset32_t *);
387 390 extern void prsetprfpregs32(klwp_t *, prfpregset32_t *);
388 391 extern size_t prpdsize32(struct as *);
389 392 extern int prpdread32(proc_t *, uint_t, struct uio *);
390 393 extern size_t oprpdsize32(struct as *);
391 394 extern int oprpdread32(struct as *, uint_t, struct uio *);
392 395 #endif /* _SYSCALL32_IMPL */
393 396
394 397 extern void prpokethread(kthread_t *t);
395 398 extern int prgetrvals(klwp_t *, long *, long *);
396 399 extern void prgetprfpregs(klwp_t *, prfpregset_t *);
397 400 extern void prsetprfpregs(klwp_t *, prfpregset_t *);
398 401 extern void prgetprxregs(klwp_t *, caddr_t);
399 402 extern void prsetprxregs(klwp_t *, caddr_t);
400 403 extern int prgetprxregsize(proc_t *);
401 404 extern int prhasfp(void);
402 405 extern int prhasx(proc_t *);
403 406 extern caddr_t prgetstackbase(proc_t *);
404 407 extern caddr_t prgetpsaddr(proc_t *);
405 408 extern int prisstep(klwp_t *);
406 409 extern void prsvaddr(klwp_t *, caddr_t);
407 410 extern int prfetchinstr(klwp_t *, ulong_t *);
408 411 extern ushort_t prgetpctcpu(uint64_t);
409 412
410 413 #endif /* _KERNEL */
411 414
412 415 #ifdef __cplusplus
413 416 }
414 417 #endif
415 418
416 419 #endif /* _SYS_PROC_PRDATA_H */
|
↓ open down ↓ |
57 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX