Support disklabel partitions on all platforms.
also addresses buildrump.sh issue #41 (github)
This commit is contained in:
pooka
parent
8b205e8660
commit
cbdf0ef490
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.6 2013/09/10 18:28:46 pooka Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2013/11/13 17:47:27 pooka Exp $
|
||||
#
|
||||
|
||||
PROG= rump_allserver
|
||||
@ -14,11 +14,4 @@ RUMPTOP=${.CURDIR}/../../sys/rump
|
||||
LDADD+= ${RUMPDEVLDADD} ${RUMPFSLDADD} ${RUMPKERNLDADD} ${RUMPNETLDADD}
|
||||
LDADD+= -lrumpdev -lrumpvfs -lrumpnet -lrump -lrumpuser -lpthread
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.if ${RUMP_SERVER_LIBUTIL:Uyes} == "yes"
|
||||
DPADD+= ${LIBUTIL}
|
||||
LDADD+= -lutil
|
||||
.endif
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: rump_allserver.c,v 1.27 2013/11/13 16:43:38 pooka Exp $ */
|
||||
/* $NetBSD: rump_allserver.c,v 1.28 2013/11/13 17:47:27 pooka Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
|
||||
@ -28,18 +28,13 @@
|
||||
#include <rump/rumpuser_port.h>
|
||||
|
||||
#ifndef lint
|
||||
__RCSID("$NetBSD: rump_allserver.c,v 1.27 2013/11/13 16:43:38 pooka Exp $");
|
||||
__RCSID("$NetBSD: rump_allserver.c,v 1.28 2013/11/13 17:47:27 pooka Exp $");
|
||||
#endif /* !lint */
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/signal.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#ifdef PLATFORM_HAS_DISKLABEL
|
||||
#include <sys/disklabel.h>
|
||||
#include <util.h>
|
||||
#endif
|
||||
|
||||
#include <dlfcn.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
@ -119,6 +114,8 @@ struct etfstype {
|
||||
{ "reg", RUMP_ETFS_REG },
|
||||
};
|
||||
|
||||
static void processlabel(int, int, int, off_t *, off_t *);
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
@ -373,27 +370,10 @@ main(int argc, char *argv[])
|
||||
if (fd == -1)
|
||||
die(sflag, errno, "etfs hostpath open");
|
||||
|
||||
#ifdef PLATFORM_HAS_DISKLABEL
|
||||
if (etfs[i].partition) {
|
||||
struct disklabel dl;
|
||||
char buf[1<<16];
|
||||
int partition = etfs[i].partition - 'a';
|
||||
|
||||
pread(fd, buf, sizeof(buf), 0);
|
||||
if (disklabel_scan(&dl, buf, sizeof(buf)))
|
||||
die(sflag, ENOENT, "disklabel not found");
|
||||
|
||||
if (partition >= dl.d_npartitions)
|
||||
die(sflag, ENOENT, "partition not available");
|
||||
|
||||
foffset = dl.d_partitions[partition].p_offset
|
||||
<< DEV_BSHIFT;
|
||||
flen = dl.d_partitions[partition].p_size
|
||||
<< DEV_BSHIFT;
|
||||
processlabel(sflag, fd, etfs[i].partition - 'a',
|
||||
&foffset, &flen);
|
||||
} else {
|
||||
#else
|
||||
{
|
||||
#endif
|
||||
foffset = etfs[i].foffset;
|
||||
flen = etfs[i].flen;
|
||||
}
|
||||
@ -435,3 +415,310 @@ main(int argc, char *argv[])
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Copyright (c) 1987, 1988, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)disklabel.h 8.2 (Berkeley) 7/10/94
|
||||
*/
|
||||
|
||||
#define RUMPSERVER_MAXPARTITIONS 22
|
||||
#define RUMPSERVER_DISKMAGIC ((uint32_t)0x82564557) /* magic */
|
||||
#define RUMPSERVER_DEVSHIFT 9
|
||||
|
||||
struct rumpserver_disklabel {
|
||||
uint32_t d_magic; /* the magic number */
|
||||
uint16_t d_type; /* drive type */
|
||||
uint16_t d_subtype; /* controller/d_type specific */
|
||||
char d_typename[16]; /* type name, e.g. "eagle" */
|
||||
|
||||
/*
|
||||
* d_packname contains the pack identifier and is returned when
|
||||
* the disklabel is read off the disk or in-core copy.
|
||||
* d_boot0 and d_boot1 are the (optional) names of the
|
||||
* primary (block 0) and secondary (block 1-15) bootstraps
|
||||
* as found in /usr/mdec. These are returned when using
|
||||
* getdiskbyname(3) to retrieve the values from /etc/disktab.
|
||||
*/
|
||||
union {
|
||||
char un_d_packname[16]; /* pack identifier */
|
||||
struct {
|
||||
char *un_d_boot0; /* primary bootstrap name */
|
||||
char *un_d_boot1; /* secondary bootstrap name */
|
||||
} un_b;
|
||||
} d_un;
|
||||
#define d_packname d_un.un_d_packname
|
||||
#define d_boot0 d_un.un_b.un_d_boot0
|
||||
#define d_boot1 d_un.un_b.un_d_boot1
|
||||
|
||||
/* disk geometry: */
|
||||
uint32_t d_secsize; /* # of bytes per sector */
|
||||
uint32_t d_nsectors; /* # of data sectors per track */
|
||||
uint32_t d_ntracks; /* # of tracks per cylinder */
|
||||
uint32_t d_ncylinders; /* # of data cylinders per unit */
|
||||
uint32_t d_secpercyl; /* # of data sectors per cylinder */
|
||||
uint32_t d_secperunit; /* # of data sectors per unit */
|
||||
|
||||
/*
|
||||
* Spares (bad sector replacements) below are not counted in
|
||||
* d_nsectors or d_secpercyl. Spare sectors are assumed to
|
||||
* be physical sectors which occupy space at the end of each
|
||||
* track and/or cylinder.
|
||||
*/
|
||||
uint16_t d_sparespertrack; /* # of spare sectors per track */
|
||||
uint16_t d_sparespercyl; /* # of spare sectors per cylinder */
|
||||
/*
|
||||
* Alternative cylinders include maintenance, replacement,
|
||||
* configuration description areas, etc.
|
||||
*/
|
||||
uint32_t d_acylinders; /* # of alt. cylinders per unit */
|
||||
|
||||
/* hardware characteristics: */
|
||||
/*
|
||||
* d_interleave, d_trackskew and d_cylskew describe perturbations
|
||||
* in the media format used to compensate for a slow controller.
|
||||
* Interleave is physical sector interleave, set up by the
|
||||
* formatter or controller when formatting. When interleaving is
|
||||
* in use, logically adjacent sectors are not physically
|
||||
* contiguous, but instead are separated by some number of
|
||||
* sectors. It is specified as the ratio of physical sectors
|
||||
* traversed per logical sector. Thus an interleave of 1:1
|
||||
* implies contiguous layout, while 2:1 implies that logical
|
||||
* sector 0 is separated by one sector from logical sector 1.
|
||||
* d_trackskew is the offset of sector 0 on track N relative to
|
||||
* sector 0 on track N-1 on the same cylinder. Finally, d_cylskew
|
||||
* is the offset of sector 0 on cylinder N relative to sector 0
|
||||
* on cylinder N-1.
|
||||
*/
|
||||
uint16_t d_rpm; /* rotational speed */
|
||||
uint16_t d_interleave; /* hardware sector interleave */
|
||||
uint16_t d_trackskew; /* sector 0 skew, per track */
|
||||
uint16_t d_cylskew; /* sector 0 skew, per cylinder */
|
||||
uint32_t d_headswitch; /* head switch time, usec */
|
||||
uint32_t d_trkseek; /* track-to-track seek, usec */
|
||||
uint32_t d_flags; /* generic flags */
|
||||
#define NDDATA 5
|
||||
uint32_t d_drivedata[NDDATA]; /* drive-type specific information */
|
||||
#define NSPARE 5
|
||||
uint32_t d_spare[NSPARE]; /* reserved for future use */
|
||||
uint32_t d_magic2; /* the magic number (again) */
|
||||
uint16_t d_checksum; /* xor of data incl. partitions */
|
||||
|
||||
/* filesystem and partition information: */
|
||||
uint16_t d_npartitions; /* number of partitions in following */
|
||||
uint32_t d_bbsize; /* size of boot area at sn0, bytes */
|
||||
uint32_t d_sbsize; /* max size of fs superblock, bytes */
|
||||
struct rumpserver_partition { /* the partition table */
|
||||
uint32_t p_size; /* number of sectors in partition */
|
||||
uint32_t p_offset; /* starting sector */
|
||||
union {
|
||||
uint32_t fsize; /* FFS, ADOS:
|
||||
filesystem basic fragment size */
|
||||
uint32_t cdsession; /* ISO9660: session offset */
|
||||
} __partition_u2;
|
||||
#define p_fsize __partition_u2.fsize
|
||||
#define p_cdsession __partition_u2.cdsession
|
||||
uint8_t p_fstype; /* filesystem type, see below */
|
||||
uint8_t p_frag; /* filesystem fragments per block */
|
||||
union {
|
||||
uint16_t cpg; /* UFS: FS cylinders per group */
|
||||
uint16_t sgs; /* LFS: FS segment shift */
|
||||
} __partition_u1;
|
||||
#define p_cpg __partition_u1.cpg
|
||||
#define p_sgs __partition_u1.sgs
|
||||
} d_partitions[RUMPSERVER_MAXPARTITIONS]; /* actually may be more */
|
||||
};
|
||||
|
||||
|
||||
/* for swapping disklabel, so don't care about perf, just portability */
|
||||
#define bs32(x) \
|
||||
((((x) & 0xff000000) >> 24)| \
|
||||
(((x) & 0x00ff0000) >> 8) | \
|
||||
(((x) & 0x0000ff00) << 8) | \
|
||||
(((x) & 0x000000ff) << 24))
|
||||
#define bs16(x) ((((x) & 0xff00) >> 8) | (((x) & 0x00ff) << 8))
|
||||
|
||||
/*
|
||||
* From:
|
||||
* $NetBSD: disklabel_dkcksum.c,v 1.4 2005/05/15 21:01:34 thorpej Exp
|
||||
*/
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
static uint16_t
|
||||
rs_dl_dkcksum(struct rumpserver_disklabel *lp, int imswapped)
|
||||
{
|
||||
uint16_t *start, *end;
|
||||
uint16_t sum;
|
||||
uint16_t npart;
|
||||
|
||||
if (imswapped)
|
||||
npart = bs16(lp->d_npartitions);
|
||||
else
|
||||
npart = lp->d_npartitions;
|
||||
|
||||
sum = 0;
|
||||
start = (uint16_t *)(void *)lp;
|
||||
end = (uint16_t *)(void *)&lp->d_partitions[npart];
|
||||
while (start < end) {
|
||||
if (imswapped)
|
||||
sum ^= bs16(*start);
|
||||
else
|
||||
sum ^= *start;
|
||||
start++;
|
||||
}
|
||||
return (sum);
|
||||
}
|
||||
|
||||
/*
|
||||
* From:
|
||||
* NetBSD: disklabel_scan.c,v 1.3 2009/01/18 12:13:03 lukem Exp
|
||||
*/
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002 The NetBSD Foundation, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to The NetBSD Foundation
|
||||
* by Roland C. Dowdeswell.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
||||
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
||||
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
static int
|
||||
rs_dl_scan(struct rumpserver_disklabel *lp, int *isswapped,
|
||||
char *buf, size_t buflen)
|
||||
{
|
||||
size_t i;
|
||||
int imswapped;
|
||||
uint16_t npart;
|
||||
|
||||
/* scan for the correct magic numbers. */
|
||||
|
||||
for (i=0; i <= buflen - sizeof(*lp); i += 4) {
|
||||
memcpy(lp, buf + i, sizeof(*lp));
|
||||
if (lp->d_magic == RUMPSERVER_DISKMAGIC &&
|
||||
lp->d_magic2 == RUMPSERVER_DISKMAGIC) {
|
||||
imswapped = 0;
|
||||
goto sanity;
|
||||
}
|
||||
if (lp->d_magic == bs32(RUMPSERVER_DISKMAGIC) &&
|
||||
lp->d_magic2 == bs32(RUMPSERVER_DISKMAGIC)) {
|
||||
imswapped = 1;
|
||||
goto sanity;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
|
||||
sanity:
|
||||
if (imswapped)
|
||||
npart = bs16(lp->d_npartitions);
|
||||
else
|
||||
npart = lp->d_npartitions;
|
||||
/* we've found something, let's sanity check it */
|
||||
if (npart > RUMPSERVER_MAXPARTITIONS
|
||||
|| rs_dl_dkcksum(lp, imswapped))
|
||||
return 1;
|
||||
|
||||
*isswapped = imswapped;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
processlabel(int sflag, int fd, int partition, off_t *foffp, off_t *flenp)
|
||||
{
|
||||
struct rumpserver_disklabel dl;
|
||||
char buf[1<<16];
|
||||
uint32_t foffset, flen;
|
||||
int imswapped;
|
||||
|
||||
if (pread(fd, buf, sizeof(buf), 0) == -1)
|
||||
die(sflag, errno, "could not read disk device");
|
||||
if (rs_dl_scan(&dl, &imswapped, buf, sizeof(buf)))
|
||||
die(sflag, ENOENT, "disklabel not found");
|
||||
|
||||
if (partition >= dl.d_npartitions)
|
||||
die(sflag, ENOENT, "partition not available");
|
||||
|
||||
foffset = dl.d_partitions[partition].p_offset << RUMPSERVER_DEVSHIFT;
|
||||
flen = dl.d_partitions[partition].p_size << RUMPSERVER_DEVSHIFT;
|
||||
if (imswapped) {
|
||||
foffset = bs32(foffset);
|
||||
flen = bs32(flen);
|
||||
}
|
||||
|
||||
*foffp = (off_t)foffset;
|
||||
*flenp = (off_t)flen;
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.6 2013/11/11 15:53:56 pooka Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2013/11/13 17:47:27 pooka Exp $
|
||||
#
|
||||
|
||||
.PATH: ${.CURDIR}/../rump_allserver
|
||||
@ -9,11 +9,4 @@ NOMAN= installed by ../rump_allserver
|
||||
|
||||
LDADD+= -Wl,--whole-archive -lrump -lrumpuser -Wl,--no-whole-archive -lpthread
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.if ${RUMP_SERVER_LIBUTIL:Uyes} == "yes"
|
||||
DPADD+= ${LIBUTIL}
|
||||
LDADD+= -lutil
|
||||
.endif
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user