1. 21 Jan, 2024 28 commits
    • Kent Overstreet's avatar
      bcachefs: Prep work for variable size btree node buffers · ec4edd7b
      Kent Overstreet authored
      bcachefs btree nodes are big - typically 256k - and btree roots are
      pinned in memory. As we're now up to 18 btrees, we now have significant
      memory overhead in mostly empty btree roots.
      
      And in the future we're going to start enforcing that certain btree node
      boundaries exist, to solve lock contention issues - analagous to XFS's
      AGIs.
      
      Thus, we need to start allocating smaller btree node buffers when we
      can. This patch changes code that refers to the filesystem constant
      c->opts.btree_node_size to refer to the btree node buffer size -
      btree_buf_bytes() - where appropriate.
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      ec4edd7b
    • Su Yue's avatar
      bcachefs: grab s_umount only if snapshotting · 2acc59dd
      Su Yue authored
      When I was testing mongodb over bcachefs with compression,
      there is a lockdep warning when snapshotting mongodb data volume.
      
      $ cat test.sh
      prog=bcachefs
      
      $prog subvolume create /mnt/data
      $prog subvolume create /mnt/data/snapshots
      
      while true;do
          $prog subvolume snapshot /mnt/data /mnt/data/snapshots/$(date +%s)
          sleep 1s
      done
      
      $ cat /etc/mongodb.conf
      systemLog:
        destination: file
        logAppend: true
        path: /mnt/data/mongod.log
      
      storage:
        dbPath: /mnt/data/
      
      lockdep reports:
      [ 3437.452330] ======================================================
      [ 3437.452750] WARNING: possible circular locking dependency detected
      [ 3437.453168] 6.7.0-rc7-custom+ #85 Tainted: G            E
      [ 3437.453562] ------------------------------------------------------
      [ 3437.453981] bcachefs/35533 is trying to acquire lock:
      [ 3437.454325] ffffa0a02b2b1418 (sb_writers#10){.+.+}-{0:0}, at: filename_create+0x62/0x190
      [ 3437.454875]
                     but task is already holding lock:
      [ 3437.455268] ffffa0a02b2b10e0 (&type->s_umount_key#48){.+.+}-{3:3}, at: bch2_fs_file_ioctl+0x232/0xc90 [bcachefs]
      [ 3437.456009]
                     which lock already depends on the new lock.
      
      [ 3437.456553]
                     the existing dependency chain (in reverse order) is:
      [ 3437.457054]
                     -> #3 (&type->s_umount_key#48){.+.+}-{3:3}:
      [ 3437.457507]        down_read+0x3e/0x170
      [ 3437.457772]        bch2_fs_file_ioctl+0x232/0xc90 [bcachefs]
      [ 3437.458206]        __x64_sys_ioctl+0x93/0xd0
      [ 3437.458498]        do_syscall_64+0x42/0xf0
      [ 3437.458779]        entry_SYSCALL_64_after_hwframe+0x6e/0x76
      [ 3437.459155]
                     -> #2 (&c->snapshot_create_lock){++++}-{3:3}:
      [ 3437.459615]        down_read+0x3e/0x170
      [ 3437.459878]        bch2_truncate+0x82/0x110 [bcachefs]
      [ 3437.460276]        bchfs_truncate+0x254/0x3c0 [bcachefs]
      [ 3437.460686]        notify_change+0x1f1/0x4a0
      [ 3437.461283]        do_truncate+0x7f/0xd0
      [ 3437.461555]        path_openat+0xa57/0xce0
      [ 3437.461836]        do_filp_open+0xb4/0x160
      [ 3437.462116]        do_sys_openat2+0x91/0xc0
      [ 3437.462402]        __x64_sys_openat+0x53/0xa0
      [ 3437.462701]        do_syscall_64+0x42/0xf0
      [ 3437.462982]        entry_SYSCALL_64_after_hwframe+0x6e/0x76
      [ 3437.463359]
                     -> #1 (&sb->s_type->i_mutex_key#15){+.+.}-{3:3}:
      [ 3437.463843]        down_write+0x3b/0xc0
      [ 3437.464223]        bch2_write_iter+0x5b/0xcc0 [bcachefs]
      [ 3437.464493]        vfs_write+0x21b/0x4c0
      [ 3437.464653]        ksys_write+0x69/0xf0
      [ 3437.464839]        do_syscall_64+0x42/0xf0
      [ 3437.465009]        entry_SYSCALL_64_after_hwframe+0x6e/0x76
      [ 3437.465231]
                     -> #0 (sb_writers#10){.+.+}-{0:0}:
      [ 3437.465471]        __lock_acquire+0x1455/0x21b0
      [ 3437.465656]        lock_acquire+0xc6/0x2b0
      [ 3437.465822]        mnt_want_write+0x46/0x1a0
      [ 3437.465996]        filename_create+0x62/0x190
      [ 3437.466175]        user_path_create+0x2d/0x50
      [ 3437.466352]        bch2_fs_file_ioctl+0x2ec/0xc90 [bcachefs]
      [ 3437.466617]        __x64_sys_ioctl+0x93/0xd0
      [ 3437.466791]        do_syscall_64+0x42/0xf0
      [ 3437.466957]        entry_SYSCALL_64_after_hwframe+0x6e/0x76
      [ 3437.467180]
                     other info that might help us debug this:
      
      [ 3437.469670] 2 locks held by bcachefs/35533:
                     other info that might help us debug this:
      
      [ 3437.467507] Chain exists of:
                       sb_writers#10 --> &c->snapshot_create_lock --> &type->s_umount_key#48
      
      [ 3437.467979]  Possible unsafe locking scenario:
      
      [ 3437.468223]        CPU0                    CPU1
      [ 3437.468405]        ----                    ----
      [ 3437.468585]   rlock(&type->s_umount_key#48);
      [ 3437.468758]                                lock(&c->snapshot_create_lock);
      [ 3437.469030]                                lock(&type->s_umount_key#48);
      [ 3437.469291]   rlock(sb_writers#10);
      [ 3437.469434]
                      *** DEADLOCK ***
      
      [ 3437.469670] 2 locks held by bcachefs/35533:
      [ 3437.469838]  #0: ffffa0a02ce00a88 (&c->snapshot_create_lock){++++}-{3:3}, at: bch2_fs_file_ioctl+0x1e3/0xc90 [bcachefs]
      [ 3437.470294]  #1: ffffa0a02b2b10e0 (&type->s_umount_key#48){.+.+}-{3:3}, at: bch2_fs_file_ioctl+0x232/0xc90 [bcachefs]
      [ 3437.470744]
                     stack backtrace:
      [ 3437.470922] CPU: 7 PID: 35533 Comm: bcachefs Kdump: loaded Tainted: G            E      6.7.0-rc7-custom+ #85
      [ 3437.471313] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Arch Linux 1.16.3-1-1 04/01/2014
      [ 3437.471694] Call Trace:
      [ 3437.471795]  <TASK>
      [ 3437.471884]  dump_stack_lvl+0x57/0x90
      [ 3437.472035]  check_noncircular+0x132/0x150
      [ 3437.472202]  __lock_acquire+0x1455/0x21b0
      [ 3437.472369]  lock_acquire+0xc6/0x2b0
      [ 3437.472518]  ? filename_create+0x62/0x190
      [ 3437.472683]  ? lock_is_held_type+0x97/0x110
      [ 3437.472856]  mnt_want_write+0x46/0x1a0
      [ 3437.473025]  ? filename_create+0x62/0x190
      [ 3437.473204]  filename_create+0x62/0x190
      [ 3437.473380]  user_path_create+0x2d/0x50
      [ 3437.473555]  bch2_fs_file_ioctl+0x2ec/0xc90 [bcachefs]
      [ 3437.473819]  ? lock_acquire+0xc6/0x2b0
      [ 3437.474002]  ? __fget_files+0x2a/0x190
      [ 3437.474195]  ? __fget_files+0xbc/0x190
      [ 3437.474380]  ? lock_release+0xc5/0x270
      [ 3437.474567]  ? __x64_sys_ioctl+0x93/0xd0
      [ 3437.474764]  ? __pfx_bch2_fs_file_ioctl+0x10/0x10 [bcachefs]
      [ 3437.475090]  __x64_sys_ioctl+0x93/0xd0
      [ 3437.475277]  do_syscall_64+0x42/0xf0
      [ 3437.475454]  entry_SYSCALL_64_after_hwframe+0x6e/0x76
      [ 3437.475691] RIP: 0033:0x7f2743c313af
      ======================================================
      
      In __bch2_ioctl_subvolume_create(), we grab s_umount unconditionally
      and unlock it at the end of the function. There is a comment
      "why do we need this lock?" about the lock coming from
      commit 42d23732 ("bcachefs: Snapshot creation, deletion")
      The reason is that __bch2_ioctl_subvolume_create() calls
      sync_inodes_sb() which enforce locked s_umount to writeback all dirty
      nodes before doing snapshot works.
      
      Fix it by read locking s_umount for snapshotting only and unlocking
      s_umount after sync_inodes_sb().
      Signed-off-by: default avatarSu Yue <glass.su@suse.com>
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      2acc59dd
    • Su Yue's avatar
      bcachefs: kvfree bch_fs::snapshots in bch2_fs_snapshots_exit · 369acf97
      Su Yue authored
      bch_fs::snapshots is allocated by kvzalloc in __snapshot_t_mut.
      It should be freed by kvfree not kfree.
      Or umount will triger:
      
      [  406.829178 ] BUG: unable to handle page fault for address: ffffe7b487148008
      [  406.830676 ] #PF: supervisor read access in kernel mode
      [  406.831643 ] #PF: error_code(0x0000) - not-present page
      [  406.832487 ] PGD 0 P4D 0
      [  406.832898 ] Oops: 0000 [#1] PREEMPT SMP PTI
      [  406.833512 ] CPU: 2 PID: 1754 Comm: umount Kdump: loaded Tainted: G           OE      6.7.0-rc7-custom+ #90
      [  406.834746 ] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Arch Linux 1.16.3-1-1 04/01/2014
      [  406.835796 ] RIP: 0010:kfree+0x62/0x140
      [  406.836197 ] Code: 80 48 01 d8 0f 82 e9 00 00 00 48 c7 c2 00 00 00 80 48 2b 15 78 9f 1f 01 48 01 d0 48 c1 e8 0c 48 c1 e0 06 48 03 05 56 9f 1f 01 <48> 8b 50 08 48 89 c7 f6 c2 01 0f 85 b0 00 00 00 66 90 48 8b 07 f6
      [  406.837810 ] RSP: 0018:ffffb9d641607e48 EFLAGS: 00010286
      [  406.838213 ] RAX: ffffe7b487148000 RBX: ffffb9d645200000 RCX: ffffb9d641607dc4
      [  406.838738 ] RDX: 000065bb00000000 RSI: ffffffffc0d88b84 RDI: ffffb9d645200000
      [  406.839217 ] RBP: ffff9a4625d00068 R08: 0000000000000001 R09: 0000000000000001
      [  406.839650 ] R10: 0000000000000001 R11: 000000000000001f R12: ffff9a4625d4da80
      [  406.840055 ] R13: ffff9a4625d00000 R14: ffffffffc0e2eb20 R15: 0000000000000000
      [  406.840451 ] FS:  00007f0a264ffb80(0000) GS:ffff9a4e2d500000(0000) knlGS:0000000000000000
      [  406.840851 ] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [  406.841125 ] CR2: ffffe7b487148008 CR3: 000000018c4d2000 CR4: 00000000000006f0
      [  406.841464 ] Call Trace:
      [  406.841583 ]  <TASK>
      [  406.841682 ]  ? __die+0x1f/0x70
      [  406.841828 ]  ? page_fault_oops+0x159/0x470
      [  406.842014 ]  ? fixup_exception+0x22/0x310
      [  406.842198 ]  ? exc_page_fault+0x1ed/0x200
      [  406.842382 ]  ? asm_exc_page_fault+0x22/0x30
      [  406.842574 ]  ? bch2_fs_release+0x54/0x280 [bcachefs]
      [  406.842842 ]  ? kfree+0x62/0x140
      [  406.842988 ]  ? kfree+0x104/0x140
      [  406.843138 ]  bch2_fs_release+0x54/0x280 [bcachefs]
      [  406.843390 ]  kobject_put+0xb7/0x170
      [  406.843552 ]  deactivate_locked_super+0x2f/0xa0
      [  406.843756 ]  cleanup_mnt+0xba/0x150
      [  406.843917 ]  task_work_run+0x59/0xa0
      [  406.844083 ]  exit_to_user_mode_prepare+0x197/0x1a0
      [  406.844302 ]  syscall_exit_to_user_mode+0x16/0x40
      [  406.844510 ]  do_syscall_64+0x4e/0xf0
      [  406.844675 ]  entry_SYSCALL_64_after_hwframe+0x6e/0x76
      [  406.844907 ] RIP: 0033:0x7f0a2664e4fb
      Signed-off-by: default avatarSu Yue <glass.su@suse.com>
      Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      369acf97
    • Kent Overstreet's avatar
      bcachefs: bios must be 512 byte algined · 00fff4dd
      Kent Overstreet authored
      Fixes: 023f9ac9 bcachefs: Delete dio read alignment check
      Reported-by: default avatarBrian Foster <bfoster@redhat.com>
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      00fff4dd
    • Colin Ian King's avatar
      bcachefs: remove redundant variable tmp · aead3428
      Colin Ian King authored
      The variable tmp is being assigned a value but it isn't being
      read afterwards. The assignment is redundant and so tmp can be
      removed.
      
      Cleans up clang scan build warning:
      warning: Although the value stored to 'ret' is used in the enclosing
      expression, the value is never actually read from 'ret'
      [deadcode.DeadStores]
      Signed-off-by: default avatarColin Ian King <colin.i.king@gmail.com>
      Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      aead3428
    • Kent Overstreet's avatar
    • Kent Overstreet's avatar
      bcachefs: Fix excess transaction restarts in __bchfs_fallocate() · 46bf2e9c
      Kent Overstreet authored
      drop_locks_do() should not be used in a fastpath without first trying
      the do in nonblocking mode - the unlock and relock will cause excessive
      transaction restarts and potentially livelocking with other threads that
      are contending for the same locks.
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      46bf2e9c
    • Kent Overstreet's avatar
      bcachefs: extents_to_bp_state · 1a503904
      Kent Overstreet authored
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      1a503904
    • Kent Overstreet's avatar
      bcachefs: bkey_and_val_eq() · ba96d36c
      Kent Overstreet authored
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      ba96d36c
    • Kent Overstreet's avatar
      bcachefs: Better journal tracepoints · e6a2566f
      Kent Overstreet authored
      Factor out bch2_journal_bufs_to_text(), and use it in the
      journal_entry_full() tracepoint; when we can't get a journal reservation
      we need to know the outstanding journal entry sizes to know if the
      problem is due to excessive flushing.
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      e6a2566f
    • Kent Overstreet's avatar
    • Kent Overstreet's avatar
      bcachefs: Avoid flushing the journal in the discard path · a6548c8b
      Kent Overstreet authored
      When issuing discards, we may need to flush the journal if there's too
      many buckets that can't be discarded until a journal flush.
      
      But the heuristic was bad; we should be comparing the number of buckets
      that need to flushes against the number of free buckets, not the number
      of buckets we saw.
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      a6548c8b
    • Kent Overstreet's avatar
      bcachefs: Improve move_extent tracepoint · 189c176c
      Kent Overstreet authored
      Also print out the data_opts, so that we can see what specifically is
      being done to an extent.
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      189c176c
    • Kent Overstreet's avatar
      bcachefs: Add missing bch2_moving_ctxt_flush_all() · ef740a1e
      Kent Overstreet authored
      This fixes a bug with rebalance IOs getting stuck with reads completed,
      but writes never being issued.
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      ef740a1e
    • Kent Overstreet's avatar
      bcachefs: Re-add move_extent_write tracepoint · fa3185af
      Kent Overstreet authored
      It appears this was accidentally deleted at some point - also, do a bit
      of cleanup.
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      fa3185af
    • Kent Overstreet's avatar
      bcachefs: bch2_kthread_io_clock_wait() no longer sleeps until full amount · d92b83f5
      Kent Overstreet authored
      Drop t he loop in bch2_kthread_io_clock_wait(): this allows the code
      that uses it to be woken up for other reasons, and fixes a bug where
      rebalance wouldn't wake up when a scan was requested.
      
      This raises the possibility of spurious wakeups, but callers should
      always be able to handle that reasonably well.
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      d92b83f5
    • Kent Overstreet's avatar
    • Kent Overstreet's avatar
      bcachefs: Don't pass memcmp() as a pointer · 0124f42d
      Kent Overstreet authored
      Some (buggy!) compilers have issues with this.
      
      Fixes: https://github.com/koverstreet/bcachefs/issues/625Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      0124f42d
    • Kent Overstreet's avatar
      bcachefs: Reduce would_deadlock restarts · 57f2d209
      Kent Overstreet authored
      We don't have to take locks in any particular ordering - we'll make
      forward progress just fine - but if we try to stick to an ordering, it
      can help to avoid excessive would_deadlock transaction restarts.
      
      This tweaks the reflink path to take extents btree locks in the right
      order.
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      57f2d209
    • Kent Overstreet's avatar
      bcachefs: bch2_trans_account_disk_usage_change() · 5b14ce35
      Kent Overstreet authored
      The disk space accounting rewrite is splitting out accounting for each
      replicas set - those are moving to btree keys, instead of percpu
      counters.
      
      This breaks bch2_trans_fs_usage_apply() up, splitting out the part we
      will still need.
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      5b14ce35
    • Kent Overstreet's avatar
      bcachefs: bch_fs_usage_base · 8e7834a8
      Kent Overstreet authored
      Split out base filesystem usage into its own type; prep work for
      breaking up bch2_trans_fs_usage_apply().
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      8e7834a8
    • Kent Overstreet's avatar
      bcachefs: bch2_prt_compression_type() · 4f564f4f
      Kent Overstreet authored
      bounds checking helper, since compression types are extensible
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      4f564f4f
    • Kent Overstreet's avatar
      bcachefs: helpers for printing data types · e58f963c
      Kent Overstreet authored
      We need bounds checking since new versions may introduce new data types.
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      e58f963c
    • Kent Overstreet's avatar
      bcachefs: BTREE_TRIGGER_ATOMIC · 38c23fb8
      Kent Overstreet authored
      Add a new flag to be explicit about when we're running atomic triggers.
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      38c23fb8
    • Kent Overstreet's avatar
    • Kent Overstreet's avatar
    • Kent Overstreet's avatar
      bcachefs: Don't log errors if BCH_WRITE_ALLOC_NOWAIT · 4ecad0da
      Kent Overstreet authored
      Previously, we added logging in the write path to ensure that any
      unexpected errors getting reported to userspace have a log message; but
      BCH_WRITE_ALLOC_NOWAIT is a special case, it's used for promotes where
      errors are expected and not reported out to userspace - so we need to
      silence those.
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      4ecad0da
    • Su Yue's avatar
      bcachefs: fix memleak in bch2_split_devs · e240c1b3
      Su Yue authored
      The pointer dev_name can be modified by strseq(),
      then causes the memleak:
      
      unreferenced object 0xffff9d08a2916c80 (size 32):
        comm "mount.bcachefs", pid 9090, jiffies 4295856224 (age 17.564s)
        hex dump (first 32 bytes):
          2f 64 65 76 2f 6d 61 70 70 65 72 2f 74 65 73 74  /dev/mapper/test
          2d 30 00 00 00 00 00 00 00 00 00 00 00 00 00 00  -0..............
        backtrace:
          [<00000000c5d3be7d>] __kmem_cache_alloc_node+0x1f3/0x2c0
          [<0000000052215d26>] __kmalloc_node_track_caller+0x51/0x150
          [<0000000069fea956>] kstrdup+0x32/0x60
          [<000000000877fcf1>] bch2_split_devs+0x3f/0x150 [bcachefs]
          [<000000007ee93204>] bch2_mount+0xcb/0x640 [bcachefs]
          [<000000002dd1e04b>] legacy_get_tree+0x30/0x60
          [<000000006afc31d3>] vfs_get_tree+0x28/0xf0
          [<000000007b0c538e>] path_mount+0x475/0xb60
          [<0000000092de5882>] __x64_sys_mount+0x105/0x140
          [<0000000054fc05d8>] do_syscall_64+0x42/0xf0
          [<00000000df584910>] entry_SYSCALL_64_after_hwframe+0x6e/0x76
      
      Fix it by copy pointer dev_name at beginning and free the copied
      pointer at end.
      Signed-off-by: default avatarSu Yue <glass.su@suse.com>
      Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
      Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
      e240c1b3
  2. 06 Jan, 2024 12 commits