Print this page
dlmgt mismerge (continued)
OS-3342 dlmgmtd needs to be mindful of lock ordering
OS-2608 dlmgmtd needs to record zone identifiers
OS-3492 zone_free asserts to its destruction when dlmgmtd has fallen
OS-3494 zoneadmd tears down networking too soon when boot fails
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/cmd/dlmgmtd/dlmgmt_impl.h
+++ new/usr/src/cmd/dlmgmtd/dlmgmt_impl.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
20 20 */
21 21
22 22 /*
23 23 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
24 24 */
25 25
26 26 /*
27 27 * Functions to maintain a table of datalink configuration information.
28 28 */
29 29
30 30 #ifndef _DLMGMT_IMPL_H
31 31 #define _DLMGMT_IMPL_H
32 32
33 33 #ifdef __cplusplus
34 34 extern "C" {
35 35 #endif
36 36
37 37 #include <door.h>
38 38 #include <libdllink.h>
39 39 #include <sys/avl.h>
40 40
41 41 /*
42 42 * datalink attribute structure
43 43 */
44 44 typedef struct dlmgmt_linkattr_s {
45 45 struct dlmgmt_linkattr_s *lp_next;
46 46 struct dlmgmt_linkattr_s *lp_prev;
47 47 char lp_name[MAXLINKATTRLEN];
48 48 void *lp_val;
49 49 dladm_datatype_t lp_type;
50 50 uint_t lp_sz;
51 51 boolean_t lp_linkprop;
52 52 } dlmgmt_linkattr_t;
53 53
54 54 /*
55 55 * datalink structure
56 56 */
57 57 typedef struct dlmgmt_link_s {
58 58 dlmgmt_linkattr_t *ll_head;
59 59 char ll_link[MAXLINKNAMELEN];
|
↓ open down ↓ |
59 lines elided |
↑ open up ↑ |
60 60 datalink_class_t ll_class;
61 61 uint32_t ll_media;
62 62 datalink_id_t ll_linkid;
63 63 zoneid_t ll_zoneid;
64 64 boolean_t ll_onloan;
65 65 avl_node_t ll_name_node;
66 66 avl_node_t ll_id_node;
67 67 avl_node_t ll_loan_node;
68 68 uint32_t ll_flags;
69 69 uint32_t ll_gen; /* generation number */
70 + boolean_t ll_tomb; /* tombstombed */
70 71 } dlmgmt_link_t;
71 72
72 73 /*
73 74 * datalink configuration request structure
74 75 */
75 76 typedef struct dlmgmt_dlconf_s {
76 77 dlmgmt_linkattr_t *ld_head;
77 78 char ld_link[MAXLINKNAMELEN];
78 79 datalink_id_t ld_linkid;
79 80 datalink_class_t ld_class;
80 81 uint32_t ld_media;
81 82 int ld_id;
82 83 zoneid_t ld_zoneid;
83 84 uint32_t ld_gen;
84 85 avl_node_t ld_node;
85 86 } dlmgmt_dlconf_t;
86 87
88 +#define ZONE_LOCK "/etc/dladm/zone.lck"
89 +
87 90 extern boolean_t debug;
88 91 extern const char *progname;
89 92 extern char cachefile[];
90 93 extern dladm_handle_t dld_handle;
91 94 extern datalink_id_t dlmgmt_nextlinkid;
92 95 extern avl_tree_t dlmgmt_name_avl;
93 96 extern avl_tree_t dlmgmt_id_avl;
94 97 extern avl_tree_t dlmgmt_loan_avl;
95 98 extern avl_tree_t dlmgmt_dlconf_avl;
96 99
97 100 boolean_t linkattr_equal(dlmgmt_linkattr_t **, const char *, void *,
98 101 size_t);
99 102 dlmgmt_linkattr_t *linkattr_find(dlmgmt_linkattr_t *, const char *);
100 103 void linkattr_unset(dlmgmt_linkattr_t **, const char *);
101 104 int linkattr_set(dlmgmt_linkattr_t **, const char *, void *,
102 105 size_t, dladm_datatype_t);
103 106 int linkattr_get(dlmgmt_linkattr_t **, const char *, void **,
104 107 size_t *, dladm_datatype_t *);
105 108 void linkattr_destroy(dlmgmt_link_t *);
106 109
107 110 void link_destroy(dlmgmt_link_t *);
108 111 int link_activate(dlmgmt_link_t *);
109 112 boolean_t link_is_visible(dlmgmt_link_t *, zoneid_t);
110 113 dlmgmt_link_t *link_by_id(datalink_id_t, zoneid_t);
111 114 dlmgmt_link_t *link_by_name(const char *, zoneid_t);
112 115 int dlmgmt_create_common(const char *, datalink_class_t,
113 116 uint32_t, zoneid_t, uint32_t, dlmgmt_link_t **);
114 117 int dlmgmt_destroy_common(dlmgmt_link_t *, uint32_t);
115 118 int dlmgmt_getattr_common(dlmgmt_linkattr_t **, const char *,
116 119 dlmgmt_getattr_retval_t *);
117 120
118 121 void dlmgmt_advance(dlmgmt_link_t *);
119 122 void dlmgmt_table_lock(boolean_t);
120 123 void dlmgmt_table_unlock();
121 124
122 125 int dlconf_create(const char *, datalink_id_t, datalink_class_t,
123 126 uint32_t, zoneid_t, dlmgmt_dlconf_t **);
124 127 void dlconf_destroy(dlmgmt_dlconf_t *);
125 128 void dlmgmt_advance_dlconfid(dlmgmt_dlconf_t *);
126 129 void dlmgmt_dlconf_table_lock(boolean_t);
127 130 void dlmgmt_dlconf_table_unlock(void);
128 131
129 132 int dlmgmt_generate_name(const char *, char *, size_t, zoneid_t);
130 133
|
↓ open down ↓ |
34 lines elided |
↑ open up ↑ |
131 134 void dlmgmt_linktable_init(void);
132 135 void dlmgmt_linktable_fini(void);
133 136
134 137 int dlmgmt_zone_init(zoneid_t);
135 138 int dlmgmt_elevate_privileges(void);
136 139 int dlmgmt_drop_privileges();
137 140 void dlmgmt_handler(void *, char *, size_t, door_desc_t *, uint_t);
138 141 void dlmgmt_log(int, const char *, ...);
139 142 int dlmgmt_write_db_entry(const char *, dlmgmt_link_t *, uint32_t);
140 143 int dlmgmt_delete_db_entry(dlmgmt_link_t *, uint32_t);
141 -int dlmgmt_db_init(zoneid_t);
144 +int dlmgmt_db_init(zoneid_t, char *);
142 145 void dlmgmt_db_fini(zoneid_t);
143 146
144 147 #ifdef __cplusplus
145 148 }
146 149 #endif
147 150
148 151 #endif /* _DLMGMT_IMPL_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX