Date: Sun, 5 Nov 2017 17:30:26 +0200 From: Konstantin Belousov <kostikbel@gmail.com> To: Bruce Evans <brde@optusnet.com.au> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r324853 - in head/sys: kern sys Message-ID: <20171105153026.GC2566@kib.kiev.ua> In-Reply-To: <20171106010605.L1257@besplex.bde.org> References: <201710220811.v9M8Bjw5033551@repo.freebsd.org> <20171105014453.L1354@besplex.bde.org> <20171105130349.GZ2566@kib.kiev.ua> <20171106010605.L1257@besplex.bde.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Nov 06, 2017 at 01:46:49AM +1100, Bruce Evans wrote: > On Sun, 5 Nov 2017, Konstantin Belousov wrote: > > > On Sun, Nov 05, 2017 at 03:06:22AM +1100, Bruce Evans wrote: > >> On Sun, 22 Oct 2017, Konstantin Belousov wrote: > >> > >>> Author: kib > >>> Date: Sun Oct 22 08:11:45 2017 > >>> New Revision: 324853 > >>> URL: https://svnweb.freebsd.org/changeset/base/324853 > >>> > >>> Log: > >>> Remove the support for mknod(S_IFMT), which created dummy vnodes with > >>> VBAD type. > >>> > >>> FFS ffs_write() VOP catches such vnodes and panics, other VOPs do not > >>> check for the type and their behaviour is really undefined. The > >>> comment claims that this support was done for 'badsect' to flag bad > >>> sectors, we do not have such facility in kernel anyway. > >> > >> badsect(8) is a utility and this commit breaks it by removing its kernel > >> support. > > > > I see, thank you for the pointer. I will prepare the patch to remove > > badsect(8). > > That would increase the number of things to fix. In which way ? > > Even if badsect(8) is implemented less hackishly, binary compatibility > for mknod(2) requires ifdefing it with COMPAT_*. No, mknod(S_IFMT) is clearly non-functional management interface, and we allow management interface changes between releases, and if desired, inside the releases as well. > > I only checked that badsect(*) worked before this commit without INVARIANTS > or soft updates. Perhaps the panic always occurs with INVARIANTS due to > some INAVRIANTS check being wrong, or soft updates doesn't understand this > case. badsect(8) says to run badsect on a "quiet" file system, but this > should only be necessary to prevent the bad block being reallocated while > you are creating a VBAD file to hold it. Note that mknod(S_IFMT) doesn't > force an fsck before the next mount. This seems to be be just another bug > involving the clean flag -- I doubt that it is really safe to never clean > up the VBAD files, so creating one should have set a sticky dirty flag. UFS code is not prepared to VBAD vnodes. I do not mean specifically the vnode type, but the VOPs operations on such inodes. It is pointless to spend the time on making it functional. Modern disk failure modes made badsect(8) useless in the beginning if the beginning of 199x. I will commit the following patch after make universe finishes. diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 979483ba44e..044d7c89941 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20171108: badsect(8) removal +OLD_FILES+=sbin/badsect +OLD_FILES+=usr/share/man/man8/badsect.8.gz # 20171104: libcap_random should be in /lib not in /usr/lib OLD_LIBS+=usr/lib/libcap_random.so.0 # 20171104: Casper can work only as shared library diff --git a/sbin/Makefile b/sbin/Makefile index 43f3cec7e03..ca9f42ec0d6 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -6,7 +6,6 @@ # XXX MISSING: icheck ncheck SUBDIR=adjkerntz \ - badsect \ camcontrol \ clri \ comcontrol \ diff --git a/sbin/badsect/Makefile b/sbin/badsect/Makefile deleted file mode 100644 index c344e6c6355..00000000000 --- a/sbin/badsect/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD$ - -PACKAGE=runtime -PROG= badsect -LIBADD= ufs -MAN= badsect.8 - -.include <bsd.prog.mk> diff --git a/sbin/badsect/Makefile.depend b/sbin/badsect/Makefile.depend deleted file mode 100644 index 735bf03b75b..00000000000 --- a/sbin/badsect/Makefile.depend +++ /dev/null @@ -1,18 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - gnu/lib/csu \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - lib/libufs \ - - -.include <dirdeps.mk> - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8 deleted file mode 100644 index 498febab1d9..00000000000 --- a/sbin/badsect/badsect.8 +++ /dev/null @@ -1,133 +0,0 @@ -.\" Copyright (c) 1985, 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. -.\" -.\" @(#)badsect.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD$ -.\" -.Dd June 5, 1993 -.Dt BADSECT 8 -.Os -.Sh NAME -.Nm badsect -.Nd create files to contain bad sectors -.Sh SYNOPSIS -.Nm -.Ar bbdir sector ... -.Sh DESCRIPTION -The -.Nm -utility makes a file to contain a bad sector. -Normally, bad sectors -are made inaccessible by the standard formatter, which provides -a forwarding table for bad sectors to the driver. -If a driver supports the bad blocking standard it is much preferable to -use that method to isolate bad blocks, since the bad block forwarding -makes the pack appear perfect, and such packs can then be copied with -.Xr dd 1 . -The technique used by this program is also less general than -bad block forwarding, as -.Nm -cannot make amends for -bad blocks in the i-list of file systems or in swap areas. -.Pp -On some disks, -adding a sector which is suddenly bad to the bad sector table -currently requires the running of the standard -.Tn DEC -formatter. -Thus to deal with a newly bad block -or on disks where the drivers -do not support the bad-blocking standard -.Nm -may be used to good effect. -.Pp -The -.Nm -utility is used on a quiet file system in the following way: -First mount the file system, and change to its root directory. -Make a directory -.Li BAD -there. -Run -.Nm -giving as argument the -.Ar BAD -directory followed by -all the bad sectors you wish to add. -(The sector numbers must be relative to the beginning of -the file system, but this is not hard as the system reports -relative sector numbers in its console error messages.) -Then change back to the root directory, unmount the file system -and run -.Xr fsck 8 -on the file system. -The bad sectors should show up in two files -or in the bad sector files and the free list. -Have -.Xr fsck 8 -remove files containing the offending bad sectors, but -.Em do not -have it remove the -.Pa BAD/ Ns Em nnnnn -files. -This will leave the bad sectors in only the -.Li BAD -files. -.Pp -The -.Nm -utility works by giving the specified sector numbers in a -.Xr mknod 2 -system call, -creating an illegal file whose first block address is the block containing -bad sector and whose name is the bad sector number. -When it is discovered by -.Xr fsck 8 -it will ask -.Dq Li "HOLD BAD BLOCK \&?" . -A positive response will cause -.Xr fsck 8 -to convert the inode to a regular file containing the bad block. -.Sh DIAGNOSTICS -The -.Nm -utility refuses to attach a block that -resides in a critical area or is out of range of the file system. -A warning is issued if the block is already in use. -.Sh SEE ALSO -.Xr fsck 8 -.Sh HISTORY -The -.Nm -utility appeared in -.Bx 4.1 . -.Sh BUGS -If more than one sector which comprise a file system fragment are bad, -you should specify only one of them to -.Nm , -as the blocks in the bad sector files actually cover all the sectors in a -file system fragment. diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c deleted file mode 100644 index 097e3b112f6..00000000000 --- a/sbin/badsect/badsect.c +++ /dev/null @@ -1,182 +0,0 @@ -/* - * Copyright (c) 1981, 1983, 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. - */ - -#if 0 -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1981, 1983, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -static const char sccsid[] = "@(#)badsect.c 8.1 (Berkeley) 6/5/93"; -#endif -#endif -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -/* - * badsect - * - * Badsect takes a list of file-system relative sector numbers - * and makes files containing the blocks of which these sectors are a part. - * It can be used to contain sectors which have problems if these sectors - * are not part of the bad file for the pack (see bad144). For instance, - * this program can be used if the driver for the file system in question - * does not support bad block forwarding. - */ -#include <sys/param.h> -#include <sys/stat.h> -#include <sys/disklabel.h> - -#include <ufs/ufs/dinode.h> -#include <ufs/ffs/fs.h> - -#include <err.h> -#include <errno.h> -#include <dirent.h> -#include <fcntl.h> -#include <libufs.h> -#include <paths.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -#define sblock disk.d_fs -#define acg disk.d_cg -static struct uufsd disk; -static struct fs *fs = &sblock; -static int errs; - -int chkuse(daddr_t, int); - -static void -usage(void) -{ - fprintf(stderr, "usage: badsect bbdir blkno ...\n"); - exit(1); -} - -int -main(int argc, char *argv[]) -{ - daddr_t diskbn; - daddr_t number; - struct stat stbuf, devstat; - struct dirent *dp; - DIR *dirp; - char name[2 * MAXPATHLEN]; - char *name_dir_end; - - if (argc < 3) - usage(); - if (chdir(argv[1]) < 0 || stat(".", &stbuf) < 0) - err(2, "%s", argv[1]); - strcpy(name, _PATH_DEV); - if ((dirp = opendir(name)) == NULL) - err(3, "%s", name); - name_dir_end = name + strlen(name); - while ((dp = readdir(dirp)) != NULL) { - strcpy(name_dir_end, dp->d_name); - if (lstat(name, &devstat) < 0) - err(4, "%s", name); - if (stbuf.st_dev == devstat.st_rdev && - (devstat.st_mode & IFMT) == IFCHR) - break; - } - closedir(dirp); - if (dp == NULL) { - printf("Cannot find dev 0%lo corresponding to %s\n", - (u_long)stbuf.st_rdev, argv[1]); - exit(5); - } - if (ufs_disk_fillout(&disk, name) == -1) { - if (disk.d_error != NULL) - errx(6, "%s: %s", name, disk.d_error); - else - err(7, "%s", name); - } - for (argc -= 2, argv += 2; argc > 0; argc--, argv++) { - number = strtol(*argv, NULL, 0); - if (errno == EINVAL || errno == ERANGE) - err(8, "%s", *argv); - if (chkuse(number, 1)) - continue; - diskbn = dbtofsb(fs, number); - if (mknod(*argv, IFMT|0600, (dev_t)diskbn) < 0) { - warn("%s", *argv); - errs++; - } - } - ufs_disk_close(&disk); - printf("Don't forget to run ``fsck %s''\n", name); - exit(errs); -} - -int -chkuse(daddr_t blkno, int cnt) -{ - int cg; - daddr_t fsbn, bn; - - fsbn = dbtofsb(fs, blkno); - if ((unsigned)(fsbn+cnt) > fs->fs_size) { - printf("block %ld out of range of file system\n", (long)blkno); - return (1); - } - cg = dtog(fs, fsbn); - if (fsbn < cgdmin(fs, cg)) { - if (cg == 0 || (fsbn+cnt) > cgsblock(fs, cg)) { - printf("block %ld in non-data area: cannot attach\n", - (long)blkno); - return (1); - } - } else { - if ((fsbn+cnt) > cgbase(fs, cg+1)) { - printf("block %ld in non-data area: cannot attach\n", - (long)blkno); - return (1); - } - } - if (cgread1(&disk, cg) != 1) { - fprintf(stderr, "cg %d: could not be read\n", cg); - errs++; - return (1); - } - if (!cg_chkmagic(&acg)) { - fprintf(stderr, "cg %d: bad magic number\n", cg); - errs++; - return (1); - } - bn = dtogd(fs, fsbn); - if (isclr(cg_blksfree(&acg), bn)) - printf("Warning: sector %ld is in use\n", (long)blkno); - return (0); -}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20171105153026.GC2566>