Skip to contentSkip to conversation

Btrfs updates for 2.6.31-rc

GIT PULL Chris Mason 3 participants 4 messages Jun 11, 2009 – Jun 13, 2009 Btrfs file system

lore
Share & tools
lore
#0 lore raw

Hello everyone,

This is a large pull request for btrfs, and it includes a forward
rolling format change. This means that once this code mounts a btrfs
filesystem, the older kernels won't be able to read it. Btrfs progs v0.19 is required to read the new format.

Existing filesystems will be upgraded to the new format on the first mount. All of your old data will still be there and still work properly, but I strongly recommend a full backup before going to the new code.

Since I don't want to lock testers into 2.6.31-rc, a stable branch of btrfs changes for 2.6.30 that includes this new format will be maintained under the newformat2 branch name on the btrfs git repo.

The format changes significantly lower the overhead of tracking data and metadata extents, and make a big difference in almost every benchmark. One example is a random O_DIRECT write workload went from 6,000 ops/sec on 2.6.30 to 23,000 ops/sec, with most of the gain being less IO tracking the extents during COW.

Yan Zheng did all the heavy lifting on making these format changes work, including the backward compatibility.

The pull request includes an assortment of other fixes, and a number of buffered IO optimizations.

Linus, the master branch of the btrfs-unstable repo:

git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git

Has these changes:

Chris Mason (14) commits (+136/-36):
Btrfs: avoid IO stalls behind congested devices in a multi-device FS (+4/-1)
Btrfs: avoid races between super writeout and device list updates (+45/-2)
Btrfs: fix oops when btrfs_inherit_iflags called with a NULL dir (+6/-1)
Btrfs: don't allow WRITE_SYNC bios to starve out regular writes (+15/-7)
Btrfs: stop avoiding balancing at the end of the transaction. (+4/-7)
Btrfs: add mount -o ssd_spread to spread allocations out (+22/-6)
Btrfs: avoid allocation clusters that are too spread out (+2/-1)
Btrfs: fix extent_buffer leak during tree log replay (+1/-0)
Btrfs: fix metadata dirty throttling limits (+2/-5)
Btrfs: fix -o nodatasum printk spelling (+1/-1)
Btrfs: reduce mount -o ssd CPU usage (+1/-1)
Btrfs: balance btree more often (+2/-2)
Btrfs: autodetect SSD devices (+24/-0)
Btrfs: Add mount -o nossd (+7/-2)

Yan Zheng (3) commits (+6946/-2058):
Btrfs: Mixed back reference (FORWARD ROLLING FORMAT CHANGE) (+6928/-2043)
Btrfs: check duplicate backrefs for both data and metadata (+4/-11)
btrfs: Fix set/clear_extent_bit for 'end == (u64)-1' (+14/-4)

Hisashi Hifumi (2) commits (+31/-14):
Btrfs: fdatasync should skip metadata writeout (+2/-0)
Btrfs: pin buffers during write_dev_supers (+29/-14)

David Woodhouse (1) commits (+7/-37):
Btrfs: remove crc32c.h and use libcrc32c directly.

Shin Hong (1) commits (+1/-1):
Btrfs: init worker struct fields before kthread-run

Christoph Hellwig (1) commits (+200/-21):
Btrfs: implement FS_IOC_GETFLAGS/SETFLAGS/GETVERSION

Al Viro (1) commits (+4/-5):
Fix btrfs when ACLs are configured out

Total: (23) commits

 fs/btrfs/Makefile           |    4 
 fs/btrfs/acl.c              |    5 
 fs/btrfs/async-thread.c     |    2 
 fs/btrfs/btrfs_inode.h      |    4 
 fs/btrfs/compression.c      |    6 
 fs/btrfs/crc32c.h           |   29 
 fs/btrfs/ctree.c            |  700 +++-----
 fs/btrfs/ctree.h            |  330 ++-
 fs/btrfs/delayed-ref.c      |  509 ++++--
 fs/btrfs/delayed-ref.h      |   85 -
 fs/btrfs/disk-io.c          |  164 +
 fs/btrfs/export.c           |    4 
 fs/btrfs/extent-tree.c      | 2638 +++++++++++++++++++++----------
 fs/btrfs/extent_io.c        |   18 
 fs/btrfs/file.c             |   78 
 fs/btrfs/free-space-cache.c |   10 
 fs/btrfs/free-space-cache.h |    1 
 fs/btrfs/hash.h             |    4 
 fs/btrfs/inode.c            |  159 +
 fs/btrfs/ioctl.c            |  199 ++
 fs/btrfs/print-tree.c       |  155 +
 fs/btrfs/relocation.c       | 3711 ++++++++++++++++++++++++++++++++++++++++++++
 fs/btrfs/root-tree.c        |   17 
 fs/btrfs/super.c            |   59 
 fs/btrfs/transaction.c      |  410 +---
 fs/btrfs/transaction.h      |   12 
 fs/btrfs/tree-log.c         |  103 -
 fs/btrfs/volumes.c          |   69 
 fs/btrfs/volumes.h          |   12 
 29 files changed, 7325 insertions(+), 2172 deletions(-)
#1 lore raw
Quoted 5 lines · Chris Mason

Existing filesystems will be upgraded to the new format on the first mount. All of your old data will still be there and still work properly, but I strongly recommend a full backup before going to the new code.

Auugh.

This is horrible. I just screwed up my system by booting a kernel on this:
it worked beatifully, but due to other reasons I then wanted to bisect a totally unrelated issue. While having _totally_ forgotten about this issue, even if I was technically aware of it.

.. so I installed a new kernel, and now it won't boot due to "couldn't mount because of unsupported optional features (1)". In fact, I have no kernel available on that system that will boot, since my normal "safe" fall-back kernels are all distro kernels that can't boot this either.

Ok, so I'll end up booting from a USB stick, and it will all work out in the end, but this does essentially make it entirely impossible to do any bisection on any btrfs system.

Double-plus-ungood.

Linus

#2 lore raw
Quoted 14 lines · Linus Torvalds
Quoted 5 lines · Chris Mason

Existing filesystems will be upgraded to the new format on the first mount. All of your old data will still be there and still work properly, but I strongly recommend a full backup before going to the new code.

Auugh.

This is horrible. I just screwed up my system by booting a kernel on this:
it worked beatifully, but due to other reasons I then wanted to bisect a totally unrelated issue. While having _totally_ forgotten about this issue, even if I was technically aware of it.

Quoted 4 lines

.. so I installed a new kernel, and now it won't boot due to "couldn't mount because of unsupported optional features (1)". In fact, I have no kernel available on that system that will boot, since my normal "safe" fall-back kernels are all distro kernels that can't boot this either.

We learned this lesson the hard way with ext3, a long time ago, although occasionally we've had to relearn it along the way. The normal failure mode is that some user is still using some ancient distribution, (say, Red Hat 8), and for some reason they boot using a Fedora Rescue CD, and are really annoyed when the filesystem is no longer mountable using the 2.4 kernel that comes with their ancient distribution.

So my policy at least with ext4 is to *never* add any new patches were the kernel automatically adds some new feature to the compatibility bitmasks. The user should have to explicitly and manually use a userspace program (i.e., tune2fs) to add some new feature. At least initially we had some cases where ext4 would automatically add some new feature flag thanks to a mount option, but I believe we've gotten rid of all of those cases.

I'd suggest that btrfs follow the same strategy; yeah, it means you have to keep more backwards compatibility code for longer, but as btrfs matures, it'll definitely be a Good Thing.

- Ted

#3 lore raw
In reply to Linus Torvalds
Quoted 16 lines · Linus Torvalds
Quoted 5 lines · Chris Mason

Existing filesystems will be upgraded to the new format on the first mount. All of your old data will still be there and still work properly, but I strongly recommend a full backup before going to the new code.

Auugh.

This is horrible. I just screwed up my system by booting a kernel on this:
it worked beatifully, but due to other reasons I then wanted to bisect a totally unrelated issue. While having _totally_ forgotten about this issue, even if I was technically aware of it.

Quoted 8 lines

.. so I installed a new kernel, and now it won't boot due to "couldn't mount because of unsupported optional features (1)". In fact, I have no kernel available on that system that will boot, since my normal "safe" fall-back kernels are all distro kernels that can't boot this either.

Ok, so I'll end up booting from a USB stick, and it will all work out in the end, but this does essentially make it entirely impossible to do any bisection on any btrfs system.

First off, I'm sorry. I definitely knew this was going to happen to some of the btrfs users. I wanted to get it in as close as possible to 2.6.30 so that it would be close to the good end of the git bisecting.

My choices were:

1) No backward compatibility at all
2) Forward rolling (what we did)
3) Maintain the code to write the old and new formats the way Ted suggests.

A number of people argued for #1. The problem with #3 is that it explodes our testing matrix even more, and this is already the most complex part of the FS. For the stage Btrfs is at, I think #2 was the best option.

Our future format features will be what Ted is describing, explicitly enabled and much more fined grained.

I'll try to find some livecd images for usb sticks that support Btrfs, and make links on the btrfs homepage.

-chris