Changes in 4.9.233 xfs: catch inode allocation state mismatch corruption xfs: validate cached inodes are free when allocated xfs: don't call xfs_da_shrink_inode with NULL bp net: phy: mdio-bcm-unimac: fix potential NULL dereference in unimac_mdio_probe() crypto: ccp - Release all allocated memory if sha type is invalid media: rc: prevent memory leak in cx23888_ir_probe ath9k_htc: release allocated buffer if timed out ath9k: release allocated buffer if timed out PCI/ASPM: Disable ASPM on ASMedia ASM1083/1085 PCIe-to-PCI bridge ARM: 8986/1: hw_breakpoint: Don't invoke overflow handler on uaccess watchpoints drm/amdgpu: Prevent kernel-infoleak in amdgpu_info_ioctl() drm: hold gem reference until object is no longer accessed f2fs: check memory boundary by insane namelen f2fs: check if file namelen exceeds max value 9p/trans_fd: abort p9_read_work if req status changed 9p/trans_fd: Fix concurrency del of req_list in p9_fd_cancelled/p9_read_work x86/build/lto: Fix truncated .bss with -fdata-sections x86, vmlinux.lds: Page-align end of ..page_aligned sections fbdev: Detect integer underflow at "struct fbcon_ops"->clear_margins. rds: Prevent kernel-infoleak in rds_notify_queue_get() xfs: fix missed wakeup on l_flush_wait uapi: includes linux/types.h before exporting files install several missing uapi headers net/x25: Fix x25_neigh refcnt leak when x25 disconnect net/x25: Fix null-ptr-deref in x25_disconnect sh: Fix validation of system call number net: lan78xx: add missing endpoint sanity check net: lan78xx: fix transfer-buffer memory leak mlx4: disable device on shutdown mlxsw: core: Increase scope of RCU read-side critical section mlxsw: core: Free EMAD transactions using kfree_rcu() ibmvnic: Fix IRQ mapping disposal in error path mac80211: mesh: Free ie data when leaving mesh mac80211: mesh: Free pending skb when destroying a mpath arm64: csum: Fix handling of bad packets usb: hso: Fix debug compile warning on sparc32 qed: Disable "MFW indication via attention" SPAM every 5 minutes nfc: s3fwrn5: add missing release on skb in s3fwrn5_recv_frame parisc: add support for cmpxchg on u8 pointers net: ethernet: ravb: exit if re-initialization fails in tx timeout Revert "i2c: cadence: Fix the hold bit setting" xen-netfront: fix potential deadlock in xennet_remove() KVM: LAPIC: Prevent setting the tscdeadline timer if the lapic is hw disabled x86/i8259: Use printk_deferred() to prevent deadlock random32: update the net random state on interrupt and activity ARM: percpu.h: fix build error random: fix circular include dependency on arm64 after addition of percpu.h random32: remove net_rand_state from the latent entropy gcc plugin random32: move the pseudo-random 32-bit definitions to prandom.h ext4: fix direct I/O read error USB: serial: qcserial: add EM7305 QDL product ID net/mlx5e: Don't support phys switch id if not in switchdev mode ALSA: seq: oss: Serialize ioctls Bluetooth: Fix slab-out-of-bounds read in hci_extended_inquiry_result_evt() Bluetooth: Prevent out-of-bounds read in hci_inquiry_result_evt() Bluetooth: Prevent out-of-bounds read in hci_inquiry_result_with_rssi_evt() omapfb: dss: Fix max fclk divider for omap36xx vgacon: Fix for missing check in scrollback handling mtd: properly check all write ioctls for permissions leds: wm831x-status: fix use-after-free on unbind leds: da903x: fix use-after-free on unbind leds: lm3533: fix use-after-free on unbind leds: 88pm860x: fix use-after-free on unbind net/9p: validate fds in p9_fd_open drm/nouveau/fbcon: fix module unload when fbcon init has failed for some reason cfg80211: check vendor command doit pointer before use igb: reinit_locked() should be called with rtnl_lock atm: fix atm_dev refcnt leaks in atmtcp_remove_persistent tools lib traceevent: Fix memory leak in process_dynamic_array_len xattr: break delegations in {set,remove}xattr binder: Prevent context manager from incrementing ref 0 ipv4: Silence suspicious RCU usage warning ipv6: fix memory leaks on IPV6_ADDRFORM path vxlan: Ensure FDB dump is performed under RCU net: lan78xx: replace bogus endpoint lookup Revert "vxlan: fix tos value before xmit" usb: hso: check for return value in hso_serial_common_create() Smack: fix use-after-free in smk_write_relabel_self() tracepoint: Mark __tracepoint_string's __used gpio: fix oops resulting from calling of_get_named_gpio(NULL, ...) cgroup: add missing skcd->no_refcnt check in cgroup_sk_clone() EDAC: Fix reference count leaks arm64: dts: qcom: msm8916: Replace invalid bias-pull-none property arm64: dts: exynos: Fix silent hang after boot on Espresso m68k: mac: Don't send IOP message until channel is idle m68k: mac: Fix IOP status/control register writes platform/x86: intel-hid: Fix return value check in check_acpi_dev() platform/x86: intel-vbtn: Fix return value check in check_acpi_dev() ARM: at91: pm: add missing put_device() call in at91_pm_sram_init() ARM: socfpga: PM: add missing put_device() call in socfpga_setup_ocram_self_refresh() drm/tilcdc: fix leak & null ref in panel_connector_get_modes Bluetooth: add a mutex lock to avoid UAF in do_enale_set fs/btrfs: Add cond_resched() for try_release_extent_mapping() stalls drm/radeon: Fix reference count leaks caused by pm_runtime_get_sync video: fbdev: neofb: fix memory leak in neo_scan_monitor() md-cluster: fix wild pointer of unlock_all_bitmaps() drm/nouveau: fix multiple instances of reference count leaks drm/debugfs: fix plain echo to connector "force" attribute mm/mmap.c: Add cond_resched() for exit_mmap() CPU stalls brcmfmac: To fix Bss Info flag definition Bug iwlegacy: Check the return value of pcie_capability_read_*() usb: gadget: net2280: fix memory leak on probe error handling paths bdc: Fix bug causing crash after multiple disconnects dyndbg: fix a BUG_ON in ddebug_describe_flags bcache: fix super block seq numbers comparision in register_cache_set() ACPICA: Do not increment operation_region reference counts for field units agp/intel: Fix a memory leak on module initialisation failure video: fbdev: sm712fb: fix an issue about iounmap for a wrong address console: newport_con: fix an issue about leak related system resources video: pxafb: Fix the function used to balance a 'dma_alloc_coherent()' call iio: improve IIO_CONCENTRATION channel type description leds: lm355x: avoid enum conversion warning media: omap3isp: Add missed v4l2_ctrl_handler_free() for preview_init_entities() scsi: cumana_2: Fix different dev_id between request_irq() and free_irq() drm/mipi: use dcs write for mipi_dsi_dcs_set_tear_scanline cxl: Fix kobject memleak drm/radeon: fix array out-of-bounds read and write issues scsi: powertec: Fix different dev_id between request_irq() and free_irq() scsi: eesox: Fix different dev_id between request_irq() and free_irq() media: firewire: Using uninitialized values in node_probe() media: exynos4-is: Add missed check for pinctrl_lookup_state() xfs: fix reflink quota reservation accounting error PCI: Fix pci_cfg_wait queue locking problem leds: core: Flush scheduled work for system suspend drm: panel: simple: Fix bpc for LG LB070WV8 panel scsi: scsi_debug: Add check for sdebug_max_queue during module init mwifiex: Prevent memory corruption handling keys powerpc/vdso: Fix vdso cpu truncation staging: rtl8192u: fix a dubious looking mask before a shift PCI/ASPM: Add missing newline in sysfs 'policy' drm/imx: tve: fix regulator_disable error path USB: serial: iuu_phoenix: fix led-activity helpers usb: dwc2: Fix error path in gadget registration scsi: mesh: Fix panic after host or bus reset Smack: fix another vsscanf out of bounds Smack: prevent underflow in smk_set_cipso() power: supply: check if calc_soc succeeded in pm860x_init_battery selftests/powerpc: Fix CPU affinity for child process selftests/powerpc: Fix online CPU selection s390/qeth: don't process empty bridge port events wl1251: fix always return 0 error net: spider_net: Fix the size used in a 'dma_free_coherent()' call fsl/fman: use 32-bit unsigned integer fsl/fman: fix dereference null return value fsl/fman: fix unreachable code fsl/fman: check dereferencing null pointer fsl/fman: fix eth hash table allocation dlm: Fix kobject memleak pinctrl-single: fix pcs_parse_pinconf() return value drivers/net/wan/lapbether: Added needed_headroom and a skb->len check net/nfc/rawsock.c: add CAP_NET_RAW check. net: Set fput_needed iff FDPUT_FPUT is set USB: serial: cp210x: re-enable auto-RTS on open USB: serial: cp210x: enable usb generic throttle/unthrottle ALSA: usb-audio: Creative USB X-Fi Pro SB1095 volume knob support ALSA: usb-audio: fix overeager device match for MacroSilicon MS2109 ALSA: usb-audio: add quirk for Pioneer DDJ-RB crypto: qat - fix double free in qat_uclo_create_batch_init_list crypto: ccp - Fix use of merged scatterlists fs/minix: check return value of sb_getblk() fs/minix: don't allow getting deleted inodes fs/minix: reject too-large maximum file size ALSA: usb-audio: work around streaming quirk for MacroSilicon MS2109 9p: Fix memory leak in v9fs_mount parisc: mask out enable and reserved bits from sba imask ARM: 8992/1: Fix unwind_frame for clang-built kernels xen/balloon: fix accounting in alloc_xenballooned_pages error path xen/balloon: make the balloon wait interruptible smb3: warn on confusing error scenario with sec=krb5 PCI: hotplug: ACPI: Fix context refcounting in acpiphp_grab_context() btrfs: don't allocate anonymous block device for user invisible roots btrfs: only search for left_info if there is no right_info in try_merge_free_space btrfs: fix memory leaks after failure to lookup checksums during inode logging iio: dac: ad5592r: fix unbalanced mutex unlocks in ad5592r_read_raw() xtensa: fix xtensa_pmu_setup prototype powerpc: Fix circular dependency between percpu.h and mmu.h net: ethernet: stmmac: Disable hardware multicast filter net: stmmac: dwmac1000: provide multicast filter fallback net/compat: Add missing sock updates for SCM_RIGHTS md/raid5: Fix Force reconstruct-write io stuck in degraded raid5 bcache: allocate meta data pages as compound pages mac80211: fix misplaced while instead of if MIPS: CPU#0 is not hotpluggable ext2: fix missing percpu_counter_inc ocfs2: change slot number type s16 to u16 ftrace: Setup correct FTRACE_FL_REGS flags for module kprobes: Fix NULL pointer dereference at kprobe_ftrace_handler watchdog: f71808e_wdt: indicate WDIOF_CARDRESET support in watchdog_info.options watchdog: f71808e_wdt: remove use of wrong watchdog_info option watchdog: f71808e_wdt: clear watchdog timeout occurred flag pseries: Fix 64 bit logical memory block panic mfd: arizona: Ensure 32k clock is put on driver unbind and error USB: serial: ftdi_sio: make process-packet buffer unsigned USB: serial: ftdi_sio: clean up receive processing gpu: ipu-v3: image-convert: Combine rotate/no-rotate irq handlers iommu/omap: Check for failure of a call to omap_iommu_dump_ctx iommu/vt-d: Enforce PASID devTLB field mask i2c: rcar: slave: only send STOP event when we have been addressed clk: clk-atlas6: fix return value check in atlas6_clk_init() pwm: bcm-iproc: handle clk_get_rate() return Input: sentelic - fix error return when fsp_reg_write fails drm/vmwgfx: Fix two list_for_each loop exit tests net: qcom/emac: add missed clk_disable_unprepare in error path of emac_clks_phase1_init nfs: Fix getxattr kernel panic and memory overflow fs/ufs: avoid potential u32 multiplication overflow mfd: dln2: Run event handler loop under spinlock ALSA: echoaudio: Fix potential Oops in snd_echo_resume() sh: landisk: Add missing initialization of sh_io_port_base khugepaged: retract_page_tables() remember to test exit mm: Avoid calling build_all_zonelists_init under hotplug context Linux 4.9.233 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ied62cb0768f5bd8e989d75e7c2ccf6f1e6f2efd4
848 lines
19 KiB
C
848 lines
19 KiB
C
/*
|
|
* bcache journalling code, for btree insertions
|
|
*
|
|
* Copyright 2012 Google, Inc.
|
|
*/
|
|
|
|
#include "bcache.h"
|
|
#include "btree.h"
|
|
#include "debug.h"
|
|
#include "extents.h"
|
|
|
|
#include <trace/events/bcache.h>
|
|
|
|
/*
|
|
* Journal replay/recovery:
|
|
*
|
|
* This code is all driven from run_cache_set(); we first read the journal
|
|
* entries, do some other stuff, then we mark all the keys in the journal
|
|
* entries (same as garbage collection would), then we replay them - reinserting
|
|
* them into the cache in precisely the same order as they appear in the
|
|
* journal.
|
|
*
|
|
* We only journal keys that go in leaf nodes, which simplifies things quite a
|
|
* bit.
|
|
*/
|
|
|
|
static void journal_read_endio(struct bio *bio)
|
|
{
|
|
struct closure *cl = bio->bi_private;
|
|
closure_put(cl);
|
|
}
|
|
|
|
static int journal_read_bucket(struct cache *ca, struct list_head *list,
|
|
unsigned bucket_index)
|
|
{
|
|
struct journal_device *ja = &ca->journal;
|
|
struct bio *bio = &ja->bio;
|
|
|
|
struct journal_replay *i;
|
|
struct jset *j, *data = ca->set->journal.w[0].data;
|
|
struct closure cl;
|
|
unsigned len, left, offset = 0;
|
|
int ret = 0;
|
|
sector_t bucket = bucket_to_sector(ca->set, ca->sb.d[bucket_index]);
|
|
|
|
closure_init_stack(&cl);
|
|
|
|
pr_debug("reading %u", bucket_index);
|
|
|
|
while (offset < ca->sb.bucket_size) {
|
|
reread: left = ca->sb.bucket_size - offset;
|
|
len = min_t(unsigned, left, PAGE_SECTORS << JSET_BITS);
|
|
|
|
bio_reset(bio);
|
|
bio->bi_iter.bi_sector = bucket + offset;
|
|
bio->bi_bdev = ca->bdev;
|
|
bio->bi_iter.bi_size = len << 9;
|
|
|
|
bio->bi_end_io = journal_read_endio;
|
|
bio->bi_private = &cl;
|
|
bio_set_op_attrs(bio, REQ_OP_READ, 0);
|
|
bch_bio_map(bio, data);
|
|
|
|
closure_bio_submit(bio, &cl);
|
|
closure_sync(&cl);
|
|
|
|
/* This function could be simpler now since we no longer write
|
|
* journal entries that overlap bucket boundaries; this means
|
|
* the start of a bucket will always have a valid journal entry
|
|
* if it has any journal entries at all.
|
|
*/
|
|
|
|
j = data;
|
|
while (len) {
|
|
struct list_head *where;
|
|
size_t blocks, bytes = set_bytes(j);
|
|
|
|
if (j->magic != jset_magic(&ca->sb)) {
|
|
pr_debug("%u: bad magic", bucket_index);
|
|
return ret;
|
|
}
|
|
|
|
if (bytes > left << 9 ||
|
|
bytes > PAGE_SIZE << JSET_BITS) {
|
|
pr_info("%u: too big, %zu bytes, offset %u",
|
|
bucket_index, bytes, offset);
|
|
return ret;
|
|
}
|
|
|
|
if (bytes > len << 9)
|
|
goto reread;
|
|
|
|
if (j->csum != csum_set(j)) {
|
|
pr_info("%u: bad csum, %zu bytes, offset %u",
|
|
bucket_index, bytes, offset);
|
|
return ret;
|
|
}
|
|
|
|
blocks = set_blocks(j, block_bytes(ca->set));
|
|
|
|
while (!list_empty(list)) {
|
|
i = list_first_entry(list,
|
|
struct journal_replay, list);
|
|
if (i->j.seq >= j->last_seq)
|
|
break;
|
|
list_del(&i->list);
|
|
kfree(i);
|
|
}
|
|
|
|
list_for_each_entry_reverse(i, list, list) {
|
|
if (j->seq == i->j.seq)
|
|
goto next_set;
|
|
|
|
if (j->seq < i->j.last_seq)
|
|
goto next_set;
|
|
|
|
if (j->seq > i->j.seq) {
|
|
where = &i->list;
|
|
goto add;
|
|
}
|
|
}
|
|
|
|
where = list;
|
|
add:
|
|
i = kmalloc(offsetof(struct journal_replay, j) +
|
|
bytes, GFP_KERNEL);
|
|
if (!i)
|
|
return -ENOMEM;
|
|
memcpy(&i->j, j, bytes);
|
|
list_add(&i->list, where);
|
|
ret = 1;
|
|
|
|
ja->seq[bucket_index] = j->seq;
|
|
next_set:
|
|
offset += blocks * ca->sb.block_size;
|
|
len -= blocks * ca->sb.block_size;
|
|
j = ((void *) j) + blocks * block_bytes(ca);
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
int bch_journal_read(struct cache_set *c, struct list_head *list)
|
|
{
|
|
#define read_bucket(b) \
|
|
({ \
|
|
int ret = journal_read_bucket(ca, list, b); \
|
|
__set_bit(b, bitmap); \
|
|
if (ret < 0) \
|
|
return ret; \
|
|
ret; \
|
|
})
|
|
|
|
struct cache *ca;
|
|
unsigned iter;
|
|
|
|
for_each_cache(ca, c, iter) {
|
|
struct journal_device *ja = &ca->journal;
|
|
DECLARE_BITMAP(bitmap, SB_JOURNAL_BUCKETS);
|
|
unsigned i, l, r, m;
|
|
uint64_t seq;
|
|
|
|
bitmap_zero(bitmap, SB_JOURNAL_BUCKETS);
|
|
pr_debug("%u journal buckets", ca->sb.njournal_buckets);
|
|
|
|
/*
|
|
* Read journal buckets ordered by golden ratio hash to quickly
|
|
* find a sequence of buckets with valid journal entries
|
|
*/
|
|
for (i = 0; i < ca->sb.njournal_buckets; i++) {
|
|
l = (i * 2654435769U) % ca->sb.njournal_buckets;
|
|
|
|
if (test_bit(l, bitmap))
|
|
break;
|
|
|
|
if (read_bucket(l))
|
|
goto bsearch;
|
|
}
|
|
|
|
/*
|
|
* If that fails, check all the buckets we haven't checked
|
|
* already
|
|
*/
|
|
pr_debug("falling back to linear search");
|
|
|
|
for (l = find_first_zero_bit(bitmap, ca->sb.njournal_buckets);
|
|
l < ca->sb.njournal_buckets;
|
|
l = find_next_zero_bit(bitmap, ca->sb.njournal_buckets, l + 1))
|
|
if (read_bucket(l))
|
|
goto bsearch;
|
|
|
|
/* no journal entries on this device? */
|
|
if (l == ca->sb.njournal_buckets)
|
|
continue;
|
|
bsearch:
|
|
BUG_ON(list_empty(list));
|
|
|
|
/* Binary search */
|
|
m = l;
|
|
r = find_next_bit(bitmap, ca->sb.njournal_buckets, l + 1);
|
|
pr_debug("starting binary search, l %u r %u", l, r);
|
|
|
|
while (l + 1 < r) {
|
|
seq = list_entry(list->prev, struct journal_replay,
|
|
list)->j.seq;
|
|
|
|
m = (l + r) >> 1;
|
|
read_bucket(m);
|
|
|
|
if (seq != list_entry(list->prev, struct journal_replay,
|
|
list)->j.seq)
|
|
l = m;
|
|
else
|
|
r = m;
|
|
}
|
|
|
|
/*
|
|
* Read buckets in reverse order until we stop finding more
|
|
* journal entries
|
|
*/
|
|
pr_debug("finishing up: m %u njournal_buckets %u",
|
|
m, ca->sb.njournal_buckets);
|
|
l = m;
|
|
|
|
while (1) {
|
|
if (!l--)
|
|
l = ca->sb.njournal_buckets - 1;
|
|
|
|
if (l == m)
|
|
break;
|
|
|
|
if (test_bit(l, bitmap))
|
|
continue;
|
|
|
|
if (!read_bucket(l))
|
|
break;
|
|
}
|
|
|
|
seq = 0;
|
|
|
|
for (i = 0; i < ca->sb.njournal_buckets; i++)
|
|
if (ja->seq[i] > seq) {
|
|
seq = ja->seq[i];
|
|
/*
|
|
* When journal_reclaim() goes to allocate for
|
|
* the first time, it'll use the bucket after
|
|
* ja->cur_idx
|
|
*/
|
|
ja->cur_idx = i;
|
|
ja->last_idx = ja->discard_idx = (i + 1) %
|
|
ca->sb.njournal_buckets;
|
|
|
|
}
|
|
}
|
|
|
|
if (!list_empty(list))
|
|
c->journal.seq = list_entry(list->prev,
|
|
struct journal_replay,
|
|
list)->j.seq;
|
|
|
|
return 0;
|
|
#undef read_bucket
|
|
}
|
|
|
|
void bch_journal_mark(struct cache_set *c, struct list_head *list)
|
|
{
|
|
atomic_t p = { 0 };
|
|
struct bkey *k;
|
|
struct journal_replay *i;
|
|
struct journal *j = &c->journal;
|
|
uint64_t last = j->seq;
|
|
|
|
/*
|
|
* journal.pin should never fill up - we never write a journal
|
|
* entry when it would fill up. But if for some reason it does, we
|
|
* iterate over the list in reverse order so that we can just skip that
|
|
* refcount instead of bugging.
|
|
*/
|
|
|
|
list_for_each_entry_reverse(i, list, list) {
|
|
BUG_ON(last < i->j.seq);
|
|
i->pin = NULL;
|
|
|
|
while (last-- != i->j.seq)
|
|
if (fifo_free(&j->pin) > 1) {
|
|
fifo_push_front(&j->pin, p);
|
|
atomic_set(&fifo_front(&j->pin), 0);
|
|
}
|
|
|
|
if (fifo_free(&j->pin) > 1) {
|
|
fifo_push_front(&j->pin, p);
|
|
i->pin = &fifo_front(&j->pin);
|
|
atomic_set(i->pin, 1);
|
|
}
|
|
|
|
for (k = i->j.start;
|
|
k < bset_bkey_last(&i->j);
|
|
k = bkey_next(k))
|
|
if (!__bch_extent_invalid(c, k)) {
|
|
unsigned j;
|
|
|
|
for (j = 0; j < KEY_PTRS(k); j++)
|
|
if (ptr_available(c, k, j))
|
|
atomic_inc(&PTR_BUCKET(c, k, j)->pin);
|
|
|
|
bch_initial_mark_key(c, 0, k);
|
|
}
|
|
}
|
|
}
|
|
|
|
bool is_discard_enabled(struct cache_set *s)
|
|
{
|
|
struct cache *ca;
|
|
unsigned int i;
|
|
|
|
for_each_cache(ca, s, i)
|
|
if (ca->discard)
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
int bch_journal_replay(struct cache_set *s, struct list_head *list)
|
|
{
|
|
int ret = 0, keys = 0, entries = 0;
|
|
struct bkey *k;
|
|
struct journal_replay *i =
|
|
list_entry(list->prev, struct journal_replay, list);
|
|
|
|
uint64_t start = i->j.last_seq, end = i->j.seq, n = start;
|
|
struct keylist keylist;
|
|
|
|
list_for_each_entry(i, list, list) {
|
|
BUG_ON(i->pin && atomic_read(i->pin) != 1);
|
|
|
|
if (n != i->j.seq) {
|
|
if (n == start && is_discard_enabled(s))
|
|
pr_info("bcache: journal entries %llu-%llu may be discarded! (replaying %llu-%llu)",
|
|
n, i->j.seq - 1, start, end);
|
|
else {
|
|
pr_err("bcache: journal entries %llu-%llu missing! (replaying %llu-%llu)",
|
|
n, i->j.seq - 1, start, end);
|
|
ret = -EIO;
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
for (k = i->j.start;
|
|
k < bset_bkey_last(&i->j);
|
|
k = bkey_next(k)) {
|
|
trace_bcache_journal_replay_key(k);
|
|
|
|
bch_keylist_init_single(&keylist, k);
|
|
|
|
ret = bch_btree_insert(s, &keylist, i->pin, NULL);
|
|
if (ret)
|
|
goto err;
|
|
|
|
BUG_ON(!bch_keylist_empty(&keylist));
|
|
keys++;
|
|
|
|
cond_resched();
|
|
}
|
|
|
|
if (i->pin)
|
|
atomic_dec(i->pin);
|
|
n = i->j.seq + 1;
|
|
entries++;
|
|
}
|
|
|
|
pr_info("journal replay done, %i keys in %i entries, seq %llu",
|
|
keys, entries, end);
|
|
err:
|
|
while (!list_empty(list)) {
|
|
i = list_first_entry(list, struct journal_replay, list);
|
|
list_del(&i->list);
|
|
kfree(i);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
/* Journalling */
|
|
|
|
static void btree_flush_write(struct cache_set *c)
|
|
{
|
|
/*
|
|
* Try to find the btree node with that references the oldest journal
|
|
* entry, best is our current candidate and is locked if non NULL:
|
|
*/
|
|
struct btree *b, *best;
|
|
unsigned i;
|
|
retry:
|
|
best = NULL;
|
|
|
|
for_each_cached_btree(b, c, i)
|
|
if (btree_current_write(b)->journal) {
|
|
if (!best)
|
|
best = b;
|
|
else if (journal_pin_cmp(c,
|
|
btree_current_write(best)->journal,
|
|
btree_current_write(b)->journal)) {
|
|
best = b;
|
|
}
|
|
}
|
|
|
|
b = best;
|
|
if (b) {
|
|
mutex_lock(&b->write_lock);
|
|
if (!btree_current_write(b)->journal) {
|
|
mutex_unlock(&b->write_lock);
|
|
/* We raced */
|
|
goto retry;
|
|
}
|
|
|
|
__bch_btree_node_write(b, NULL);
|
|
mutex_unlock(&b->write_lock);
|
|
}
|
|
}
|
|
|
|
#define last_seq(j) ((j)->seq - fifo_used(&(j)->pin) + 1)
|
|
|
|
static void journal_discard_endio(struct bio *bio)
|
|
{
|
|
struct journal_device *ja =
|
|
container_of(bio, struct journal_device, discard_bio);
|
|
struct cache *ca = container_of(ja, struct cache, journal);
|
|
|
|
atomic_set(&ja->discard_in_flight, DISCARD_DONE);
|
|
|
|
closure_wake_up(&ca->set->journal.wait);
|
|
closure_put(&ca->set->cl);
|
|
}
|
|
|
|
static void journal_discard_work(struct work_struct *work)
|
|
{
|
|
struct journal_device *ja =
|
|
container_of(work, struct journal_device, discard_work);
|
|
|
|
submit_bio(&ja->discard_bio);
|
|
}
|
|
|
|
static void do_journal_discard(struct cache *ca)
|
|
{
|
|
struct journal_device *ja = &ca->journal;
|
|
struct bio *bio = &ja->discard_bio;
|
|
|
|
if (!ca->discard) {
|
|
ja->discard_idx = ja->last_idx;
|
|
return;
|
|
}
|
|
|
|
switch (atomic_read(&ja->discard_in_flight)) {
|
|
case DISCARD_IN_FLIGHT:
|
|
return;
|
|
|
|
case DISCARD_DONE:
|
|
ja->discard_idx = (ja->discard_idx + 1) %
|
|
ca->sb.njournal_buckets;
|
|
|
|
atomic_set(&ja->discard_in_flight, DISCARD_READY);
|
|
/* fallthrough */
|
|
|
|
case DISCARD_READY:
|
|
if (ja->discard_idx == ja->last_idx)
|
|
return;
|
|
|
|
atomic_set(&ja->discard_in_flight, DISCARD_IN_FLIGHT);
|
|
|
|
bio_init(bio);
|
|
bio_set_op_attrs(bio, REQ_OP_DISCARD, 0);
|
|
bio->bi_iter.bi_sector = bucket_to_sector(ca->set,
|
|
ca->sb.d[ja->discard_idx]);
|
|
bio->bi_bdev = ca->bdev;
|
|
bio->bi_max_vecs = 1;
|
|
bio->bi_io_vec = bio->bi_inline_vecs;
|
|
bio->bi_iter.bi_size = bucket_bytes(ca);
|
|
bio->bi_end_io = journal_discard_endio;
|
|
|
|
closure_get(&ca->set->cl);
|
|
INIT_WORK(&ja->discard_work, journal_discard_work);
|
|
schedule_work(&ja->discard_work);
|
|
}
|
|
}
|
|
|
|
static void journal_reclaim(struct cache_set *c)
|
|
{
|
|
struct bkey *k = &c->journal.key;
|
|
struct cache *ca;
|
|
uint64_t last_seq;
|
|
unsigned iter, n = 0;
|
|
atomic_t p;
|
|
|
|
while (!atomic_read(&fifo_front(&c->journal.pin)))
|
|
fifo_pop(&c->journal.pin, p);
|
|
|
|
last_seq = last_seq(&c->journal);
|
|
|
|
/* Update last_idx */
|
|
|
|
for_each_cache(ca, c, iter) {
|
|
struct journal_device *ja = &ca->journal;
|
|
|
|
while (ja->last_idx != ja->cur_idx &&
|
|
ja->seq[ja->last_idx] < last_seq)
|
|
ja->last_idx = (ja->last_idx + 1) %
|
|
ca->sb.njournal_buckets;
|
|
}
|
|
|
|
for_each_cache(ca, c, iter)
|
|
do_journal_discard(ca);
|
|
|
|
if (c->journal.blocks_free)
|
|
goto out;
|
|
|
|
/*
|
|
* Allocate:
|
|
* XXX: Sort by free journal space
|
|
*/
|
|
|
|
for_each_cache(ca, c, iter) {
|
|
struct journal_device *ja = &ca->journal;
|
|
unsigned next = (ja->cur_idx + 1) % ca->sb.njournal_buckets;
|
|
|
|
/* No space available on this device */
|
|
if (next == ja->discard_idx)
|
|
continue;
|
|
|
|
ja->cur_idx = next;
|
|
k->ptr[n++] = MAKE_PTR(0,
|
|
bucket_to_sector(c, ca->sb.d[ja->cur_idx]),
|
|
ca->sb.nr_this_dev);
|
|
}
|
|
|
|
if (n) {
|
|
bkey_init(k);
|
|
SET_KEY_PTRS(k, n);
|
|
c->journal.blocks_free = c->sb.bucket_size >> c->block_bits;
|
|
}
|
|
out:
|
|
if (!journal_full(&c->journal))
|
|
__closure_wake_up(&c->journal.wait);
|
|
}
|
|
|
|
void bch_journal_next(struct journal *j)
|
|
{
|
|
atomic_t p = { 1 };
|
|
|
|
j->cur = (j->cur == j->w)
|
|
? &j->w[1]
|
|
: &j->w[0];
|
|
|
|
/*
|
|
* The fifo_push() needs to happen at the same time as j->seq is
|
|
* incremented for last_seq() to be calculated correctly
|
|
*/
|
|
BUG_ON(!fifo_push(&j->pin, p));
|
|
atomic_set(&fifo_back(&j->pin), 1);
|
|
|
|
j->cur->data->seq = ++j->seq;
|
|
j->cur->dirty = false;
|
|
j->cur->need_write = false;
|
|
j->cur->data->keys = 0;
|
|
|
|
if (fifo_full(&j->pin))
|
|
pr_debug("journal_pin full (%zu)", fifo_used(&j->pin));
|
|
}
|
|
|
|
static void journal_write_endio(struct bio *bio)
|
|
{
|
|
struct journal_write *w = bio->bi_private;
|
|
|
|
cache_set_err_on(bio->bi_error, w->c, "journal io error");
|
|
closure_put(&w->c->journal.io);
|
|
}
|
|
|
|
static void journal_write(struct closure *);
|
|
|
|
static void journal_write_done(struct closure *cl)
|
|
{
|
|
struct journal *j = container_of(cl, struct journal, io);
|
|
struct journal_write *w = (j->cur == j->w)
|
|
? &j->w[1]
|
|
: &j->w[0];
|
|
|
|
__closure_wake_up(&w->wait);
|
|
continue_at_nobarrier(cl, journal_write, system_wq);
|
|
}
|
|
|
|
static void journal_write_unlock(struct closure *cl)
|
|
{
|
|
struct cache_set *c = container_of(cl, struct cache_set, journal.io);
|
|
|
|
c->journal.io_in_flight = 0;
|
|
spin_unlock(&c->journal.lock);
|
|
}
|
|
|
|
static void journal_write_unlocked(struct closure *cl)
|
|
__releases(c->journal.lock)
|
|
{
|
|
struct cache_set *c = container_of(cl, struct cache_set, journal.io);
|
|
struct cache *ca;
|
|
struct journal_write *w = c->journal.cur;
|
|
struct bkey *k = &c->journal.key;
|
|
unsigned i, sectors = set_blocks(w->data, block_bytes(c)) *
|
|
c->sb.block_size;
|
|
|
|
struct bio *bio;
|
|
struct bio_list list;
|
|
bio_list_init(&list);
|
|
|
|
if (!w->need_write) {
|
|
closure_return_with_destructor(cl, journal_write_unlock);
|
|
return;
|
|
} else if (journal_full(&c->journal)) {
|
|
journal_reclaim(c);
|
|
spin_unlock(&c->journal.lock);
|
|
|
|
btree_flush_write(c);
|
|
continue_at(cl, journal_write, system_wq);
|
|
return;
|
|
}
|
|
|
|
c->journal.blocks_free -= set_blocks(w->data, block_bytes(c));
|
|
|
|
w->data->btree_level = c->root->level;
|
|
|
|
bkey_copy(&w->data->btree_root, &c->root->key);
|
|
bkey_copy(&w->data->uuid_bucket, &c->uuid_bucket);
|
|
|
|
for_each_cache(ca, c, i)
|
|
w->data->prio_bucket[ca->sb.nr_this_dev] = ca->prio_buckets[0];
|
|
|
|
w->data->magic = jset_magic(&c->sb);
|
|
w->data->version = BCACHE_JSET_VERSION;
|
|
w->data->last_seq = last_seq(&c->journal);
|
|
w->data->csum = csum_set(w->data);
|
|
|
|
for (i = 0; i < KEY_PTRS(k); i++) {
|
|
ca = PTR_CACHE(c, k, i);
|
|
bio = &ca->journal.bio;
|
|
|
|
atomic_long_add(sectors, &ca->meta_sectors_written);
|
|
|
|
bio_reset(bio);
|
|
bio->bi_iter.bi_sector = PTR_OFFSET(k, i);
|
|
bio->bi_bdev = ca->bdev;
|
|
bio->bi_iter.bi_size = sectors << 9;
|
|
|
|
bio->bi_end_io = journal_write_endio;
|
|
bio->bi_private = w;
|
|
bio_set_op_attrs(bio, REQ_OP_WRITE,
|
|
REQ_SYNC|REQ_META|REQ_PREFLUSH|REQ_FUA);
|
|
bch_bio_map(bio, w->data);
|
|
|
|
trace_bcache_journal_write(bio);
|
|
bio_list_add(&list, bio);
|
|
|
|
SET_PTR_OFFSET(k, i, PTR_OFFSET(k, i) + sectors);
|
|
|
|
ca->journal.seq[ca->journal.cur_idx] = w->data->seq;
|
|
}
|
|
|
|
/* If KEY_PTRS(k) == 0, this jset gets lost in air */
|
|
BUG_ON(i == 0);
|
|
|
|
atomic_dec_bug(&fifo_back(&c->journal.pin));
|
|
bch_journal_next(&c->journal);
|
|
journal_reclaim(c);
|
|
|
|
spin_unlock(&c->journal.lock);
|
|
|
|
while ((bio = bio_list_pop(&list)))
|
|
closure_bio_submit(bio, cl);
|
|
|
|
continue_at(cl, journal_write_done, NULL);
|
|
}
|
|
|
|
static void journal_write(struct closure *cl)
|
|
{
|
|
struct cache_set *c = container_of(cl, struct cache_set, journal.io);
|
|
|
|
spin_lock(&c->journal.lock);
|
|
journal_write_unlocked(cl);
|
|
}
|
|
|
|
static void journal_try_write(struct cache_set *c)
|
|
__releases(c->journal.lock)
|
|
{
|
|
struct closure *cl = &c->journal.io;
|
|
struct journal_write *w = c->journal.cur;
|
|
|
|
w->need_write = true;
|
|
|
|
if (!c->journal.io_in_flight) {
|
|
c->journal.io_in_flight = 1;
|
|
closure_call(cl, journal_write_unlocked, NULL, &c->cl);
|
|
} else {
|
|
spin_unlock(&c->journal.lock);
|
|
}
|
|
}
|
|
|
|
static struct journal_write *journal_wait_for_write(struct cache_set *c,
|
|
unsigned nkeys)
|
|
{
|
|
size_t sectors;
|
|
struct closure cl;
|
|
bool wait = false;
|
|
|
|
closure_init_stack(&cl);
|
|
|
|
spin_lock(&c->journal.lock);
|
|
|
|
while (1) {
|
|
struct journal_write *w = c->journal.cur;
|
|
|
|
sectors = __set_blocks(w->data, w->data->keys + nkeys,
|
|
block_bytes(c)) * c->sb.block_size;
|
|
|
|
if (sectors <= min_t(size_t,
|
|
c->journal.blocks_free * c->sb.block_size,
|
|
PAGE_SECTORS << JSET_BITS))
|
|
return w;
|
|
|
|
if (wait)
|
|
closure_wait(&c->journal.wait, &cl);
|
|
|
|
if (!journal_full(&c->journal)) {
|
|
if (wait)
|
|
trace_bcache_journal_entry_full(c);
|
|
|
|
/*
|
|
* XXX: If we were inserting so many keys that they
|
|
* won't fit in an _empty_ journal write, we'll
|
|
* deadlock. For now, handle this in
|
|
* bch_keylist_realloc() - but something to think about.
|
|
*/
|
|
BUG_ON(!w->data->keys);
|
|
|
|
journal_try_write(c); /* unlocks */
|
|
} else {
|
|
if (wait)
|
|
trace_bcache_journal_full(c);
|
|
|
|
journal_reclaim(c);
|
|
spin_unlock(&c->journal.lock);
|
|
|
|
btree_flush_write(c);
|
|
}
|
|
|
|
closure_sync(&cl);
|
|
spin_lock(&c->journal.lock);
|
|
wait = true;
|
|
}
|
|
}
|
|
|
|
static void journal_write_work(struct work_struct *work)
|
|
{
|
|
struct cache_set *c = container_of(to_delayed_work(work),
|
|
struct cache_set,
|
|
journal.work);
|
|
spin_lock(&c->journal.lock);
|
|
if (c->journal.cur->dirty)
|
|
journal_try_write(c);
|
|
else
|
|
spin_unlock(&c->journal.lock);
|
|
}
|
|
|
|
/*
|
|
* Entry point to the journalling code - bio_insert() and btree_invalidate()
|
|
* pass bch_journal() a list of keys to be journalled, and then
|
|
* bch_journal() hands those same keys off to btree_insert_async()
|
|
*/
|
|
|
|
atomic_t *bch_journal(struct cache_set *c,
|
|
struct keylist *keys,
|
|
struct closure *parent)
|
|
{
|
|
struct journal_write *w;
|
|
atomic_t *ret;
|
|
|
|
if (!CACHE_SYNC(&c->sb))
|
|
return NULL;
|
|
|
|
w = journal_wait_for_write(c, bch_keylist_nkeys(keys));
|
|
|
|
memcpy(bset_bkey_last(w->data), keys->keys, bch_keylist_bytes(keys));
|
|
w->data->keys += bch_keylist_nkeys(keys);
|
|
|
|
ret = &fifo_back(&c->journal.pin);
|
|
atomic_inc(ret);
|
|
|
|
if (parent) {
|
|
closure_wait(&w->wait, parent);
|
|
journal_try_write(c);
|
|
} else if (!w->dirty) {
|
|
w->dirty = true;
|
|
schedule_delayed_work(&c->journal.work,
|
|
msecs_to_jiffies(c->journal_delay_ms));
|
|
spin_unlock(&c->journal.lock);
|
|
} else {
|
|
spin_unlock(&c->journal.lock);
|
|
}
|
|
|
|
|
|
return ret;
|
|
}
|
|
|
|
void bch_journal_meta(struct cache_set *c, struct closure *cl)
|
|
{
|
|
struct keylist keys;
|
|
atomic_t *ref;
|
|
|
|
bch_keylist_init(&keys);
|
|
|
|
ref = bch_journal(c, &keys, cl);
|
|
if (ref)
|
|
atomic_dec_bug(ref);
|
|
}
|
|
|
|
void bch_journal_free(struct cache_set *c)
|
|
{
|
|
free_pages((unsigned long) c->journal.w[1].data, JSET_BITS);
|
|
free_pages((unsigned long) c->journal.w[0].data, JSET_BITS);
|
|
free_fifo(&c->journal.pin);
|
|
}
|
|
|
|
int bch_journal_alloc(struct cache_set *c)
|
|
{
|
|
struct journal *j = &c->journal;
|
|
|
|
spin_lock_init(&j->lock);
|
|
INIT_DELAYED_WORK(&j->work, journal_write_work);
|
|
|
|
c->journal_delay_ms = 100;
|
|
|
|
j->w[0].c = c;
|
|
j->w[1].c = c;
|
|
|
|
if (!(init_fifo(&j->pin, JOURNAL_PIN, GFP_KERNEL)) ||
|
|
!(j->w[0].data = (void *) __get_free_pages(GFP_KERNEL|__GFP_COMP, JSET_BITS)) ||
|
|
!(j->w[1].data = (void *) __get_free_pages(GFP_KERNEL|__GFP_COMP, JSET_BITS)))
|
|
return -ENOMEM;
|
|
|
|
return 0;
|
|
}
|