Deleted Added
sdiff udiff text old ( 110118 ) new ( 110119 )
full compact
geom_disk.c (110118) geom_disk.c (110119)
1/*-
2 * Copyright (c) 2002 Poul-Henning Kamp
3 * Copyright (c) 2002 Networks Associates Technology, Inc.
4 * All rights reserved.
5 *
6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp
7 * and NAI Labs, the Security Research Division of Network Associates, Inc.
8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the

--- 18 unchanged lines hidden (view full) ---

27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
1/*-
2 * Copyright (c) 2002 Poul-Henning Kamp
3 * Copyright (c) 2002 Networks Associates Technology, Inc.
4 * All rights reserved.
5 *
6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp
7 * and NAI Labs, the Security Research Division of Network Associates, Inc.
8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the

--- 18 unchanged lines hidden (view full) ---

27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
35 * $FreeBSD: head/sys/geom/geom_disk.c 110118 2003-01-30 19:55:19Z phk $
35 * $FreeBSD: head/sys/geom/geom_disk.c 110119 2003-01-30 20:34:23Z phk $
36 */
37
38#include "opt_geom.h"
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>
43#include <sys/sysctl.h>
44#include <sys/bio.h>
45#include <sys/conf.h>
46#include <sys/disk.h>
36 */
37
38#include "opt_geom.h"
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>
43#include <sys/sysctl.h>
44#include <sys/bio.h>
45#include <sys/conf.h>
46#include <sys/disk.h>
47#include <sys/fcntl.h>
47#include <sys/malloc.h>
48#include <sys/sysctl.h>
49#include <sys/stdint.h>
50#include <machine/md_var.h>
51
52
53#include <sys/lock.h>
54#include <sys/mutex.h>

--- 8 unchanged lines hidden (view full) ---

63 G_CLASS_INITIALIZER
64};
65
66DECLARE_GEOM_CLASS(g_disk_class, g_disk);
67
68static void __inline
69g_disk_lock_giant(struct disk *dp)
70{
48#include <sys/malloc.h>
49#include <sys/sysctl.h>
50#include <sys/stdint.h>
51#include <machine/md_var.h>
52
53
54#include <sys/lock.h>
55#include <sys/mutex.h>

--- 8 unchanged lines hidden (view full) ---

64 G_CLASS_INITIALIZER
65};
66
67DECLARE_GEOM_CLASS(g_disk_class, g_disk);
68
69static void __inline
70g_disk_lock_giant(struct disk *dp)
71{
71 if (!(dp->d_devsw->d_flags & D_NOGIANT))
72 mtx_lock(&Giant);
72 if (dp->d_flags & DISKFLAG_NOGIANT)
73 return;
74 mtx_lock(&Giant);
73}
74
75static void __inline
76g_disk_unlock_giant(struct disk *dp)
77{
75}
76
77static void __inline
78g_disk_unlock_giant(struct disk *dp)
79{
78 if (!(dp->d_devsw->d_flags & D_NOGIANT))
79 mtx_unlock(&Giant);
80 if (dp->d_flags & DISKFLAG_NOGIANT)
81 return;
82 mtx_unlock(&Giant);
80}
81
82static int
83g_disk_access(struct g_provider *pp, int r, int w, int e)
84{
85 struct disk *dp;
86 dev_t dev;
87 int error;
88
89 g_trace(G_T_ACCESS, "g_disk_access(%s, %d, %d, %d)",
90 pp->name, r, w, e);
91 g_topology_assert();
92 r += pp->acr;
93 w += pp->acw;
94 e += pp->ace;
95 dp = pp->geom->softc;
96 dev = dp->d_dev;
83}
84
85static int
86g_disk_access(struct g_provider *pp, int r, int w, int e)
87{
88 struct disk *dp;
89 dev_t dev;
90 int error;
91
92 g_trace(G_T_ACCESS, "g_disk_access(%s, %d, %d, %d)",
93 pp->name, r, w, e);
94 g_topology_assert();
95 r += pp->acr;
96 w += pp->acw;
97 e += pp->ace;
98 dp = pp->geom->softc;
99 dev = dp->d_dev;
100 error = 0;
97 if ((pp->acr + pp->acw + pp->ace) == 0 && (r + w + e) > 0) {
101 if ((pp->acr + pp->acw + pp->ace) == 0 && (r + w + e) > 0) {
98 g_disk_lock_giant(dp);
99 error = devsw(dev)->d_open(dev, 3, 0, NULL);
100 if (error != 0)
101 printf("Opened disk %s -> %d\n", pp->name, error);
102 g_disk_unlock_giant(dp);
102 if (dp->d_open != NULL) {
103 g_disk_lock_giant(dp);
104 error = dp->d_open(dev, FREAD | FWRITE, 0, NULL);
105 if (error != 0)
106 printf("Opened disk %s -> %d\n",
107 pp->name, error);
108 g_disk_unlock_giant(dp);
109 }
103 pp->mediasize = dp->d_mediasize;
104 pp->sectorsize = dp->d_sectorsize;
110 pp->mediasize = dp->d_mediasize;
111 pp->sectorsize = dp->d_sectorsize;
112 dp->d_flags |= DISKFLAG_OPEN;
105 } else if ((pp->acr + pp->acw + pp->ace) > 0 && (r + w + e) == 0) {
113 } else if ((pp->acr + pp->acw + pp->ace) > 0 && (r + w + e) == 0) {
106 g_disk_lock_giant(dp);
107 error = devsw(dev)->d_close(dev, 3, 0, NULL);
108 if (error != 0)
109 printf("Closed disk %s -> %d\n", pp->name, error);
110 g_disk_unlock_giant(dp);
111 } else {
112 error = 0;
114 if (dp->d_close != NULL) {
115 g_disk_lock_giant(dp);
116 error = dp->d_close(dev, FREAD | FWRITE, 0, NULL);
117 if (error != 0)
118 printf("Closed disk %s -> %d\n",
119 pp->name, error);
120 g_disk_unlock_giant(dp);
121 }
122 dp->d_flags &= ~DISKFLAG_OPEN;
113 }
114 return (error);
115}
116
117static void
118g_disk_kerneldump(struct bio *bp, struct disk *dp)
119{
120 int error;
121 struct g_kerneldump *gkd;
122 struct dumperinfo di;
123 struct g_geom *gp;
124
125 gkd = (struct g_kerneldump*)bp->bio_data;
126 gp = bp->bio_to->geom;
127 g_trace(G_T_TOPOLOGY, "g_disk_kernedump(%s, %jd, %jd)",
128 gp->name, (intmax_t)gkd->offset, (intmax_t)gkd->length);
123 }
124 return (error);
125}
126
127static void
128g_disk_kerneldump(struct bio *bp, struct disk *dp)
129{
130 int error;
131 struct g_kerneldump *gkd;
132 struct dumperinfo di;
133 struct g_geom *gp;
134
135 gkd = (struct g_kerneldump*)bp->bio_data;
136 gp = bp->bio_to->geom;
137 g_trace(G_T_TOPOLOGY, "g_disk_kernedump(%s, %jd, %jd)",
138 gp->name, (intmax_t)gkd->offset, (intmax_t)gkd->length);
129 di.dumper = (dumper_t *)dp->d_devsw->d_dump;
139 di.dumper = dp->d_dump;
130 di.priv = dp->d_dev;
131 di.blocksize = dp->d_sectorsize;
132 di.mediaoffset = gkd->offset;
133 di.mediasize = gkd->length;
134 error = set_dumper(&di);
135 g_io_deliver(bp, error);
136}
137
138static void
139g_disk_done(struct bio *bp)
140{
141 struct disk *dp;
142
143 dp = bp->bio_caller1;
144 bp->bio_completed = bp->bio_length - bp->bio_resid;
140 di.priv = dp->d_dev;
141 di.blocksize = dp->d_sectorsize;
142 di.mediaoffset = gkd->offset;
143 di.mediasize = gkd->length;
144 error = set_dumper(&di);
145 g_io_deliver(bp, error);
146}
147
148static void
149g_disk_done(struct bio *bp)
150{
151 struct disk *dp;
152
153 dp = bp->bio_caller1;
154 bp->bio_completed = bp->bio_length - bp->bio_resid;
145 if (!(dp->d_devsw->d_flags & D_NOGIANT)) {
155 if (!(dp->d_flags & DISKFLAG_NOGIANT)) {
146 DROP_GIANT();
147 g_std_done(bp);
148 PICKUP_GIANT();
149 } else {
150 g_std_done(bp);
151 }
152}
153

--- 6 unchanged lines hidden (view full) ---

160 struct g_ioctl *gio;
161 int error;
162
163 dp = bp->bio_to->geom->softc;
164 dev = dp->d_dev;
165 error = EJUSTRETURN;
166 switch(bp->bio_cmd) {
167 case BIO_DELETE:
156 DROP_GIANT();
157 g_std_done(bp);
158 PICKUP_GIANT();
159 } else {
160 g_std_done(bp);
161 }
162}
163

--- 6 unchanged lines hidden (view full) ---

170 struct g_ioctl *gio;
171 int error;
172
173 dp = bp->bio_to->geom->softc;
174 dev = dp->d_dev;
175 error = EJUSTRETURN;
176 switch(bp->bio_cmd) {
177 case BIO_DELETE:
168 if (!(devsw(dev)->d_flags & D_CANFREE)) {
178 if (!(dp->d_flags & DISKFLAG_CANDELETE)) {
169 error = 0;
170 break;
171 }
172 /* fall-through */
173 case BIO_READ:
174 case BIO_WRITE:
175 bp2 = g_clone_bio(bp);
176 bp2->bio_done = g_disk_done;
177 bp2->bio_blkno = bp2->bio_offset >> DEV_BSHIFT;
178 bp2->bio_pblkno = bp2->bio_offset / dp->d_sectorsize;
179 bp2->bio_bcount = bp2->bio_length;
180 bp2->bio_dev = dev;
181 bp2->bio_caller1 = dp;
182 g_disk_lock_giant(dp);
179 error = 0;
180 break;
181 }
182 /* fall-through */
183 case BIO_READ:
184 case BIO_WRITE:
185 bp2 = g_clone_bio(bp);
186 bp2->bio_done = g_disk_done;
187 bp2->bio_blkno = bp2->bio_offset >> DEV_BSHIFT;
188 bp2->bio_pblkno = bp2->bio_offset / dp->d_sectorsize;
189 bp2->bio_bcount = bp2->bio_length;
190 bp2->bio_dev = dev;
191 bp2->bio_caller1 = dp;
192 g_disk_lock_giant(dp);
183 devsw(dev)->d_strategy(bp2);
193 dp->d_strategy(bp2);
184 g_disk_unlock_giant(dp);
185 break;
186 case BIO_GETATTR:
187 if (g_handleattr_int(bp, "GEOM::fwsectors", dp->d_fwsectors))
188 break;
189 else if (g_handleattr_int(bp, "GEOM::fwheads", dp->d_fwheads))
190 break;
191 else if (g_handleattr_off_t(bp, "GEOM::frontstuff", 0))
192 break;
193 else if (!strcmp(bp->bio_attribute, "GEOM::kerneldump"))
194 g_disk_kerneldump(bp, dp);
194 g_disk_unlock_giant(dp);
195 break;
196 case BIO_GETATTR:
197 if (g_handleattr_int(bp, "GEOM::fwsectors", dp->d_fwsectors))
198 break;
199 else if (g_handleattr_int(bp, "GEOM::fwheads", dp->d_fwheads))
200 break;
201 else if (g_handleattr_off_t(bp, "GEOM::frontstuff", 0))
202 break;
203 else if (!strcmp(bp->bio_attribute, "GEOM::kerneldump"))
204 g_disk_kerneldump(bp, dp);
195 else if (!strcmp(bp->bio_attribute, "GEOM::ioctl") &&
205 else if (dp->d_ioctl != NULL &&
206 !strcmp(bp->bio_attribute, "GEOM::ioctl") &&
196 bp->bio_length == sizeof *gio) {
197 gio = (struct g_ioctl *)bp->bio_data;
207 bp->bio_length == sizeof *gio) {
208 gio = (struct g_ioctl *)bp->bio_data;
198 gio->func = devsw(dp->d_dev)->d_ioctl;
209 gio->func = dp->d_ioctl;
199 gio->dev = dp->d_dev;
200 error = EDIRIOCTL;
201 } else
202 error = ENOIOCTL;
203 break;
204 case BIO_SETATTR:
205 if (!strcmp(bp->bio_attribute, "GEOM::ioctl") &&
206 bp->bio_length == sizeof *gio) {

--- 53 unchanged lines hidden (view full) ---

260 g_error_provider(pp, 0);
261 if (bootverbose)
262 printf("GEOM: new disk %s\n", gp->name);
263}
264
265
266
267dev_t
210 gio->dev = dp->d_dev;
211 error = EDIRIOCTL;
212 } else
213 error = ENOIOCTL;
214 break;
215 case BIO_SETATTR:
216 if (!strcmp(bp->bio_attribute, "GEOM::ioctl") &&
217 bp->bio_length == sizeof *gio) {

--- 53 unchanged lines hidden (view full) ---

271 g_error_provider(pp, 0);
272 if (bootverbose)
273 printf("GEOM: new disk %s\n", gp->name);
274}
275
276
277
278dev_t
268disk_create(int unit, struct disk *dp, int flags, struct cdevsw *cdevsw, void *unused)
279disk_create(int unit, struct disk *dp, int flags, struct cdevsw *cdevsw, void * unused __unused)
269{
270 dev_t dev;
271
272 dev = g_malloc(sizeof *dev, M_ZERO);
273 dp->d_dev = dev;
280{
281 dev_t dev;
282
283 dev = g_malloc(sizeof *dev, M_ZERO);
284 dp->d_dev = dev;
285 dp->d_flags = flags;
274 dp->d_devsw = cdevsw;
275 dev->si_devsw = cdevsw;
286 dp->d_devsw = cdevsw;
287 dev->si_devsw = cdevsw;
288 if (cdevsw != NULL) {
289 dp->d_open = cdevsw->d_open;
290 dp->d_close = cdevsw->d_close;
291 dp->d_strategy = cdevsw->d_strategy;
292 dp->d_ioctl = cdevsw->d_ioctl;
293 dp->d_dump = (dumper_t *)cdevsw->d_dump;
294 dp->d_name = cdevsw->d_name;
295 }
296 KASSERT(dp->d_strategy != NULL, ("disk_create need d_strategy"));
297 KASSERT(dp->d_name != NULL, ("disk_create need d_name"));
298 KASSERT(*dp->d_name != 0, ("disk_create need d_name"));
276 dev->si_disk = dp;
277 dev->si_udev = 0x10002; /* XXX: Needed ? */
299 dev->si_disk = dp;
300 dev->si_udev = 0x10002; /* XXX: Needed ? */
278 sprintf(dev->si_name, "%s%d", cdevsw->d_name, unit);
301 sprintf(dev->si_name, "%s%d", dp->d_name, unit);
279 g_call_me(g_disk_create, dev);
280 return (dev);
281}
282
283void
284disk_destroy(dev_t dev)
285{
286 struct disk *dp;
287 struct g_geom *gp;
288
289 dp = dev->si_disk;
290 gp = dp->d_softc;
291 g_free(dev);
292 gp->flags |= G_GEOM_WITHER;
302 g_call_me(g_disk_create, dev);
303 return (dev);
304}
305
306void
307disk_destroy(dev_t dev)
308{
309 struct disk *dp;
310 struct g_geom *gp;
311
312 dp = dev->si_disk;
313 gp = dp->d_softc;
314 g_free(dev);
315 gp->flags |= G_GEOM_WITHER;
316 gp->softc = NULL;
293 g_orphan_provider(LIST_FIRST(&gp->provider), ENXIO);
294}
295
296static void
297g_kern_disks(void *p)
298{
299 struct sbuf *sb;
300 struct g_geom *gp;

--- 33 unchanged lines hidden --- 		317 g_orphan_provider(LIST_FIRST(&gp->provider), ENXIO);
318}
319
320static void
321g_kern_disks(void *p)
322{
323 struct sbuf *sb;
324 struct g_geom *gp;

--- 33 unchanged lines hidden ---