diff --git a/.gitignore b/.gitignore index b6f2463c..e8c50120 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ /src/fsync-tester /src/ftrunc /src/genhashnames +/src/dirhash_collide /src/getdevicesize /src/getpagesize /src/godown diff --git a/src/Makefile b/src/Makefile index 6509f2de..2dbc696d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -11,7 +11,7 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \ devzero feature alloc fault fstest t_access_root \ godown resvtest writemod makeextents itrash rename \ multi_open_unlink dmiperf unwritten_sync genhashnames t_holes \ - t_mmap_writev t_truncate_cmtime + t_mmap_writev t_truncate_cmtime dirhash_collide LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ preallo_rw_pattern_writer ftrunc trunc fs_perms testx looptest \ diff --git a/src/dirhash_collide.c b/src/dirhash_collide.c new file mode 100644 index 00000000..55cec872 --- /dev/null +++ b/src/dirhash_collide.c @@ -0,0 +1,223 @@ +/* + * Generates files or directories with hash collisions on a XFS filesystem + * Copyright (C) 2014 Hannes Frederic Sowa + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +static enum { + ILLEGAL, + DIRECTORY, + FILENAME, +} touch_mode = ILLEGAL; + +static bool one_hash = false; + +static uint32_t rol32(uint32_t word, unsigned int shift) +{ + return (word << shift) | (word >> (32 - shift)); +} + +static uint32_t xfs_da_hashname(const uint8_t *name, int namelen) +{ + uint32_t hash; + + for (hash = 0; namelen >= 4; namelen -= 4, name += 4) + hash = (name[0] << 21) ^ (name[1] << 14) ^ (name[2] << 7) ^ + (name[3] << 0) ^ rol32(hash, 7 * 4); + + if (namelen) { + fprintf(stderr, + "internal error: " + "misbalanced input buffer to xfs_da_hashname - " + "overlapping %d bytes\n", namelen); + exit(1); + } + + return hash; +} + +static uint8_t gen_rand(void) +{ + uint8_t r; + while (!(r = rand())); + return r; +} + +static uint8_t buffer[252+1] = {0}; + +static void gen_name(void) +{ + int idx; + uint32_t hash, last; + +again: + for (idx = 0; idx < 252-4; idx+=4) { + buffer[idx + 0] = gen_rand(); + buffer[idx + 1] = gen_rand(); + buffer[idx + 2] = gen_rand(); + buffer[idx + 3] = gen_rand(); + } + + hash = rol32(xfs_da_hashname(buffer, 248), 7 * 4); + last = hash ^ ~0U; + + if (last == 0) + goto again; + + buffer[idx + 3] = last & 0x7fU; + buffer[idx + 2] = (last >> 7) & 0x7fU; + buffer[idx + 1] = (last >> 14) & 0x7fU; + buffer[idx + 0] = ((last >> 21) & 0xffU); + + if (memchr(buffer, '.', sizeof(buffer)) || + memchr(buffer, '/', sizeof(buffer))) + goto again; + + if (one_hash) { + /* very poor - can be improved later */ + static bool done = false; + static uint32_t filter; + + if (!done) { + filter = xfs_da_hashname(buffer, 252); + done = true; + return; + } + + if (filter != xfs_da_hashname(buffer, 252)) + goto again; + } +} + +static int touch(const char *buffer) +{ + if (touch_mode == DIRECTORY) { + if (mkdir(buffer, S_IRWXU)) { + /* ignore if directory is already present */ + if (errno == EEXIST) + return 0; + perror("mkdir with random directory name"); + return 1; + } + } else if (touch_mode == FILENAME) { + int fd = creat(buffer, S_IRWXU); + if (fd == -1) { + /* ignore duplicate files */ + if (errno == EEXIST) + return 0; + perror("creat with random directory name"); + return 1; + } + if (close(fd)) { + perror("close is leaking a file descriptor"); + return 1; + } + return 0; + } + return 0; +} + +static void do_seed(void) +{ + struct timeval tv; + if (gettimeofday(&tv, NULL)) { + perror("gettimeofday"); + exit(1); + } + srand(tv.tv_sec ^ tv.tv_usec ^ getpid()); +} + +static void usage_and_exit(const char *pname) +{ + fprintf(stderr, "usage: %s [-d] [-f] [-n num] [-s] directory\n" + "\t-f\tcreate files (the default)\n" + "\t-d\tcreate directories\n" + "\t-n num\tcreate num directories or files (default 200000)\n" + "\t-s\tonly generate one hash\n" + "\tdirectory\tthe directory to chdir() to\n", + pname); + exit(1); +} + +int main(int argc, char **argv) +{ + const char allopts[] = "hsdfn:"; + int c, orig_cycles, errors = 0, cycles = 200000; + + while ((c = getopt(argc, argv, allopts)) != -1) { + switch (c) { + case 'd': + if (touch_mode != ILLEGAL) + usage_and_exit(argv[0]); + touch_mode = DIRECTORY; + break; + case 'f': + if (touch_mode != ILLEGAL) + usage_and_exit(argv[0]); + touch_mode = FILENAME; + break; + case 'n': + errno = 0; + if (sscanf(optarg, "%d", &cycles) != 1 || + errno == ERANGE) { + fputs("could not parse number of iterations", stderr); + exit(1); + } + break; + case 's': + one_hash = true; + break; + default: + usage_and_exit(argv[0]); + break; + } + } + + if (argc <= optind || touch_mode == ILLEGAL) + usage_and_exit(argv[0]); + + if (chdir(argv[optind])) { + perror("chdir"); + exit(1); + } + + orig_cycles = cycles; + + do_seed(); + + while (cycles--) { + gen_name(); + errors += touch((char *)buffer); + } + + if (errors) + fprintf(stderr, "creating %d %s caused %d errors\n", + orig_cycles, touch_mode == FILENAME ? "files" : "directories", + errors); + + return 0; +} diff --git a/tests/xfs/006 b/tests/xfs/006 new file mode 100755 index 00000000..fa84e40e --- /dev/null +++ b/tests/xfs/006 @@ -0,0 +1,63 @@ +#! /bin/bash +# FS QA Test No. 006 +# +# Test that directory hash entries are place in the correct order. +# commit f5ea110 ("xfs: add CRCs to dir2/da node blocks") left the +# directory with incorrect hash ordering. +# +#----------------------------------------------------------------------- +# Copyright (c) 2014 Hannes Frederic Sowa. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/repair + +# real QA test starts here + +_supported_fs xfs +_supported_os Linux +_require_scratch + +_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs +_scratch_mount | _filter_scratch + +mkdir $SCRATCH_MNT/x +$here/src/dirhash_collide -d -n 10000 $SCRATCH_MNT/x +umount $SCRATCH_MNT 2>&1 | _filter_scratch + +_scratch_xfs_repair 2>&1 | _filter_repair + +# success, all done +status=0 +exit diff --git a/tests/xfs/006.out b/tests/xfs/006.out new file mode 100644 index 00000000..9c142ac4 --- /dev/null +++ b/tests/xfs/006.out @@ -0,0 +1,28 @@ +QA output created by 006 +meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks +data = bsize=XXX blocks=XXX, imaxpct=PCT + = sunit=XXX swidth=XXX, unwritten=X +naming =VERN bsize=XXX +log =LDEV bsize=XXX blocks=XXX +realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX +Phase 1 - find and verify superblock... +Phase 2 - using log + - zero log... + - scan filesystem freespace and inode maps... + - found root inode chunk +Phase 3 - for each AG... + - scan and clear agi unlinked lists... + - process known inodes and perform inode discovery... + - process newly discovered inodes... +Phase 4 - check for duplicate blocks... + - setting up duplicate extent list... + - check for inodes claiming duplicate blocks... +Phase 5 - rebuild AG headers and trees... + - reset superblock... +Phase 6 - check inode connectivity... + - resetting contents of realtime bitmap and summary inodes + - traversing filesystem ... + - traversal finished ... + - moving disconnected inodes to lost+found ... +Phase 7 - verify and correct link counts... +done diff --git a/tests/xfs/group b/tests/xfs/group index ba34650a..e9c48083 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -3,6 +3,7 @@ 003 db auto quick 004 db auto quick 005 auto quick +006 auto dir 008 rw ioctl auto quick 009 rw ioctl auto prealloc quick 012 rw auto quick