1. 29 Oct, 2010 14 commits
    • Chris Mason's avatar
      Btrfs: fix raid code for removing missing drives · 18e503d6
      Chris Mason authored
      
      
      When btrfs is mounted in degraded mode, it has some internal structures
      to track the missing devices.  This missing device is setup as readonly,
      but the mapping code can get upset when we try to write to it.
      
      This changes the mapping code to return -EIO instead of oops when we try
      to write to the readonly device.
      Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
      18e503d6
    • Miao Xie's avatar
      Btrfs: Switch the extent buffer rbtree into a radix tree · 19fe0a8b
      Miao Xie authored
      This patch reduces the CPU time spent in the extent buffer search by using the
      radix tree instead of the rbtree and using the rcu lock instead of the spin
      lock.
      
      I did a quick test by the benchmark tool[1] and found the patch improve the
      file creation/deletion performance problem that I have reported[2].
      
      Before applying this patch:
      Create files:
      	Total files: 50000
      	Total time: 0.971531
      	Average time: 0.000019
      Delete files:
      	Total files: 50000
      	Total time: 1.366761
      	Average time: 0.000027
      
      After applying this patch:
      Create files:
      	Total files: 50000
      	Total time: 0.927455
      	Average time: 0.000019
      Delete files:
      	Total files: 50000
      	Total time: 1.292280
      	Average time: 0.000026
      
      [1] http://marc.info/?l=linux-btrfs&m=128212635122920&q=p3
      [2] http://marc.info/?l=linux-btrfs&m=128212635122920&w=2
      
      Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
      Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
      19fe0a8b
    • Miao Xie's avatar
      Btrfs: restructure try_release_extent_buffer() · 897ca6e9
      Miao Xie authored
      
      
      restructure try_release_extent_buffer() and write a function to release the
      extent buffer. It will be used later.
      Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
      Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
      897ca6e9
    • Chris Mason's avatar
      Btrfs: use the flusher threads for delalloc throttling · bf9022e0
      Chris Mason authored
      
      
      We have a fairly complex set of loops around walking our list of
      delalloc inodes when we find metadata delalloc space running low.
      It doesn't work very well, can use large amounts of CPU and doesn't
      do very efficient writeback.
      
      This switches us to kick the bdi flusher threads instead.  All dirty
      data in btrfs is accounted as delalloc data, so this is very similar
      in terms of what it writes, but we're able to just kick off the IO
      and wait for progress.
      Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
      bf9022e0
    • Chris Mason's avatar
      Btrfs: tune the chunk allocation to 5% of the FS as metadata · e5bc2458
      Chris Mason authored
      
      
      An earlier commit tried to keep us from allocating too many
      empty metadata chunks.  It was somewhat too restrictive and could
      lead to ENOSPC errors on empty filesystems.
      
      This increases the limits to about 5% of the FS size, allowing more
      metadata chunks to be preallocated.
      Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
      e5bc2458
    • Chris Mason's avatar
      Add new functions for triggering inode writeback · 3259f8be
      Chris Mason authored
      
      
      When btrfs is running low on metadata space, it needs to force delayed
      allocation pages to disk.  It currently does this with a suboptimal walk
      of a private list of inodes with delayed allocation, and it would be
      much better if we used the generic flusher threads.
      
      writeback_inodes_sb_if_idle would be ideal, but it waits for the flusher
      thread to start IO on all the dirty pages in the FS before it returns.
      This adds variants of writeback_inodes_sb* that allow the caller to
      control how many pages get sent down.
      Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
      3259f8be
    • Chris Mason's avatar
      Btrfs: don't loop forever on bad btree blocks · cb44921a
      Chris Mason authored
      
      
      When btrfs discovers the generation number in a btree block is
      incorrect, it can loop forever without forcing the RAID
      code to try a valid mirror, and without returning EIO.
      
      This changes things to properly kick out the EIO.
      Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
      cb44921a
    • Chris Mason's avatar
      Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work · 6b5b817f
      Chris Mason authored
      
      
      Conflicts:
      	fs/btrfs/extent-tree.c
      Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
      6b5b817f
    • Josef Bacik's avatar
      Btrfs: let the user know space caching is enabled · 8216ef86
      Josef Bacik authored
      
      
      If you mount -o space_cache, the option will be persistent across mounts, but to
      make sure the user knows that they did this, emit a message telling them if they
      didn't mount with -o space_cache but the feature is still used.
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      8216ef86
    • Josef Bacik's avatar
      Btrfs: Add a clear_cache mount option · 88c2ba3b
      Josef Bacik authored
      
      
      If something goes wrong with the free space cache we need a way to make sure
      it's not loaded on mount and that it's cleared for everybody.  When you pass the
      clear_cache option it will make it so all block groups are setup to be cleared,
      which keeps them from being loaded and then they will be truncated when the
      transaction is committed.  Thanks,
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      88c2ba3b
    • Josef Bacik's avatar
      Btrfs: add support for mixed data+metadata block groups · 67377734
      Josef Bacik authored
      
      
      There are just a few things that need to be fixed in the kernel to support mixed
      data+metadata block groups.  Mostly we just need to make sure that if we are
      using mixed block groups that we continue to allocate mixed block groups as we
      need them.  Also we need to make sure __find_space_info will find our space info
      if we search for DATA or METADATA only.  Tested this with xfstests and it works
      nicely.  Thanks,
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      67377734
    • Josef Bacik's avatar
      Btrfs: check cache->caching_ctl before returning if caching has started · dde5abee
      Josef Bacik authored
      
      
      With the free space disk caching we can mark the block group as started with the
      caching, but we don't have a caching ctl.  This can race with anybody else who
      tries to get the caching ctl before we cache (this is very hard to do btw).  So
      instead check to see if cache->caching_ctl is set, and if not return NULL.
      Thanks,
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      dde5abee
    • Josef Bacik's avatar
      Btrfs: load free space cache if it exists · 9d66e233
      Josef Bacik authored
      
      
      This patch actually loads the free space cache if it exists.  The only thing
      that really changes here is that we need to cache the block group if we're going
      to remove an extent from it.  Previously we did not do this since the caching
      kthread would pick it up.  With the on disk cache we don't have this luxury so
      we need to make sure we read the on disk cache in first, and then remove the
      extent, that way when the extent is unpinned the free space is added to the
      block group.  This has been tested with all sorts of things.
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      9d66e233
    • Josef Bacik's avatar
      Btrfs: write out free space cache · 0cb59c99
      Josef Bacik authored
      
      
      This is a simple bit, just dump the free space cache out to our preallocated
      inode when we're writing out dirty block groups.  There are a bunch of changes
      in inode.c in order to account for special cases.  Mostly when we're doing the
      writeout we're holding trans_mutex, so we need to use the nolock transacation
      functions.  Also we can't do asynchronous completions since the async thread
      could be blocked on already completed IO waiting for the transaction lock.  This
      has been tested with xfstests and btrfs filesystem balance, as well as my ENOSPC
      tests.  Thanks,
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      0cb59c99
  2. 28 Oct, 2010 1 commit
    • Josef Bacik's avatar
      Btrfs: create special free space cache inode · 0af3d00b
      Josef Bacik authored
      
      
      In order to save free space cache, we need an inode to hold the data, and we
      need a special item to point at the right inode for the right block group.  So
      first, create a special item that will point to the right inode, and the number
      of extent entries we will have and the number of bitmaps we will have.  We
      truncate and pre-allocate space everytime to make sure it's uptodate.
      
      This feature will be turned on as soon as you mount with -o space_cache, however
      it is safe to boot into old kernels, they will just generate the cache the old
      fashion way.  When you boot back into a newer kernel we will notice that we
      modified and not the cache and automatically discard the cache.
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      0af3d00b
  3. 26 Oct, 2010 2 commits
    • Josef Bacik's avatar
      Btrfs: remove warn_on from use_block_rsv · e9bb7f10
      Josef Bacik authored
      
      
      Because btrfs_dirty_inode does a btrfs_join_transaction, it doesn't actually
      reserve space.  It does this so we can try and dirty the inode quickly without
      having to deal with the ENOSPC problems.  But if it does get back ENOSPC it
      handles it properly.  The problem is use_block_rsv does a WARN_ON whenever this
      case happens, even tho btrfs_dirty_inode takes it into account and actually
      expects to get -ENOSPC if things are particularly tight.  So instead just remove
      the warning.  Thanks,
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      e9bb7f10
    • Josef Bacik's avatar
      Btrfs: set trans to null in reserve_metadata_bytes if we commit the transaction · 38227933
      Josef Bacik authored
      
      
      btrfs_commit_transaction will free our trans, but because we pass trans to
      shrink_delalloc we could possibly have a use after free situation.  So instead
      if we commit the transaction, set trans to null and set committed to true so we
      don't keep trying to commit a transaction.  This fixes a panic I could reproduce
      at will.  Thanks,
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      38227933
  4. 22 Oct, 2010 8 commits
    • Josef Bacik's avatar
      Btrfs: fix error handling in btrfs_get_sb · 0e78340f
      Josef Bacik authored
      
      
      If we failed to find the root subvol id, or the subvol=<name>, we would
      deactivate the locked super and close the devices.  The problem is at this point
      we have gotten the SB all setup, which includes setting super_operations, so
      when we'd deactiveate the super, we'd do a close_ctree() which closes the
      devices, so we'd end up closing the devices twice.  So if you do something like
      this
      
      mount /dev/sda1 /mnt/test1
      mount /dev/sda1 /mnt/test2 -o subvol=xxx
      umount /mnt/test1
      
      it would blow up (if subvol xxx doesn't exist).  This patch fixes that problem.
      Thanks,
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      0e78340f
    • Josef Bacik's avatar
      Btrfs: rework how we reserve metadata bytes · 8bb8ab2e
      Josef Bacik authored
      
      
      With multi-threaded writes we were getting ENOSPC early because somebody would
      come in, start flushing delalloc because they couldn't make their reservation,
      and in the meantime other threads would come in and use the space that was
      getting freed up, so when the original thread went to check to see if they had
      space they didn't and they'd return ENOSPC.  So instead if we have some free
      space but not enough for our reservation, take the reservation and then start
      doing the flushing.  The only time we don't take reservations is when we've
      already overcommitted our space, that way we don't have people who come late to
      the party way overcommitting ourselves.  This also moves all of the retrying and
      flushing code into reserve_metdata_bytes so it's all uniform.  This keeps my
      fs_mark test from returning -ENOSPC as soon as it starts and actually lets me
      fill up the disk.  Thanks,
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      8bb8ab2e
    • Josef Bacik's avatar
      Btrfs: don't allocate chunks as aggressively · 14ed0ca6
      Josef Bacik authored
      
      
      Because the ENOSPC code over reserves super aggressively we end up allocating
      chunks way more often than we should.  For example with my fs_mark tests on a
      2gb fs I can end up reserved 1gb just for metadata, when only 34mb of that is
      being used.  So instead check to see if the amount of space actually used is
      less than 30% of the total space, and if so don't allocate a chunk, but only if
      we have at least 256mb of free space to make sure we don't put too much pressure
      on free space.
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      14ed0ca6
    • Josef Bacik's avatar
      Btrfs: re-work delalloc flushing · 0019f10d
      Josef Bacik authored
      
      
      Currently we try and flush delalloc, but we only do that in a sort of weak way,
      which works fine in most cases but if we're under heavy pressure we need to be
      able to wait for flushing to happen.  Also instead of checking the bytes
      reserved in the block_rsv, check the space info since it is more accurate.  The
      sync option will be used in a future patch.
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      0019f10d
    • Josef Bacik's avatar
      Btrfs: fix reservation code for mixed block groups · 6d48755d
      Josef Bacik authored
      
      
      The global reservation stuff tries to add together DATA and METADATA used in
      order to figure out how much to reserve for everything, but this doesn't work
      right for mixed block groups.  Instead if we have mixed block groups just set
      data used to 0.  Also with mixed block groups we will use bytes_may_use for
      keeping track of delalloc bytes, so we need to take that into account in our
      reservation calculations.
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      6d48755d
    • Josef Bacik's avatar
      Btrfs: fix df regression · 89a55897
      Josef Bacik authored
      
      
      The new ENOSPC stuff breaks out the raid types which breaks the way we were
      reporting df to the system.  This fixes it back so that Available is the total
      space available to data and used is the actual bytes used by the filesystem.
      This means that Available is Total - data used - all of the metadata space.
      Thanks,
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      89a55897
    • Josef Bacik's avatar
      Btrfs: fix the df ioctl to report raid types · bf5fc093
      Josef Bacik authored
      
      
      The new ENOSPC stuff broke the df ioctl since we no longer create seperate space
      info's for each RAID type.  So instead, loop through each space info's raid
      lists so we can get the right RAID information which will allow the df ioctl to
      tell us RAID types again.  Thanks,
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      bf5fc093
    • Josef Bacik's avatar
      Btrfs: stop trying to shrink delalloc if there are no inodes to reclaim · a1f76506
      Josef Bacik authored
      
      
      In very severe ENOSPC cases we can run out of inodes to do delalloc on, which
      means we'll just keep looping trying to shrink delalloc.  Instead, if we fail to
      shrink delalloc 3 times in a row break out since we're not likely to make any
      progress.  Tested this with a 100mb fs an xfstests test 13.  Before the patch it
      would hang the box, with the patch we get -ENOSPC like we should.  Thanks,
      Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
      a1f76506
  5. 20 Oct, 2010 5 commits
  6. 19 Oct, 2010 7 commits
  7. 18 Oct, 2010 3 commits