X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=misc%2Fbadblocks.c;h=0c4019a8c2d28c26f335698ad46b7002e1702667;hb=665ebf3710f685fdd37d849676bb14601bd2cc6f;hp=66e352b3f29cc35711d1c2e66824bb08d5fe5050;hpb=a551b783479b47d05ec996da5c87009a092cf491;p=tools%2Fe2fsprogs.git diff --git a/misc/badblocks.c b/misc/badblocks.c index 66e352b..0c4019a 100644 --- a/misc/badblocks.c +++ b/misc/badblocks.c @@ -10,7 +10,7 @@ * * This file is based on the minix file system programs fsck and mkfs * written and copyrighted by Linus Torvalds - * + * * %Begin-Header% * This file may be redistributed under the terms of the GNU Public * License. @@ -24,11 +24,16 @@ * 99/06/30...99/07/26 - Added non-destructive write-testing, * configurable blocks-at-once parameter, * loading of badblocks list to avoid testing - * blocks known to be bad, multiple passes to + * blocks known to be bad, multiple passes to * make sure that no new blocks are added to the * list. (Work done by David Beattie) */ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE /* for O_DIRECT */ +#endif + +#include "config.h" #include #include #ifdef HAVE_GETOPT_H @@ -43,58 +48,116 @@ extern int optind; #include #include #include +#include +#include +#include #include #include -#if HAVE_LINUX_FS_H -#include -#endif - #include "et/com_err.h" #include "ext2fs/ext2_io.h" -#include +#include "ext2fs/ext2_fs.h" #include "ext2fs/ext2fs.h" -#include "nls-enable.h" +#include "support/nls-enable.h" + +#ifndef O_LARGEFILE +#define O_LARGEFILE 0 +#endif -const char * program_name = "badblocks"; -const char * done_string = N_("done \n"); +/* Maximum number of bad blocks we support */ +#define MAX_BAD_BLOCKS (INT_MAX/2) -static int v_flag = 0; /* verbose */ -static int w_flag = 0; /* do r/w test: 0=no, 1=yes, - * 2=non-destructive */ -static int s_flag = 0; /* show progress of test */ -static int force = 0; /* force check of mounted device */ +static const char * program_name = "badblocks"; +static const char * done_string = N_("done \n"); -static void usage(NOARGS) +static int v_flag; /* verbose */ +static int w_flag; /* do r/w test: 0=no, 1=yes, + * 2=non-destructive */ +static int s_flag; /* show progress of test */ +static int force; /* force check of mounted device */ +static int t_flag; /* number of test patterns */ +static int t_max; /* allocated test patterns */ +static unsigned int *t_patts; /* test patterns */ +static int use_buffered_io; +static int exclusive_ok; +static unsigned int max_bb = MAX_BAD_BLOCKS; /* Abort test if more than this + * number of bad blocks has been + * encountered */ +static unsigned int d_flag; /* delay factor between reads */ +static struct timeval time_start; + +#define T_INC 32 + +static unsigned int sys_page_size = 4096; + +static void usage(void) { - fprintf(stderr, _("Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n [-c blocks_at_once] [-p num_passes] device [blocks_count [start_count]]\n"), + fprintf(stderr, _( +"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n" +" [-c blocks_at_once] [-d delay_factor_between_reads] [-e max_bad_blocks]\n" +" [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n" +" device [last_block [first_block]]\n"), program_name); exit (1); } -static unsigned long currently_testing = 0; -static unsigned long num_blocks = 0; +static void exclusive_usage(void) +{ + fprintf(stderr, + _("%s: The -n and -w options are mutually exclusive.\n\n"), + program_name); + exit(1); +} + +static blk_t currently_testing = 0; +static blk_t num_blocks = 0; +static blk_t num_read_errors = 0; +static blk_t num_write_errors = 0; +static blk_t num_corruption_errors = 0; static ext2_badblocks_list bb_list = NULL; static FILE *out; static blk_t next_bad = 0; static ext2_badblocks_iterate bb_iter = NULL; -/* Everything is STDC, these days */ -#define NOARGS void +enum error_types { READ_ERROR, WRITE_ERROR, CORRUPTION_ERROR }; + +static void *allocate_buffer(size_t size) +{ + void *ret = 0; + +#ifdef HAVE_POSIX_MEMALIGN + if (posix_memalign(&ret, sys_page_size, size) < 0) + ret = 0; +#else +#ifdef HAVE_MEMALIGN + ret = memalign(sys_page_size, size); +#else +#ifdef HAVE_VALLOC + ret = valloc(size); +#endif /* HAVE_VALLOC */ +#endif /* HAVE_MEMALIGN */ +#endif /* HAVE_POSIX_MEMALIGN */ + + if (!ret) + ret = malloc(size); + + return ret; +} /* * This routine reports a new bad block. If the bad block has already * been seen before, then it returns 0; otherwise it returns 1. */ -static int bb_output (unsigned long bad) +static int bb_output (blk_t bad, enum error_types error_type) { errcode_t errcode; if (ext2fs_badblocks_list_test(bb_list, bad)) return 0; - fprintf (out, "%lu\n", bad); + fprintf(out, "%lu\n", (unsigned long) bad); + fflush(out); errcode = ext2fs_badblocks_list_add (bb_list, bad); if (errcode) { @@ -103,36 +166,95 @@ static int bb_output (unsigned long bad) } /* kludge: - increment the iteration through the bb_list if + increment the iteration through the bb_list if an element was just added before the current iteration position. This should not cause next_bad to change. */ if (bb_iter && bad < next_bad) ext2fs_badblocks_list_iterate (bb_iter, &next_bad); + + if (error_type == READ_ERROR) { + num_read_errors++; + } else if (error_type == WRITE_ERROR) { + num_write_errors++; + } else if (error_type == CORRUPTION_ERROR) { + num_corruption_errors++; + } return 1; } -static void print_status(NOARGS) +static char *time_diff_format(struct timeval *tv1, + struct timeval *tv2, char *buf) +{ + time_t diff = (tv1->tv_sec - tv2->tv_sec); + int hr,min,sec; + + sec = diff % 60; + diff /= 60; + min = diff % 60; + hr = diff / 60; + + if (hr) + sprintf(buf, "%d:%02d:%02d", hr, min, sec); + else + sprintf(buf, "%d:%02d", min, sec); + return buf; +} + +static float calc_percent(unsigned long current, unsigned long total) { + float percent = 0.0; + if (total <= 0) + return percent; + if (current >= total) { + percent = 100.0; + } else { + percent=(100.0*(float)current/(float)total); + } + return percent; +} + +static void print_status(void) { - fprintf(stderr, "%9ld/%9ld", currently_testing, num_blocks); - fprintf(stderr, "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); + struct timeval time_end; + char diff_buf[32], line_buf[128]; + int len; + + gettimeofday(&time_end, 0); + len = snprintf(line_buf, sizeof(line_buf), + _("%6.2f%% done, %s elapsed. " + "(%d/%d/%d errors)"), + calc_percent((unsigned long) currently_testing, + (unsigned long) num_blocks), + time_diff_format(&time_end, &time_start, diff_buf), + num_read_errors, + num_write_errors, + num_corruption_errors); +#ifdef HAVE_MBSTOWCS + len = mbstowcs(NULL, line_buf, sizeof(line_buf)); +#endif + fputs(line_buf, stderr); + memset(line_buf, '\b', len); + line_buf[len] = 0; + fputs(line_buf, stderr); fflush (stderr); } -static void alarm_intr(int alnum) +static void alarm_intr(int alnum EXT2FS_ATTR((unused))) { signal (SIGALRM, alarm_intr); alarm(1); if (!num_blocks) return; - fprintf(stderr, "%9ld/%9ld", currently_testing, num_blocks); - fprintf(stderr, "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); - fflush (stderr); + print_status(); } static void *terminate_addr = NULL; -static void terminate_intr(int signo) +static void terminate_intr(int signo EXT2FS_ATTR((unused))) { + fflush(out); + fprintf(stderr, "\n\nInterrupted at block %llu\n", + (unsigned long long) currently_testing); + fflush(stderr); if (terminate_addr) longjmp(terminate_addr,1); exit(1); @@ -149,7 +271,7 @@ static void capture_terminate(jmp_buf term_addr) signal (SIGUSR2, terminate_intr); } -static void uncapture_terminate(NOARGS) +static void uncapture_terminate(void) { terminate_addr = NULL; signal (SIGHUP, SIG_DFL); @@ -160,14 +282,92 @@ static void uncapture_terminate(NOARGS) signal (SIGUSR2, SIG_DFL); } +/* Linux requires that O_DIRECT I/Os be 512-byte sector aligned */ + +#define O_DIRECT_SIZE 512 + +static void set_o_direct(int dev, unsigned char *buffer, size_t size, + ext2_loff_t offset) +{ +#ifdef O_DIRECT + static int current_O_DIRECT; /* Current status of O_DIRECT flag */ + int new_flag = O_DIRECT; + int flag; + + if ((use_buffered_io != 0) || + (((unsigned long) buffer & (sys_page_size - 1)) != 0) || + ((size & (sys_page_size - 1)) != 0) || + ((offset & (O_DIRECT_SIZE - 1)) != 0)) + new_flag = 0; + + if (new_flag != current_O_DIRECT) { + /* printf("%s O_DIRECT\n", new_flag ? "Setting" : "Clearing"); */ + flag = fcntl(dev, F_GETFL); + if (flag > 0) { + flag = (flag & ~O_DIRECT) | new_flag; + if (fcntl(dev, F_SETFL, flag) < 0) + perror("set_o_direct"); + } + current_O_DIRECT = new_flag; + } +#endif +} + + +static void pattern_fill(unsigned char *buffer, unsigned int pattern, + size_t n) +{ + unsigned int i, nb; + unsigned char bpattern[sizeof(pattern)], *ptr; + + if (pattern == (unsigned int) ~0) { + for (ptr = buffer; ptr < buffer + n; ptr++) { + (*ptr) = random() % (1 << (8 * sizeof(char))); + } + if (s_flag | v_flag) + fputs(_("Testing with random pattern: "), stderr); + } else { + bpattern[0] = 0; + for (i = 0; i < sizeof(bpattern); i++) { + if (pattern == 0) + break; + bpattern[i] = pattern & 0xFF; + pattern = pattern >> 8; + } + nb = i ? (i-1) : 0; + for (ptr = buffer, i = nb; ptr < buffer + n; ptr++) { + *ptr = bpattern[i]; + if (i == 0) + i = nb; + else + i--; + } + if (s_flag | v_flag) { + fputs(_("Testing with pattern 0x"), stderr); + for (i = 0; i <= nb; i++) + fprintf(stderr, "%02x", buffer[i]); + fputs(": ", stderr); + } + } +} + /* * Perform a read of a sequence of blocks; return the number of blocks * successfully sequentially read. */ -static long do_read (int dev, char * buffer, int try, int block_size, - unsigned long current_block) +static int do_read (int dev, unsigned char * buffer, int try, int block_size, + blk_t current_block) { long got; + struct timeval tv1, tv2; +#define NANOSEC (1000000000L) +#define MILISEC (1000L) + +#if 0 + printf("do_read: block %d, try %d\n", current_block, try); +#endif + set_o_direct(dev, buffer, try * block_size, + ((ext2_loff_t) current_block) * block_size); if (v_flag > 1) print_status(); @@ -175,15 +375,55 @@ static long do_read (int dev, char * buffer, int try, int block_size, /* Seek to the correct loc. */ if (ext2fs_llseek (dev, (ext2_loff_t) current_block * block_size, SEEK_SET) != (ext2_loff_t) current_block * block_size) - com_err (program_name, errno, _("during seek")); + com_err (program_name, errno, "%s", _("during seek")); /* Try the read */ + if (d_flag) + gettimeofday(&tv1, NULL); got = read (dev, buffer, try * block_size); + if (d_flag) + gettimeofday(&tv2, NULL); if (got < 0) - got = 0; + got = 0; if (got & 511) fprintf(stderr, _("Weird value (%ld) in do_read\n"), got); got /= block_size; + if (d_flag && got == try) { +#ifdef HAVE_NANOSLEEP + struct timespec ts; + ts.tv_sec = tv2.tv_sec - tv1.tv_sec; + ts.tv_nsec = (tv2.tv_usec - tv1.tv_usec) * MILISEC; + if (ts.tv_nsec < 0) { + ts.tv_nsec += NANOSEC; + ts.tv_sec -= 1; + } + /* increase/decrease the sleep time based on d_flag value */ + ts.tv_sec = ts.tv_sec * d_flag / 100; + ts.tv_nsec = ts.tv_nsec * d_flag / 100; + if (ts.tv_nsec > NANOSEC) { + ts.tv_sec += ts.tv_nsec / NANOSEC; + ts.tv_nsec %= NANOSEC; + } + if (ts.tv_sec || ts.tv_nsec) + nanosleep(&ts, NULL); +#else +#ifdef HAVE_USLEEP + struct timeval tv; + tv.tv_sec = tv2.tv_sec - tv1.tv_sec; + tv.tv_usec = tv2.tv_usec - tv1.tv_usec; + tv.tv_sec = tv.tv_sec * d_flag / 100; + tv.tv_usec = tv.tv_usec * d_flag / 100; + if (tv.tv_usec > 1000000) { + tv.tv_sec += tv.tv_usec / 1000000; + tv.tv_usec %= 1000000; + } + if (tv.tv_sec) + sleep(tv.tv_sec); + if (tv.tv_usec) + usleep(tv.tv_usec); +#endif +#endif + } return got; } @@ -191,93 +431,112 @@ static long do_read (int dev, char * buffer, int try, int block_size, * Perform a write of a sequence of blocks; return the number of blocks * successfully sequentially written. */ -static long do_write (int dev, char * buffer, int try, int block_size, - unsigned long current_block) +static int do_write(int dev, unsigned char * buffer, int try, int block_size, + unsigned long current_block) { long got; +#if 0 + printf("do_write: block %lu, try %d\n", current_block, try); +#endif + set_o_direct(dev, buffer, try * block_size, + ((ext2_loff_t) current_block) * block_size); + if (v_flag > 1) print_status(); /* Seek to the correct loc. */ if (ext2fs_llseek (dev, (ext2_loff_t) current_block * block_size, SEEK_SET) != (ext2_loff_t) current_block * block_size) - com_err (program_name, errno, _("during seek")); + com_err (program_name, errno, "%s", _("during seek")); /* Try the write */ got = write (dev, buffer, try * block_size); if (got < 0) - got = 0; + got = 0; if (got & 511) - fprintf (stderr, - "Weird value (%ld) in do_write\n", got); + fprintf(stderr, "Weird value (%ld) in do_write\n", got); got /= block_size; return got; } static int host_dev; -static void flush_bufs (int dev) +static void flush_bufs(void) { -#ifdef HAVE_FDATASYNC - if (sync && fdatasync (dev) == -1) - com_err (program_name, errno, _("during fdatasync")); -#else - if (sync && fsync (dev) == -1) - com_err (program_name, errno, _("during fsync")); -#endif + errcode_t retval; -#ifdef BLKFLSBUF - ioctl (host_dev, BLKFLSBUF, 0); /* In case this is a HD */ -#endif -#ifdef FDFLUSH - ioctl (host_dev, FDFLUSH, 0); /* In case this is floppy */ +#ifdef O_DIRECT + if (!use_buffered_io) + return; #endif + retval = ext2fs_sync_device(host_dev, 1); + if (retval) + com_err(program_name, retval, "%s", + _("during ext2fs_sync_device")); } -static unsigned int test_ro (int dev, unsigned long blocks_count, - int block_size, unsigned long from_count, - unsigned long blocks_at_once) +static unsigned int test_ro (int dev, blk_t last_block, + int block_size, blk_t first_block, + unsigned int blocks_at_once) { - char * blkbuf; + unsigned char * blkbuf; int try; - long got; + int got; unsigned int bb_count = 0; errcode_t errcode; + blk_t recover_block = ~0; + + /* set up abend handler */ + capture_terminate(NULL); errcode = ext2fs_badblocks_list_iterate_begin(bb_list,&bb_iter); if (errcode) { - com_err (program_name, errcode, - _("while beginning bad block list iteration")); + com_err(program_name, errcode, "%s", + _("while beginning bad block list iteration")); exit (1); } do { ext2fs_badblocks_list_iterate (bb_iter, &next_bad); - } while (next_bad && next_bad < from_count); + } while (next_bad && next_bad < first_block); - blkbuf = malloc (blocks_at_once * block_size); + if (t_flag) { + blkbuf = allocate_buffer((blocks_at_once + 1) * block_size); + } else { + blkbuf = allocate_buffer(blocks_at_once * block_size); + } if (!blkbuf) { - com_err (program_name, ENOMEM, _("while allocating buffers")); + com_err(program_name, ENOMEM, "%s", + _("while allocating buffers")); exit (1); } - flush_bufs(dev); if (v_flag) { - fprintf(stderr, _("Checking for bad blocks in read-only mode\n")); - fprintf (stderr, _("From block %lu to %lu\n"), from_count, - blocks_count); + fprintf(stderr, _("Checking blocks %lu to %lu\n"), + (unsigned long)first_block, + (unsigned long)last_block - 1); } - try = blocks_at_once; - currently_testing = from_count; - num_blocks = blocks_count; - if (s_flag || v_flag > 1) { - fprintf(stderr, - _("Checking for bad blocks (read-only test): ")); - if (v_flag <= 1) - alarm_intr(SIGALRM); + if (t_flag) { + fputs(_("Checking for bad blocks in read-only mode\n"), stderr); + pattern_fill(blkbuf + blocks_at_once * block_size, + t_patts[0], block_size); } - while (currently_testing < blocks_count) + flush_bufs(); + try = blocks_at_once; + currently_testing = first_block; + num_blocks = last_block - 1; + if (!t_flag && (s_flag || v_flag)) + fputs(_("Checking for bad blocks (read-only test): "), stderr); + if (s_flag && v_flag <= 1) + alarm_intr(SIGALRM); + while (currently_testing < last_block) { + if (bb_count >= max_bb) { + if (s_flag || v_flag) { + fputs(_("Too many bad blocks, aborting test\n"), stderr); + } + break; + } if (next_bad) { if (currently_testing == next_bad) { /* fprintf (out, "%lu\n", nextbad); */ @@ -288,115 +547,180 @@ static unsigned int test_ro (int dev, unsigned long blocks_count, else if (currently_testing + try > next_bad) try = next_bad - currently_testing; } - if (currently_testing + try > blocks_count) - try = blocks_count - currently_testing; + if (currently_testing + try > last_block) + try = last_block - currently_testing; got = do_read (dev, blkbuf, try, block_size, currently_testing); - currently_testing += got; - if (got == try) { - try = blocks_at_once; - continue; + if (t_flag) { + /* test the comparison between all the + blocks successfully read */ + int i; + for (i = 0; i < got; ++i) + if (memcmp (blkbuf+i*block_size, + blkbuf+blocks_at_once*block_size, + block_size)) + bb_count += bb_output(currently_testing + i, CORRUPTION_ERROR); } - else + if (got == 0 && try == 1) + bb_count += bb_output(currently_testing++, READ_ERROR); + currently_testing += got; + if (got != try) { try = 1; - if (got == 0) { - bb_count += bb_output(currently_testing++); + if (recover_block == ~0U) + recover_block = currently_testing - got + + blocks_at_once; + continue; + } else if (currently_testing == recover_block) { + try = blocks_at_once; + recover_block = ~0; } } num_blocks = 0; alarm(0); - if (s_flag || v_flag > 1) - fprintf(stderr, _(done_string)); + if (s_flag || v_flag) + fputs(_(done_string), stderr); fflush (stderr); free (blkbuf); ext2fs_badblocks_list_iterate_end(bb_iter); + uncapture_terminate(); + return bb_count; } -static unsigned int test_rw (int dev, unsigned long blocks_count, - int block_size, unsigned long from_count, - unsigned long blocks_at_once) +static unsigned int test_rw (int dev, blk_t last_block, + int block_size, blk_t first_block, + unsigned int blocks_at_once) { - int i; - char * buffer; - unsigned char pattern[] = {0xaa, 0x55, 0xff, 0x00}; + unsigned char *buffer, *read_buffer; + const unsigned int patterns[] = {0xaa, 0x55, 0xff, 0x00}; + const unsigned int *pattern; + int i, try, got, nr_pattern, pat_idx; unsigned int bb_count = 0; + blk_t recover_block = ~0; - buffer = malloc (2 * block_size); - if (!buffer) - { - com_err (program_name, ENOMEM, _("while allocating buffers")); + /* set up abend handler */ + capture_terminate(NULL); + + buffer = allocate_buffer(2 * blocks_at_once * block_size); + read_buffer = buffer + blocks_at_once * block_size; + + if (!buffer) { + com_err(program_name, ENOMEM, "%s", + _("while allocating buffers")); exit (1); } - flush_bufs(dev); + flush_bufs(); if (v_flag) { - fprintf(stderr, - _("Checking for bad blocks in read-write mode\n")); + fputs(_("Checking for bad blocks in read-write mode\n"), + stderr); fprintf(stderr, _("From block %lu to %lu\n"), - from_count, blocks_count); + (unsigned long) first_block, + (unsigned long) last_block - 1); } - for (i = 0; i < sizeof (pattern); i++) { - memset (buffer, pattern[i], block_size); - if (s_flag | v_flag) - fprintf (stderr, _("Writing pattern 0x%08x: "), - *((int *) buffer)); - num_blocks = blocks_count; - currently_testing = from_count; + if (t_flag) { + pattern = t_patts; + nr_pattern = t_flag; + } else { + pattern = patterns; + nr_pattern = sizeof(patterns) / sizeof(patterns[0]); + } + for (pat_idx = 0; pat_idx < nr_pattern; pat_idx++) { + pattern_fill(buffer, pattern[pat_idx], + blocks_at_once * block_size); + num_blocks = last_block - 1; + currently_testing = first_block; if (s_flag && v_flag <= 1) alarm_intr(SIGALRM); - for (; - currently_testing < blocks_count; - currently_testing++) - { - if (ext2fs_llseek (dev, (ext2_loff_t) currently_testing * - block_size, SEEK_SET) != - (ext2_loff_t) currently_testing * block_size) - com_err (program_name, errno, - _("during seek on block %d"), - currently_testing); + + try = blocks_at_once; + while (currently_testing < last_block) { + if (bb_count >= max_bb) { + if (s_flag || v_flag) { + fputs(_("Too many bad blocks, aborting test\n"), stderr); + } + break; + } + if (currently_testing + try > last_block) + try = last_block - currently_testing; + got = do_write(dev, buffer, try, block_size, + currently_testing); if (v_flag > 1) print_status(); - write (dev, buffer, block_size); + + if (got == 0 && try == 1) + bb_count += bb_output(currently_testing++, WRITE_ERROR); + currently_testing += got; + if (got != try) { + try = 1; + if (recover_block == ~0U) + recover_block = currently_testing - + got + blocks_at_once; + continue; + } else if (currently_testing == recover_block) { + try = blocks_at_once; + recover_block = ~0; + } } + num_blocks = 0; alarm (0); if (s_flag | v_flag) - fprintf(stderr, _(done_string)); - flush_bufs(dev); + fputs(_(done_string), stderr); + flush_bufs(); if (s_flag | v_flag) - fprintf (stderr, _("Reading and comparing: ")); - num_blocks = blocks_count; - currently_testing = from_count; + fputs(_("Reading and comparing: "), stderr); + num_blocks = last_block; + currently_testing = first_block; if (s_flag && v_flag <= 1) alarm_intr(SIGALRM); - for (; - currently_testing < blocks_count; - currently_testing++) - { - if (ext2fs_llseek (dev, (ext2_loff_t) currently_testing * - block_size, SEEK_SET) != - (ext2_loff_t) currently_testing * block_size) - com_err (program_name, errno, - _("during seek on block %d"), - currently_testing); + + try = blocks_at_once; + while (currently_testing < last_block) { + if (bb_count >= max_bb) { + if (s_flag || v_flag) { + fputs(_("Too many bad blocks, aborting test\n"), stderr); + } + break; + } + if (currently_testing + try > last_block) + try = last_block - currently_testing; + got = do_read (dev, read_buffer, try, block_size, + currently_testing); + if (got == 0 && try == 1) + bb_count += bb_output(currently_testing++, READ_ERROR); + currently_testing += got; + if (got != try) { + try = 1; + if (recover_block == ~0U) + recover_block = currently_testing - + got + blocks_at_once; + continue; + } else if (currently_testing == recover_block) { + try = blocks_at_once; + recover_block = ~0U; + } + for (i=0; i < got; i++) { + if (memcmp(read_buffer + i * block_size, + buffer + i * block_size, + block_size)) + bb_count += bb_output(currently_testing+i, CORRUPTION_ERROR); + } if (v_flag > 1) print_status(); - if ((read (dev, buffer + block_size, block_size) - != block_size) || - memcmp(buffer, buffer + block_size, block_size)) - bb_count += bb_output(currently_testing); } + num_blocks = 0; alarm (0); if (s_flag | v_flag) - fprintf(stderr, _(done_string)); - flush_bufs(dev); + fputs(_(done_string), stderr); + flush_bufs(); } - + uncapture_terminate(); + free(buffer); return bb_count; } @@ -405,69 +729,71 @@ struct saved_blk_record { int num; }; -static unsigned int test_nd (int dev, unsigned long blocks_count, - int block_size, unsigned long from_count, - unsigned long blocks_at_once) +static unsigned int test_nd (int dev, blk_t last_block, + int block_size, blk_t first_block, + unsigned int blocks_at_once) { - char *blkbuf, *save_ptr, *test_ptr, *read_ptr; - char * ptr; + unsigned char *blkbuf, *save_ptr, *test_ptr, *read_ptr; + unsigned char *test_base, *save_base, *read_base; int try, i; - long got, used2, written, save_currently_testing; + const unsigned int patterns[] = { ~0 }; + const unsigned int *pattern; + int nr_pattern, pat_idx; + int got, used2, written; + blk_t save_currently_testing; struct saved_blk_record *test_record; /* This is static to prevent being clobbered by the longjmp */ static int num_saved; jmp_buf terminate_env; errcode_t errcode; - long buf_used; - unsigned int bb_count; + unsigned long buf_used; + static unsigned int bb_count; + unsigned int granularity = blocks_at_once; + blk_t recover_block = ~0U; + bb_count = 0; errcode = ext2fs_badblocks_list_iterate_begin(bb_list,&bb_iter); if (errcode) { - com_err (program_name, errcode, - _("while beginning bad block list iteration")); + com_err(program_name, errcode, "%s", + _("while beginning bad block list iteration")); exit (1); } do { ext2fs_badblocks_list_iterate (bb_iter, &next_bad); - } while (next_bad && next_bad < from_count); + } while (next_bad && next_bad < first_block); - blkbuf = malloc (3 * blocks_at_once * block_size); - test_record = malloc (blocks_at_once*sizeof(struct saved_blk_record)); + blkbuf = allocate_buffer(3 * blocks_at_once * block_size); + test_record = malloc(blocks_at_once * sizeof(struct saved_blk_record)); if (!blkbuf || !test_record) { - com_err(program_name, ENOMEM, _("while allocating buffers")); + com_err(program_name, ENOMEM, "%s", + _("while allocating buffers")); exit (1); } - num_saved = 0; - /* inititalize the test data randomly: */ - if (v_flag) { - fprintf (stderr, _("Initializing random test data\n")); - } - for(ptr = blkbuf + blocks_at_once * block_size; - ptr < blkbuf + 2 * blocks_at_once * block_size; - ++ptr) { - (*ptr) = random() % (1 << sizeof(char)); - } + save_base = blkbuf; + test_base = blkbuf + (blocks_at_once * block_size); + read_base = blkbuf + (2 * blocks_at_once * block_size); + + num_saved = 0; - flush_bufs(dev); + flush_bufs(); if (v_flag) { - fprintf (stderr, - _("Checking for bad blocks in non-destructive read-write mode\n")); - fprintf (stderr, _("From block %lu to %lu\n"), from_count, blocks_count); + fputs(_("Checking for bad blocks in non-destructive read-write mode\n"), stderr); + fprintf (stderr, _("From block %lu to %lu\n"), + (unsigned long) first_block, + (unsigned long) last_block - 1); } if (s_flag || v_flag > 1) { - fprintf(stderr, _("Checking for bad blocks (non-destructive read-write test): ")); - if (v_flag <= 1) - alarm_intr(SIGALRM); + fputs(_("Checking for bad blocks (non-destructive read-write test)\n"), stderr); } if (setjmp(terminate_env)) { /* * Abnormal termination by a signal is handled here. */ signal (SIGALRM, SIG_IGN); - fprintf(stderr, _("\nInterrupt caught, cleaning up\n")); + fputs(_("\nInterrupt caught, cleaning up\n"), stderr); - save_ptr = blkbuf; + save_ptr = save_base; for (i=0; i < num_saved; i++) { do_write(dev, save_ptr, test_record[i].num, block_size, test_record[i].block); @@ -476,138 +802,177 @@ static unsigned int test_nd (int dev, unsigned long blocks_count, fflush (out); exit(1); } - + /* set up abend handler */ capture_terminate(terminate_env); - buf_used = 0; - bb_count = 0; - save_ptr = blkbuf; - test_ptr = blkbuf + (blocks_at_once * block_size); - currently_testing = from_count; - num_blocks = blocks_count; + if (t_flag) { + pattern = t_patts; + nr_pattern = t_flag; + } else { + pattern = patterns; + nr_pattern = sizeof(patterns) / sizeof(patterns[0]); + } + for (pat_idx = 0; pat_idx < nr_pattern; pat_idx++) { + pattern_fill(test_base, pattern[pat_idx], + blocks_at_once * block_size); - while (currently_testing < blocks_count) { - try = blocks_at_once - buf_used; - if (next_bad) { - if (currently_testing == next_bad) { - /* fprintf (out, "%lu\n", nextbad); */ - ext2fs_badblocks_list_iterate (bb_iter, &next_bad); - currently_testing++; + buf_used = 0; + bb_count = 0; + save_ptr = save_base; + test_ptr = test_base; + currently_testing = first_block; + num_blocks = last_block - 1; + if (s_flag && v_flag <= 1) + alarm_intr(SIGALRM); + + while (currently_testing < last_block) { + if (bb_count >= max_bb) { + if (s_flag || v_flag) { + fputs(_("Too many bad blocks, aborting test\n"), stderr); + } + break; + } + got = try = granularity - buf_used; + if (next_bad) { + if (currently_testing == next_bad) { + /* fprintf (out, "%lu\n", nextbad); */ + ext2fs_badblocks_list_iterate (bb_iter, &next_bad); + currently_testing++; + goto check_for_more; + } + else if (currently_testing + try > next_bad) + try = next_bad - currently_testing; + } + if (currently_testing + try > last_block) + try = last_block - currently_testing; + got = do_read (dev, save_ptr, try, block_size, + currently_testing); + if (got == 0) { + if (recover_block == ~0U) + recover_block = currently_testing + + blocks_at_once; + if (granularity != 1) { + granularity = 1; + continue; + } + /* First block must have been bad. */ + bb_count += bb_output(currently_testing++, READ_ERROR); goto check_for_more; } - else if (currently_testing + try > next_bad) - try = next_bad - currently_testing; - } - if (currently_testing + try > blocks_count) - try = blocks_count - currently_testing; - got = do_read (dev, save_ptr, try, block_size, - currently_testing); - if (got == 0) { - /* First block must have been bad. */ - bb_count += bb_output(currently_testing++); - goto check_for_more; - } - /* - * Note the fact that we've saved this much data - * *before* we overwrite it with test data - */ - test_record[num_saved].block = currently_testing; - test_record[num_saved].num = got; - num_saved++; - - /* Write the test data */ - written = do_write (dev, test_ptr, got, block_size, - currently_testing); - if (written != got) - com_err (program_name, errno, - _("during test data write, block %lu"), - currently_testing + written); - - buf_used += got; - save_ptr += got * block_size; - test_ptr += got * block_size; - currently_testing += got; - if (got != try) - bb_count += bb_output(currently_testing++); + /* + * Note the fact that we've saved this much data + * *before* we overwrite it with test data + */ + test_record[num_saved].block = currently_testing; + test_record[num_saved].num = got; + num_saved++; + + /* Write the test data */ + written = do_write (dev, test_ptr, got, block_size, + currently_testing); + if (written != got) + com_err (program_name, errno, + _("during test data write, block %lu"), + (unsigned long) currently_testing + + written); - check_for_more: - /* - * If there's room for more blocks to be tested this - * around, and we're not done yet testing the disk, go - * back and get some more blocks. - */ - if ((buf_used != blocks_at_once) && - (currently_testing < blocks_count)) - continue; + buf_used += got; + save_ptr += got * block_size; + test_ptr += got * block_size; + currently_testing += got; + if (got != try) { + try = 1; + if (recover_block == ~0U) + recover_block = currently_testing - + got + blocks_at_once; + continue; + } - flush_bufs(dev); - save_currently_testing = currently_testing; + check_for_more: + /* + * If there's room for more blocks to be tested this + * around, and we're not done yet testing the disk, go + * back and get some more blocks. + */ + if ((buf_used != granularity) && + (currently_testing < last_block)) + continue; - /* - * for each contiguous block that we read into the - * buffer (and wrote test data into afterwards), read - * it back (looping if necessary, to get past newly - * discovered unreadable blocks, of which there should - * be none, but with a hard drive which is unreliable, - * it has happened), and compare with the test data - * that was written; output to the bad block list if - * it doesn't match. - */ - used2 = 0; - save_ptr = blkbuf; - test_ptr = blkbuf + (blocks_at_once * block_size); - read_ptr = blkbuf + (2 * blocks_at_once * block_size); - try = 0; - - while (1) { - if (try == 0) { - if (used2 >= num_saved) - break; - currently_testing = test_record[used2].block; - try = test_record[used2].num; - used2++; + if (currently_testing >= recover_block) { + granularity = blocks_at_once; + recover_block = ~0; } - - got = do_read (dev, read_ptr, try, - block_size, currently_testing); - /* test the comparison between all the - blocks successfully read */ - for (i = 0; i < got; ++i) - if (memcmp (test_ptr+i*block_size, - read_ptr+i*block_size, block_size)) - bb_count += bb_output(currently_testing + i); - if (got < try) { - bb_count += bb_output(currently_testing + got); - got++; + flush_bufs(); + save_currently_testing = currently_testing; + + /* + * for each contiguous block that we read into the + * buffer (and wrote test data into afterwards), read + * it back (looping if necessary, to get past newly + * discovered unreadable blocks, of which there should + * be none, but with a hard drive which is unreliable, + * it has happened), and compare with the test data + * that was written; output to the bad block list if + * it doesn't match. + */ + used2 = 0; + save_ptr = save_base; + test_ptr = test_base; + read_ptr = read_base; + try = 0; + + while (1) { + if (try == 0) { + if (used2 >= num_saved) + break; + currently_testing = test_record[used2].block; + try = test_record[used2].num; + used2++; + } + + got = do_read (dev, read_ptr, try, + block_size, currently_testing); + + /* test the comparison between all the + blocks successfully read */ + for (i = 0; i < got; ++i) + if (memcmp (test_ptr+i*block_size, + read_ptr+i*block_size, block_size)) + bb_count += bb_output(currently_testing + i, CORRUPTION_ERROR); + if (got < try) { + bb_count += bb_output(currently_testing + got, READ_ERROR); + got++; + } + + /* write back original data */ + do_write (dev, save_ptr, got, + block_size, currently_testing); + save_ptr += got * block_size; + + currently_testing += got; + test_ptr += got * block_size; + read_ptr += got * block_size; + try -= got; } - - /* when done, write back original data */ - do_write (dev, save_ptr, got, block_size, - currently_testing); - currently_testing += got; - save_ptr += got * block_size; - test_ptr += got * block_size; - read_ptr += got * block_size; - try -= got; + /* empty the buffer so it can be reused */ + num_saved = 0; + buf_used = 0; + save_ptr = save_base; + test_ptr = test_base; + currently_testing = save_currently_testing; } + num_blocks = 0; + alarm(0); + if (s_flag || v_flag > 1) + fputs(_(done_string), stderr); - /* empty the buffer so it can be reused */ - num_saved = 0; - buf_used = 0; - save_ptr = blkbuf; - test_ptr = blkbuf + (blocks_at_once * block_size); - currently_testing = save_currently_testing; + flush_bufs(); } - num_blocks = 0; - alarm(0); uncapture_terminate(); - if (s_flag || v_flag > 1) - fprintf(stderr, _(done_string)); - fflush(stderr); free(blkbuf); free(test_record); @@ -629,60 +994,101 @@ static void check_mount(char *device_name) device_name); return; } - if (!(mount_flags & EXT2_MF_MOUNTED)) - return; + if (mount_flags & EXT2_MF_MOUNTED) { + fprintf(stderr, _("%s is mounted; "), device_name); + if (force) { + fputs(_("badblocks forced anyway. " + "Hope /etc/mtab is incorrect.\n"), stderr); + return; + } + abort_badblocks: + fputs(_("it's not safe to run badblocks!\n"), stderr); + exit(1); + } - fprintf(stderr, _("%s is mounted; "), device_name); - if (force) { - fprintf(stderr, _("badblocks forced anyway. " - "Hope /etc/mtab is incorrect.\n")); - return; + if ((mount_flags & EXT2_MF_BUSY) && !exclusive_ok) { + fprintf(stderr, _("%s is apparently in use by the system; "), + device_name); + if (force) + fputs(_("badblocks forced anyway.\n"), stderr); + else + goto abort_badblocks; } - fprintf(stderr, _("it's not safe to run badblocks!\n")); - exit(1); + } +/* + * This function will convert a string to an unsigned long, printing + * an error message if it fails, and returning success or failure in err. + */ +static unsigned int parse_uint(const char *str, const char *descr) +{ + char *tmp; + unsigned long ret; + + errno = 0; + ret = strtoul(str, &tmp, 0); + if (*tmp || errno || (ret > UINT_MAX) || + (ret == ULONG_MAX && errno == ERANGE)) { + com_err (program_name, 0, _("invalid %s - %s"), descr, str); + exit (1); + } + return ret; +} int main (int argc, char ** argv) { int c; - char * tmp; char * device_name; char * host_device_name = NULL; char * input_file = NULL; char * output_file = NULL; FILE * in = NULL; int block_size = 1024; - unsigned long blocks_at_once = 16; - blk_t blocks_count, from_count; + unsigned int blocks_at_once = 64; + blk64_t last_block, first_block; int num_passes = 0; int passes_clean = 0; int dev; errcode_t errcode; - unsigned int (*test_func)(int dev, unsigned long blocks_count, - int block_size, unsigned long from_count, - unsigned long blocks_at_once); + unsigned int pattern; + unsigned int (*test_func)(int, blk_t, + int, blk_t, + unsigned int); + int open_flag; + long sysval; + blk64_t inblk; setbuf(stdout, NULL); setbuf(stderr, NULL); #ifdef ENABLE_NLS setlocale(LC_MESSAGES, ""); + setlocale(LC_CTYPE, ""); bindtextdomain(NLS_CAT_NAME, LOCALEDIR); textdomain(NLS_CAT_NAME); + set_com_err_gettext(gettext); #endif + srandom((unsigned int)time(NULL)); /* simple randomness is enough */ test_func = test_ro; - + + /* Determine the system page size if possible */ +#ifdef HAVE_SYSCONF +#if (!defined(_SC_PAGESIZE) && defined(_SC_PAGE_SIZE)) +#define _SC_PAGESIZE _SC_PAGE_SIZE +#endif +#ifdef _SC_PAGESIZE + sysval = sysconf(_SC_PAGESIZE); + if (sysval > 0) + sys_page_size = sysval; +#endif /* _SC_PAGESIZE */ +#endif /* HAVE_SYSCONF */ + if (argc && *argv) program_name = *argv; - while ((c = getopt (argc, argv, "b:fi:o:svwnc:p:h:")) != EOF) { + while ((c = getopt (argc, argv, "b:d:e:fi:o:svwnc:p:h:t:BX")) != EOF) { switch (c) { case 'b': - block_size = strtoul (optarg, &tmp, 0); - if (*tmp || block_size > 4096) { - com_err (program_name, 0, - _("bad block size - %s"), optarg); - exit (1); - } + block_size = parse_uint(optarg, "block size"); break; case 'f': force++; @@ -701,93 +1107,145 @@ int main (int argc, char ** argv) break; case 'w': if (w_flag) - usage(); + exclusive_usage(); test_func = test_rw; w_flag = 1; break; case 'n': if (w_flag) - usage(); + exclusive_usage(); test_func = test_nd; w_flag = 2; break; case 'c': - blocks_at_once = strtoul (optarg, &tmp, 0); - if (*tmp) { + blocks_at_once = parse_uint(optarg, "blocks at once"); + break; + case 'e': + max_bb = parse_uint(optarg, "max bad block count"); + if (max_bb > MAX_BAD_BLOCKS) { com_err (program_name, 0, - "bad simultaneous block count - %s", optarg); + _("Too big max bad blocks count %u - " + "maximum is %u"), max_bb, + MAX_BAD_BLOCKS); exit (1); } + /* 0 really means unlimited but we cannot do that much... */ + if (max_bb == 0) + max_bb = MAX_BAD_BLOCKS; + break; + case 'd': + d_flag = parse_uint(optarg, "read delay factor"); break; case 'p': - num_passes = strtoul (optarg, &tmp, 0); - if (*tmp) { - com_err (program_name, 0, - "bad number of clean passes - %s", optarg); - exit (1); - } + num_passes = parse_uint(optarg, + "number of clean passes"); break; case 'h': host_device_name = optarg; break; + case 't': + if (t_flag + 1 > t_max) { + unsigned int *t_patts_new; + + t_patts_new = realloc(t_patts, sizeof(int) * + (t_max + T_INC)); + if (!t_patts_new) { + com_err(program_name, ENOMEM, + _("can't allocate memory for " + "test_pattern - %s"), + optarg); + exit(1); + } + t_patts = t_patts_new; + t_max += T_INC; + } + if (!strcmp(optarg, "r") || !strcmp(optarg,"random")) { + t_patts[t_flag++] = ~0; + } else { + pattern = parse_uint(optarg, "test pattern"); + if (pattern == (unsigned int) ~0) + pattern = 0xffff; + t_patts[t_flag++] = pattern; + } + break; + case 'B': + use_buffered_io = 1; + break; + case 'X': + exclusive_ok++; + break; default: usage(); } } + if (!w_flag) { + if (t_flag > 1) { + com_err(program_name, 0, "%s", + _("Maximum of one test_pattern may be " + "specified in read-only mode")); + exit(1); + } + if (t_patts && (t_patts[0] == (unsigned int) ~0)) { + com_err(program_name, 0, "%s", + _("Random test_pattern is not allowed " + "in read-only mode")); + exit(1); + } + } if (optind > argc - 1) usage(); device_name = argv[optind++]; if (optind > argc - 1) { - errcode = ext2fs_get_device_size(device_name, + errcode = ext2fs_get_device_size2(device_name, block_size, - &blocks_count); + &last_block); if (errcode == EXT2_ET_UNIMPLEMENTED) { - com_err(program_name, 0, + com_err(program_name, 0, "%s", _("Couldn't determine device size; you " "must specify\nthe size manually\n")); exit(1); } if (errcode) { - com_err(program_name, errcode, + com_err(program_name, errcode, "%s", _("while trying to determine device size")); exit(1); } } else { - blocks_count = strtoul (argv[optind], &tmp, 0); - if (*tmp) { - com_err (program_name, 0, _("bad blocks count - %s"), - argv[optind]); - exit (1); - } + errno = 0; + last_block = parse_uint(argv[optind], _("last block")); + last_block++; optind++; } if (optind <= argc-1) { - from_count = strtoul (argv[optind], &tmp, 0); - if (*tmp) { - com_err (program_name, 0, _("bad starting block - %s"), - argv[optind]); - exit (1); - } - } else from_count = 0; - if (from_count >= blocks_count) { - com_err (program_name, 0, _("bad blocks range: %lu-%lu"), - from_count, blocks_count); + errno = 0; + first_block = parse_uint(argv[optind], _("first block")); + } else first_block = 0; + if (first_block >= last_block) { + com_err (program_name, 0, _("invalid starting block (%llu): must be less than %llu"), + first_block, last_block); exit (1); } + /* ext2 badblocks file can't handle large values */ + if (last_block >> 32) { + com_err(program_name, EOVERFLOW, + _("invalid end block (%llu): must be 32-bit value"), + last_block); + exit(1); + } if (w_flag) check_mount(device_name); - - dev = open (device_name, w_flag ? O_RDWR : O_RDONLY); - if (dev == -1) - { + + gettimeofday(&time_start, 0); + open_flag = O_LARGEFILE | (w_flag ? O_RDWR : O_RDONLY); + dev = open (device_name, open_flag); + if (dev == -1) { com_err (program_name, errno, _("while trying to open %s"), device_name); exit (1); } if (host_device_name) { - host_dev = open (host_device_name, O_RDONLY); - if (host_dev == -1) - { + host_dev = open (host_device_name, open_flag); + if (host_dev == -1) { com_err (program_name, errno, _("while trying to open %s"), host_device_name); @@ -795,7 +1253,7 @@ int main (int argc, char ** argv) } } else host_dev = dev; - if (input_file) + if (input_file) { if (strcmp (input_file, "-") == 0) in = stdin; else { @@ -808,6 +1266,7 @@ int main (int argc, char ** argv) exit (1); } } + } if (output_file && strcmp (output_file, "-") != 0) { out = fopen (output_file, "w"); @@ -824,23 +1283,35 @@ int main (int argc, char ** argv) errcode = ext2fs_badblocks_list_create(&bb_list,0); if (errcode) { - com_err (program_name, errcode, - _("creating in-memory bad blocks list")); + com_err(program_name, errcode, "%s", + _("while creating in-memory bad blocks list")); exit (1); } if (in) { for(;;) { - switch(fscanf (in, "%u\n", &next_bad)) { + switch (fscanf(in, "%llu\n", &inblk)) { case 0: - com_err (program_name, 0, "input file - bad format"); + com_err(program_name, 0, "%s", + _("input file - bad format")); exit (1); case EOF: break; default: + if (inblk >> 32) { + com_err(program_name, + EOVERFLOW, "%s", + _("while adding to in-memory " + "bad block list")); + exit(1); + } + next_bad = inblk; errcode = ext2fs_badblocks_list_add(bb_list,next_bad); if (errcode) { - com_err (program_name, errcode, _("adding to in-memory bad block list")); + com_err(program_name, errcode, + "%s", + _("while adding to in-memory " + "bad block list")); exit (1); } continue; @@ -855,23 +1326,23 @@ int main (int argc, char ** argv) do { unsigned int bb_count; - bb_count = test_func(dev, blocks_count, block_size, - from_count, blocks_at_once); + bb_count = test_func(dev, last_block, block_size, + first_block, blocks_at_once); if (bb_count) passes_clean = 0; else ++passes_clean; - + if (v_flag) fprintf(stderr, - _("Pass completed, %u bad blocks found.\n"), - bb_count); + _("Pass completed, %u bad blocks found. (%d/%d/%d errors)\n"), + bb_count, num_read_errors, num_write_errors, num_corruption_errors); } while (passes_clean < num_passes); close (dev); if (out != stdout) fclose (out); + free(t_patts); return 0; } -