Here's stabilized version of my patchset which intended to bring huge pages to ext4. The basics are the same as with tmpfs[1] which is in Linus' tree now and ext4 built on top of it. The main difference is that we need to handle read out from and write-back to backing storage. Head page links buffers for whole huge page. Dirty/writeback tracking happens on per-hugepage level. We read out whole huge page at once. It required bumping BIO_MAX_PAGES to not less than HPAGE_PMD_NR. I defined BIO_MAX_PAGES to HPAGE_PMD_NR if huge pagecache enabled. On split_huge_page() we need to free buffers before splitting the page. Page buffers takes additional pin on the page and can be a vector to mess with the page during split. We want to avoid this. If try_to_free_buffers() fails, split_huge_page() would return -EBUSY. Readahead doesn't play with huge pages well: 128k max readahead window, assumption on page size, PageReadahead() to track hit/miss. I've got it to allocate huge pages, but it doesn't provide any readahead as such. I don't know how to do this right. It's not clear at this point if we really need readahead with huge pages. I guess it's good enough for now. Shadow entries ignored on allocation -- recently evicted page is not promoted to active list. Not sure if current workingset logic is adequate for huge pages. On eviction, we split the huge page and setup 4k shadow entries as usual. Unlike tmpfs, ext4 makes use of tags in radix-tree. The approach I used for tmpfs -- 512 entries in radix-tree per-hugepages -- doesn't work well if we want to have coherent view on tags. So the first 8 patches of the patchset converts tmpfs to use multi-order entries in radix-tree. The same infrastructure used for ext4. Encryption doesn't handle huge pages yet. To avoid regressions we just disable huge pages for the inode if it has EXT4_INODE_ENCRYPT. With this version I don't see any xfstests regressions with huge pages enabled. Patch with new configurations for xfstests-bld is below. Tested with 4k, 1k, encryption and bigalloc. All with and without huge=always. I think it's reasonable coverage. The patchset is also in git: git://git.kernel.org/pub/scm/linux/kernel/git/kas/linux.git hugeext4/v2 Please review and consider applying. [1] http://lkml.kernel.org/r/1465222029-45942-1-git-send-email-kirill.shutemov@xxxxxxxxxxxxxxx TODO: - readahead ?; - wire up madvise()/fadvise(); - encryption with huge pages; - reclaim of file huge pages can be optimized -- split_huge_page() is not required for pages with backing storage; Kirill A. Shutemov (34): mm, shmem: swich huge tmpfs to multi-order radix-tree entries Revert "radix-tree: implement radix_tree_maybe_preload_order()" page-flags: relax page flag policy for few flags mm, rmap: account file thp pages thp: try to free page's buffers before attempt split thp: handle write-protection faults for file THP truncate: make sure invalidate_mapping_pages() can discard huge pages filemap: allocate huge page in page_cache_read(), if allowed filemap: handle huge pages in do_generic_file_read() filemap: allocate huge page in pagecache_get_page(), if allowed filemap: handle huge pages in filemap_fdatawait_range() HACK: readahead: alloc huge pages, if allowed block: define BIO_MAX_PAGES to HPAGE_PMD_NR if huge page cache enabled mm: make write_cache_pages() work on huge pages thp: introduce hpage_size() and hpage_mask() thp: do not threat slab pages as huge in hpage_{nr_pages,size,mask} fs: make block_read_full_page() be able to read huge page fs: make block_write_{begin,end}() be able to handle huge pages fs: make block_page_mkwrite() aware about huge pages truncate: make truncate_inode_pages_range() aware about huge pages truncate: make invalidate_inode_pages2_range() aware about huge pages ext4: make ext4_mpage_readpages() hugepage-aware ext4: make ext4_writepage() work on huge pages ext4: handle huge pages in ext4_page_mkwrite() ext4: handle huge pages in __ext4_block_zero_page_range() ext4: make ext4_block_write_begin() aware about huge pages ext4: handle huge pages in ext4_da_write_end() ext4: make ext4_da_page_release_reservation() aware about huge pages ext4: handle writeback with huge pages ext4: make EXT4_IOC_MOVE_EXT work with huge pages ext4: fix SEEK_DATA/SEEK_HOLE for huge pages ext4: make fallocate() operations work with huge pages mm, fs, ext4: expand use of page_mapping() and page_to_pgoff() ext4, vfs: add huge= mount option Matthew Wilcox (6): tools: Add WARN_ON_ONCE radix tree test suite: Allow GFP_ATOMIC allocations to fail radix-tree: Add radix_tree_join radix-tree: Add radix_tree_split radix-tree: Add radix_tree_split_preload() radix-tree: Handle multiorder entries being deleted by replace_clear_tags Naoya Horiguchi (1): mm, hugetlb: switch hugetlbfs to multi-order radix-tree entries drivers/base/node.c | 6 + fs/buffer.c | 89 +++--- fs/ext4/ext4.h | 5 + fs/ext4/extents.c | 10 +- fs/ext4/file.c | 18 +- fs/ext4/inode.c | 159 ++++++---- fs/ext4/move_extent.c | 12 +- fs/ext4/page-io.c | 11 +- fs/ext4/readpage.c | 38 ++- fs/ext4/super.c | 26 ++ fs/hugetlbfs/inode.c | 22 +- fs/proc/meminfo.c | 4 + fs/proc/task_mmu.c | 5 +- include/linux/bio.h | 4 + include/linux/buffer_head.h | 10 +- include/linux/fs.h | 5 + include/linux/huge_mm.h | 18 +- include/linux/mm.h | 1 + include/linux/mmzone.h | 2 + include/linux/page-flags.h | 12 +- include/linux/pagemap.h | 32 +- include/linux/radix-tree.h | 10 +- lib/radix-tree.c | 357 ++++++++++++++++------- mm/filemap.c | 529 ++++++++++++++++++++++++---------- mm/huge_memory.c | 69 ++++- mm/hugetlb.c | 19 +- mm/khugepaged.c | 26 +- mm/memory.c | 15 +- mm/page-writeback.c | 19 +- mm/page_alloc.c | 5 + mm/readahead.c | 17 +- mm/rmap.c | 12 +- mm/shmem.c | 36 +-- mm/truncate.c | 138 +++++++-- mm/vmstat.c | 2 + tools/include/asm/bug.h | 11 + tools/testing/radix-tree/Makefile | 2 +- tools/testing/radix-tree/linux.c | 7 +- tools/testing/radix-tree/linux/bug.h | 2 +- tools/testing/radix-tree/linux/gfp.h | 24 +- tools/testing/radix-tree/linux/slab.h | 5 - tools/testing/radix-tree/multiorder.c | 82 ++++++ tools/testing/radix-tree/test.h | 9 + 43 files changed, 1373 insertions(+), 512 deletions(-) ------8<------ >From f765119236c9963466cd39a1502653d8c1dde836 Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx> Date: Fri, 12 Aug 2016 19:44:30 +0300 Subject: [PATCH] Add few more configurations to test ext4 with huge pages Four new configurations: huge_4k, huge_1k, huge_bigalloc, huge_encrypt. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx> --- kvm-xfstests/config | 8 +++++--- kvm-xfstests/kvm-xfstests | 2 +- .../test-appliance/files/root/fs/ext4/cfg/all.list | 4 ++++ .../test-appliance/files/root/fs/ext4/cfg/huge_1k | 6 ++++++ .../test-appliance/files/root/fs/ext4/cfg/huge_4k | 6 ++++++ .../test-appliance/files/root/fs/ext4/cfg/huge_bigalloc | 14 ++++++++++++++ .../files/root/fs/ext4/cfg/huge_bigalloc.exclude | 7 +++++++ .../test-appliance/files/root/fs/ext4/cfg/huge_encrypt | 5 +++++ .../files/root/fs/ext4/cfg/huge_encrypt.exclude | 16 ++++++++++++++++ kvm-xfstests/test-appliance/gen-image | 4 ++-- kvm-xfstests/util/parse_cli | 1 + 11 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_1k create mode 100644 kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_4k create mode 100644 kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_bigalloc create mode 100644 kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_bigalloc.exclude create mode 100644 kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_encrypt create mode 100644 kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_encrypt.exclude diff --git a/kvm-xfstests/config b/kvm-xfstests/config index e135f08872cb..11d513b71fbc 100644 --- a/kvm-xfstests/config +++ b/kvm-xfstests/config @@ -2,10 +2,12 @@ # Customize these or put new values in ~/.config/kvm-xfstests or config.custom # #QEMU=/usr/local/bin/qemu-system-x86_64 -QEMU=/usr/bin/kvm -KERNEL=/u1/ext4/arch/x86/boot/bzImage +#QEMU=/usr/bin/kvm +QEMU=/home/kas/opt/qemu/bin/qemu-system-x86_64 +KERNEL=/home/kas/var/linus/arch/x86/boot/bzImage NR_CPU=2 -MEM=2048 +MEM=16384 +#MEM=2048 CONFIG_DIR=$HOME/.config PRIMARY_FSTYPE="ext4" diff --git a/kvm-xfstests/kvm-xfstests b/kvm-xfstests/kvm-xfstests index c7ac2b40cfb6..25e2c04c67d1 100755 --- a/kvm-xfstests/kvm-xfstests +++ b/kvm-xfstests/kvm-xfstests @@ -79,7 +79,7 @@ fi chmod 400 "$VDH" $NO_ACTION $IONICE $QEMU -boot order=c $NET \ - -machine type=pc,accel=kvm:tcg \ + -machine type=q35,accel=kvm:tcg \ -drive file=$ROOT_FS,if=virtio$SNAPSHOT \ -drive file=$VDB,cache=none,if=virtio,format=raw \ -drive file=$VDC,cache=none,if=virtio,format=raw \ diff --git a/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/all.list b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/all.list index 7ec37f4bafaa..14a8e72d2e6e 100644 --- a/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/all.list +++ b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/all.list @@ -9,3 +9,7 @@ dioread_nolock data_journal bigalloc bigalloc_1k +huge_4k +huge_1k +huge_bigalloc +huge_encrypt diff --git a/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_1k b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_1k new file mode 100644 index 000000000000..209c76a8a6c1 --- /dev/null +++ b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_1k @@ -0,0 +1,6 @@ +export FS=ext4 +export TEST_DEV=$SM_TST_DEV +export TEST_DIR=$SM_TST_MNT +export MKFS_OPTIONS="-q -b 1024" +export EXT_MOUNT_OPTIONS="huge=always" +TESTNAME="Ext4 1k block with huge pages" diff --git a/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_4k b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_4k new file mode 100644 index 000000000000..bae901cb2bab --- /dev/null +++ b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_4k @@ -0,0 +1,6 @@ +export FS=ext4 +export TEST_DEV=$PRI_TST_DEV +export TEST_DIR=$PRI_TST_MNT +export MKFS_OPTIONS="-q" +export EXT_MOUNT_OPTIONS="huge=always" +TESTNAME="Ext4 4k block with huge pages" diff --git a/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_bigalloc b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_bigalloc new file mode 100644 index 000000000000..b3d87562bce6 --- /dev/null +++ b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_bigalloc @@ -0,0 +1,14 @@ +SIZE=large +export MKFS_OPTIONS="-O bigalloc" +export EXT_MOUNT_OPTIONS="huge=always" + +# Until we can teach xfstests the difference between cluster size and +# block size, avoid collapse_range, insert_range, and zero_range since +# these will fail due the fact that these operations require +# cluster-aligned ranges. +export FSX_AVOID="-C -I -z" +export FSSTRESS_AVOID="-f collapse=0 -f insert=0 -f zero=0" +export XFS_IO_AVOID="fcollapse finsert zero" + +TESTNAME="Ext4 4k block w/bigalloc" + diff --git a/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_bigalloc.exclude b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_bigalloc.exclude new file mode 100644 index 000000000000..bd779be99518 --- /dev/null +++ b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_bigalloc.exclude @@ -0,0 +1,7 @@ +# bigalloc does not support on-line defrag +ext4/301 +ext4/302 +ext4/303 +ext4/304 +ext4/307 +ext4/308 diff --git a/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_encrypt b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_encrypt new file mode 100644 index 000000000000..29f058ba937d --- /dev/null +++ b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_encrypt @@ -0,0 +1,5 @@ +SIZE=small +export MKFS_OPTIONS="" +export EXT_MOUNT_OPTIONS="test_dummy_encryption,huge=always" +REQUIRE_FEATURE=encryption +TESTNAME="Ext4 encryption" diff --git a/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_encrypt.exclude b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_encrypt.exclude new file mode 100644 index 000000000000..b91cc58b5aa3 --- /dev/null +++ b/kvm-xfstests/test-appliance/files/root/fs/ext4/cfg/huge_encrypt.exclude @@ -0,0 +1,16 @@ +ext4/004 # dump/restore doesn't handle quotas + +# encryption doesn't play well with quota +generic/082 +generic/219 +generic/230 +generic/231 +generic/232 +generic/233 +generic/235 +generic/270 + +# generic/204 tests ENOSPC handling; it doesn't correctly +# anticipate the external extended attribute required when +# using a 1k block size +generic/204 diff --git a/kvm-xfstests/test-appliance/gen-image b/kvm-xfstests/test-appliance/gen-image index 717166047cbf..62871af12e12 100755 --- a/kvm-xfstests/test-appliance/gen-image +++ b/kvm-xfstests/test-appliance/gen-image @@ -4,8 +4,8 @@ SAVE_ARGS=("$@") -SUITE=jessie -MIRROR=http://mirrors.kernel.org/debian +SUITE=testing +MIRROR="http://linux-ftp.fi.intel.com/pub/mirrors/debian"; DIR=$(pwd) ROOTDIR=$DIR/rootdir #ARCH="--arch=i386" diff --git a/kvm-xfstests/util/parse_cli b/kvm-xfstests/util/parse_cli index 83400ea71985..ba64ce5df016 100644 --- a/kvm-xfstests/util/parse_cli +++ b/kvm-xfstests/util/parse_cli @@ -36,6 +36,7 @@ print_help () echo "Common file system configurations are:" echo " 4k 1k ext3 nojournal ext3conv metacsum dioread_nolock " echo " data_journal bigalloc bigalloc_1k inline" + echo " huge_4k huge_1k huge_bigalloc huge_encrypt" echo "" echo "xfstest names have the form: ext4/NNN generic/NNN shared/NNN" echo "" -- 2.8.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>