Commit 4d939780 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2024-10-17-16-08' of... 

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

Pull misc fixes from Andrew Morton:
 "28 hotfixes. 13 are cc:stable. 23 are MM.

  It is the usual shower of unrelated singletons - please see the
  individual changelogs for details"

* tag 'mm-hotfixes-stable-2024-10-17-16-08' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (28 commits)
  maple_tree: add regression test for spanning store bug
  maple_tree: correct tree corruption on spanning store
  mm/mglru: only clear kswapd_failures if reclaimable
  mm/swapfile: skip HugeTLB pages for unuse_vma
  selftests: mm: fix the incorrect usage() info of khugepaged
  MAINTAINERS: add Jann as memory mapping/VMA reviewer
  mm: swap: prevent possible data-race in __try_to_reclaim_swap
  mm: khugepaged: fix the incorrect statistics when collapsing large file folios
  MAINTAINERS: kasan, kcov: add bugzilla links
  mm: don't install PMD mappings when THPs are disabled by the hw/process/vma
  mm: huge_memory: add vma_thp_disabled() and thp_disabled_by_hw()
  Docs/damon/maintainer-profile: update deprecated awslabs GitHub URLs
  Docs/damon/maintainer-profile: add missing '_' suffixes for external web links
  maple_tree: check for MA_STATE_BULK on setting wr_rebalance
  mm: khugepaged: fix the arguments order in khugepaged_collapse_file trace point
  mm/damon/tests/sysfs-kunit.h: fix memory leak in damon_sysfs_test_add_targets()
  mm: remove unused stub for can_swapin_thp()
  mailmap: add an entry for Andy Chiu
  MAINTAINERS: add memory mapping/VMA co-maintainers
  fs/proc: fix build with GCC 15 due to -Werror=unterminated-string-initialization
  ...
parents d4b82e58 e993457d

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com> 
Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>

André Almeida <andrealmeid@igalia.com> <andrealmeid@collabora.com>

Andy Adamson <andros@citi.umich.edu>

Andy Chiu <andybnac@gmail.com> <andy.chiu@sifive.com>

Andy Chiu <andybnac@gmail.com> <taochiu@synology.com>

Andy Shevchenko <andy@kernel.org> <andy@smile.org.ua>

Andy Shevchenko <andy@kernel.org> <ext-andriy.shevchenko@nokia.com>

Anilkumar Kolli <quic_akolli@quicinc.com> <akolli@codeaurora.org>

Documentation/mm/damon/maintainer-profile.rst

+19 −19
Original line number Diff line number Diff line
@@ -7,26 +7,26 @@ The DAMON subsystem covers the files that are listed in 'DATA ACCESS MONITOR' 
section of 'MAINTAINERS' file.



The mailing lists for the subsystem are damon@lists.linux.dev and

linux-mm@kvack.org.  Patches should be made against the mm-unstable `tree

<https://git.kernel.org/akpm/mm/h/mm-unstable>` whenever possible and posted to

the mailing lists.

linux-mm@kvack.org.  Patches should be made against the `mm-unstable tree

<https://git.kernel.org/akpm/mm/h/mm-unstable>`_ whenever possible and posted

to the mailing lists.



SCM Trees

---------



There are multiple Linux trees for DAMON development.  Patches under

development or testing are queued in `damon/next

<https://git.kernel.org/sj/h/damon/next>` by the DAMON maintainer.

<https://git.kernel.org/sj/h/damon/next>`_ by the DAMON maintainer.

Sufficiently reviewed patches will be queued in `mm-unstable

<https://git.kernel.org/akpm/mm/h/mm-unstable>` by the memory management

<https://git.kernel.org/akpm/mm/h/mm-unstable>`_ by the memory management

subsystem maintainer.  After more sufficient tests, the patches will be queued

in `mm-stable <https://git.kernel.org/akpm/mm/h/mm-stable>` , and finally

in `mm-stable <https://git.kernel.org/akpm/mm/h/mm-stable>`_, and finally

pull-requested to the mainline by the memory management subsystem maintainer.



Note again the patches for mm-unstable `tree

<https://git.kernel.org/akpm/mm/h/mm-unstable>` are queued by the memory

Note again the patches for `mm-unstable tree

<https://git.kernel.org/akpm/mm/h/mm-unstable>`_ are queued by the memory

management subsystem maintainer.  If the patches requires some patches in

damon/next `tree <https://git.kernel.org/sj/h/damon/next>` which not yet merged

`damon/next tree <https://git.kernel.org/sj/h/damon/next>`_ which not yet merged

in mm-unstable, please make sure the requirement is clearly specified.



Submit checklist addendum
@@ -37,25 +37,25 @@ When making DAMON changes, you should do below. 
- Build changes related outputs including kernel and documents.

- Ensure the builds introduce no new errors or warnings.

- Run and ensure no new failures for DAMON `selftests

  <https://github.com/awslabs/damon-tests/blob/master/corr/run.sh#L49>` and

  <https://github.com/damonitor/damon-tests/blob/master/corr/run.sh#L49>`_ and

  `kunittests

  <https://github.com/awslabs/damon-tests/blob/master/corr/tests/kunit.sh>`.

  <https://github.com/damonitor/damon-tests/blob/master/corr/tests/kunit.sh>`_.



Further doing below and putting the results will be helpful.



- Run `damon-tests/corr

  <https://github.com/awslabs/damon-tests/tree/master/corr>` for normal

  <https://github.com/damonitor/damon-tests/tree/master/corr>`_ for normal

  changes.

- Run `damon-tests/perf

  <https://github.com/awslabs/damon-tests/tree/master/perf>` for performance

  <https://github.com/damonitor/damon-tests/tree/master/perf>`_ for performance

  changes.



Key cycle dates

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



Patches can be sent anytime.  Key cycle dates of the `mm-unstable

<https://git.kernel.org/akpm/mm/h/mm-unstable>` and `mm-stable

<https://git.kernel.org/akpm/mm/h/mm-stable>` trees depend on the memory

<https://git.kernel.org/akpm/mm/h/mm-unstable>`_ and `mm-stable

<https://git.kernel.org/akpm/mm/h/mm-stable>`_ trees depend on the memory

management subsystem maintainer.



Review cadence
@@ -72,13 +72,13 @@ Mailing tool 
Like many other Linux kernel subsystems, DAMON uses the mailing lists

(damon@lists.linux.dev and linux-mm@kvack.org) as the major communication

channel.  There is a simple tool called `HacKerMaiL

<https://github.com/damonitor/hackermail>` (``hkml``), which is for people who

<https://github.com/damonitor/hackermail>`_ (``hkml``), which is for people who

are not very familiar with the mailing lists based communication.  The tool

could be particularly helpful for DAMON community members since it is developed

and maintained by DAMON maintainer.  The tool is also officially announced to

support DAMON and general Linux kernel development workflow.



In other words, `hkml <https://github.com/damonitor/hackermail>` is a mailing

In other words, `hkml <https://github.com/damonitor/hackermail>`_ is a mailing

tool for DAMON community, which DAMON maintainer is committed to support.

Please feel free to try and report issues or feature requests for the tool to

the maintainer.
@@ -98,8 +98,8 @@ slots, and attendees should reserve one of those at least 24 hours before the 
time slot, by reaching out to the maintainer.



Schedules and available reservation time slots are available at the Google `doc

<https://docs.google.com/document/d/1v43Kcj3ly4CYqmAkMaZzLiM2GEnWfgdGbZAH3mi2vpM/edit?usp=sharing>`.

<https://docs.google.com/document/d/1v43Kcj3ly4CYqmAkMaZzLiM2GEnWfgdGbZAH3mi2vpM/edit?usp=sharing>`_.

There is also a public Google `calendar

<https://calendar.google.com/calendar/u/0?cid=ZDIwOTA4YTMxNjc2MDQ3NTIyMmUzYTM5ZmQyM2U4NDA0ZGIwZjBiYmJlZGQxNDM0MmY4ZTRjOTE0NjdhZDRiY0Bncm91cC5jYWxlbmRhci5nb29nbGUuY29t>`

<https://calendar.google.com/calendar/u/0?cid=ZDIwOTA4YTMxNjc2MDQ3NTIyMmUzYTM5ZmQyM2U4NDA0ZGIwZjBiYmJlZGQxNDM0MmY4ZTRjOTE0NjdhZDRiY0Bncm91cC5jYWxlbmRhci5nb29nbGUuY29t>`_

that has the events.  Anyone can subscribe it.  DAMON maintainer will also

provide periodic reminder to the mailing list (damon@lists.linux.dev).

MAINTAINERS

+8 −4
Original line number Diff line number Diff line
@@ -12242,6 +12242,7 @@ R: Dmitry Vyukov <dvyukov@google.com> 
R:	Vincenzo Frascino <vincenzo.frascino@arm.com>

L:	kasan-dev@googlegroups.com

S:	Maintained

B:	https://bugzilla.kernel.org/buglist.cgi?component=Sanitizers&product=Memory%20Management

F:	Documentation/dev-tools/kasan.rst

F:	arch/*/include/asm/*kasan.h

F:	arch/*/mm/kasan_init*
@@ -12265,6 +12266,7 @@ R: Dmitry Vyukov <dvyukov@google.com> 
R:	Andrey Konovalov <andreyknvl@gmail.com>

L:	kasan-dev@googlegroups.com

S:	Maintained

B:	https://bugzilla.kernel.org/buglist.cgi?component=Sanitizers&product=Memory%20Management

F:	Documentation/dev-tools/kcov.rst

F:	include/linux/kcov.h

F:	include/uapi/linux/kcov.h
@@ -14907,9 +14909,10 @@ N: include/linux/page[-_]* 








MEMORY MAPPING









M:	Andrew Morton <akpm@linux-foundation.org>









R:	Liam R. Howlett <Liam.Howlett@oracle.com>









M:	Liam R. Howlett <Liam.Howlett@oracle.com>









M:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









R:	Vlastimil Babka <vbabka@suse.cz>









R:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









R:	Jann Horn <jannh@google.com>









L:	linux-mm@kvack.org









S:	Maintained









W:	http://www.linux-mm.org








@@ -24738,9 +24741,10 @@ F:	tools/testing/vsock/















VMA









M:	Andrew Morton <akpm@linux-foundation.org>









R:	Liam R. Howlett <Liam.Howlett@oracle.com>









M:	Liam R. Howlett <Liam.Howlett@oracle.com>









M:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









R:	Vlastimil Babka <vbabka@suse.cz>









R:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>









R:	Jann Horn <jannh@google.com>









L:	linux-mm@kvack.org









S:	Maintained









W:	https://www.linux-mm.org

























fs/fat/namei_vfat.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1037,7 +1037,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,







	if (corrupt < 0) {









		fat_fs_error(new_dir->i_sb,









			     "%s: Filesystem corrupted (i_pos %lld)",









			     __func__, sinfo.i_pos);









			     __func__, new_i_pos);









	}









	goto out;









}
































fs/nilfs2/dir.c



+25
−23






























Original line number
Diff line number
Diff line







@@ -289,7 +289,7 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx)







 * The folio is mapped and unlocked.  When the caller is finished with









 * the entry, it should call folio_release_kmap().









 *









 * On failure, returns NULL and the caller should ignore foliop.









 * On failure, returns an error pointer and the caller should ignore foliop.









 */









struct nilfs_dir_entry *nilfs_find_entry(struct inode *dir,









		const struct qstr *qstr, struct folio **foliop)








@@ -312,7 +312,9 @@ struct nilfs_dir_entry *nilfs_find_entry(struct inode *dir,







	do {









		char *kaddr = nilfs_get_folio(dir, n, foliop);



















		if (!IS_ERR(kaddr)) {









		if (IS_ERR(kaddr))









			return ERR_CAST(kaddr);



















		de = (struct nilfs_dir_entry *)kaddr;









		kaddr += nilfs_last_byte(dir, n) - reclen;









		while ((char *)de <= kaddr) {








@@ -327,7 +329,7 @@ struct nilfs_dir_entry *nilfs_find_entry(struct inode *dir,







			de = nilfs_next_entry(de);









		}









		folio_release_kmap(*foliop, kaddr);









		}



















		if (++n >= npages)









			n = 0;









		/* next folio is past the blocks we've got */








@@ -340,7 +342,7 @@ struct nilfs_dir_entry *nilfs_find_entry(struct inode *dir,







		}









	} while (n != start);









out:









	return NULL;









	return ERR_PTR(-ENOENT);



















found:









	ei->i_dir_start_lookup = n;








@@ -384,18 +386,18 @@ struct nilfs_dir_entry *nilfs_dotdot(struct inode *dir, struct folio **foliop)







	return NULL;









}



















ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr)









int nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr, ino_t *ino)









{









	ino_t res = 0;









	struct nilfs_dir_entry *de;









	struct folio *folio;



















	de = nilfs_find_entry(dir, qstr, &folio);









	if (de) {









		res = le64_to_cpu(de->inode);









	if (IS_ERR(de))









		return PTR_ERR(de);



















	*ino = le64_to_cpu(de->inode);









	folio_release_kmap(folio, de);









	}









	return res;









	return 0;









}



















void nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de,