From nobody Mon Feb 9 05:13:40 2026 Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D0788286A for ; Wed, 7 Aug 2024 21:19:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723065576; cv=none; b=PuG5/J/YdY9tItBpyD2fUOyfMF6E5czCYLw3nogofIitXfU33y2zC337XWPMFNStjNRxUL3aSXxBQWdZmOAdYsPS2+fgo2/UZCcTG3eHZuP8ZAMyPLGeyO0UJhC6+WLA+NoNC7BGxzV+ytfqYxkVYdoeTYu5aWnjljVsH59/RDI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723065576; c=relaxed/simple; bh=mXuho5qRbcIktuppWuhYAb1FR0k6aVabcnCwkyhGc3A=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IClp0cSDZwyJt9cblbeSejZgA8AZ5EtmU5TEof4Q/V5vFv5gOTf8U7f5pev4Mqx2mHMGHaNStOUNDTKTDQHZqHp1hOXdloHwVdpcJOAgYjxxbok25+yZwc3k6d75QzOvVdilXvR2drlpDKwLK7yzV+uNwZgAii5uKrZ8USKMrzM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen-com.20230601.gappssmtp.com header.i=@soleen-com.20230601.gappssmtp.com header.b=yxU+H8bL; arc=none smtp.client-ip=209.85.210.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen-com.20230601.gappssmtp.com header.i=@soleen-com.20230601.gappssmtp.com header.b="yxU+H8bL" Received: by mail-ot1-f44.google.com with SMTP id 46e09a7af769-70943b07c2cso177851a34.1 for ; Wed, 07 Aug 2024 14:19:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen-com.20230601.gappssmtp.com; s=20230601; t=1723065573; x=1723670373; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=oRSFFXDfNtNVk7lGVeoRIubNta7FSFGwpVVL6fGvxf0=; b=yxU+H8bLn/VnjVHhhEWYqNM/2tzUm2JA+J1eBxBL9E5KfNReNlHtYTKwwU0Mgg+1Wt fQUUvj3nnFtMxxt9arm5B/6XxLv/GYnWs3F5lzEht3ESlDNR78/J7gQC28gw9soNFWlx fIM9JpwqmorhBP/dr4bAxn11PSbvxlrgrvmALLdij7WWJTXmufzioGYzx/AP26epWItW I6z79WY5asX9/u9IobTPPqcRsUsUXYVQLwOwaUnQPynJeiXD9weSSmtoc4B5yaY1zl53 GcFmpohnxcKbR/bgC+lodW8ilHhkGi6sLWCyYlu1pl8i5z1+H++7vrjS1nsk7aTXWDGe USTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723065573; x=1723670373; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oRSFFXDfNtNVk7lGVeoRIubNta7FSFGwpVVL6fGvxf0=; b=JtiwNBHHYzUK8QysCAQfLt3/2qvUlHylsEYAM1fSN08//O3ctFnx4vr+CK8Ix8vkyj JOYKK3MZzq2IzxDusUDc42dRzBT5QKZbUTDpkXSfbXaVQy/QIilP3PjYSpuKhvmWpQyo J/mvAydWfRzcR+1omx0lUsNeaOtMNUwzZWM52yrVUHdIWowfviG8PA2xQhiID3l+ch+/ PxGNJKwU5vwL4sRX0I/7ELGDdb69/rt89S2Kfd7QQbZ06P8kmz3DJAQhI9KBeeF4PBxk qhNC8Xe6kz/yb9ix+6TGMxVCJg66xUF5BGV+XfhpKh4i9sZRMKWWdGyx2rOlXJOvi5FN PlOA== X-Forwarded-Encrypted: i=1; AJvYcCVGMxW5eRvq/AZMm9mOUTITmmNHNwnwjrKa0+hHNyB8eN7k51TxMfzMO2q+IrOh1M3va8VkqFcmTfq2tE8iTrAddvzKFLvuHN1oDEmK X-Gm-Message-State: AOJu0YzaMqHm+fTh1gnBWewArSJ0IyKJ5PKDJSXKydqdKwwsNtO9I4fw fbrIgLnrYfHn0g06+qjD8dSuHSC9aBj05hTo7wd3A7cTkR0eemTA6xiobRnX4iU= X-Google-Smtp-Source: AGHT+IH15LQSc/UvvmQ30rxTzDG4NPtwy6Tdib44HAX04NTTQ2nGeWxvTn4nEbzI17bKR2TPoCepVA== X-Received: by 2002:a05:6830:370c:b0:709:3c5b:effb with SMTP id 46e09a7af769-709b9975138mr23032461a34.23.1723065573520; Wed, 07 Aug 2024 14:19:33 -0700 (PDT) Received: from soleen.c.googlers.com.com (118.239.150.34.bc.googleusercontent.com. [34.150.239.118]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6bb9c839ee1sm59976976d6.89.2024.08.07.14.19.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Aug 2024 14:19:33 -0700 (PDT) From: Pasha Tatashin To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.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 Subject: [PATCH v2 1/3] mm: update the memmap stat before page is freed Date: Wed, 7 Aug 2024 21:19:27 +0000 Message-ID: <20240807211929.3433304-2-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.46.0.76.ge559c4bf1a-goog In-Reply-To: <20240807211929.3433304-1-pasha.tatashin@soleen.com> References: <20240807211929.3433304-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It is more logical to update the stat before the page is freed, to avoid use after free scenarios. Fixes: 15995a352474 ("mm: report per-page metadata information") Signed-off-by: Pasha Tatashin Reviewed-by: David Hildenbrand Reported-by line, and optionally include the lists where the report origina= ted Tested-by: Dan Williams --- mm/hugetlb_vmemmap.c | 4 ++-- mm/page_ext.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 829112b0a914..fa83a7b38199 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -185,11 +185,11 @@ static int vmemmap_remap_range(unsigned long start, u= nsigned long end, static inline void free_vmemmap_page(struct page *page) { if (PageReserved(page)) { - free_bootmem_page(page); mod_node_page_state(page_pgdat(page), NR_MEMMAP_BOOT, -1); + free_bootmem_page(page); } else { - __free_page(page); mod_node_page_state(page_pgdat(page), NR_MEMMAP, -1); + __free_page(page); } } =20 diff --git a/mm/page_ext.c b/mm/page_ext.c index c191e490c401..962d45eee1f8 100644 --- a/mm/page_ext.c +++ b/mm/page_ext.c @@ -330,18 +330,18 @@ static void free_page_ext(void *addr) if (is_vmalloc_addr(addr)) { page =3D vmalloc_to_page(addr); pgdat =3D page_pgdat(page); + mod_node_page_state(pgdat, NR_MEMMAP, + -1L * (DIV_ROUND_UP(table_size, PAGE_SIZE))); vfree(addr); } else { page =3D virt_to_page(addr); pgdat =3D page_pgdat(page); + mod_node_page_state(pgdat, NR_MEMMAP, + -1L * (DIV_ROUND_UP(table_size, PAGE_SIZE))); BUG_ON(PageReserved(page)); kmemleak_free(addr); free_pages_exact(addr, table_size); } - - mod_node_page_state(pgdat, NR_MEMMAP, - -1L * (DIV_ROUND_UP(table_size, PAGE_SIZE))); - } =20 static void __free_page_ext(unsigned long pfn) --=20 2.46.0.76.ge559c4bf1a-goog From nobody Mon Feb 9 05:13:40 2026 Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6697145333 for ; Wed, 7 Aug 2024 21:19:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723065577; cv=none; b=WMMHA9RA9SUNBDpD9DejIdU/41OcWTHqFlTap0wXxqYOiv7Fz7GPD26b+Ie3SLdSBQTFxQBEY0SqQpys1mhtm9j/F7LqcG819f52dTj4jx3IdeiE6yaxof2gsEJBMkWDmRGQi5mutVnixn8e5jCTvTQH2vCT7pwd3nxipgtHFAs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723065577; c=relaxed/simple; bh=8rI7joosp8awa/gMykJMhXumICc/dwUYMwOKiBmRUD4=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QJmqyKxU5WGhuUjnP1ZQfSo5q61+RRDT72ONYNFynztlxPkYny80ZBylPq3r+WAlG2Pn7OX27Dtu63oJl56ywMq+FG7FeKG5sv9SsKR2stUS5q6I9FBn6FB1Kz0QOa0xu9J9xHvFhe2j/rPrE/+/GkISqzfFLExlXA216yRAGg4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen-com.20230601.gappssmtp.com header.i=@soleen-com.20230601.gappssmtp.com header.b=J3YTdUMJ; arc=none smtp.client-ip=209.85.219.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen-com.20230601.gappssmtp.com header.i=@soleen-com.20230601.gappssmtp.com header.b="J3YTdUMJ" Received: by mail-qv1-f49.google.com with SMTP id 6a1803df08f44-6b78c980981so1922386d6.2 for ; Wed, 07 Aug 2024 14:19:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen-com.20230601.gappssmtp.com; s=20230601; t=1723065575; x=1723670375; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=y3neo5ZpPv5S0nCnjgNJX6IioRmVVyTly9egBg9Jmdk=; b=J3YTdUMJRTFmsjr7S5rbRpFaNInTzQMvBSht8An5a3wCk0pM2wU379g/sgeKjQXRpI gWa32+dYtcpZixOps1dkq4MBjWTqHojyoMTdN3zsWXRTkZJbZpSBbF83OzKkkNTsSXy/ +vo602fdToY/yk2BKlsBVjYJTyNrDnWvvIqRuzauPE9jSNRPAT8wmWnpcGKrlPkodqH+ BRllaH4j1cDwOkkWhYeyj5M0Gr50qDTb/g1PK2B40bPhbYqzZxbQyJ13Id+UJOQyfL9w /OyWVV/OCC8mOpeFFUqBaiviVUS39UVG5mipPfxfCoIzHA+2VUMdlhlBpAAqOCAbXf3E 6v+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723065575; x=1723670375; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y3neo5ZpPv5S0nCnjgNJX6IioRmVVyTly9egBg9Jmdk=; b=kjKql/e101Qpxv1Hx07FTf3B4vRkhaxJb3AJq+DJxuctsuOWcI05n0lhwkv2ak9i17 i33T/iFSnn8iqQCgeqk0oHxVqX272Ur6Dpk9OfSM0cuI9TmYKhqgWk+EEwtDvvDjrQma 4k3o2Uk1mgVTYHTWvklF85trdB8wuO0H/FYTSJ5fetBCBEGZMYdBCOQ9vbNxlUFVNs4Z mi4Yffc2jRZt63d0sK8yhCR5HooPn4BkmjgZ30c63I+PkyHIWM9izCg8BYShF+KWaIII z/WJj9mA3ZNa1Afd1ZfALbcHn4NnjJetN7UXY9nWaV/BD9y8kYgOGWDmf8fScLpZ06t6 pMLg== X-Forwarded-Encrypted: i=1; AJvYcCVqyLQ/AcCr+AMMo9x6GIL+IN9c/sfhBuhX9jd2LbZ54ykQXZcXopQPeqlQPmv4+QfHIxVjroVQfD7ag34=@vger.kernel.org X-Gm-Message-State: AOJu0YwZLne8gFfoLp37ZWVP7AUOlOiypXyfN/mg1NywR64yvGxKQRQU UiR7s8rhJGWOCkL+bs/46LTkrhYC5Lue9bcxjovnqHUhmLx4MYdBHZpLj37XXrc= X-Google-Smtp-Source: AGHT+IGDB+qjFAN0Pa9M7zx0IpSPlf2wphfmg2Ue+Ixo5QIdxXn96CHrQxZdzF26s9y/IaiPsW7CsQ== X-Received: by 2002:a05:6214:5883:b0:6b5:49c9:ed4d with SMTP id 6a1803df08f44-6bb983d79a1mr247222576d6.32.1723065574748; Wed, 07 Aug 2024 14:19:34 -0700 (PDT) Received: from soleen.c.googlers.com.com (118.239.150.34.bc.googleusercontent.com. [34.150.239.118]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6bb9c839ee1sm59976976d6.89.2024.08.07.14.19.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Aug 2024 14:19:33 -0700 (PDT) From: Pasha Tatashin To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.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 Subject: [PATCH v2 2/3] mm: don't account memmap on failure Date: Wed, 7 Aug 2024 21:19:28 +0000 Message-ID: <20240807211929.3433304-3-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.46.0.76.ge559c4bf1a-goog In-Reply-To: <20240807211929.3433304-1-pasha.tatashin@soleen.com> References: <20240807211929.3433304-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reported-by line, and optionally include the lists where the report origina= ted Tested-by: Dan Williams --- 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 star= t, unsigned long end, =20 for (i =3D 0; i < nr_pages; i++) { page =3D 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); =20 return 0; --=20 2.46.0.76.ge559c4bf1a-goog From nobody Mon Feb 9 05:13:40 2026 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7E84149E0E for ; Wed, 7 Aug 2024 21:19:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723065578; cv=none; b=ugNmaLj+kZvV2vBNCLmr2cVVNuyvE89Wn6NlBK9VOqEonSxPTdK0BCGWihTSOJGljsoe++U8F/Bro0vQL11PxjbyCHIeX4hOmKfSyQYARroqotLg7YYhc9HOjp9ZM0Uod6VcP1/GB3yfQn8qL2xbZZFuYFkDSR993EPqAALOG84= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723065578; c=relaxed/simple; bh=VSfdnlkU/rsZFdvFZi+IhQ4wyB2eLDqM36lXHVZ8y0g=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oVh6gnnEq+fRUOlJAk6NJCLaOi7yf+j/gvTYxzEOe/6TpfHA7dNTE/cs/lAd7T4plFOQ0adPAtdFP0nvnE2VIFvjP0owlKOCY70WXN65SdNyDY33vbfHrRTb+LPYAV0X0gFPkZfYUrIVYz8AeMfr1qrysCCNSB6jSc7KOKkdQA8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen-com.20230601.gappssmtp.com header.i=@soleen-com.20230601.gappssmtp.com header.b=EgQb9UCj; arc=none smtp.client-ip=209.85.219.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen-com.20230601.gappssmtp.com header.i=@soleen-com.20230601.gappssmtp.com header.b="EgQb9UCj" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-6bba6ced3d4so1933886d6.2 for ; Wed, 07 Aug 2024 14:19:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen-com.20230601.gappssmtp.com; s=20230601; t=1723065575; x=1723670375; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=uMYAklW02P/DcMlwBhwf3Eib1+5kNLt8UcMJSghVYnc=; b=EgQb9UCjMKGH3YjAbaLv1H9pP31gXOZRnmLvsME/+Dcx7wK+0l76YVwWENE2RDS6W0 iiMfzY4yYwI79wRXNHLS1XlvaunBz+oZQ9DFjxfi8gX39zTBEEuEONDnsDylTAaUBvBI HOksc+WKeSWJ4DtdtwKWBPVTL/cwGRj8dG3FMNmFpczFPHeqhrAGyuUmsAX/YLdkWvWE Bwuv8mhG1WMO49Lm4RcOuZzwj3FnDo9bu3tPhlVWCNqMELQQ2h/IK+5UMSEnREa5xz4r yoRma2xjZWGQDWxh0X4Qx3KTRE0R/L51vVyuMvIET8qQ4gMpBpfNAUNN2M31I0oEfGBR NzGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723065575; x=1723670375; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uMYAklW02P/DcMlwBhwf3Eib1+5kNLt8UcMJSghVYnc=; b=i75AOepG5KJ8d+t2pH+Uq7zdjPhYcZTUnsx8Ogz7Bt5ExNIsEyK3zLGCIubs9LxToh cGakKrH8jamu8MqwMZxLu9ktXC6ijC/+f4B46xEY/oVJMzN5mRzVzW9Kjgte0ySDkLH5 j0NWZa4GeCkp0FTQCqheXm1KnollJx2NPSE9HeOPzQCEeqMwE/OGVWQ5+1SGOyJ52BYE 0bYN4qfY2qH3yPmDNArh2t8BFgNobhtMCN0QlBF88Ml7dWm3hzM1fsRxkaIMIFIKfadF PR1lkSoV1ljoeM4FE0fVEqt9KIdU2KD3ySagq3WH19duM8EA3p/YmqL9Y6SOaxcM7FqQ vaJQ== X-Forwarded-Encrypted: i=1; AJvYcCUWi/TlLSAGD6NK8hY4kbiRrgzYIA2xkwfAaitkj9bfOkpxCUegIiTjklUPrMzpe0THF6CwIWCeOa+fiwXZNEfQtwRmS/9An6py9UFp X-Gm-Message-State: AOJu0YzjFZ9Boud3QmD/ahezp9ZQ4Ov+GwqJzqFHUSBj1//IT6GNcs8+ 8aReAs9H6V4CAQcwfnJE9eKsB5JayBL6u6iD5OdYZNHxDfuFfXhn0k5lLMtDTqE= X-Google-Smtp-Source: AGHT+IHX0P53AXLSrpya3nHqG+XEXCDIzG+nu1l2vvgDK33GmfZQge38TJm5ph8bU9ymSBMQTKHlMw== X-Received: by 2002:a05:6214:4a82:b0:6bb:be58:f278 with SMTP id 6a1803df08f44-6bbbe58f530mr40641846d6.47.1723065575417; Wed, 07 Aug 2024 14:19:35 -0700 (PDT) Received: from soleen.c.googlers.com.com (118.239.150.34.bc.googleusercontent.com. [34.150.239.118]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6bb9c839ee1sm59976976d6.89.2024.08.07.14.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Aug 2024 14:19:35 -0700 (PDT) From: Pasha Tatashin To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.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 Subject: [PATCH v2 3/3] mm: don't account memmap per node Date: Wed, 7 Aug 2024 21:19:29 +0000 Message-ID: <20240807211929.3433304-4-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.46.0.76.ge559c4bf1a-goog In-Reply-To: <20240807211929.3433304-1-pasha.tatashin@soleen.com> References: <20240807211929.3433304-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, when memory is hot-plugged or hot-removed the accounting is done based on the assumption that memmap is allocated from the same node as the hot-plugged/hot-removed memory, which is not always the case. In addition, there are challenges with keeping the node id of the memory that is being remove to the time when memmap accounting is actually performed: since this is done after remove_pfn_range_from_zone(), and also after remove_memory_block_devices(). Meaning that we cannot use pgdat nor walking though memblocks to get the nid. Given all of that, account the memmap overhead system wide instead. Reported-by: Yi Zhang Closes: https://lore.kernel.org/linux-cxl/CAHj4cs9Ax1=3DCoJkgBGP_+sNu6-6=3D= 6v=3D_L-ZBZY0bVLD3wUWZQg@mail.gmail.com Reported-by: Alison Schofield Closes: https://lore.kernel.org/linux-mm/Zq0tPd2h6alFz8XF@aschofie-mobl2/#t Fixes: 15995a352474 ("mm: report per-page metadata information") Signed-off-by: Pasha Tatashin Reported-by line, and optionally include the lists where the report origina= ted Tested-by: Dan Williams --- include/linux/mmzone.h | 2 -- include/linux/vm_event_item.h | 2 ++ include/linux/vmstat.h | 7 ++++-- mm/hugetlb_vmemmap.c | 8 +++---- mm/mm_init.c | 3 +-- mm/page_alloc.c | 1 - mm/page_ext.c | 15 ++++-------- mm/sparse-vmemmap.c | 11 ++++----- mm/sparse.c | 5 ++-- mm/vmstat.c | 45 ++++++++++++++++------------------- 10 files changed, 44 insertions(+), 55 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 41458892bc8a..1dc6248feb83 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -220,8 +220,6 @@ enum node_stat_item { PGDEMOTE_KSWAPD, PGDEMOTE_DIRECT, PGDEMOTE_KHUGEPAGED, - NR_MEMMAP, /* page metadata allocated through buddy allocator */ - NR_MEMMAP_BOOT, /* page metadata allocated through boot allocator */ NR_VM_NODE_STAT_ITEMS }; =20 diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h index 747943bc8cc2..89d091d5da19 100644 --- a/include/linux/vm_event_item.h +++ b/include/linux/vm_event_item.h @@ -154,6 +154,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, VMA_LOCK_RETRY, VMA_LOCK_MISS, #endif + NR_MEMMAP, /* page metadata allocated through buddy allocator */ + NR_MEMMAP_BOOT, /* page metadata allocated through boot allocator */ NR_VM_EVENT_ITEMS }; =20 diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 23cd17942036..b978df3992f2 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -625,7 +625,10 @@ static inline void lruvec_stat_sub_folio(struct folio = *folio, lruvec_stat_mod_folio(folio, idx, -folio_nr_pages(folio)); } =20 -void __meminit mod_node_early_perpage_metadata(int nid, long delta); -void __meminit store_early_perpage_metadata(void); +void mod_memmap_boot(long delta); +static inline void mod_memmap(long delta) +{ + count_vm_events(NR_MEMMAP, delta); +} =20 #endif /* _LINUX_VMSTAT_H */ diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 70027869d844..60a5faa1f341 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -185,10 +185,10 @@ static int vmemmap_remap_range(unsigned long start, u= nsigned long end, static inline void free_vmemmap_page(struct page *page) { if (PageReserved(page)) { - mod_node_page_state(page_pgdat(page), NR_MEMMAP_BOOT, -1); + mod_memmap_boot(-1); free_bootmem_page(page); } else { - mod_node_page_state(page_pgdat(page), NR_MEMMAP, -1); + mod_memmap(-1); __free_page(page); } } @@ -341,7 +341,7 @@ static int vmemmap_remap_free(unsigned long start, unsi= gned long end, copy_page(page_to_virt(walk.reuse_page), (void *)walk.reuse_addr); list_add(&walk.reuse_page->lru, vmemmap_pages); - mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, 1); + mod_memmap(1); } =20 /* @@ -396,7 +396,7 @@ static int alloc_vmemmap_page_list(unsigned long start,= unsigned long end, goto out; list_add(&page->lru, list); } - mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, nr_pages); + mod_memmap(nr_pages); =20 return 0; out: diff --git a/mm/mm_init.c b/mm/mm_init.c index 75c3bd42799b..29677274e74e 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1623,8 +1623,7 @@ static void __init alloc_node_mem_map(struct pglist_d= ata *pgdat) panic("Failed to allocate %ld bytes for node %d memory map\n", size, pgdat->node_id); pgdat->node_mem_map =3D map + offset; - mod_node_early_perpage_metadata(pgdat->node_id, - DIV_ROUND_UP(size, PAGE_SIZE)); + mod_memmap_boot(DIV_ROUND_UP(size, PAGE_SIZE)); pr_debug("%s: node %d, pgdat %08lx, node_mem_map %08lx\n", __func__, pgdat->node_id, (unsigned long)pgdat, (unsigned long)pgdat->node_mem_map); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 28f80daf5c04..875d76e8684a 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5755,7 +5755,6 @@ void __init setup_per_cpu_pageset(void) for_each_online_pgdat(pgdat) pgdat->per_cpu_nodestats =3D alloc_percpu(struct per_cpu_nodestat); - store_early_perpage_metadata(); } =20 __meminit void zone_pcp_init(struct zone *zone) diff --git a/mm/page_ext.c b/mm/page_ext.c index 962d45eee1f8..a4b485b39330 100644 --- a/mm/page_ext.c +++ b/mm/page_ext.c @@ -214,8 +214,7 @@ static int __init alloc_node_page_ext(int nid) return -ENOMEM; NODE_DATA(nid)->node_page_ext =3D base; total_usage +=3D table_size; - mod_node_page_state(NODE_DATA(nid), NR_MEMMAP_BOOT, - DIV_ROUND_UP(table_size, PAGE_SIZE)); + mod_memmap_boot(DIV_ROUND_UP(table_size, PAGE_SIZE)); return 0; } =20 @@ -275,10 +274,8 @@ static void *__meminit alloc_page_ext(size_t size, int= nid) else addr =3D vzalloc_node(size, nid); =20 - if (addr) { - mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, - DIV_ROUND_UP(size, PAGE_SIZE)); - } + if (addr) + mod_memmap(DIV_ROUND_UP(size, PAGE_SIZE)); =20 return addr; } @@ -330,14 +327,12 @@ static void free_page_ext(void *addr) if (is_vmalloc_addr(addr)) { page =3D vmalloc_to_page(addr); pgdat =3D page_pgdat(page); - mod_node_page_state(pgdat, NR_MEMMAP, - -1L * (DIV_ROUND_UP(table_size, PAGE_SIZE))); + mod_memmap(-1L * (DIV_ROUND_UP(table_size, PAGE_SIZE))); vfree(addr); } else { page =3D virt_to_page(addr); pgdat =3D page_pgdat(page); - mod_node_page_state(pgdat, NR_MEMMAP, - -1L * (DIV_ROUND_UP(table_size, PAGE_SIZE))); + mod_memmap(-1L * (DIV_ROUND_UP(table_size, PAGE_SIZE))); BUG_ON(PageReserved(page)); kmemleak_free(addr); free_pages_exact(addr, table_size); diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 1dda6c53370b..307f6fe83598 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -469,13 +469,10 @@ struct page * __meminit __populate_section_memmap(uns= igned long pfn, if (r < 0) return NULL; =20 - if (system_state =3D=3D SYSTEM_BOOTING) { - mod_node_early_perpage_metadata(nid, DIV_ROUND_UP(end - start, - PAGE_SIZE)); - } else { - mod_node_page_state(NODE_DATA(nid), NR_MEMMAP, - DIV_ROUND_UP(end - start, PAGE_SIZE)); - } + if (system_state =3D=3D SYSTEM_BOOTING) + mod_memmap_boot(DIV_ROUND_UP(end - start, PAGE_SIZE)); + else + mod_memmap(DIV_ROUND_UP(end - start, PAGE_SIZE)); =20 return pfn_to_page(pfn); } diff --git a/mm/sparse.c b/mm/sparse.c index e4b830091d13..9cc80ba1f7c1 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -463,7 +463,7 @@ static void __init sparse_buffer_init(unsigned long siz= e, int nid) sparsemap_buf =3D memmap_alloc(size, section_map_size(), addr, nid, true); sparsemap_buf_end =3D sparsemap_buf + size; #ifndef CONFIG_SPARSEMEM_VMEMMAP - mod_node_early_perpage_metadata(nid, DIV_ROUND_UP(size, PAGE_SIZE)); + mod_memmap_boot(DIV_ROUND_UP(size, PAGE_SIZE)); #endif } =20 @@ -643,8 +643,7 @@ static void depopulate_section_memmap(unsigned long pfn= , unsigned long nr_pages, unsigned long start =3D (unsigned long) pfn_to_page(pfn); unsigned long end =3D start + nr_pages * sizeof(struct page); =20 - mod_node_page_state(page_pgdat(pfn_to_page(pfn)), NR_MEMMAP, - -1L * (DIV_ROUND_UP(end - start, PAGE_SIZE))); + mod_memmap(-1L * (DIV_ROUND_UP(end - start, PAGE_SIZE))); vmemmap_free(start, end, altmap); } static void free_map_bootmem(struct page *memmap) diff --git a/mm/vmstat.c b/mm/vmstat.c index 04a1cb6cc636..7bee38347f10 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1255,8 +1255,6 @@ const char * const vmstat_text[] =3D { "pgdemote_kswapd", "pgdemote_direct", "pgdemote_khugepaged", - "nr_memmap", - "nr_memmap_boot", /* enum writeback_stat_item counters */ "nr_dirty_threshold", "nr_dirty_background_threshold", @@ -1417,6 +1415,8 @@ const char * const vmstat_text[] =3D { "vma_lock_retry", "vma_lock_miss", #endif + "nr_memmap", + "nr_memmap_boot", #endif /* CONFIG_VM_EVENT_COUNTERS || CONFIG_MEMCG */ }; #endif /* CONFIG_PROC_FS || CONFIG_SYSFS || CONFIG_NUMA || CONFIG_MEMCG */ @@ -2117,6 +2117,24 @@ static int vmstat_cpu_dead(unsigned int cpu) =20 #endif =20 +/* nr_memmap_boot that is used prior to setup_per_cpu_areas() call */ +static atomic_long_t early_memmap_boot; +static bool early_memmap_boot_finished; + +void mod_memmap_boot(long delta) +{ + if (early_memmap_boot_finished) + count_vm_events(NR_MEMMAP_BOOT, delta); + else + atomic_long_add(delta, &early_memmap_boot); +} + +static void __init finish_early_memmap_boot(void) +{ + early_memmap_boot_finished =3D true; + mod_memmap_boot(atomic_long_read(&early_memmap_boot)); +} + struct workqueue_struct *mm_percpu_wq; =20 void __init init_mm_internals(void) @@ -2149,6 +2167,7 @@ void __init init_mm_internals(void) proc_create_seq("vmstat", 0444, NULL, &vmstat_op); proc_create_seq("zoneinfo", 0444, NULL, &zoneinfo_op); #endif + finish_early_memmap_boot(); } =20 #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_COMPACTION) @@ -2285,25 +2304,3 @@ static int __init extfrag_debug_init(void) module_init(extfrag_debug_init); =20 #endif - -/* - * Page metadata size (struct page and page_ext) in pages - */ -static unsigned long early_perpage_metadata[MAX_NUMNODES] __meminitdata; - -void __meminit mod_node_early_perpage_metadata(int nid, long delta) -{ - early_perpage_metadata[nid] +=3D delta; -} - -void __meminit store_early_perpage_metadata(void) -{ - int nid; - struct pglist_data *pgdat; - - for_each_online_pgdat(pgdat) { - nid =3D pgdat->node_id; - mod_node_page_state(NODE_DATA(nid), NR_MEMMAP_BOOT, - early_perpage_metadata[nid]); - } -} --=20 2.46.0.76.ge559c4bf1a-goog