d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6208b149df
freebsd-skq/sys/kern/subr_diskmbr.c

518 lines
15 KiB
C
Raw Normal View History

diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
/*-
* Copyright (c) 1994 Bruce D. Evans.
* All rights reserved.
*
* Copyright (c) 1982, 1986, 1988 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. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. 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.
*
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
$Id$ -> $FreeBSD$
1999-08-28 01:08:13 +00:00
* $FreeBSD$
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
*/
#include <sys/param.h>
Divorce "dev_t" from the "major|minor" bitmap, which is now called udev_t in the kernel but still called dev_t in userland. Provide functions to manipulate both types: major() umajor() minor() uminor() makedev() umakedev() dev2udev() udev2dev() For now they're functions, they will become in-line functions after one of the next two steps in this process. Return major/minor/makedev to macro-hood for userland. Register a name in cdevsw[] for the "filedescriptor" driver. In the kernel the udev_t appears in places where we have the major/minor number combination, (ie: a potential device: we may not have the driver nor the device), like in inodes, vattr, cdevsw registration and so on, whereas the dev_t appears where we carry around a reference to a actual device. In the future the cdevsw and the aliased-from vnode will be hung directly from the dev_t, along with up to two softc pointers for the device driver and a few houskeeping bits. This will essentially replace the current "alias" check code (same buck, bigger bang). A little stunt has been provided to try to catch places where the wrong type is being used (dev_t vs udev_t), if you see something not working, #undef DEVT_FASCIST in kern/kern_conf.c and see if it makes a difference. If it does, please try to track it down (many hands make light work) or at least try to reproduce it as simply as possible, and describe how to do that. Without DEVT_FASCIST I belive this patch is a no-op. Stylistic/posixoid comments about the userland view of the <sys/*.h> files welcome now, from userland they now contain the end result. Next planned step: make all dev_t's refer to the same devsw[] which means convert BLK's to CHR's at the perimeter of the vnodes and other places where they enter the game (bootdev, mknod, sysctl).
1999-05-11 19:55:07 +00:00
#include <sys/systm.h>
Separate the struct bio related stuff out of <sys/buf.h> into <sys/bio.h>. <sys/bio.h> is now a prerequisite for <sys/buf.h> but it shall not be made a nested include according to bdes teachings on the subject of nested includes. Diskdrivers and similar stuff below specfs::strategy() should no longer need to include <sys/buf.> unless they need caching of data. Still a few bogus uses of struct buf to track down. Repocopy by: peter
2000-05-05 09:59:14 +00:00
#include <sys/bio.h>
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
#include <sys/buf.h>
Don't include <sys/conf.h> for the kernel in disk-related headers. It is needed for implementation details but very little of it is needed for the interface. Include it in the few places that didn't already include it. Include <sys/ioccom.h> in <sys/disklabel.h> (as already in <sys/diskslice.h>) so that all the disk-related headers are almost self-sufficient.
1996-09-20 17:39:44 +00:00
#include <sys/conf.h>
Merge alpha and pc98 changes into i386 MBR handling code and replace all three copies with one copy in MI land.
1999-08-29 09:12:54 +00:00
#ifdef PC98
Fixed style bugs in rev.1.36-1.39.
1999-09-04 14:21:42 +00:00
#define PC98_ATCOMPAT
#define dsinit atcompat_dsinit
Merge alpha and pc98 changes into i386 MBR handling code and replace all three copies with one copy in MI land.
1999-08-29 09:12:54 +00:00
#endif
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
#include <sys/disklabel.h>
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
#define DOSPTYP_EXTENDED 5
The machine dependent disk slice manager does not recognize DOS partition type 15 (Extended DOS, LBA) as a container for DOS logical volumes, so the appropriate slices (e.g. sd1s5) are not initialized. PR: 7549 PR: 4120 Reviewed by: phk Submitted by: Jim Mattson <jmattson@sonic.net>
1998-08-10 07:22:14 +00:00
#define DOSPTYP_EXTENDEDX 15
Added support for disks which "OnTrack Disk Manager" has munged. I suggest you do all partitioning using the OnTrack SW, to avoid confusing it.
1995-04-20 01:21:51 +00:00
#define DOSPTYP_ONTRACK 84
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
#include <sys/diskslice.h>
#include <sys/malloc.h>
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
#include <sys/syslog.h>
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
#define TRACE(str) do { if (dsi_debug) printf str; } while (0)
static volatile u_char dsi_debug;
Add more compatibility cruft: - ignore the partition table if it is identical with the bogus one in /usr/src/sys/i386/boot/biosboot/start.S. Honoring the bogus size field was fatal. The error is detected but other compatibilty cruft weakens the error handling too much for this case. - weaken the partition entry checking to allow the following treatments of C/H/S addresses when C should be >= 1024: (1) allow C = 1023, H = max, S = max. (2) allow C to be correct modulo 1024. Other compatibilty cruft weakens the error handling to allow all C/H/S addresses, but there too many errors were reported. Improve error messages: - print C/H/S addresses if relevant. - distinguish primary partition table from extended partition tables. - don't use diskerr() except for i/o errors.
1995-03-25 12:07:31 +00:00
static struct dos_partition historical_bogus_partition_table[NDOSPART] = {
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
{ 0x80, 0, 1, 0, DOSPTYP_386BSD, 255, 255, 255, 0, 50000, },
};
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
static int check_part __P((char *sname, struct dos_partition *dp,
Added support for disks which "OnTrack Disk Manager" has munged. I suggest you do all partitioning using the OnTrack SW, to avoid confusing it.
1995-04-20 01:21:51 +00:00
u_long offset, int nsectors, int ntracks,
u_long mbr_offset));
We don't need to pass the diskname argument all over the diskslice/label code, we can find the name from any convenient dev_t
1999-08-28 14:33:44 +00:00
static void mbr_extended __P((dev_t dev, struct disklabel *lp,
Fixed style bugs in rev.1.36-1.39.
1999-09-04 14:21:42 +00:00
struct diskslices *ssp, u_long ext_offset,
u_long ext_size, u_long base_ext_offset,
Quick fix for stack overflow when there are more than about 25 slices. Using recursion to traverse the recursive data structure for extended partitions was never good, but when slice support was implemented in 1995, the recursion worked for the default maximum number of slices (32), and standard fdisk utilities didn't support creating more than the default number. Even then, corrupt extended partitions could cause endless recursion, because we attempt to check all slices, even ones which we don't turn into devices. The recursion has succumbed to creeping features. The stack requirements for each level had grown to 204 bytes on i386's. Most of the growth was caused by adding a 64-byte copy of the DOSpartition table to each frame. The kernel stack size has shrunk to about 5K on i386's. Most of the shrinkage was caused by the growth of `struct sigacts' by 2388 bytes to support 128 signals. Linux fdisk (a 1997 version at least) can now create 60 slices (4 standard ones, 56 for logical drives within extended partitions, and it seems to be leaving room to map the 4 BSD partitions on my test drive), and Linux (2.2.29 and 2.3.35 at least) now reports all these slices at boot time. The fix limits the recursion to 16 levels (4 + 16 slices) and recovers 32 bytes per level caused by gcc pessimizing for space. Switching to a static buffer doesn't cause any problems due to recursion, since the buffer is not passed down. Using a static buffer is wrong in general because it requires the giant lock to protect it. However, this problem is small compared with using a static buffer for dsname(). We sometimes neglect to copy the result of dsname() before sleeping. Also fixed slice names when we find more than MAX_SLICES (32) slices. The number of the last slice found was not passed passed recursively. The limit on the recursion now prevents finding more than 32 slices with a standard extended partition data structure anyway.
2000-01-27 05:11:29 +00:00
int nsectors, int ntracks, u_long mbr_offset,
int level));
Don't permit generation of non-physical disk addresses. subr_diskmbr.c: Don't "helpfully" enlarge our idea of the disk size to cover all the primary slices. Instead, truncate or discard slices that don't seem to be on the disk. The enlargement was a hack for disks that don't report their size (e.g., MFM disks). It is just wrong in general. wd.c: In CHS mode, limit the disk size so that cylinder numbers >= 65536 cannot occur. This normally only affects disks larger than 33.8GB. CHS mode accesses to addresses above the limit are now properly broken (an error is returned instead of garbage for reads and disk corruption for writes). PR: 15611 Reviewed by: readers of freebsd-bugs did not respond to a request for review
2000-01-28 10:22:07 +00:00
static int mbr_setslice __P((char *sname, struct disklabel *lp,
struct diskslice *sp, struct dos_partition *dp,
u_long br_offset));
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
static int
Added support for disks which "OnTrack Disk Manager" has munged. I suggest you do all partitioning using the OnTrack SW, to avoid confusing it.
1995-04-20 01:21:51 +00:00
check_part(sname, dp, offset, nsectors, ntracks, mbr_offset )
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
char *sname;
struct dos_partition *dp;
u_long offset;
int nsectors;
int ntracks;
Added support for disks which "OnTrack Disk Manager" has munged. I suggest you do all partitioning using the OnTrack SW, to avoid confusing it.
1995-04-20 01:21:51 +00:00
u_long mbr_offset;
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
{
Add more compatibility cruft: - ignore the partition table if it is identical with the bogus one in /usr/src/sys/i386/boot/biosboot/start.S. Honoring the bogus size field was fatal. The error is detected but other compatibilty cruft weakens the error handling too much for this case. - weaken the partition entry checking to allow the following treatments of C/H/S addresses when C should be >= 1024: (1) allow C = 1023, H = max, S = max. (2) allow C to be correct modulo 1024. Other compatibilty cruft weakens the error handling to allow all C/H/S addresses, but there too many errors were reported. Improve error messages: - print C/H/S addresses if relevant. - distinguish primary partition table from extended partition tables. - don't use diskerr() except for i/o errors.
1995-03-25 12:07:31 +00:00
int chs_ecyl;
int chs_esect;
int chs_scyl;
int chs_ssect;
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
int error;
u_long esector;
u_long esector1;
u_long secpercyl;
u_long ssector;
u_long ssector1;
secpercyl = (u_long)nsectors * ntracks;
Add more compatibility cruft: - ignore the partition table if it is identical with the bogus one in /usr/src/sys/i386/boot/biosboot/start.S. Honoring the bogus size field was fatal. The error is detected but other compatibilty cruft weakens the error handling too much for this case. - weaken the partition entry checking to allow the following treatments of C/H/S addresses when C should be >= 1024: (1) allow C = 1023, H = max, S = max. (2) allow C to be correct modulo 1024. Other compatibilty cruft weakens the error handling to allow all C/H/S addresses, but there too many errors were reported. Improve error messages: - print C/H/S addresses if relevant. - distinguish primary partition table from extended partition tables. - don't use diskerr() except for i/o errors.
1995-03-25 12:07:31 +00:00
chs_scyl = DPCYL(dp->dp_scyl, dp->dp_ssect);
chs_ssect = DPSECT(dp->dp_ssect);
Fix style inconsistencies in the last few commits.
1995-05-07 07:06:36 +00:00
ssector = chs_ssect - 1 + dp->dp_shd * nsectors + chs_scyl * secpercyl
+ mbr_offset;
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
ssector1 = offset + dp->dp_start;
Add more compatibility cruft: - ignore the partition table if it is identical with the bogus one in /usr/src/sys/i386/boot/biosboot/start.S. Honoring the bogus size field was fatal. The error is detected but other compatibilty cruft weakens the error handling too much for this case. - weaken the partition entry checking to allow the following treatments of C/H/S addresses when C should be >= 1024: (1) allow C = 1023, H = max, S = max. (2) allow C to be correct modulo 1024. Other compatibilty cruft weakens the error handling to allow all C/H/S addresses, but there too many errors were reported. Improve error messages: - print C/H/S addresses if relevant. - distinguish primary partition table from extended partition tables. - don't use diskerr() except for i/o errors.
1995-03-25 12:07:31 +00:00
/*
* If ssector1 is on a cylinder >= 1024, then ssector can't be right.
* Allow the C/H/S for it to be 1023/ntracks-1/nsectors, or correct
Avoid division by 0 in check_part(). (It occurred when max_nsectors == 0. This case is clearly an error, but we keep calling check_part() to get diagnostics.) Fixed nearby indentation and commenting bugs.
1997-04-19 14:14:17 +00:00
* apart from the cylinder being reduced modulo 1024. Always allow
* 1023/255/63.
Add more compatibility cruft: - ignore the partition table if it is identical with the bogus one in /usr/src/sys/i386/boot/biosboot/start.S. Honoring the bogus size field was fatal. The error is detected but other compatibilty cruft weakens the error handling too much for this case. - weaken the partition entry checking to allow the following treatments of C/H/S addresses when C should be >= 1024: (1) allow C = 1023, H = max, S = max. (2) allow C to be correct modulo 1024. Other compatibilty cruft weakens the error handling to allow all C/H/S addresses, but there too many errors were reported. Improve error messages: - print C/H/S addresses if relevant. - distinguish primary partition table from extended partition tables. - don't use diskerr() except for i/o errors.
1995-03-25 12:07:31 +00:00
*/
Fix warnings in preparation for adding -Wall -Wcast-qual to the kernel compile
1999-01-28 01:59:53 +00:00
if ((ssector < ssector1
Improved English in the messages printed by diskerr(). Fixed some formatting bugs.
2000-01-26 10:28:23 +00:00
&& ((chs_ssect == nsectors && dp->dp_shd == ntracks - 1
&& chs_scyl == 1023)
|| (secpercyl != 0
&& (ssector1 - ssector) % (1024 * secpercyl) == 0)))
Avoid division by 0 in check_part(). (It occurred when max_nsectors == 0. This case is clearly an error, but we keep calling check_part() to get diagnostics.) Fixed nearby indentation and commenting bugs.
1997-04-19 14:14:17 +00:00
|| (dp->dp_scyl == 255 && dp->dp_shd == 255
&& dp->dp_ssect == 255)) {
Add more compatibility cruft: - ignore the partition table if it is identical with the bogus one in /usr/src/sys/i386/boot/biosboot/start.S. Honoring the bogus size field was fatal. The error is detected but other compatibilty cruft weakens the error handling too much for this case. - weaken the partition entry checking to allow the following treatments of C/H/S addresses when C should be >= 1024: (1) allow C = 1023, H = max, S = max. (2) allow C to be correct modulo 1024. Other compatibilty cruft weakens the error handling to allow all C/H/S addresses, but there too many errors were reported. Improve error messages: - print C/H/S addresses if relevant. - distinguish primary partition table from extended partition tables. - don't use diskerr() except for i/o errors.
1995-03-25 12:07:31 +00:00
TRACE(("%s: C/H/S start %d/%d/%d, start %lu: allow\n",
sname, chs_scyl, dp->dp_shd, chs_ssect, ssector1));
ssector = ssector1;
}
chs_ecyl = DPCYL(dp->dp_ecyl, dp->dp_esect);
chs_esect = DPSECT(dp->dp_esect);
Fix style inconsistencies in the last few commits.
1995-05-07 07:06:36 +00:00
esector = chs_esect - 1 + dp->dp_ehd * nsectors + chs_ecyl * secpercyl
+ mbr_offset;
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
esector1 = ssector1 + dp->dp_size - 1;
Add more compatibility cruft: - ignore the partition table if it is identical with the bogus one in /usr/src/sys/i386/boot/biosboot/start.S. Honoring the bogus size field was fatal. The error is detected but other compatibilty cruft weakens the error handling too much for this case. - weaken the partition entry checking to allow the following treatments of C/H/S addresses when C should be >= 1024: (1) allow C = 1023, H = max, S = max. (2) allow C to be correct modulo 1024. Other compatibilty cruft weakens the error handling to allow all C/H/S addresses, but there too many errors were reported. Improve error messages: - print C/H/S addresses if relevant. - distinguish primary partition table from extended partition tables. - don't use diskerr() except for i/o errors.
1995-03-25 12:07:31 +00:00
/* Allow certain bogus C/H/S values for esector, as above. */
Fix warnings in preparation for adding -Wall -Wcast-qual to the kernel compile
1999-01-28 01:59:53 +00:00
if ((esector < esector1
Improved English in the messages printed by diskerr(). Fixed some formatting bugs.
2000-01-26 10:28:23 +00:00
&& ((chs_esect == nsectors && dp->dp_ehd == ntracks - 1
&& chs_ecyl == 1023)
|| (secpercyl != 0
&& (esector1 - esector) % (1024 * secpercyl) == 0)))
Avoid division by 0 in check_part(). (It occurred when max_nsectors == 0. This case is clearly an error, but we keep calling check_part() to get diagnostics.) Fixed nearby indentation and commenting bugs.
1997-04-19 14:14:17 +00:00
|| (dp->dp_ecyl == 255 && dp->dp_ehd == 255
&& dp->dp_esect == 255)) {
Add more compatibility cruft: - ignore the partition table if it is identical with the bogus one in /usr/src/sys/i386/boot/biosboot/start.S. Honoring the bogus size field was fatal. The error is detected but other compatibilty cruft weakens the error handling too much for this case. - weaken the partition entry checking to allow the following treatments of C/H/S addresses when C should be >= 1024: (1) allow C = 1023, H = max, S = max. (2) allow C to be correct modulo 1024. Other compatibilty cruft weakens the error handling to allow all C/H/S addresses, but there too many errors were reported. Improve error messages: - print C/H/S addresses if relevant. - distinguish primary partition table from extended partition tables. - don't use diskerr() except for i/o errors.
1995-03-25 12:07:31 +00:00
TRACE(("%s: C/H/S end %d/%d/%d, end %lu: allow\n",
sname, chs_ecyl, dp->dp_ehd, chs_esect, esector1));
esector = esector1;
}
error = (ssector == ssector1 && esector == esector1) ? 0 : EINVAL;
Make the "information" slice printfs if(bootverbose). Fix the message about Ontrack.
1995-05-18 22:45:35 +00:00
if (bootverbose)
printf("%s: type 0x%x, start %lu, end = %lu, size %lu %s\n",
Fixed printf format errors.
1998-07-11 07:46:16 +00:00
sname, dp->dp_typ, ssector1, esector1,
(u_long)dp->dp_size, error ? "" : ": OK");
Make the "information" slice printfs if(bootverbose). Fix the message about Ontrack.
1995-05-18 22:45:35 +00:00
if (ssector != ssector1 && bootverbose)
Add more compatibility cruft: - ignore the partition table if it is identical with the bogus one in /usr/src/sys/i386/boot/biosboot/start.S. Honoring the bogus size field was fatal. The error is detected but other compatibilty cruft weakens the error handling too much for this case. - weaken the partition entry checking to allow the following treatments of C/H/S addresses when C should be >= 1024: (1) allow C = 1023, H = max, S = max. (2) allow C to be correct modulo 1024. Other compatibilty cruft weakens the error handling to allow all C/H/S addresses, but there too many errors were reported. Improve error messages: - print C/H/S addresses if relevant. - distinguish primary partition table from extended partition tables. - don't use diskerr() except for i/o errors.
1995-03-25 12:07:31 +00:00
printf("%s: C/H/S start %d/%d/%d (%lu) != start %lu: invalid\n",
sname, chs_scyl, dp->dp_shd, chs_ssect,
ssector, ssector1);
Make the "information" slice printfs if(bootverbose). Fix the message about Ontrack.
1995-05-18 22:45:35 +00:00
if (esector != esector1 && bootverbose)
Add more compatibility cruft: - ignore the partition table if it is identical with the bogus one in /usr/src/sys/i386/boot/biosboot/start.S. Honoring the bogus size field was fatal. The error is detected but other compatibilty cruft weakens the error handling too much for this case. - weaken the partition entry checking to allow the following treatments of C/H/S addresses when C should be >= 1024: (1) allow C = 1023, H = max, S = max. (2) allow C to be correct modulo 1024. Other compatibilty cruft weakens the error handling to allow all C/H/S addresses, but there too many errors were reported. Improve error messages: - print C/H/S addresses if relevant. - distinguish primary partition table from extended partition tables. - don't use diskerr() except for i/o errors.
1995-03-25 12:07:31 +00:00
printf("%s: C/H/S end %d/%d/%d (%lu) != end %lu: invalid\n",
sname, chs_ecyl, dp->dp_ehd, chs_esect,
esector, esector1);
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
return (error);
}
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
int
We don't need to pass the diskname argument all over the diskslice/label code, we can find the name from any convenient dev_t
1999-08-28 14:33:44 +00:00
dsinit(dev, lp, sspp)
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
dev_t dev;
struct disklabel *lp;
struct diskslices **sspp;
{
struct buf *bp;
u_char *cp;
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
int dospart;
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
struct dos_partition *dp;
struct dos_partition *dp0;
Merge alpha and pc98 changes into i386 MBR handling code and replace all three copies with one copy in MI land.
1999-08-29 09:12:54 +00:00
struct dos_partition dpcopy[NDOSPART];
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
int error;
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
int max_ncyls;
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
int max_nsectors;
int max_ntracks;
Fix style inconsistencies in the last few commits.
1995-05-07 07:06:36 +00:00
u_long mbr_offset;
Use dsname() to get consistent names.
1995-02-22 22:46:48 +00:00
char partname[2];
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
u_long secpercyl;
Use dsname() to get consistent names.
1995-02-22 22:46:48 +00:00
char *sname;
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
struct diskslice *sp;
struct diskslices *ssp;
Fix style inconsistencies in the last few commits.
1995-05-07 07:06:36 +00:00
mbr_offset = DOSBBSECTOR;
reread_mbr:
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
/* Read master boot record. */
bp = geteblk((int)lp->d_secsize);
bp->b_dev = dkmodpart(dkmodslice(dev, WHOLE_DISK_SLICE), RAW_PART);
Added support for disks which "OnTrack Disk Manager" has munged. I suggest you do all partitioning using the OnTrack SW, to avoid confusing it.
1995-04-20 01:21:51 +00:00
bp->b_blkno = mbr_offset;
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
bp->b_bcount = lp->d_secsize;
Remove B_READ, B_WRITE and B_FREEBUF and replace them with a new field in struct buf: b_iocmd. The b_iocmd is enforced to have exactly one bit set. B_WRITE was bogusly defined as zero giving rise to obvious coding mistakes. Also eliminate the redundant struct buf flag B_CALL, it can just as efficiently be done by comparing b_iodone to NULL. Should you get a panic or drop into the debugger, complaining about "b_iocmd", don't continue. It is likely to write on your disk where it should have been reading. This change is a step in the direction towards a stackable BIO capability. A lot of this patch were machine generated (Thanks to style(9) compliance!) Vinum users: Greg has not had time to test this yet, be careful.
2000-03-20 10:44:49 +00:00
bp->b_iocmd = BIO_READ;
diff, patch and cvs didn't like these three last time around, try again.
2000-03-20 12:34:21 +00:00
DEV_STRATEGY(bp, 1);
s/biowait/bufwait/g Prodded by: several.
2000-04-29 16:25:22 +00:00
if (bufwait(bp) != 0) {
Complete the bio/buf divorce for all code below devfs::strategy Exceptions: Vinum untouched. This means that it cannot be compiled. Greg Lehey is on the case. CCD not converted yet, casts to struct buf (still safe) atapi-cd casts to struct buf to examine B_PHYS
2000-04-15 05:54:02 +00:00
diskerr(&bp->b_io, "reading primary partition table: error",
Make diskerr() always log with printf.
2000-11-26 19:29:15 +00:00
0, (struct disklabel *)NULL);
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
printf("\n");
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
error = EIO;
goto done;
}
/* Weakly verify it. */
In all such uses of struct buf: 's/b_un.b_addr/b_data/g'
1997-12-02 21:07:20 +00:00
cp = bp->b_data;
Improved English in the messages printed by diskerr(). Fixed some formatting bugs.
2000-01-26 10:28:23 +00:00
sname = dsname(dev, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART, partname);
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) {
Hide the `no magic' babble behind bootverbose, since it has proven to be too much magic for 99.9 % of the users.
1997-09-27 15:34:34 +00:00
if (bootverbose)
printf("%s: invalid primary partition table: no magic\n",
sname);
Add more compatibility cruft: - ignore the partition table if it is identical with the bogus one in /usr/src/sys/i386/boot/biosboot/start.S. Honoring the bogus size field was fatal. The error is detected but other compatibilty cruft weakens the error handling too much for this case. - weaken the partition entry checking to allow the following treatments of C/H/S addresses when C should be >= 1024: (1) allow C = 1023, H = max, S = max. (2) allow C to be correct modulo 1024. Other compatibilty cruft weakens the error handling to allow all C/H/S addresses, but there too many errors were reported. Improve error messages: - print C/H/S addresses if relevant. - distinguish primary partition table from extended partition tables. - don't use diskerr() except for i/o errors.
1995-03-25 12:07:31 +00:00
error = EINVAL;
goto done;
}
Fixed style bugs in rev.1.36-1.39.
1999-09-04 14:21:42 +00:00
/* Make a copy of the partition table to avoid alignment problems. */
memcpy(&dpcopy[0], cp + DOSPARTOFF, sizeof(dpcopy));
Merge alpha and pc98 changes into i386 MBR handling code and replace all three copies with one copy in MI land.
1999-08-29 09:12:54 +00:00
dp0 = &dpcopy[0];
Added support for disks which "OnTrack Disk Manager" has munged. I suggest you do all partitioning using the OnTrack SW, to avoid confusing it.
1995-04-20 01:21:51 +00:00
Make the "information" slice printfs if(bootverbose). Fix the message about Ontrack.
1995-05-18 22:45:35 +00:00
/* Check for "Ontrack Diskmanager". */
Fix style inconsistencies in the last few commits.
1995-05-07 07:06:36 +00:00
for (dospart = 0, dp = dp0; dospart < NDOSPART; dospart++, dp++) {
if (dp->dp_typ == DOSPTYP_ONTRACK) {
Make the "information" slice printfs if(bootverbose). Fix the message about Ontrack.
1995-05-18 22:45:35 +00:00
if (bootverbose)
printf(
"%s: Found \"Ontrack Disk Manager\" on this disk.\n", sname);
Fix a bug that b_flags was getting unnecessarily modified by the slice code. The effect up to now has been insignficant, but improved buffer allocation code will break with this problem.
1996-03-01 19:01:04 +00:00
bp->b_flags |= B_INVAL | B_AGE;
Added support for disks which "OnTrack Disk Manager" has munged. I suggest you do all partitioning using the OnTrack SW, to avoid confusing it.
1995-04-20 01:21:51 +00:00
brelse(bp);
Make the "information" slice printfs if(bootverbose). Fix the message about Ontrack.
1995-05-18 22:45:35 +00:00
mbr_offset = 63;
Added support for disks which "OnTrack Disk Manager" has munged. I suggest you do all partitioning using the OnTrack SW, to avoid confusing it.
1995-04-20 01:21:51 +00:00
goto reread_mbr;
Fix style inconsistencies in the last few commits.
1995-05-07 07:06:36 +00:00
}
}
Added support for disks which "OnTrack Disk Manager" has munged. I suggest you do all partitioning using the OnTrack SW, to avoid confusing it.
1995-04-20 01:21:51 +00:00
Add more compatibility cruft: - ignore the partition table if it is identical with the bogus one in /usr/src/sys/i386/boot/biosboot/start.S. Honoring the bogus size field was fatal. The error is detected but other compatibilty cruft weakens the error handling too much for this case. - weaken the partition entry checking to allow the following treatments of C/H/S addresses when C should be >= 1024: (1) allow C = 1023, H = max, S = max. (2) allow C to be correct modulo 1024. Other compatibilty cruft weakens the error handling to allow all C/H/S addresses, but there too many errors were reported. Improve error messages: - print C/H/S addresses if relevant. - distinguish primary partition table from extended partition tables. - don't use diskerr() except for i/o errors.
1995-03-25 12:07:31 +00:00
if (bcmp(dp0, historical_bogus_partition_table,
sizeof historical_bogus_partition_table) == 0) {
TRACE(("%s: invalid primary partition table: historical\n",
sname));
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
error = EINVAL;
goto done;
}
/* Guess the geometry. */
/*
* TODO:
* Perhaps skip entries with 0 size.
* Perhaps only look at entries of type DOSPTYP_386BSD.
*/
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
max_ncyls = 0;
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
max_nsectors = 0;
max_ntracks = 0;
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
for (dospart = 0, dp = dp0; dospart < NDOSPART; dospart++, dp++) {
Don't clobber max_ncyls, ending up guessing thetotal number of cylinders as the number in the 4th slot. Fixes PR 1893. Should be in 2.1.5 and 2.2.
1996-11-04 17:40:43 +00:00
int ncyls;
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
int nsectors;
int ntracks;
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
Don't clobber max_ncyls, ending up guessing thetotal number of cylinders as the number in the 4th slot. Fixes PR 1893. Should be in 2.1.5 and 2.2.
1996-11-04 17:40:43 +00:00
ncyls = DPCYL(dp->dp_ecyl, dp->dp_esect) + 1;
if (max_ncyls < ncyls)
max_ncyls = ncyls;
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
nsectors = DPSECT(dp->dp_esect);
if (max_nsectors < nsectors)
max_nsectors = nsectors;
ntracks = dp->dp_ehd + 1;
if (max_ntracks < ntracks)
max_ntracks = ntracks;
}
Don't clobber max_ncyls, ending up guessing thetotal number of cylinders as the number in the 4th slot. Fixes PR 1893. Should be in 2.1.5 and 2.2.
1996-11-04 17:40:43 +00:00
/*
* Check that we have guessed the geometry right by checking the
* partition entries.
*/
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
/*
* TODO:
* As above.
* Check for overlaps.
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
* Check against d_secperunit if the latter is reliable.
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
*/
error = 0;
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
for (dospart = 0, dp = dp0; dospart < NDOSPART; dospart++, dp++) {
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
if (dp->dp_scyl == 0 && dp->dp_shd == 0 && dp->dp_ssect == 0
&& dp->dp_start == 0 && dp->dp_size == 0)
continue;
We don't need to pass the diskname argument all over the diskslice/label code, we can find the name from any convenient dev_t
1999-08-28 14:33:44 +00:00
sname = dsname(dev, dkunit(dev), BASE_SLICE + dospart,
Fix style inconsistencies in the last few commits.
1995-05-07 07:06:36 +00:00
RAW_PART, partname);
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
/*
* Temporarily ignore errors from this check. We could
* simplify things by accepting the table eariler if we
* always ignore errors here. Perhaps we should always
* accept the table if the magic is right but not let
* bad entries affect the geometry.
*/
Added support for disks which "OnTrack Disk Manager" has munged. I suggest you do all partitioning using the OnTrack SW, to avoid confusing it.
1995-04-20 01:21:51 +00:00
check_part(sname, dp, mbr_offset, max_nsectors, max_ntracks,
Fix style inconsistencies in the last few commits.
1995-05-07 07:06:36 +00:00
mbr_offset);
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
}
if (error != 0)
goto done;
/*
* Accept the DOS partition table.
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
* First adjust the label (we have been careful not to change it
* before we can guarantee success).
*/
Don't clobber max_ncyls, ending up guessing thetotal number of cylinders as the number in the 4th slot. Fixes PR 1893. Should be in 2.1.5 and 2.2.
1996-11-04 17:40:43 +00:00
secpercyl = (u_long)max_nsectors * max_ntracks;
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
if (secpercyl != 0) {
lp->d_nsectors = max_nsectors;
lp->d_ntracks = max_ntracks;
lp->d_secpercyl = secpercyl;
Don't clip d_ncylinders to value used by partitions.
1995-08-23 11:43:45 +00:00
lp->d_ncylinders = lp->d_secperunit / secpercyl;
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
}
/*
Moved allocation of the slices struct to the right place. Initialize everything in it (the devsw pointers were not initialized early or at all for the !DEVFS case, but this was harmless on i386's).
1998-07-20 13:39:45 +00:00
* We are passed a pointer to a suitably initialized minimal
* slices "struct" with no dangling pointers in it. Replace it
* by a maximal one. This usually oversizes the "struct", but
* enlarging it while searching for logical drives would be
* inconvenient.
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
*/
Moved allocation of the slices struct to the right place. Initialize everything in it (the devsw pointers were not initialized early or at all for the !DEVFS case, but this was harmless on i386's).
1998-07-20 13:39:45 +00:00
free(*sspp, M_DEVBUF);
ssp = dsmakeslicestruct(MAX_SLICES, lp);
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
*sspp = ssp;
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
/* Initialize normal slices. */
Moved allocation of the slices struct to the right place. Initialize everything in it (the devsw pointers were not initialized early or at all for the !DEVFS case, but this was harmless on i386's).
1998-07-20 13:39:45 +00:00
sp = &ssp->dss_slices[BASE_SLICE];
Fix style inconsistencies in the last few commits.
1995-05-07 07:06:36 +00:00
for (dospart = 0, dp = dp0; dospart < NDOSPART; dospart++, dp++, sp++) {
Don't permit generation of non-physical disk addresses. subr_diskmbr.c: Don't "helpfully" enlarge our idea of the disk size to cover all the primary slices. Instead, truncate or discard slices that don't seem to be on the disk. The enlargement was a hack for disks that don't report their size (e.g., MFM disks). It is just wrong in general. wd.c: In CHS mode, limit the disk size so that cylinder numbers >= 65536 cannot occur. This normally only affects disks larger than 33.8GB. CHS mode accesses to addresses above the limit are now properly broken (an error is returned instead of garbage for reads and disk corruption for writes). PR: 15611 Reviewed by: readers of freebsd-bugs did not respond to a request for review
2000-01-28 10:22:07 +00:00
sname = dsname(dev, dkunit(dev), BASE_SLICE + dospart,
RAW_PART, partname);
(void)mbr_setslice(sname, lp, sp, dp, mbr_offset);
Add compatibility cruft. Slice 0 is now for the first BSD slice. The first BSD slice is the first DOSpartition with id 0xa5 or the whole disk if their are no DOSpartitions (except the latter is not yet implemented). Existing partitions on it work the same as in 2.0 except the 'd' partition is no longer special and partitions are relative to the skice. Slice 1 is now for the whole disk and gets a read-only label describing the disk. Previously, slice 0 was for the whole disk and there was no label on it. Slices 2-31 are for DOSpartitions. Slice 0 is an alias for one of these if there is a BSD slice. Previously, slices 1-31 were for DOSpartitions. diskslice_machdep.c: Expand whole disk slice to include all DOSpartitions. More work is required for >1024 cylinders and to rewrite the label iff the driver is unsure about the geometry. subr_diskslice.c: New function dsisopen() to help handle media changes.
1995-02-16 15:19:19 +00:00
}
Fix style inconsistencies in the last few commits.
1995-05-07 07:06:36 +00:00
ssp->dss_nslices = BASE_SLICE + NDOSPART;
Don't generate any errors here other than EIO. An invalid partition table is not an error, it just causes a smaller slice table.
1995-02-21 08:37:09 +00:00
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
/* Handle extended partitions. */
sp -= NDOSPART;
for (dospart = 0; dospart < NDOSPART; dospart++, sp++)
Improved English in the messages printed by diskerr(). Fixed some formatting bugs.
2000-01-26 10:28:23 +00:00
if (sp->ds_type == DOSPTYP_EXTENDED ||
sp->ds_type == DOSPTYP_EXTENDEDX)
We don't need to pass the diskname argument all over the diskslice/label code, we can find the name from any convenient dev_t
1999-08-28 14:33:44 +00:00
mbr_extended(bp->b_dev, lp, ssp,
Fixed style bugs in rev.1.36-1.39.
1999-09-04 14:21:42 +00:00
sp->ds_offset, sp->ds_size, sp->ds_offset,
Quick fix for stack overflow when there are more than about 25 slices. Using recursion to traverse the recursive data structure for extended partitions was never good, but when slice support was implemented in 1995, the recursion worked for the default maximum number of slices (32), and standard fdisk utilities didn't support creating more than the default number. Even then, corrupt extended partitions could cause endless recursion, because we attempt to check all slices, even ones which we don't turn into devices. The recursion has succumbed to creeping features. The stack requirements for each level had grown to 204 bytes on i386's. Most of the growth was caused by adding a 64-byte copy of the DOSpartition table to each frame. The kernel stack size has shrunk to about 5K on i386's. Most of the shrinkage was caused by the growth of `struct sigacts' by 2388 bytes to support 128 signals. Linux fdisk (a 1997 version at least) can now create 60 slices (4 standard ones, 56 for logical drives within extended partitions, and it seems to be leaving room to map the 4 BSD partitions on my test drive), and Linux (2.2.29 and 2.3.35 at least) now reports all these slices at boot time. The fix limits the recursion to 16 levels (4 + 16 slices) and recovers 32 bytes per level caused by gcc pessimizing for space. Switching to a static buffer doesn't cause any problems due to recursion, since the buffer is not passed down. Using a static buffer is wrong in general because it requires the giant lock to protect it. However, this problem is small compared with using a static buffer for dsname(). We sometimes neglect to copy the result of dsname() before sleeping. Also fixed slice names when we find more than MAX_SLICES (32) slices. The number of the last slice found was not passed passed recursively. The limit on the recursion now prevents finding more than 32 slices with a standard extended partition data structure anyway.
2000-01-27 05:11:29 +00:00
max_nsectors, max_ntracks, mbr_offset, 1);
/*
* mbr_extended() abuses ssp->dss_nslices for the number of slices
* that would be found if there were no limit on the number of slices
* in *ssp. Cut it back now.
*/
if (ssp->dss_nslices > MAX_SLICES)
ssp->dss_nslices = MAX_SLICES;
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
done:
Fix a bug that b_flags was getting unnecessarily modified by the slice code. The effect up to now has been insignficant, but improved buffer allocation code will break with this problem.
1996-03-01 19:01:04 +00:00
bp->b_flags |= B_INVAL | B_AGE;
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
brelse(bp);
if (error == EINVAL)
Don't generate any errors here other than EIO. An invalid partition table is not an error, it just causes a smaller slice table.
1995-02-21 08:37:09 +00:00
error = 0;
diskslice_machdep.c implements reading and checking of DOS slice tables. It will eventually replace readMBR.c.
1994-12-12 00:22:30 +00:00
return (error);
}
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
void
Fixed style bugs in rev.1.36-1.39.
1999-09-04 14:21:42 +00:00
mbr_extended(dev, lp, ssp, ext_offset, ext_size, base_ext_offset, nsectors,
Quick fix for stack overflow when there are more than about 25 slices. Using recursion to traverse the recursive data structure for extended partitions was never good, but when slice support was implemented in 1995, the recursion worked for the default maximum number of slices (32), and standard fdisk utilities didn't support creating more than the default number. Even then, corrupt extended partitions could cause endless recursion, because we attempt to check all slices, even ones which we don't turn into devices. The recursion has succumbed to creeping features. The stack requirements for each level had grown to 204 bytes on i386's. Most of the growth was caused by adding a 64-byte copy of the DOSpartition table to each frame. The kernel stack size has shrunk to about 5K on i386's. Most of the shrinkage was caused by the growth of `struct sigacts' by 2388 bytes to support 128 signals. Linux fdisk (a 1997 version at least) can now create 60 slices (4 standard ones, 56 for logical drives within extended partitions, and it seems to be leaving room to map the 4 BSD partitions on my test drive), and Linux (2.2.29 and 2.3.35 at least) now reports all these slices at boot time. The fix limits the recursion to 16 levels (4 + 16 slices) and recovers 32 bytes per level caused by gcc pessimizing for space. Switching to a static buffer doesn't cause any problems due to recursion, since the buffer is not passed down. Using a static buffer is wrong in general because it requires the giant lock to protect it. However, this problem is small compared with using a static buffer for dsname(). We sometimes neglect to copy the result of dsname() before sleeping. Also fixed slice names when we find more than MAX_SLICES (32) slices. The number of the last slice found was not passed passed recursively. The limit on the recursion now prevents finding more than 32 slices with a standard extended partition data structure anyway.
2000-01-27 05:11:29 +00:00
ntracks, mbr_offset, level)
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
dev_t dev;
struct disklabel *lp;
struct diskslices *ssp;
u_long ext_offset;
u_long ext_size;
u_long base_ext_offset;
int nsectors;
int ntracks;
Added support for disks which "OnTrack Disk Manager" has munged. I suggest you do all partitioning using the OnTrack SW, to avoid confusing it.
1995-04-20 01:21:51 +00:00
u_long mbr_offset;
Quick fix for stack overflow when there are more than about 25 slices. Using recursion to traverse the recursive data structure for extended partitions was never good, but when slice support was implemented in 1995, the recursion worked for the default maximum number of slices (32), and standard fdisk utilities didn't support creating more than the default number. Even then, corrupt extended partitions could cause endless recursion, because we attempt to check all slices, even ones which we don't turn into devices. The recursion has succumbed to creeping features. The stack requirements for each level had grown to 204 bytes on i386's. Most of the growth was caused by adding a 64-byte copy of the DOSpartition table to each frame. The kernel stack size has shrunk to about 5K on i386's. Most of the shrinkage was caused by the growth of `struct sigacts' by 2388 bytes to support 128 signals. Linux fdisk (a 1997 version at least) can now create 60 slices (4 standard ones, 56 for logical drives within extended partitions, and it seems to be leaving room to map the 4 BSD partitions on my test drive), and Linux (2.2.29 and 2.3.35 at least) now reports all these slices at boot time. The fix limits the recursion to 16 levels (4 + 16 slices) and recovers 32 bytes per level caused by gcc pessimizing for space. Switching to a static buffer doesn't cause any problems due to recursion, since the buffer is not passed down. Using a static buffer is wrong in general because it requires the giant lock to protect it. However, this problem is small compared with using a static buffer for dsname(). We sometimes neglect to copy the result of dsname() before sleeping. Also fixed slice names when we find more than MAX_SLICES (32) slices. The number of the last slice found was not passed passed recursively. The limit on the recursion now prevents finding more than 32 slices with a standard extended partition data structure anyway.
2000-01-27 05:11:29 +00:00
int level;
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
{
struct buf *bp;
u_char *cp;
int dospart;
struct dos_partition *dp;
Merge alpha and pc98 changes into i386 MBR handling code and replace all three copies with one copy in MI land.
1999-08-29 09:12:54 +00:00
struct dos_partition dpcopy[NDOSPART];
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
u_long ext_offsets[NDOSPART];
u_long ext_sizes[NDOSPART];
char partname[2];
int slice;
char *sname;
struct diskslice *sp;
Quick fix for stack overflow when there are more than about 25 slices. Using recursion to traverse the recursive data structure for extended partitions was never good, but when slice support was implemented in 1995, the recursion worked for the default maximum number of slices (32), and standard fdisk utilities didn't support creating more than the default number. Even then, corrupt extended partitions could cause endless recursion, because we attempt to check all slices, even ones which we don't turn into devices. The recursion has succumbed to creeping features. The stack requirements for each level had grown to 204 bytes on i386's. Most of the growth was caused by adding a 64-byte copy of the DOSpartition table to each frame. The kernel stack size has shrunk to about 5K on i386's. Most of the shrinkage was caused by the growth of `struct sigacts' by 2388 bytes to support 128 signals. Linux fdisk (a 1997 version at least) can now create 60 slices (4 standard ones, 56 for logical drives within extended partitions, and it seems to be leaving room to map the 4 BSD partitions on my test drive), and Linux (2.2.29 and 2.3.35 at least) now reports all these slices at boot time. The fix limits the recursion to 16 levels (4 + 16 slices) and recovers 32 bytes per level caused by gcc pessimizing for space. Switching to a static buffer doesn't cause any problems due to recursion, since the buffer is not passed down. Using a static buffer is wrong in general because it requires the giant lock to protect it. However, this problem is small compared with using a static buffer for dsname(). We sometimes neglect to copy the result of dsname() before sleeping. Also fixed slice names when we find more than MAX_SLICES (32) slices. The number of the last slice found was not passed passed recursively. The limit on the recursion now prevents finding more than 32 slices with a standard extended partition data structure anyway.
2000-01-27 05:11:29 +00:00
if (level >= 16) {
printf(
"%s: excessive recursion in search for slices; aborting search\n",
devtoname(dev));
return;
}
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
/* Read extended boot record. */
bp = geteblk((int)lp->d_secsize);
bp->b_dev = dev;
bp->b_blkno = ext_offset;
bp->b_bcount = lp->d_secsize;
Remove B_READ, B_WRITE and B_FREEBUF and replace them with a new field in struct buf: b_iocmd. The b_iocmd is enforced to have exactly one bit set. B_WRITE was bogusly defined as zero giving rise to obvious coding mistakes. Also eliminate the redundant struct buf flag B_CALL, it can just as efficiently be done by comparing b_iodone to NULL. Should you get a panic or drop into the debugger, complaining about "b_iocmd", don't continue. It is likely to write on your disk where it should have been reading. This change is a step in the direction towards a stackable BIO capability. A lot of this patch were machine generated (Thanks to style(9) compliance!) Vinum users: Greg has not had time to test this yet, be careful.
2000-03-20 10:44:49 +00:00
bp->b_iocmd = BIO_READ;
diff, patch and cvs didn't like these three last time around, try again.
2000-03-20 12:34:21 +00:00
DEV_STRATEGY(bp, 1);
s/biowait/bufwait/g Prodded by: several.
2000-04-29 16:25:22 +00:00
if (bufwait(bp) != 0) {
Complete the bio/buf divorce for all code below devfs::strategy Exceptions: Vinum untouched. This means that it cannot be compiled. Greg Lehey is on the case. CCD not converted yet, casts to struct buf (still safe) atapi-cd casts to struct buf to examine B_PHYS
2000-04-15 05:54:02 +00:00
diskerr(&bp->b_io, "reading extended partition table: error",
Make diskerr() always log with printf.
2000-11-26 19:29:15 +00:00
0, (struct disklabel *)NULL);
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
printf("\n");
Fix support for extended partitions (forgot to release the buffer).
1995-03-15 16:25:08 +00:00
goto done;
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
}
/* Weakly verify it. */
In all such uses of struct buf: 's/b_un.b_addr/b_data/g'
1997-12-02 21:07:20 +00:00
cp = bp->b_data;
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) {
We don't need to pass the diskname argument all over the diskslice/label code, we can find the name from any convenient dev_t
1999-08-28 14:33:44 +00:00
sname = dsname(dev, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART,
Add more compatibility cruft: - ignore the partition table if it is identical with the bogus one in /usr/src/sys/i386/boot/biosboot/start.S. Honoring the bogus size field was fatal. The error is detected but other compatibilty cruft weakens the error handling too much for this case. - weaken the partition entry checking to allow the following treatments of C/H/S addresses when C should be >= 1024: (1) allow C = 1023, H = max, S = max. (2) allow C to be correct modulo 1024. Other compatibilty cruft weakens the error handling to allow all C/H/S addresses, but there too many errors were reported. Improve error messages: - print C/H/S addresses if relevant. - distinguish primary partition table from extended partition tables. - don't use diskerr() except for i/o errors.
1995-03-25 12:07:31 +00:00
partname);
Hide the `no magic' babble behind bootverbose, since it has proven to be too much magic for 99.9 % of the users.
1997-09-27 15:34:34 +00:00
if (bootverbose)
printf("%s: invalid extended partition table: no magic\n",
sname);
Fix support for extended partitions (forgot to release the buffer).
1995-03-15 16:25:08 +00:00
goto done;
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
}
Fixed style bugs in rev.1.36-1.39.
1999-09-04 14:21:42 +00:00
/* Make a copy of the partition table to avoid alignment problems. */
memcpy(&dpcopy[0], cp + DOSPARTOFF, sizeof(dpcopy));
Quick fix for stack overflow when there are more than about 25 slices. Using recursion to traverse the recursive data structure for extended partitions was never good, but when slice support was implemented in 1995, the recursion worked for the default maximum number of slices (32), and standard fdisk utilities didn't support creating more than the default number. Even then, corrupt extended partitions could cause endless recursion, because we attempt to check all slices, even ones which we don't turn into devices. The recursion has succumbed to creeping features. The stack requirements for each level had grown to 204 bytes on i386's. Most of the growth was caused by adding a 64-byte copy of the DOSpartition table to each frame. The kernel stack size has shrunk to about 5K on i386's. Most of the shrinkage was caused by the growth of `struct sigacts' by 2388 bytes to support 128 signals. Linux fdisk (a 1997 version at least) can now create 60 slices (4 standard ones, 56 for logical drives within extended partitions, and it seems to be leaving room to map the 4 BSD partitions on my test drive), and Linux (2.2.29 and 2.3.35 at least) now reports all these slices at boot time. The fix limits the recursion to 16 levels (4 + 16 slices) and recovers 32 bytes per level caused by gcc pessimizing for space. Switching to a static buffer doesn't cause any problems due to recursion, since the buffer is not passed down. Using a static buffer is wrong in general because it requires the giant lock to protect it. However, this problem is small compared with using a static buffer for dsname(). We sometimes neglect to copy the result of dsname() before sleeping. Also fixed slice names when we find more than MAX_SLICES (32) slices. The number of the last slice found was not passed passed recursively. The limit on the recursion now prevents finding more than 32 slices with a standard extended partition data structure anyway.
2000-01-27 05:11:29 +00:00
slice = ssp->dss_nslices;
for (dospart = 0, dp = &dpcopy[0]; dospart < NDOSPART;
dospart++, dp++) {
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
ext_sizes[dospart] = 0;
if (dp->dp_scyl == 0 && dp->dp_shd == 0 && dp->dp_ssect == 0
&& dp->dp_start == 0 && dp->dp_size == 0)
continue;
Improved English in the messages printed by diskerr(). Fixed some formatting bugs.
2000-01-26 10:28:23 +00:00
if (dp->dp_typ == DOSPTYP_EXTENDED ||
dp->dp_typ == DOSPTYP_EXTENDEDX) {
Quick fix for stack overflow when there are more than about 25 slices. Using recursion to traverse the recursive data structure for extended partitions was never good, but when slice support was implemented in 1995, the recursion worked for the default maximum number of slices (32), and standard fdisk utilities didn't support creating more than the default number. Even then, corrupt extended partitions could cause endless recursion, because we attempt to check all slices, even ones which we don't turn into devices. The recursion has succumbed to creeping features. The stack requirements for each level had grown to 204 bytes on i386's. Most of the growth was caused by adding a 64-byte copy of the DOSpartition table to each frame. The kernel stack size has shrunk to about 5K on i386's. Most of the shrinkage was caused by the growth of `struct sigacts' by 2388 bytes to support 128 signals. Linux fdisk (a 1997 version at least) can now create 60 slices (4 standard ones, 56 for logical drives within extended partitions, and it seems to be leaving room to map the 4 BSD partitions on my test drive), and Linux (2.2.29 and 2.3.35 at least) now reports all these slices at boot time. The fix limits the recursion to 16 levels (4 + 16 slices) and recovers 32 bytes per level caused by gcc pessimizing for space. Switching to a static buffer doesn't cause any problems due to recursion, since the buffer is not passed down. Using a static buffer is wrong in general because it requires the giant lock to protect it. However, this problem is small compared with using a static buffer for dsname(). We sometimes neglect to copy the result of dsname() before sleeping. Also fixed slice names when we find more than MAX_SLICES (32) slices. The number of the last slice found was not passed passed recursively. The limit on the recursion now prevents finding more than 32 slices with a standard extended partition data structure anyway.
2000-01-27 05:11:29 +00:00
static char buf[32];
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
We don't need to pass the diskname argument all over the diskslice/label code, we can find the name from any convenient dev_t
1999-08-28 14:33:44 +00:00
sname = dsname(dev, dkunit(dev), WHOLE_DISK_SLICE,
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
RAW_PART, partname);
Examine all occurrences of sprintf(), strcat(), and str[n]cpy() for possible buffer overflow problems. Replaced most sprintf()'s with snprintf(); for others cases, added terminating NUL bytes where appropriate, replaced constants like "16" with sizeof(), etc. These changes include several bug fixes, but most changes are for maintainability's sake. Any instance where it wasn't "immediately obvious" that a buffer overflow could not occur was made safer. Reviewed by: Bruce Evans <bde@zeta.org.au> Reviewed by: Matthew Dillon <dillon@apollo.backplane.com> Reviewed by: Mike Spengler <mks@networkcs.com>
1998-12-04 22:54:57 +00:00
snprintf(buf, sizeof(buf), "%s", sname);
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
if (strlen(buf) < sizeof buf - 11)
strcat(buf, "<extended>");
check_part(buf, dp, base_ext_offset, nsectors,
Added support for disks which "OnTrack Disk Manager" has munged. I suggest you do all partitioning using the OnTrack SW, to avoid confusing it.
1995-04-20 01:21:51 +00:00
ntracks, mbr_offset);
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
ext_offsets[dospart] = base_ext_offset + dp->dp_start;
ext_sizes[dospart] = dp->dp_size;
} else {
We don't need to pass the diskname argument all over the diskslice/label code, we can find the name from any convenient dev_t
1999-08-28 14:33:44 +00:00
sname = dsname(dev, dkunit(dev), slice, RAW_PART,
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
partname);
Added support for disks which "OnTrack Disk Manager" has munged. I suggest you do all partitioning using the OnTrack SW, to avoid confusing it.
1995-04-20 01:21:51 +00:00
check_part(sname, dp, ext_offset, nsectors, ntracks,
Fix style inconsistencies in the last few commits.
1995-05-07 07:06:36 +00:00
mbr_offset);
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
if (slice >= MAX_SLICES) {
printf("%s: too many slices\n", sname);
slice++;
continue;
}
Quick fix for stack overflow when there are more than about 25 slices. Using recursion to traverse the recursive data structure for extended partitions was never good, but when slice support was implemented in 1995, the recursion worked for the default maximum number of slices (32), and standard fdisk utilities didn't support creating more than the default number. Even then, corrupt extended partitions could cause endless recursion, because we attempt to check all slices, even ones which we don't turn into devices. The recursion has succumbed to creeping features. The stack requirements for each level had grown to 204 bytes on i386's. Most of the growth was caused by adding a 64-byte copy of the DOSpartition table to each frame. The kernel stack size has shrunk to about 5K on i386's. Most of the shrinkage was caused by the growth of `struct sigacts' by 2388 bytes to support 128 signals. Linux fdisk (a 1997 version at least) can now create 60 slices (4 standard ones, 56 for logical drives within extended partitions, and it seems to be leaving room to map the 4 BSD partitions on my test drive), and Linux (2.2.29 and 2.3.35 at least) now reports all these slices at boot time. The fix limits the recursion to 16 levels (4 + 16 slices) and recovers 32 bytes per level caused by gcc pessimizing for space. Switching to a static buffer doesn't cause any problems due to recursion, since the buffer is not passed down. Using a static buffer is wrong in general because it requires the giant lock to protect it. However, this problem is small compared with using a static buffer for dsname(). We sometimes neglect to copy the result of dsname() before sleeping. Also fixed slice names when we find more than MAX_SLICES (32) slices. The number of the last slice found was not passed passed recursively. The limit on the recursion now prevents finding more than 32 slices with a standard extended partition data structure anyway.
2000-01-27 05:11:29 +00:00
sp = &ssp->dss_slices[slice];
Don't permit generation of non-physical disk addresses. subr_diskmbr.c: Don't "helpfully" enlarge our idea of the disk size to cover all the primary slices. Instead, truncate or discard slices that don't seem to be on the disk. The enlargement was a hack for disks that don't report their size (e.g., MFM disks). It is just wrong in general. wd.c: In CHS mode, limit the disk size so that cylinder numbers >= 65536 cannot occur. This normally only affects disks larger than 33.8GB. CHS mode accesses to addresses above the limit are now properly broken (an error is returned instead of garbage for reads and disk corruption for writes). PR: 15611 Reviewed by: readers of freebsd-bugs did not respond to a request for review
2000-01-28 10:22:07 +00:00
if (mbr_setslice(sname, lp, sp, dp, ext_offset) != 0)
continue;
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
slice++;
}
}
Quick fix for stack overflow when there are more than about 25 slices. Using recursion to traverse the recursive data structure for extended partitions was never good, but when slice support was implemented in 1995, the recursion worked for the default maximum number of slices (32), and standard fdisk utilities didn't support creating more than the default number. Even then, corrupt extended partitions could cause endless recursion, because we attempt to check all slices, even ones which we don't turn into devices. The recursion has succumbed to creeping features. The stack requirements for each level had grown to 204 bytes on i386's. Most of the growth was caused by adding a 64-byte copy of the DOSpartition table to each frame. The kernel stack size has shrunk to about 5K on i386's. Most of the shrinkage was caused by the growth of `struct sigacts' by 2388 bytes to support 128 signals. Linux fdisk (a 1997 version at least) can now create 60 slices (4 standard ones, 56 for logical drives within extended partitions, and it seems to be leaving room to map the 4 BSD partitions on my test drive), and Linux (2.2.29 and 2.3.35 at least) now reports all these slices at boot time. The fix limits the recursion to 16 levels (4 + 16 slices) and recovers 32 bytes per level caused by gcc pessimizing for space. Switching to a static buffer doesn't cause any problems due to recursion, since the buffer is not passed down. Using a static buffer is wrong in general because it requires the giant lock to protect it. However, this problem is small compared with using a static buffer for dsname(). We sometimes neglect to copy the result of dsname() before sleeping. Also fixed slice names when we find more than MAX_SLICES (32) slices. The number of the last slice found was not passed passed recursively. The limit on the recursion now prevents finding more than 32 slices with a standard extended partition data structure anyway.
2000-01-27 05:11:29 +00:00
ssp->dss_nslices = slice;
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
/* If we found any more slices, recursively find all the subslices. */
for (dospart = 0; dospart < NDOSPART; dospart++)
if (ext_sizes[dospart] != 0)
Fixed style bugs in rev.1.36-1.39.
1999-09-04 14:21:42 +00:00
mbr_extended(dev, lp, ssp, ext_offsets[dospart],
ext_sizes[dospart], base_ext_offset,
Quick fix for stack overflow when there are more than about 25 slices. Using recursion to traverse the recursive data structure for extended partitions was never good, but when slice support was implemented in 1995, the recursion worked for the default maximum number of slices (32), and standard fdisk utilities didn't support creating more than the default number. Even then, corrupt extended partitions could cause endless recursion, because we attempt to check all slices, even ones which we don't turn into devices. The recursion has succumbed to creeping features. The stack requirements for each level had grown to 204 bytes on i386's. Most of the growth was caused by adding a 64-byte copy of the DOSpartition table to each frame. The kernel stack size has shrunk to about 5K on i386's. Most of the shrinkage was caused by the growth of `struct sigacts' by 2388 bytes to support 128 signals. Linux fdisk (a 1997 version at least) can now create 60 slices (4 standard ones, 56 for logical drives within extended partitions, and it seems to be leaving room to map the 4 BSD partitions on my test drive), and Linux (2.2.29 and 2.3.35 at least) now reports all these slices at boot time. The fix limits the recursion to 16 levels (4 + 16 slices) and recovers 32 bytes per level caused by gcc pessimizing for space. Switching to a static buffer doesn't cause any problems due to recursion, since the buffer is not passed down. Using a static buffer is wrong in general because it requires the giant lock to protect it. However, this problem is small compared with using a static buffer for dsname(). We sometimes neglect to copy the result of dsname() before sleeping. Also fixed slice names when we find more than MAX_SLICES (32) slices. The number of the last slice found was not passed passed recursively. The limit on the recursion now prevents finding more than 32 slices with a standard extended partition data structure anyway.
2000-01-27 05:11:29 +00:00
nsectors, ntracks, mbr_offset, ++level);
Fix support for extended partitions (forgot to release the buffer).
1995-03-15 16:25:08 +00:00
done:
Fix a bug that b_flags was getting unnecessarily modified by the slice code. The effect up to now has been insignficant, but improved buffer allocation code will break with this problem.
1996-03-01 19:01:04 +00:00
bp->b_flags |= B_INVAL | B_AGE;
Fix support for extended partitions (forgot to release the buffer).
1995-03-15 16:25:08 +00:00
brelse(bp);
Support extended DOSpartitions. Accept even suspicious partitions. Moved most handling of the compatibility slice to dsopen(). Report i/o errors.
1995-03-04 11:44:05 +00:00
}
Merge alpha and pc98 changes into i386 MBR handling code and replace all three copies with one copy in MI land.
1999-08-29 09:12:54 +00:00
Don't permit generation of non-physical disk addresses. subr_diskmbr.c: Don't "helpfully" enlarge our idea of the disk size to cover all the primary slices. Instead, truncate or discard slices that don't seem to be on the disk. The enlargement was a hack for disks that don't report their size (e.g., MFM disks). It is just wrong in general. wd.c: In CHS mode, limit the disk size so that cylinder numbers >= 65536 cannot occur. This normally only affects disks larger than 33.8GB. CHS mode accesses to addresses above the limit are now properly broken (an error is returned instead of garbage for reads and disk corruption for writes). PR: 15611 Reviewed by: readers of freebsd-bugs did not respond to a request for review
2000-01-28 10:22:07 +00:00
static int
mbr_setslice(sname, lp, sp, dp, br_offset)
char *sname;
struct disklabel *lp;
struct diskslice *sp;
struct dos_partition *dp;
u_long br_offset;
{
u_long offset;
u_long size;
offset = br_offset + dp->dp_start;
if (offset > lp->d_secperunit || offset < br_offset) {
printf(
"%s: slice starts beyond end of the disk: rejecting it\n",
sname);
return (1);
}
size = lp->d_secperunit - offset;
if (size >= dp->dp_size)
size = dp->dp_size;
else
printf(
"%s: slice extends beyond end of disk: truncating from %lu to %lu sectors\n",
sname, (u_long)dp->dp_size, size);
sp->ds_offset = offset;
sp->ds_size = size;
sp->ds_type = dp->dp_typ;
#ifdef PC98_ATCOMPAT
/* Fake FreeBSD(98). */
if (sp->ds_type == DOSPTYP_386BSD)
sp->ds_type = 0x94;
#endif
#if 0
lp->d_subtype |= (lp->d_subtype & 3) | dospart | DSTYPE_INDOSPART;
#endif
return (0);
}
Merge alpha and pc98 changes into i386 MBR handling code and replace all three copies with one copy in MI land.
1999-08-29 09:12:54 +00:00
#ifdef __alpha__
void
alpha_fix_srm_checksum(bp)
struct buf *bp;
{
Fixed style bugs in rev.1.36-1.39.
1999-09-04 14:21:42 +00:00
u_int64_t *p;
u_int64_t sum;
Merge alpha and pc98 changes into i386 MBR handling code and replace all three copies with one copy in MI land.
1999-08-29 09:12:54 +00:00
int i;
Fix a warning.
1999-11-09 21:35:10 +00:00
p = (u_int64_t *) bp->b_data;
Fixed style bugs in rev.1.36-1.39.
1999-09-04 14:21:42 +00:00
sum = 0;
Merge alpha and pc98 changes into i386 MBR handling code and replace all three copies with one copy in MI land.
1999-08-29 09:12:54 +00:00
for (i = 0; i < 63; i++)
sum += p[i];
p[63] = sum;
}
#endif
Reference in New Issue Copy Permalink