linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Pasha Tatashin <pasha.tatashin@soleen.com>
To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
	linux-mm@kvack.org, linux-cxl@vger.kernel.org,
	cerasuolodomenico@gmail.com, hannes@cmpxchg.org,
	j.granados@samsung.com, lizhijian@fujitsu.com,
	muchun.song@linux.dev, nphamcs@gmail.com,
	pasha.tatashin@soleen.com, rientjes@google.com, rppt@kernel.org,
	souravpanda@google.com, vbabka@suse.cz, willy@infradead.org,
	dan.j.williams@intel.com, yi.zhang@redhat.com,
	alison.schofield@intel.com, david@redhat.com,
	yosryahmed@google.com
Subject: [PATCH v3 2/4] mm: don't account memmap on failure
Date: Thu,  8 Aug 2024 15:42:35 +0000	[thread overview]
Message-ID: <20240808154237.220029-3-pasha.tatashin@soleen.com> (raw)
In-Reply-To: <20240808154237.220029-1-pasha.tatashin@soleen.com>

When in alloc_vmemmap_page_list() memmap is failed to allocate, do
not account, the memory is going to be release at the function exit.

Fixes: 15995a352474 ("mm: report per-page metadata information")
Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com>
---
 mm/hugetlb_vmemmap.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c
index fa83a7b38199..70027869d844 100644
--- a/mm/hugetlb_vmemmap.c
+++ b/mm/hugetlb_vmemmap.c
@@ -392,13 +392,10 @@ static int alloc_vmemmap_page_list(unsigned long start, unsigned long end,
 
 	for (i = 0; i < nr_pages; i++) {
 		page = alloc_pages_node(nid, gfp_mask, 0);
-		if (!page) {
-			mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, i);
+		if (!page)
 			goto out;
-		}
 		list_add(&page->lru, list);
 	}
-
 	mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, nr_pages);
 
 	return 0;
-- 
2.46.0.76.ge559c4bf1a-goog



  parent reply	other threads:[~2024-08-08 15:42 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-08 15:42 [PATCH v3 0/4] Fixes for memmap accounting Pasha Tatashin
2024-08-08 15:42 ` [PATCH v3 1/4] mm: update the memmap stat before page is freed Pasha Tatashin
2024-08-08 17:17   ` Yosry Ahmed
2024-08-08 17:20     ` Yosry Ahmed
2024-08-08 17:37       ` Pasha Tatashin
2024-08-08 17:17   ` Fan Ni
2024-08-08 15:42 ` Pasha Tatashin [this message]
2024-08-08 17:18   ` [PATCH v3 2/4] mm: don't account memmap on failure Yosry Ahmed
2024-08-08 17:19   ` Fan Ni
2024-08-08 18:12   ` David Hildenbrand
2024-08-08 18:54     ` Pasha Tatashin
2024-08-08 15:42 ` [PATCH v3 3/4] mm: add system wide stats items category Pasha Tatashin
2024-08-08 18:20   ` David Hildenbrand
2024-08-08 19:01     ` Pasha Tatashin
2024-08-08 15:42 ` [PATCH v3 4/4] mm: don't account memmap per-node Pasha Tatashin
2024-08-08 18:26   ` David Hildenbrand
2024-08-08 19:03     ` Pasha Tatashin
2024-08-08 18:55   ` Alison Schofield
2024-08-08 19:05     ` Pasha Tatashin
2024-08-08 21:12       ` Alison Schofield

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=20240808154237.220029-3-pasha.tatashin@soleen.com \
    --to=pasha.tatashin@soleen.com \
    --cc=akpm@linux-foundation.org \
    --cc=alison.schofield@intel.com \
    --cc=cerasuolodomenico@gmail.com \
    --cc=dan.j.williams@intel.com \
    --cc=david@redhat.com \
    --cc=hannes@cmpxchg.org \
    --cc=j.granados@samsung.com \
    --cc=linux-cxl@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=lizhijian@fujitsu.com \
    --cc=muchun.song@linux.dev \
    --cc=nphamcs@gmail.com \
    --cc=rientjes@google.com \
    --cc=rppt@kernel.org \
    --cc=souravpanda@google.com \
    --cc=vbabka@suse.cz \
    --cc=willy@infradead.org \
    --cc=yi.zhang@redhat.com \
    --cc=yosryahmed@google.com \
    /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