From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Matthew Wilcox <willy@infradead•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Muchun Song <songmuchun@bytedance•com>
Subject: linux-next: manual merge of the mm tree with the folio tree
Date: Wed, 22 Jun 2022 15:38:15 +1000 [thread overview]
Message-ID: <20220622153815.6f2e671a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1855 bytes --]
Hi all,
Today's linux-next merge of the mm tree got a conflict in:
mm/vmscan.c
between commit:
15077be8badc ("vmscan: Add check_move_unevictable_folios()")
from the folio tree and commits:
cca700a8e695 ("mm: lru: use lruvec lock to serialize memcg changes")
from the mm tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc mm/vmscan.c
index 04f8671caad9,60335f974803..000000000000
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@@ -4823,18 -4856,22 +4873,17 @@@ void check_move_unevictable_folios(stru
int pgrescued = 0;
int i;
- for (i = 0; i < pvec->nr; i++) {
- struct page *page = pvec->pages[i];
- struct folio *folio = page_folio(page);
- int nr_pages;
-
- if (PageTransTail(page))
- continue;
+ for (i = 0; i < fbatch->nr; i++) {
+ struct folio *folio = fbatch->folios[i];
+ int nr_pages = folio_nr_pages(folio);
- nr_pages = folio_nr_pages(folio);
pgscanned += nr_pages;
- /* block memcg migration while the folio moves between lrus */
- if (!folio_test_clear_lru(folio))
+ lruvec = folio_lruvec_relock_irq(folio, lruvec);
+ if (!folio_test_lru(folio) || !folio_test_unevictable(folio))
continue;
- lruvec = folio_lruvec_relock_irq(folio, lruvec);
- if (folio_evictable(folio) && folio_test_unevictable(folio)) {
+ if (folio_evictable(folio)) {
lruvec_del_folio(lruvec, folio);
folio_clear_unevictable(folio);
lruvec_add_folio(lruvec, folio);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-06-22 5:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-22 5:38 Stephen Rothwell [this message]
2022-06-22 7:22 ` linux-next: manual merge of the mm tree with the folio tree Muchun Song
2022-06-22 18:59 ` Andrew Morton
2022-06-23 2:15 ` Muchun Song
-- strict thread matches above, loose matches on Subject: below --
2022-06-20 3:53 Stephen Rothwell
2022-05-12 8:26 Stephen Rothwell
2022-05-12 11:52 ` Ryusuke Konishi
2022-05-12 12:51 ` Matthew Wilcox
2022-05-12 16:13 ` Ryusuke Konishi
2022-05-03 6:14 Stephen Rothwell
2022-05-02 9:36 Stephen Rothwell
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=20220622153815.6f2e671a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=songmuchun@bytedance$(echo .)com \
--cc=willy@infradead$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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