linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Gavin Shan <gshan@redhat.com>
To: linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org,
	willy@infradead.org, david@redhat.com, vbabka@suse.cz,
	osalvador@suse.de, gehao@kylinos.cn, shan.gavin@gmail.com
Subject: [PATCH 2/2] mm/debug: Fix parameter passed to page_mapcount_is_type()
Date: Fri, 21 Mar 2025 15:31:48 +1000	[thread overview]
Message-ID: <20250321053148.1434076-3-gshan@redhat.com> (raw)
In-Reply-To: <20250321053148.1434076-1-gshan@redhat.com>

As the comments of page_mapcount_is_type() indicate, the parameter passed
to the function should be one more than page->__mapcount. However,
page->__mapcount is passed to the function by commit 4ffca5a96678
("mm: support only one page_type per page") where page_type_has_type()
is replaced by page_mapcount_is_type(), but the parameter isn't adjusted.

Fix the parameter passed to page_mapcount_is_type() to be (page->__mapcount
+ 1).

Fixes: 4ffca5a96678 ("mm: support only one page_type per page")
Cc: stable@vger.kernel.org # v6.12+
Signed-off-by: Gavin Shan <gshan@redhat.com>
---
 mm/debug.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/debug.c b/mm/debug.c
index 8d2acf432385..b6bd9555ec7b 100644
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -71,10 +71,10 @@ static void __dump_folio(struct folio *folio, struct page *page,
 		unsigned long pfn, unsigned long idx)
 {
 	struct address_space *mapping = folio_mapping(folio);
-	int mapcount = atomic_read(&page->_mapcount);
+	int mapcount = atomic_read(&page->_mapcount) + 1;
 	char *type = "";
 
-	mapcount = page_mapcount_is_type(mapcount) ? 0 : mapcount + 1;
+	mapcount = page_mapcount_is_type(mapcount) ? 0 : mapcount;
 	pr_warn("page: refcount:%d mapcount:%d mapping:%p index:%#lx pfn:%#lx\n",
 			folio_ref_count(folio), mapcount, mapping,
 			folio->index + idx, pfn);
-- 
2.48.1



  parent reply	other threads:[~2025-03-21  5:32 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-21  5:31 [PATCH 0/2] " Gavin Shan
2025-03-21  5:31 ` [PATCH 1/2] mm: " Gavin Shan
2025-03-21 10:13   ` David Hildenbrand
2025-03-21 11:26     ` Gavin Shan
2025-03-21 11:28       ` David Hildenbrand
2025-03-21  5:31 ` Gavin Shan [this message]
2025-03-21 10:14   ` [PATCH 2/2] mm/debug: " David Hildenbrand
2025-03-21  5:34 ` [PATCH 0/2] " Gavin Shan
2025-03-21  9:23 ` Vlastimil Babka
2025-03-21 10:11   ` David Hildenbrand
2025-03-21 11:25     ` Gavin Shan
2025-03-21 11:27       ` David Hildenbrand
2025-03-21 11:33       ` Vlastimil Babka
2025-03-21 12:07         ` Gavin Shan

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=20250321053148.1434076-3-gshan@redhat.com \
    --to=gshan@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=david@redhat.com \
    --cc=gehao@kylinos.cn \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=osalvador@suse.de \
    --cc=shan.gavin@gmail.com \
    --cc=vbabka@suse.cz \
    --cc=willy@infradead.org \
    /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