LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Coly Li <colyli@suse.de>, Jens Axboe <axboe@kernel.dk>,
	Sasha Levin <sashal@kernel.org>,
	linux-bcache@vger.kernel.org
Subject: [PATCH AUTOSEL 4.14 045/167] bcache: add failure check to run_cache_set() for journal replay
Date: Wed, 22 May 2019 15:26:40 -0400	[thread overview]
Message-ID: <20190522192842.25858-45-sashal@kernel.org> (raw)
In-Reply-To: <20190522192842.25858-1-sashal@kernel.org>

From: Coly Li <colyli@suse.de>

[ Upstream commit ce3e4cfb59cb382f8e5ce359238aa580d4ae7778 ]

Currently run_cache_set() has no return value, if there is failure in
bch_journal_replay(), the caller of run_cache_set() has no idea about
such failure and just continue to execute following code after
run_cache_set().  The internal failure is triggered inside
bch_journal_replay() and being handled in async way. This behavior is
inefficient, while failure handling inside bch_journal_replay(), cache
register code is still running to start the cache set. Registering and
unregistering code running as same time may introduce some rare race
condition, and make the code to be more hard to be understood.

This patch adds return value to run_cache_set(), and returns -EIO if
bch_journal_rreplay() fails. Then caller of run_cache_set() may detect
such failure and stop registering code flow immedidately inside
register_cache_set().

If journal replay fails, run_cache_set() can report error immediately
to register_cache_set(). This patch makes the failure handling for
bch_journal_replay() be in synchronized way, easier to understand and
debug, and avoid poetential race condition for register-and-unregister
in same time.

Signed-off-by: Coly Li <colyli@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/md/bcache/super.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index 9e875aba41b9b..6a5670db7b44a 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -1560,7 +1560,7 @@ struct cache_set *bch_cache_set_alloc(struct cache_sb *sb)
 	return NULL;
 }
 
-static void run_cache_set(struct cache_set *c)
+static int run_cache_set(struct cache_set *c)
 {
 	const char *err = "cannot allocate memory";
 	struct cached_dev *dc, *t;
@@ -1652,7 +1652,9 @@ static void run_cache_set(struct cache_set *c)
 		if (j->version < BCACHE_JSET_VERSION_UUID)
 			__uuid_write(c);
 
-		bch_journal_replay(c, &journal);
+		err = "bcache: replay journal failed";
+		if (bch_journal_replay(c, &journal))
+			goto err;
 	} else {
 		pr_notice("invalidating existing data");
 
@@ -1720,11 +1722,13 @@ static void run_cache_set(struct cache_set *c)
 	flash_devs_run(c);
 
 	set_bit(CACHE_SET_RUNNING, &c->flags);
-	return;
+	return 0;
 err:
 	closure_sync(&cl);
 	/* XXX: test this, it's broken */
 	bch_cache_set_error(c, "%s", err);
+
+	return -EIO;
 }
 
 static bool can_attach_cache(struct cache *ca, struct cache_set *c)
@@ -1788,8 +1792,11 @@ static const char *register_cache_set(struct cache *ca)
 	ca->set->cache[ca->sb.nr_this_dev] = ca;
 	c->cache_by_alloc[c->caches_loaded++] = ca;
 
-	if (c->caches_loaded == c->sb.nr_in_set)
-		run_cache_set(c);
+	if (c->caches_loaded == c->sb.nr_in_set) {
+		err = "failed to run cache set";
+		if (run_cache_set(c) < 0)
+			goto err;
+	}
 
 	return NULL;
 err:
-- 
2.20.1


  parent reply	other threads:[~2019-05-22 19:29 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-22 19:25 [PATCH AUTOSEL 4.14 001/167] gfs2: Fix lru_count going negative Sasha Levin
2019-05-22 19:25 ` [PATCH AUTOSEL 4.14 002/167] cxgb4: Fix error path in cxgb4_init_module Sasha Levin
2019-05-22 19:25 ` [PATCH AUTOSEL 4.14 003/167] NFS: make nfs_match_client killable Sasha Levin
2019-05-22 19:25 ` [PATCH AUTOSEL 4.14 004/167] IB/hfi1: Fix WQ_MEM_RECLAIM warning Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 005/167] gfs2: Fix occasional glock use-after-free Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 006/167] mmc: core: Verify SD bus width Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 007/167] tools/bpf: fix perf build error with uClibc (seen on ARC) Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 008/167] dmaengine: tegra210-dma: free dma controller in remove() Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 009/167] net: ena: gcc 8: fix compilation warning Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 010/167] orangefs: truncate before updating size Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 011/167] pinctrl: zte: fix leaked of_node references Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 012/167] ASoC: hdmi-codec: unlock the device on startup errors Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 013/167] leds: avoid races with workqueue Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 014/167] powerpc/perf: Return accordingly on invalid chip-id in Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 015/167] powerpc/boot: Fix missing check of lseek() return value Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 016/167] ASoC: imx: fix fiq dependencies Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 017/167] spi: pxa2xx: fix SCR (divisor) calculation Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 018/167] brcm80211: potential NULL dereference in brcmf_cfg80211_vndr_cmds_dcmd_handler() Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 019/167] ACPI / property: fix handling of data_nodes in acpi_get_next_subnode() Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 020/167] ARM: vdso: Remove dependency with the arch_timer driver internals Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 021/167] arm64: Fix compiler warning from pte_unmap() with -Wunused-but-set-variable Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 022/167] sched/cpufreq: Fix kobject memleak Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 023/167] scsi: qla2xxx: Fix a qla24xx_enable_msix() error path Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 024/167] scsi: qla2xxx: Fix abort handling in tcm_qla2xxx_write_pending() Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 025/167] scsi: qla2xxx: Avoid that lockdep complains about unsafe locking in tcm_qla2xxx_close_session() Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 026/167] Btrfs: fix data bytes_may_use underflow with fallocate due to failed quota reserve Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 027/167] btrfs: fix panic during relocation after ENOSPC before writeback happens Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 028/167] btrfs: Don't panic when we can't find a root key Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 029/167] iwlwifi: pcie: don't crash on invalid RX interrupt Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 030/167] rtc: 88pm860x: prevent use-after-free on device remove Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 031/167] scsi: qedi: Abort ep termination if offload not scheduled Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 032/167] w1: fix the resume command API Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 033/167] dmaengine: pl330: _stop: clear interrupt status Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 034/167] mac80211/cfg80211: update bss channel on channel switch Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 035/167] libbpf: fix samples/bpf build failure due to undefined UINT32_MAX Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 036/167] driver core: platform: Fix the usage of platform device name(pdev->name) Sasha Levin
2019-05-22 20:05   ` Greg Kroah-Hartman
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 037/167] ASoC: fsl_sai: Update is_slave_mode with correct value Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 038/167] mwifiex: prevent an array overflow Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 039/167] net: cw1200: fix a NULL pointer dereference Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 040/167] at76c50x-usb: Don't register led_trigger if usb_register_driver failed Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 041/167] ssb: Fix possible NULL pointer dereference in ssb_host_pcmcia_exit Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 042/167] crypto: sun4i-ss - Fix invalid calculation of hash end Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 043/167] bcache: return error immediately in bch_journal_replay() Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 044/167] bcache: fix failure in journal relplay Sasha Levin
2019-05-22 19:26 ` Sasha Levin [this message]
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 046/167] bcache: avoid clang -Wunintialized warning Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 047/167] RDMA/cma: Consider scope_id while binding to ipv6 ll address Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 048/167] vfio-ccw: Do not call flush_workqueue while holding the spinlock Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 049/167] vfio-ccw: Release any channel program when releasing/removing vfio-ccw mdev Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 050/167] x86/build: Move _etext to actual end of .text Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 051/167] smpboot: Place the __percpu annotation correctly Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 052/167] x86/mm: Remove in_nmi() warning from 64-bit implementation of vmalloc_fault() Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 053/167] mm/uaccess: Use 'unsigned long' to placate UBSAN warnings on older GCC versions Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 054/167] HID: logitech-hidpp: use RAP instead of FAP to get the protocol version Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 055/167] pinctrl: pistachio: fix leaked of_node references Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 056/167] pinctrl: samsung: " Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 057/167] clk: rockchip: undo several noc and special clocks as critical on rk3288 Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 058/167] dmaengine: at_xdmac: remove BUG_ON macro in tasklet Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 059/167] media: coda: clear error return value before picture run Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 060/167] media: ov6650: Move v4l2_clk_get() to ov6650_video_probe() helper Sasha Levin
2019-05-22 19:26 ` [PATCH AUTOSEL 4.14 061/167] media: au0828: stop video streaming only when last user stops Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190522192842.25858-45-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=axboe@kernel.dk \
    --cc=colyli@suse.de \
    --cc=linux-bcache@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --subject='Re: [PATCH AUTOSEL 4.14 045/167] bcache: add failure check to run_cache_set() for journal replay' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).