mirror of
https://github.com/torvalds/linux.git
synced 2025-04-06 00:16:18 +00:00
35f5197009
Running the preempt tiering tests with a lower than normal journal reclaim delay turned up a shutdown hang - a lost wakeup, caused because flushing a journal pin (e.g. key cache/write buffer) can generate a new journal pin. The "simple" fix of adding the correct wakeup didn't work because of ordering issues; if we flush btree node pins too aggressively before other pins have completed, we end up spinning where each flush iteration generates new work. So to fix this correctly: - The list of flushed journal pins is now broken out by type, so that we can wait for key cache/write buffer pin flushing to complete before flushing dirty btree nodes - A new closure_waitlist is added for bch2_journal_flush_pins; this one is only used under or when we're taking the journal lock, so it's pretty cheap to add rigorously correct wakeups to journal_pin_set() and journal_pin_drop(). Additionally, bch2_journal_seq_pins_to_text() is moved to journal_reclaim.c, where it belongs, along with a bit of other small renaming and refactoring. Besides fixing the hang, the better ordering between key cache/write buffer flushing and btree node flushing should help or fix the "unmount taking excessively long" a few users have been noticing. Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
85 lines
2.5 KiB
C
85 lines
2.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _BCACHEFS_JOURNAL_RECLAIM_H
|
|
#define _BCACHEFS_JOURNAL_RECLAIM_H
|
|
|
|
#define JOURNAL_PIN (32 * 1024)
|
|
|
|
static inline void journal_reclaim_kick(struct journal *j)
|
|
{
|
|
struct task_struct *p = READ_ONCE(j->reclaim_thread);
|
|
|
|
j->reclaim_kicked = true;
|
|
if (p)
|
|
wake_up_process(p);
|
|
}
|
|
|
|
unsigned bch2_journal_dev_buckets_available(struct journal *,
|
|
struct journal_device *,
|
|
enum journal_space_from);
|
|
void bch2_journal_set_watermark(struct journal *);
|
|
void bch2_journal_space_available(struct journal *);
|
|
|
|
static inline bool journal_pin_active(struct journal_entry_pin *pin)
|
|
{
|
|
return pin->seq != 0;
|
|
}
|
|
|
|
static inline struct journal_entry_pin_list *
|
|
journal_seq_pin(struct journal *j, u64 seq)
|
|
{
|
|
EBUG_ON(seq < j->pin.front || seq >= j->pin.back);
|
|
|
|
return &j->pin.data[seq & j->pin.mask];
|
|
}
|
|
|
|
void bch2_journal_reclaim_fast(struct journal *);
|
|
bool __bch2_journal_pin_put(struct journal *, u64);
|
|
void bch2_journal_pin_put(struct journal *, u64);
|
|
void bch2_journal_pin_drop(struct journal *, struct journal_entry_pin *);
|
|
|
|
void bch2_journal_pin_set(struct journal *, u64, struct journal_entry_pin *,
|
|
journal_pin_flush_fn);
|
|
|
|
static inline void bch2_journal_pin_add(struct journal *j, u64 seq,
|
|
struct journal_entry_pin *pin,
|
|
journal_pin_flush_fn flush_fn)
|
|
{
|
|
if (unlikely(!journal_pin_active(pin) || pin->seq > seq))
|
|
bch2_journal_pin_set(j, seq, pin, flush_fn);
|
|
}
|
|
|
|
void bch2_journal_pin_copy(struct journal *,
|
|
struct journal_entry_pin *,
|
|
struct journal_entry_pin *,
|
|
journal_pin_flush_fn);
|
|
|
|
static inline void bch2_journal_pin_update(struct journal *j, u64 seq,
|
|
struct journal_entry_pin *pin,
|
|
journal_pin_flush_fn flush_fn)
|
|
{
|
|
if (unlikely(!journal_pin_active(pin) || pin->seq < seq))
|
|
bch2_journal_pin_set(j, seq, pin, flush_fn);
|
|
}
|
|
|
|
void bch2_journal_pin_flush(struct journal *, struct journal_entry_pin *);
|
|
|
|
void bch2_journal_do_discards(struct journal *);
|
|
int bch2_journal_reclaim(struct journal *);
|
|
|
|
void bch2_journal_reclaim_stop(struct journal *);
|
|
int bch2_journal_reclaim_start(struct journal *);
|
|
|
|
bool bch2_journal_flush_pins(struct journal *, u64);
|
|
|
|
static inline bool bch2_journal_flush_all_pins(struct journal *j)
|
|
{
|
|
return bch2_journal_flush_pins(j, U64_MAX);
|
|
}
|
|
|
|
int bch2_journal_flush_device_pins(struct journal *, int);
|
|
|
|
void bch2_journal_pins_to_text(struct printbuf *, struct journal *);
|
|
bool bch2_journal_seq_pins_to_text(struct printbuf *, struct journal *, u64 *);
|
|
|
|
#endif /* _BCACHEFS_JOURNAL_RECLAIM_H */
|