Commit 3aaa8ce7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2024-03-07-16-17' of... 

Merge tag 'mm-hotfixes-stable-2024-03-07-16-17' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "6 hotfixes. 4 are cc:stable and the remainder pertain to post-6.7
  issues or aren't considered to be needed in earlier kernel versions"

* tag 'mm-hotfixes-stable-2024-03-07-16-17' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  scripts/gdb/symbols: fix invalid escape sequence warning
  mailmap: fix Kishon's email
  init/Kconfig: lower GCC version check for -Warray-bounds
  mm, mmap: fix vma_merge() case 7 with vma_ops->close
  mm: userfaultfd: fix unexpected change to src_folio when UFFDIO_MOVE fails
  mm, vmscan: prevent infinite loop for costly GFP_NOIO | __GFP_RETRY_MAYFAIL allocations
parents c381c89d ded79af4

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com> 
Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>

Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>

Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>

Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>

Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

include/linux/gfp.h

+9 −0
Original line number Diff line number Diff line
@@ -353,6 +353,15 @@ static inline bool gfp_has_io_fs(gfp_t gfp) 
	return (gfp & (__GFP_IO | __GFP_FS)) == (__GFP_IO | __GFP_FS);

}



/*

 * Check if the gfp flags allow compaction - GFP_NOIO is a really

 * tricky context because the migration might require IO.

 */

static inline bool gfp_compaction_allowed(gfp_t gfp_mask)

{

	return IS_ENABLED(CONFIG_COMPACTION) && (gfp_mask & __GFP_IO);

}



extern gfp_t vma_thp_gfp_mask(struct vm_area_struct *vma);



#ifdef CONFIG_CONTIG_ALLOC

init/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -876,14 +876,14 @@ config CC_IMPLICIT_FALLTHROUGH 
	default "-Wimplicit-fallthrough=5" if CC_IS_GCC && $(cc-option,-Wimplicit-fallthrough=5)

	default "-Wimplicit-fallthrough" if CC_IS_CLANG && $(cc-option,-Wunreachable-code-fallthrough)



# Currently, disable gcc-11+ array-bounds globally.

# Currently, disable gcc-10+ array-bounds globally.

# It's still broken in gcc-13, so no upper bound yet.

config GCC11_NO_ARRAY_BOUNDS

config GCC10_NO_ARRAY_BOUNDS

	def_bool y



config CC_NO_ARRAY_BOUNDS

	bool

	default y if CC_IS_GCC && GCC_VERSION >= 110000 && GCC11_NO_ARRAY_BOUNDS

	default y if CC_IS_GCC && GCC_VERSION >= 100000 && GCC10_NO_ARRAY_BOUNDS



# Currently, disable -Wstringop-overflow for GCC globally.

config GCC_NO_STRINGOP_OVERFLOW

mm/compaction.c

+1 −6
Original line number Diff line number Diff line
@@ -2723,16 +2723,11 @@ enum compact_result try_to_compact_pages(gfp_t gfp_mask, unsigned int order, 
		unsigned int alloc_flags, const struct alloc_context *ac,

		enum compact_priority prio, struct page **capture)

{

	int may_perform_io = (__force int)(gfp_mask & __GFP_IO);

	struct zoneref *z;

	struct zone *zone;

	enum compact_result rc = COMPACT_SKIPPED;



	/*

	 * Check if the GFP flags allow compaction - GFP_NOIO is really

	 * tricky context because the migration might require IO

	 */

	if (!may_perform_io)

	if (!gfp_compaction_allowed(gfp_mask))

		return COMPACT_SKIPPED;



	trace_mm_compaction_try_to_compact_pages(order, gfp_mask, prio);

mm/mmap.c

+9 −1
Original line number Diff line number Diff line
@@ -954,13 +954,21 @@ static struct vm_area_struct 
	} else if (merge_prev) {			/* case 2 */

		if (curr) {

			vma_start_write(curr);

			err = dup_anon_vma(prev, curr, &anon_dup);

			if (end == curr->vm_end) {	/* case 7 */

				/*

				 * can_vma_merge_after() assumed we would not be

				 * removing prev vma, so it skipped the check

				 * for vm_ops->close, but we are removing curr

				 */

				if (curr->vm_ops && curr->vm_ops->close)

					err = -EINVAL;

				remove = curr;

			} else {			/* case 5 */

				adjust = curr;

				adj_start = (end - curr->vm_start);

			}

			if (!err)

				err = dup_anon_vma(prev, curr, &anon_dup);

		}

	} else { /* merge_next */

		vma_start_write(next);