mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Qu Wenruo <wqu@suse.com>, David Sterba <dsterba@suse.com>,
	Sasha Levin <sashal@kernel.org>,
	linux-btrfs@vger.kernel.org
Subject: [PATCH AUTOSEL 4.19 56/97] btrfs: volumes: Make sure there is no overlap of dev extents at mount time
Date: Tue,  8 Jan 2019 14:29:05 -0500	[thread overview]
Message-ID: <20190108192949.122407-56-sashal@kernel.org> (raw)
In-Reply-To: <20190108192949.122407-1-sashal@kernel.org>

From: Qu Wenruo <wqu@suse.com>

[ Upstream commit 5eb193812a42dc49331f25137a38dfef9612d3e4 ]

Enhance btrfs_verify_dev_extents() to remember previous checked dev
extents, so it can verify no dev extents can overlap.

Analysis from Hans:

"Imagine allocating a DATA|DUP chunk.

 In the chunk allocator, we first set...
   max_stripe_size = SZ_1G;
   max_chunk_size = BTRFS_MAX_DATA_CHUNK_SIZE
 ... which is 10GiB.

 Then...
   /* we don't want a chunk larger than 10% of writeable space */
   max_chunk_size = min(div_factor(fs_devices->total_rw_bytes, 1),
       		 max_chunk_size);

 Imagine we only have one 7880MiB block device in this filesystem. Now
 max_chunk_size is down to 788MiB.

 The next step in the code is to search for max_stripe_size * dev_stripes
 amount of free space on the device, which is in our example 1GiB * 2 =
 2GiB. Imagine the device has exactly 1578MiB free in one contiguous
 piece. This amount of bytes will be put in devices_info[ndevs - 1].max_avail

 Next we recalculate the stripe_size (which is actually the device extent
 length), based on the actual maximum amount of available raw disk space:
   stripe_size = div_u64(devices_info[ndevs - 1].max_avail, dev_stripes);

 stripe_size is now 789MiB

 Next we do...
   data_stripes = num_stripes / ncopies
 ...where data_stripes ends up as 1, because num_stripes is 2 (the amount
 of device extents we're going to have), and DUP has ncopies 2.

 Next there's a check...
   if (stripe_size * data_stripes > max_chunk_size)
 ...which matches because 789MiB * 1 > 788MiB.

 We go into the if code, and next is...
   stripe_size = div_u64(max_chunk_size, data_stripes);
 ...which resets stripe_size to max_chunk_size: 788MiB

 Next is a fun one...
   /* bump the answer up to a 16MB boundary */
   stripe_size = round_up(stripe_size, SZ_16M);
 ...which changes stripe_size from 788MiB to 800MiB.

 We're not done changing stripe_size yet...
   /* But don't go higher than the limits we found while searching
    * for free extents
    */
   stripe_size = min(devices_info[ndevs - 1].max_avail,
       	      stripe_size);

 This is bad. max_avail is twice the stripe_size (we need to fit 2 device
 extents on the same device for DUP).

 The result here is that 800MiB < 1578MiB, so it's unchanged. However,
 the resulting DUP chunk will need 1600MiB disk space, which isn't there,
 and the second dev_extent might extend into the next thing (next
 dev_extent? end of device?) for 22MiB.

 The last shown line of code relies on a situation where there's twice
 the value of stripe_size present as value for the variable stripe_size
 when it's DUP. This was actually the case before commit 92e222df7b
 "btrfs: alloc_chunk: fix DUP stripe size handling", from which I quote:
   "[...] in the meantime there's a check to see if the stripe_size does
 not exceed max_chunk_size. Since during this check stripe_size is twice
 the amount as intended, the check will reduce the stripe_size to
 max_chunk_size if the actual correct to be used stripe_size is more than
 half the amount of max_chunk_size."

 In the previous version of the code, the 16MiB alignment (why is this
 done, by the way?) would result in a 50% chance that it would actually
 do an 8MiB alignment for the individual dev_extents, since it was
 operating on double the size. Does this matter?

 Does it matter that stripe_size can be set to anything which is not
 16MiB aligned because of the amount of remaining available disk space
 which is just taken?

 What is the main purpose of this round_up?

 The most straightforward thing to do seems something like...
   stripe_size = min(
       div_u64(devices_info[ndevs - 1].max_avail, dev_stripes),
       stripe_size
   )
 ..just putting half of the max_avail into stripe_size."

Link: https://lore.kernel.org/linux-btrfs/b3461a38-e5f8-f41d-c67c-2efac8129054@mendix.com/
Reported-by: Hans van Kranenburg <hans.van.kranenburg@mendix.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
[ add analysis from report ]
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 fs/btrfs/volumes.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index f4405e430da6..5aa6296699b4 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -7467,6 +7467,8 @@ int btrfs_verify_dev_extents(struct btrfs_fs_info *fs_info)
 	struct btrfs_path *path;
 	struct btrfs_root *root = fs_info->dev_root;
 	struct btrfs_key key;
+	u64 prev_devid = 0;
+	u64 prev_dev_ext_end = 0;
 	int ret = 0;
 
 	key.objectid = 1;
@@ -7511,10 +7513,22 @@ int btrfs_verify_dev_extents(struct btrfs_fs_info *fs_info)
 		chunk_offset = btrfs_dev_extent_chunk_offset(leaf, dext);
 		physical_len = btrfs_dev_extent_length(leaf, dext);
 
+		/* Check if this dev extent overlaps with the previous one */
+		if (devid == prev_devid && physical_offset < prev_dev_ext_end) {
+			btrfs_err(fs_info,
+"dev extent devid %llu physical offset %llu overlap with previous dev extent end %llu",
+				  devid, physical_offset, prev_dev_ext_end);
+			ret = -EUCLEAN;
+			goto out;
+		}
+
 		ret = verify_one_dev_extent(fs_info, chunk_offset, devid,
 					    physical_offset, physical_len);
 		if (ret < 0)
 			goto out;
+		prev_devid = devid;
+		prev_dev_ext_end = physical_offset + physical_len;
+
 		ret = btrfs_next_item(root, path);
 		if (ret < 0)
 			goto out;
-- 
2.19.1


  parent reply	other threads:[~2019-01-08 19:52 UTC|newest]

Thread overview: 97+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-08 19:28 [PATCH AUTOSEL 4.19 01/97] netfilter: ipset: Allow matching on destination MAC address for mac and ipmac sets Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 02/97] gpio: pl061: Move irq_chip definition inside struct pl061 Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 03/97] drm/amd/display: Guard against null stream_state in set_crc_source Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 04/97] drm/amdkfd: fix interrupt spin lock Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 05/97] ixgbe: allow IPsec Tx offload in VEPA mode Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 06/97] platform/x86: asus-wmi: Tell the EC the OS will handle the display off hotkey Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 07/97] e1000e: allow non-monotonic SYSTIM readings Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 08/97] usb: typec: tcpm: Do not disconnect link for self powered devices Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 09/97] selftests/bpf: enable (uncomment) all tests in test_libbpf.sh Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 10/97] of: overlay: add missing of_node_put() after add new node to changeset Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 11/97] writeback: don't decrement wb->refcnt if !wb->bdi Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 12/97] serial: set suppress_bind_attrs flag only if builtin Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 13/97] bpf: Allow narrow loads with offset > 0 Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 14/97] ALSA: oxfw: add support for APOGEE duet FireWire Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 15/97] x86/mce: Fix -Wmissing-prototypes warnings Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 16/97] MIPS: SiByte: Enable swiotlb for SWARM, LittleSur and BigSur Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 17/97] crypto: ecc - regularize scalar for scalar multiplication Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 18/97] arm64: perf: set suppress_bind_attrs flag to true Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 19/97] USB: serial: ftdi_sio: use rounding when calculating baud rate divisors Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 20/97] drm/atomic-helper: Complete fake_commit->flip_done potentially earlier Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 21/97] clk: meson: meson8b: fix incorrect divider mapping in cpu_scale_table Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 22/97] samples: bpf: fix: error handling regarding kprobe_events Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 23/97] usb: gadget: udc: renesas_usb3: add a safety connection way for forced_b_device Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 24/97] fpga: altera-cvp: fix probing for multiple FPGAs on the bus Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 25/97] selinux: always allow mounting submounts Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 26/97] drm/amdgpu: Correct get_crtc_scanoutpos behavior when vpos >= vtotal Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 27/97] block: use rcu_work instead of call_rcu to avoid sleep in softirq Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 28/97] ASoC: pcm3168a: Don't disable pcm3168a when CONFIG_PM defined Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 29/97] scsi: qedi: Check for session online before getting iSCSI TLV data Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 30/97] drm/amdgpu: Reorder uvd ring init before uvd resume Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 31/97] rxe: IB_WR_REG_MR does not capture MR's iova field Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 32/97] efi/libstub: Disable some warnings for x86{,_64} Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 33/97] jffs2: Fix use of uninitialized delayed_work, lockdep breakage Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 34/97] clk: imx: make mux parent strings const Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 35/97] pstore/ram: Do not treat empty buffers as valid Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 36/97] media: uvcvideo: Refactor teardown of uvc on USB disconnect Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 37/97] powerpc/xmon: Fix invocation inside lock region Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 38/97] powerpc/pseries/cpuidle: Fix preempt warning Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 39/97] arm64: relocatable: fix inconsistencies in linker script and options Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 40/97] media: firewire: Fix app_info parameter type in avc_ca{,_app}_info Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 41/97] ASoC: use dma_ops of parent device for acp_audio_dma Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 42/97] IB/hfi1: Incorrect sizing of sge for PIO will OOPs Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 43/97] media: venus: core: Set dma maximum segment size Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 44/97] staging: erofs: fix use-after-free of on-stack `z_erofs_vle_unzip_io' Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 45/97] net: call sk_dst_reset when set SO_DONTROUTE Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 46/97] scsi: target: use consistent left-aligned ASCII INQUIRY data Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 47/97] scsi: target/core: Make sure that target_wait_for_sess_cmds() waits long enough Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 48/97] selftests: do not macro-expand failed assertion expressions Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 49/97] arm64: kasan: Increase stack size for KASAN_EXTRA Sasha Levin
2019-01-08 19:28 ` [PATCH AUTOSEL 4.19 50/97] clk: imx6q: reset exclusive gates on init Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 51/97] arm64: Fix minor issues with the dcache_by_line_op macro Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 52/97] bpf: relax verifier restriction on BPF_MOV | BPF_ALU Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 53/97] kconfig: fix file name and line number of warn_ignored_character() Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 54/97] kconfig: fix memory leak when EOF is encountered in quotation Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 55/97] mmc: atmel-mci: do not assume idle after atmci_request_end Sasha Levin
2019-01-08 19:29 ` Sasha Levin [this message]
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 57/97] btrfs: alloc_chunk: fix more DUP stripe size handling Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 58/97] btrfs: fix use-after-free due to race between replace start and cancel Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 59/97] Btrfs: fix deadlock when enabling quotas due to concurrent snapshot creation Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 60/97] Btrfs: fix access to available allocation bits when starting balance Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 61/97] btrfs: improve error handling of btrfs_add_link Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 62/97] tty/serial: do not free trasnmit buffer page under port lock Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 63/97] perf intel-pt: Fix error with config term "pt=0" Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 64/97] perf tests ARM: Disable breakpoint tests 32-bit Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 65/97] perf svghelper: Fix unchecked usage of strncpy() Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 66/97] perf parse-events: " Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 67/97] perf vendor events intel: Fix Load_Miss_Real_Latency on SKL/SKX Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 68/97] netfilter: ipt_CLUSTERIP: check MAC address when duplicate config is set Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 69/97] netfilter: ipt_CLUSTERIP: remove wrong WARN_ON_ONCE in netns exit routine Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 70/97] netfilter: ipt_CLUSTERIP: fix deadlock " Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 71/97] x86/topology: Use total_cpus for max logical packages calculation Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 72/97] dm crypt: use u64 instead of sector_t to store iv_offset Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 73/97] dm kcopyd: Fix bug causing workqueue stalls Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 74/97] perf stat: Avoid segfaults caused by negated options Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 75/97] tools lib subcmd: Don't add the kernel sources to the include path Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 76/97] dm snapshot: Fix excessive memory usage and workqueue stalls Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 77/97] perf cs-etm: Correct packets swapping in cs_etm__flush() Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 78/97] perf tools: Add missing sigqueue() prototype for systems lacking it Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 79/97] perf tools: Add missing open_memstream() " Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 80/97] quota: Lock s_umount in exclusive mode for Q_XQUOTA{ON,OFF} quotactls Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 81/97] clocksource/drivers/integrator-ap: Add missing of_node_put() Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 82/97] dm: Check for device sector overflow if CONFIG_LBDAF is not set Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 83/97] Bluetooth: btusb: Add support for Intel bluetooth device 8087:0029 Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 84/97] ALSA: bebob: fix model-id of unit for Apogee Ensemble Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 85/97] sysfs: Disable lockdep for driver bind/unbind files Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 86/97] IB/usnic: Fix potential deadlock Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 87/97] scsi: mpt3sas: fix memory ordering on 64bit writes Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 88/97] scsi: smartpqi: correct lun reset issues Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 89/97] ath10k: fix peer stats null pointer dereference Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 90/97] scsi: smartpqi: call pqi_free_interrupts() in pqi_shutdown() Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 91/97] scsi: megaraid: fix out-of-bound array accesses Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 92/97] iomap: don't search past page end in iomap_is_partially_uptodate Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 93/97] ocfs2: fix panic due to unrecovered local alloc Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 94/97] mm/page-writeback.c: don't break integrity writeback on ->writepage() error Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 95/97] mm/swap: use nr_node_ids for avail_lists in swap_info_struct Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 96/97] userfaultfd: clear flag if remap event not enabled Sasha Levin
2019-01-08 19:29 ` [PATCH AUTOSEL 4.19 97/97] mm, proc: be more verbose about unstable VMA flags in /proc/<pid>/smaps 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=20190108192949.122407-56-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=dsterba@suse.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=wqu@suse.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome