Print this page
OS-428 add link zonename kstat (change ks_data_size before init)
OS-428 add link zonename kstat
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/uts/common/io/dls/dls_stat.c
+++ new/usr/src/uts/common/io/dls/dls_stat.c
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 2009 Sun Microsystems, Inc. All rights reserved.
23 23 * Use is subject to license terms.
24 + * Copyright 2011 Joyent, Inc. All rights reserved.
24 25 */
25 26
26 27 /*
27 28 * Data-Link Services Module
28 29 */
29 30
30 31 #include <sys/dld_impl.h>
31 32 #include <sys/mac_ether.h>
32 33
33 -static mac_stat_info_t i_dls_si[] = {
34 - { MAC_STAT_IFSPEED, "ifspeed", KSTAT_DATA_UINT64, 0 },
35 - { MAC_STAT_MULTIRCV, "multircv", KSTAT_DATA_UINT32, 0 },
36 - { MAC_STAT_BRDCSTRCV, "brdcstrcv", KSTAT_DATA_UINT32, 0 },
37 - { MAC_STAT_MULTIXMT, "multixmt", KSTAT_DATA_UINT32, 0 },
38 - { MAC_STAT_BRDCSTXMT, "brdcstxmt", KSTAT_DATA_UINT32, 0 },
39 - { MAC_STAT_NORCVBUF, "norcvbuf", KSTAT_DATA_UINT32, 0 },
40 - { MAC_STAT_IERRORS, "ierrors", KSTAT_DATA_UINT32, 0 },
41 - { MAC_STAT_NOXMTBUF, "noxmtbuf", KSTAT_DATA_UINT32, 0 },
42 - { MAC_STAT_OERRORS, "oerrors", KSTAT_DATA_UINT32, 0 },
43 - { MAC_STAT_COLLISIONS, "collisions", KSTAT_DATA_UINT32, 0 },
44 - { MAC_STAT_RBYTES, "rbytes", KSTAT_DATA_UINT32, 0 },
45 - { MAC_STAT_IPACKETS, "ipackets", KSTAT_DATA_UINT32, 0 },
46 - { MAC_STAT_OBYTES, "obytes", KSTAT_DATA_UINT32, 0 },
47 - { MAC_STAT_OPACKETS, "opackets", KSTAT_DATA_UINT32, 0 },
48 - { MAC_STAT_RBYTES, "rbytes64", KSTAT_DATA_UINT64, 0 },
49 - { MAC_STAT_IPACKETS, "ipackets64", KSTAT_DATA_UINT64, 0 },
50 - { MAC_STAT_OBYTES, "obytes64", KSTAT_DATA_UINT64, 0 },
51 - { MAC_STAT_OPACKETS, "opackets64", KSTAT_DATA_UINT64, 0 },
52 - { MAC_STAT_LINK_STATE, "link_state", KSTAT_DATA_UINT32,
53 - (uint64_t)LINK_STATE_UNKNOWN}
54 -};
34 +/*
35 + * structure for link kstats
36 + */
37 +typedef struct {
38 + kstat_named_t dk_ifspeed;
39 + kstat_named_t dk_multircv;
40 + kstat_named_t dk_brdcstrcv;
41 + kstat_named_t dk_multixmt;
42 + kstat_named_t dk_brdcstxmt;
43 + kstat_named_t dk_norcvbuf;
44 + kstat_named_t dk_ierrors;
45 + kstat_named_t dk_noxmtbuf;
46 + kstat_named_t dk_oerrors;
47 + kstat_named_t dk_collisions;
48 + kstat_named_t dk_rbytes;
49 + kstat_named_t dk_ipackets;
50 + kstat_named_t dk_obytes;
51 + kstat_named_t dk_opackets;
52 + kstat_named_t dk_rbytes64;
53 + kstat_named_t dk_ipackets64;
54 + kstat_named_t dk_obytes64;
55 + kstat_named_t dk_opackets64;
56 + kstat_named_t dk_link_state;
57 + kstat_named_t dk_link_duplex;
58 + kstat_named_t dk_unknowns;
59 + kstat_named_t dk_zonename;
60 +} dls_kstat_t;
55 61
56 -#define STAT_INFO_COUNT (sizeof (i_dls_si) / sizeof (i_dls_si[0]))
57 -
58 62 /*
59 63 * Exported functions.
60 64 */
61 65 int
62 66 dls_stat_update(kstat_t *ksp, dls_link_t *dlp, int rw)
63 67 {
64 - kstat_named_t *knp;
65 - uint_t i;
66 - uint64_t val;
68 + dls_kstat_t *dkp = ksp->ks_data;
67 69
68 70 if (rw != KSTAT_READ)
69 71 return (EACCES);
70 72
71 - knp = (kstat_named_t *)ksp->ks_data;
72 - for (i = 0; i < STAT_INFO_COUNT; i++) {
73 - val = mac_stat_get(dlp->dl_mh, i_dls_si[i].msi_stat);
73 + dkp->dk_ifspeed.value.ui64 = mac_stat_get(dlp->dl_mh, MAC_STAT_IFSPEED);
74 + dkp->dk_multircv.value.ui32 = mac_stat_get(dlp->dl_mh,
75 + MAC_STAT_MULTIRCV);
76 + dkp->dk_brdcstrcv.value.ui32 = mac_stat_get(dlp->dl_mh,
77 + MAC_STAT_BRDCSTRCV);
78 + dkp->dk_multixmt.value.ui32 = mac_stat_get(dlp->dl_mh,
79 + MAC_STAT_MULTIXMT);
80 + dkp->dk_brdcstxmt.value.ui32 = mac_stat_get(dlp->dl_mh,
81 + MAC_STAT_BRDCSTXMT);
82 + dkp->dk_norcvbuf.value.ui32 = mac_stat_get(dlp->dl_mh,
83 + MAC_STAT_NORCVBUF);
84 + dkp->dk_ierrors.value.ui32 = mac_stat_get(dlp->dl_mh, MAC_STAT_IERRORS);
85 + dkp->dk_noxmtbuf.value.ui32 = mac_stat_get(dlp->dl_mh,
86 + MAC_STAT_NOXMTBUF);
87 + dkp->dk_oerrors.value.ui32 = mac_stat_get(dlp->dl_mh, MAC_STAT_OERRORS);
88 + dkp->dk_collisions.value.ui32 = mac_stat_get(dlp->dl_mh,
89 + MAC_STAT_COLLISIONS);
90 + dkp->dk_rbytes.value.ui32 = mac_stat_get(dlp->dl_mh, MAC_STAT_RBYTES);
91 + dkp->dk_ipackets.value.ui32 = mac_stat_get(dlp->dl_mh,
92 + MAC_STAT_IPACKETS);
93 + dkp->dk_obytes.value.ui32 = mac_stat_get(dlp->dl_mh, MAC_STAT_OBYTES);
94 + dkp->dk_opackets.value.ui32 = mac_stat_get(dlp->dl_mh,
95 + MAC_STAT_OPACKETS);
96 + dkp->dk_rbytes64.value.ui64 = mac_stat_get(dlp->dl_mh, MAC_STAT_RBYTES);
97 + dkp->dk_ipackets64.value.ui64 = mac_stat_get(dlp->dl_mh,
98 + MAC_STAT_IPACKETS);
99 + dkp->dk_obytes64.value.ui64 = mac_stat_get(dlp->dl_mh, MAC_STAT_OBYTES);
100 + dkp->dk_opackets64.value.ui64 = mac_stat_get(dlp->dl_mh,
101 + MAC_STAT_OPACKETS);
102 + dkp->dk_link_state.value.ui32 = mac_stat_get(dlp->dl_mh,
103 + MAC_STAT_LINK_STATE);
74 104
75 - switch (i_dls_si[i].msi_type) {
76 - case KSTAT_DATA_UINT64:
77 - knp->value.ui64 = val;
78 - break;
79 - case KSTAT_DATA_UINT32:
80 - knp->value.ui32 = (uint32_t)val;
81 - break;
82 - default:
83 - ASSERT(B_FALSE);
84 - }
85 -
86 - knp++;
87 - }
88 -
89 105 /*
90 106 * Ethernet specific kstat "link_duplex"
91 107 */
92 108 if (dlp->dl_mip->mi_nativemedia != DL_ETHER) {
93 - knp->value.ui32 = LINK_DUPLEX_UNKNOWN;
109 + dkp->dk_link_duplex.value.ui32 = LINK_DUPLEX_UNKNOWN;
94 110 } else {
95 - val = mac_stat_get(dlp->dl_mh, ETHER_STAT_LINK_DUPLEX);
96 - knp->value.ui32 = (uint32_t)val;
111 + dkp->dk_link_duplex.value.ui32 =
112 + (uint32_t)mac_stat_get(dlp->dl_mh, ETHER_STAT_LINK_DUPLEX);
97 113 }
98 - knp++;
99 - knp->value.ui32 = dlp->dl_unknowns;
100 114
115 + dkp->dk_unknowns.value.ui32 = dlp->dl_unknowns;
116 +
101 117 return (0);
102 118 }
103 119
104 120 int
105 121 dls_stat_create(const char *module, int instance, const char *name,
106 122 zoneid_t zoneid, int (*update)(struct kstat *, int), void *private,
107 - kstat_t **kspp)
123 + kstat_t **kspp, zoneid_t newzoneid)
108 124 {
109 125 kstat_t *ksp;
110 - kstat_named_t *knp;
111 - uint_t i;
126 + zone_t *zone;
127 + dls_kstat_t *dkp;
112 128
113 129 if ((ksp = kstat_create_zone(module, instance, name, "net",
114 - KSTAT_TYPE_NAMED, STAT_INFO_COUNT + 2, 0, zoneid)) == NULL) {
130 + KSTAT_TYPE_NAMED, sizeof (dls_kstat_t) / sizeof (kstat_named_t),
131 + KSTAT_FLAG_VIRTUAL, zoneid)) == NULL) {
115 132 return (EINVAL);
116 133 }
117 134
118 135 ksp->ks_update = update;
119 136 ksp->ks_private = private;
137 + dkp = ksp->ks_data = kmem_zalloc(sizeof (dls_kstat_t), KM_SLEEP);
138 + if ((zone = zone_find_by_id(newzoneid)) != NULL) {
139 + ksp->ks_data_size += strlen(zone->zone_name) + 1;
140 + }
120 141
121 - knp = (kstat_named_t *)ksp->ks_data;
122 - for (i = 0; i < STAT_INFO_COUNT; i++) {
123 - kstat_named_init(knp, i_dls_si[i].msi_name,
124 - i_dls_si[i].msi_type);
125 - knp++;
142 + kstat_named_init(&dkp->dk_ifspeed, "ifspeed", KSTAT_DATA_UINT64);
143 + kstat_named_init(&dkp->dk_multircv, "multircv", KSTAT_DATA_UINT32);
144 + kstat_named_init(&dkp->dk_brdcstrcv, "brdcstrcv", KSTAT_DATA_UINT32);
145 + kstat_named_init(&dkp->dk_multixmt, "multixmt", KSTAT_DATA_UINT32);
146 + kstat_named_init(&dkp->dk_brdcstxmt, "brdcstxmt", KSTAT_DATA_UINT32);
147 + kstat_named_init(&dkp->dk_norcvbuf, "norcvbuf", KSTAT_DATA_UINT32);
148 + kstat_named_init(&dkp->dk_ierrors, "ierrors", KSTAT_DATA_UINT32);
149 + kstat_named_init(&dkp->dk_noxmtbuf, "noxmtbuf", KSTAT_DATA_UINT32);
150 + kstat_named_init(&dkp->dk_oerrors, "oerrors", KSTAT_DATA_UINT32);
151 + kstat_named_init(&dkp->dk_collisions, "collisions", KSTAT_DATA_UINT32);
152 + kstat_named_init(&dkp->dk_rbytes, "rbytes", KSTAT_DATA_UINT32);
153 + kstat_named_init(&dkp->dk_ipackets, "ipackets", KSTAT_DATA_UINT32);
154 + kstat_named_init(&dkp->dk_obytes, "obytes", KSTAT_DATA_UINT32);
155 + kstat_named_init(&dkp->dk_opackets, "opackets", KSTAT_DATA_UINT32);
156 + kstat_named_init(&dkp->dk_rbytes64, "rbytes64", KSTAT_DATA_UINT64);
157 + kstat_named_init(&dkp->dk_ipackets64, "ipackets64", KSTAT_DATA_UINT64);
158 + kstat_named_init(&dkp->dk_obytes64, "obytes64", KSTAT_DATA_UINT64);
159 + kstat_named_init(&dkp->dk_opackets64, "opackets64", KSTAT_DATA_UINT64);
160 + kstat_named_init(&dkp->dk_link_state, "link_state", KSTAT_DATA_UINT32);
161 + kstat_named_init(&dkp->dk_link_duplex, "link_duplex",
162 + KSTAT_DATA_UINT32);
163 + kstat_named_init(&dkp->dk_unknowns, "unknowns", KSTAT_DATA_UINT32);
164 + kstat_named_init(&dkp->dk_zonename, "zonename", KSTAT_DATA_STRING);
165 +
166 + if (zone != NULL) {
167 + kstat_named_setstr(&dkp->dk_zonename, zone->zone_name);
168 + zone_rele(zone);
126 169 }
127 170
128 - kstat_named_init(knp++, "link_duplex", KSTAT_DATA_UINT32);
129 - kstat_named_init(knp, "unknowns", KSTAT_DATA_UINT32);
130 171 kstat_install(ksp);
131 172 *kspp = ksp;
132 173 return (0);
174 +}
175 +
176 +void
177 +dls_stat_delete(kstat_t *ksp)
178 +{
179 + void *data;
180 + if (ksp != NULL) {
181 + data = ksp->ks_data;
182 + kstat_delete(ksp);
183 + kmem_free(data, sizeof (dls_kstat_t));
184 + }
133 185 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX