Print this page
OS-3561 lxbrand emulation library should execute on alternate stack
OS-3558 lxbrand add support for full in-kernel syscall handling
OS-3545 lx_syscall_regs should not walk stack
OS-3868 many LTP testcases now hang
OS-3901 lxbrand lx_recvmsg fails to translate control messages when 64-bit
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Reviewed by: Bryan Cantrill <bryan@joyent.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/uts/intel/sys/ucontext.h
+++ new/usr/src/uts/intel/sys/ucontext.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 /*
23 23 * Copyright 2015 Nexenta Systems, Inc. All rights reserved.
24 - *
24 + * Copyright 2015 Joyent, Inc.
25 25 * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
26 26 * Use is subject to license terms.
27 27 */
28 28
29 29 /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
30 30 /* All Rights Reserved */
31 31
32 32 #ifndef _SYS_UCONTEXT_H
33 33 #define _SYS_UCONTEXT_H
34 34
35 35 #include <sys/feature_tests.h>
36 36
37 37 #include <sys/types.h>
38 38 #include <sys/mcontext.h>
39 39 #if !defined(_XPG4_2) || defined(__EXTENSIONS__)
40 40 #include <sys/signal.h>
41 41 #endif
42 42
43 43 #ifdef __cplusplus
44 44 extern "C" {
45 45 #endif
46 46
47 47 /*
48 48 * Inclusion of <sys/signal.h> for sigset_t and stack_t definitions
49 49 * breaks XPG4v2 namespace. Therefore we must duplicate the defines
50 50 * for these types here when _XPG4_2 is defined.
51 51 */
52 52
53 53 #if defined(_XPG4_2) && !defined(__EXTENSIONS__)
54 54 #ifndef _SIGSET_T
55 55 #define _SIGSET_T
56 56 typedef struct { /* signal set type */
57 57 unsigned long __sigbits[4];
58 58 } sigset_t;
59 59 #endif /* _SIGSET_T */
60 60
61 61 #ifndef _STACK_T
62 62 #define _STACK_T
63 63 typedef struct {
64 64 void *ss_sp;
65 65 size_t ss_size;
66 66 int ss_flags;
67 67 } stack_t;
68 68 #endif /* _STACK_T */
69 69 #endif /* defined(_XPG4_2) && !defined(__EXTENSIONS__) */
70 70
71 71 #if !defined(_XPG4_2) || defined(__EXTENSIONS__)
72 72 typedef struct ucontext ucontext_t;
73 73 #else
74 74 typedef struct __ucontext ucontext_t;
75 75 #endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) */
76 76
|
↓ open down ↓ |
42 lines elided |
↑ open up ↑ |
77 77 #if !defined(_XPG4_2) || defined(__EXTENSIONS__)
78 78 struct ucontext {
79 79 #else
80 80 struct __ucontext {
81 81 #endif
82 82 unsigned long uc_flags;
83 83 ucontext_t *uc_link;
84 84 sigset_t uc_sigmask;
85 85 stack_t uc_stack;
86 86 mcontext_t uc_mcontext;
87 - long uc_filler[5]; /* see ABI spec for Intel386 */
87 + /*
88 + * The Intel386 ABI specification includes a 5-element array of longs
89 + * called "uc_filler", padding the size of the struct to 512 bytes. To
90 + * allow zone brands to communicate extra data right the way through
91 + * the signal handling process, from sigacthandler to setcontext, we
92 + * steal the first three of these longs as a brand-private member.
93 + */
94 + void *uc_brand_data[3];
95 + long uc_filler[2];
88 96 };
89 -
90 97 #if defined(_SYSCALL32)
91 98
92 99 /* Kernel view of user ILP32 ucontext structure */
93 100
94 101 typedef struct ucontext32 {
95 102 uint32_t uc_flags;
96 103 caddr32_t uc_link;
97 104 sigset_t uc_sigmask;
98 105 stack32_t uc_stack;
99 106 mcontext32_t uc_mcontext;
100 - int32_t uc_filler[5];
107 + caddr32_t uc_brand_data[3];
108 + int32_t uc_filler[2];
101 109 } ucontext32_t;
102 110
103 111 #if defined(_KERNEL)
104 112 extern void ucontext_nto32(const ucontext_t *src, ucontext32_t *dest);
105 113 extern void ucontext_32ton(const ucontext32_t *src, ucontext_t *dest);
106 114 #endif
107 115
108 116 #endif /* _SYSCALL32 */
109 117
110 118 #if !defined(_XPG4_2) || defined(__EXTENSIONS__)
111 119 #define GETCONTEXT 0
112 120 #define SETCONTEXT 1
113 121 #define GETUSTACK 2
114 122 #define SETUSTACK 3
115 123
116 124 /*
117 125 * values for uc_flags
118 126 * these are implementation dependent flags, that should be hidden
119 127 * from the user interface, defining which elements of ucontext
120 128 * are valid, and should be restored on call to setcontext
121 129 */
122 130
123 131 #define UC_SIGMASK 0x01
124 132 #define UC_STACK 0x02
125 133 #define UC_CPU 0x04
126 134 #define UC_MAU 0x08
127 135 #define UC_FPU UC_MAU
128 136
129 137 #define UC_MCONTEXT (UC_CPU|UC_FPU)
130 138
131 139 /*
132 140 * UC_ALL specifies the default context
133 141 */
134 142
135 143 #define UC_ALL (UC_SIGMASK|UC_STACK|UC_MCONTEXT)
136 144 #endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) */
137 145
138 146 #ifdef _KERNEL
139 147 void savecontext(ucontext_t *, const k_sigset_t *);
140 148 void restorecontext(ucontext_t *);
141 149
142 150 #ifdef _SYSCALL32
143 151 extern void savecontext32(ucontext32_t *, const k_sigset_t *);
144 152 #endif
145 153 #endif
146 154
147 155 #ifdef __cplusplus
148 156 }
149 157 #endif
150 158
151 159 #endif /* _SYS_UCONTEXT_H */
|
↓ open down ↓ |
41 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX