# git rev-parse -q --verify cef27048e5c2f88677a647c336fae490e9c5492a^{commit} cef27048e5c2f88677a647c336fae490e9c5492a already have revision, skipping fetch # git checkout -q -f -B kisskb cef27048e5c2f88677a647c336fae490e9c5492a # git clean -qxdf # < git log -1 # commit cef27048e5c2f88677a647c336fae490e9c5492a # Merge: 3fdfcd98f002 ad29cf999a91 # Author: Linus Torvalds # Date: Mon Apr 15 11:01:11 2024 -0700 # # Merge tag 'bcachefs-2024-04-15' of https://evilpiepirate.org/git/bcachefs # # Pull yet more bcachefs fixes from Kent Overstreet: # "This gets recovery working again for the affected user I've been # working with, and I'm still waiting to hear back on other bug reports # but should fix it for everyone else who's been having issues with # recovery. # # - Various recovery fixes: # # - fixes for the btree_insert_entry being resized on path # allocation btree_path array recently became dynamically # resizable, and btree_insert_entry along with it; this was being # observed during journal replay, when write buffer btree updates # don't use the write buffer and instead use the normal btree # update path # # - multiple fixes for deadlock in recovery when we need to do lots # of btree node merges; excessive merges were clocking up the # whole pipeline # # - write buffer path now correctly does btree node merges when # needed # # - fix failure to go RW when superblock indicates recovery passes # needed (i.e. to complete an unfinished upgrade) # # - Various unsafety fixes - test case contributed by a user who had # two drives out of a six drive array write out a whole bunch of # garbage after power failure # # - New (tiny) on disk format feature: since it appears the btree node # scan tool will be a more regular thing (crappy hardware, user # error) - this adds a 64 bit per-device bitmap of regions that have # ever had btree nodes. # # - A path->should_be_locked fix, from a larger patch series tightening # up invariants and assertions around btree transaction and path # locking state. # # This particular fix prevents us from keeping around btree_paths # that are no longer needed" # # * tag 'bcachefs-2024-04-15' of https://evilpiepirate.org/git/bcachefs: (24 commits) # bcachefs: set_btree_iter_dontneed also clears should_be_locked # bcachefs: fix error path of __bch2_read_super() # bcachefs: Check for backpointer bucket_offset >= bucket size # bcachefs: bch_member.btree_allocated_bitmap # bcachefs: sysfs internal/trigger_journal_flush # bcachefs: Fix bch2_btree_node_fill() for !path # bcachefs: add safety checks in bch2_btree_node_fill() # bcachefs: Interior known are required to have known key types # bcachefs: add missing bounds check in __bch2_bkey_val_invalid() # bcachefs: Fix btree node merging on write buffer btrees # bcachefs: Disable merges from interior update path # bcachefs: Run merges at BCH_WATERMARK_btree # bcachefs: Fix missing write refs in fs fio paths # bcachefs: Fix deadlock in journal replay # bcachefs: Go rw if running any explicit recovery passes # bcachefs: Standardize helpers for printing enum strs with bounds checks # bcachefs: don't queue btree nodes for rewrites during scan # bcachefs: fix race in bch2_btree_node_evict() # bcachefs: fix unsafety in bch2_stripe_to_text() # bcachefs: fix unsafety in bch2_extent_ptr_to_text() # ... # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux-ld --version # < git log --format=%s --max-count=1 cef27048e5c2f88677a647c336fae490e9c5492a # make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allnoconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- allnoconfig # < make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allnoconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- help # make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allnoconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- olddefconfig # make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allnoconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/vdso/vma.c:246:12: warning: no previous prototype for 'init_vdso_image' [-Wmissing-prototypes] int __init init_vdso_image(const struct vdso_image *image, ^ /kisskb/src/arch/sparc/prom/misc_64.c:165:5: warning: no previous prototype for 'prom_get_mmu_ihandle' [-Wmissing-prototypes] int prom_get_mmu_ihandle(void) ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/kernel/traps_64.c:253:6: warning: no previous prototype for 'is_no_fault_exception' [-Wmissing-prototypes] bool is_no_fault_exception(struct pt_regs *regs) ^ /kisskb/src/arch/sparc/kernel/traps_64.c:2035:6: warning: no previous prototype for 'do_mcd_err' [-Wmissing-prototypes] void do_mcd_err(struct pt_regs *regs, struct sun4v_error_entry ent) ^ /kisskb/src/arch/sparc/kernel/traps_64.c:2153:6: warning: no previous prototype for 'sun4v_nonresum_error_user_handled' [-Wmissing-prototypes] bool sun4v_nonresum_error_user_handled(struct pt_regs *regs, ^ /kisskb/src/arch/sparc/vdso/vclock_gettime.c:254:1: warning: no previous prototype for '__vdso_clock_gettime' [-Wmissing-prototypes] __vdso_clock_gettime(clockid_t clock, struct __kernel_old_timespec *ts) ^ /kisskb/src/arch/sparc/vdso/vclock_gettime.c:282:1: warning: no previous prototype for '__vdso_clock_gettime_stick' [-Wmissing-prototypes] __vdso_clock_gettime_stick(clockid_t clock, struct __kernel_old_timespec *ts) ^ /kisskb/src/arch/sparc/vdso/vclock_gettime.c:307:1: warning: no previous prototype for '__vdso_gettimeofday' [-Wmissing-prototypes] __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz) ^ /kisskb/src/arch/sparc/vdso/vclock_gettime.c:343:1: warning: no previous prototype for '__vdso_gettimeofday_stick' [-Wmissing-prototypes] __vdso_gettimeofday_stick(struct __kernel_old_timeval *tv, struct timezone *tz) ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/prom/p1275.c:52:6: warning: no previous prototype for 'prom_cif_init' [-Wmissing-prototypes] void prom_cif_init(void *cif_handler, void *cif_stack) ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' In file included from /kisskb/src/arch/sparc/vdso/vdso32/vclock_gettime.c:22:0: /kisskb/src/arch/sparc/vdso/vdso32/../vclock_gettime.c:254:1: warning: no previous prototype for '__vdso_clock_gettime' [-Wmissing-prototypes] __vdso_clock_gettime(clockid_t clock, struct __kernel_old_timespec *ts) ^ /kisskb/src/arch/sparc/vdso/vdso32/../vclock_gettime.c:282:1: warning: no previous prototype for '__vdso_clock_gettime_stick' [-Wmissing-prototypes] __vdso_clock_gettime_stick(clockid_t clock, struct __kernel_old_timespec *ts) ^ /kisskb/src/arch/sparc/vdso/vdso32/../vclock_gettime.c:307:1: warning: no previous prototype for '__vdso_gettimeofday' [-Wmissing-prototypes] __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz) ^ /kisskb/src/arch/sparc/vdso/vdso32/../vclock_gettime.c:343:1: warning: no previous prototype for '__vdso_gettimeofday_stick' [-Wmissing-prototypes] __vdso_gettimeofday_stick(struct __kernel_old_timeval *tv, struct timezone *tz) ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/kernel/setup_64.c:602:13: warning: no previous prototype for 'alloc_irqstack_bootmem' [-Wmissing-prototypes] void __init alloc_irqstack_bootmem(void) ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/kernel/time_64.c:880:20: warning: no previous prototype for 'sched_clock' [-Wmissing-prototypes] unsigned long long sched_clock(void) ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/kernel/adi_64.c:124:21: warning: no previous prototype for 'find_tag_store' [-Wmissing-prototypes] tag_storage_desc_t *find_tag_store(struct mm_struct *mm, ^ /kisskb/src/arch/sparc/kernel/adi_64.c:156:21: warning: no previous prototype for 'alloc_tag_store' [-Wmissing-prototypes] tag_storage_desc_t *alloc_tag_store(struct mm_struct *mm, ^ /kisskb/src/arch/sparc/kernel/adi_64.c:299:6: warning: no previous prototype for 'del_tag_store' [-Wmissing-prototypes] void del_tag_store(tag_storage_desc_t *tag_desc, struct mm_struct *mm) ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' Completed OK # rm -rf /kisskb/build/linus_allnoconfig_sparc64-gcc5 # Build took: 0:00:15.155259