Commit 482c5780 authored by Carlos Maiolino's avatar Carlos Maiolino
Browse files

Merge tag 'fix-scrub-reap-calculations_2025-09-05' of... 

Merge tag 'fix-scrub-reap-calculations_2025-09-05' of https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux

 into xfs-6.18-merge

xfs: improve online repair reap calculations [6.18 v2 1/2]

A few months ago, the multi-fsblock untorn writes patchset added a bunch
of log intent item helper functions to estimate the number of intent
items that could be added to a particular transaction.  Those helpers
enabled us to compute a safe upper bound on the number of blocks that
could be written in an untorn fashion with filesystem-provided out of
place writes.

Currently, the online fsck code employs static limits on the number of
intent items that it's willing to accrue to a single transaction when
it's trying to reap what it thinks are the old blocks from a corrupt
structure.  There have been no problems reported with this approach
after years of testing, but static limits are scary and gross because
overestimating the intent item limit could result in transaction
overflows and dead filesystems; and underestimating causes unnecessary
overhead.

This series uses the new log intent item size helpers to estimate the
limits dynamically based on worst-case per-block repair work vs. the
size of the scrub transaction.  After several months of testing this,
there don't seem to be any problems here either.

v2: rearrange patches, add review tags

This has been running on the djcloud for months with no problems.  Enjoy!

Signed-off-by: default avatar"Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: default avatarCarlos Maiolino <cem@kernel.org>
parents 33ddc796 07c34f8c

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -226,6 +226,8 @@ Domen Puncer <domen@coderock.org> 
Douglas Gilbert <dougg@torque.net>

Drew Fustini <fustini@kernel.org> <drew@pdp7.com>

<duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>

Easwar Hariharan <easwar.hariharan@linux.microsoft.com> <easwar.hariharan@intel.com>

Easwar Hariharan <easwar.hariharan@linux.microsoft.com> <eahariha@linux.microsoft.com>

Ed L. Cashin <ecashin@coraid.com>

Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org>

Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>

CREDITS

+7 −0
Original line number Diff line number Diff line
@@ -3222,6 +3222,10 @@ D: AIC5800 IEEE 1394, RAW I/O on 1394 
D: Starter of Linux1394 effort

S: ask per mail for current address



N: Boris Pismenny

E: borisp@mellanox.com

D: Kernel TLS implementation and offload support.



N: Nicolas Pitre

E: nico@fluxnic.net

D: StrongARM SA1100 support integrator & hacker
@@ -4168,6 +4172,9 @@ S: 1513 Brewster Dr. 
S: Carrollton, TX 75010

S: USA



N: Dave Watson

D: Kernel TLS implementation.



N: Tim Waugh

E: tim@cyberelk.net

D: Co-architect of the parallel-port sharing system

Documentation/ABI/stable/sysfs-block

+1 −1
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ Contact: linux-block@vger.kernel.org 
Description:

		[RW] If the device is registered for writeback throttling, then

		this file shows the target minimum read latency. If this latency

		is exceeded in a given window of time (see wb_window_usec), then

		is exceeded in a given window of time (see curr_win_nsec), then

		the writeback throttling will start scaling back writes. Writing

		a value of '0' to this file disables the feature. Writing a

		value of '-1' to this file resets the value to the default

Documentation/admin-guide/blockdev/zoned_loop.rst

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ zone_capacity_mb Device zone capacity (must always be equal to or lower than 
                   the zone size. Default: zone size.

conv_zones         Total number of conventioanl zones starting from sector 0.

                   Default: 8.

base_dir           Path to the base directoy where to create the directory

base_dir           Path to the base directory where to create the directory

                   containing the zone files of the device.

                   Default=/var/local/zloop.

                   The device directory containing the zone files is always

Documentation/admin-guide/cgroup-v2.rst

+2 −2
Original line number Diff line number Diff line
@@ -435,8 +435,8 @@ both cgroups. 
Controlling Controllers

-----------------------



Availablity

~~~~~~~~~~~

Availability

~~~~~~~~~~~~



A controller is available in a cgroup when it is supported by the kernel (i.e.,

compiled in, not disabled and not attached to a v1 hierarchy) and listed in the