From nobody Mon Feb 9 06:05:15 2026 Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (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 15CCC15920E for ; Fri, 9 Aug 2024 19:10:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723230627; cv=none; b=WaGXBgztdYv0+k4uNYP4RUV0HNDe+3onN58gW6tDp5DtrY+7WHY341gjbMTTvvuqvNXcj4q7qrSYnw93ZxOON/5+PYi41ZKodiAlZeEu963cd92KcsmMFQcvDil1TNrvME2CYzNk4ZLo8ISRVBgzf2R6QOULJOJSf1jt8t2kK4c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723230627; c=relaxed/simple; bh=RJOegQUHcv+I33+qU7btWGqlaiXtgvR83VFZU3SBof8=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OVstYSTAg5qcvrFteKEEJsqLRmRnqLMYHRDSIFlHiPYX1iSsEd5yKFfUIU4hs1KC2LjRPSvYnbdvgyH5AXEZccQMJQDHCHR6X2sFDwPMKruIondUo0mGHY0Wh6trtoH6L51xGYMvQycmCFotvdE5UshuzlvyUv7UI+U/1gpPAIs= 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=uYA+/L7R; arc=none smtp.client-ip=209.85.222.173 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="uYA+/L7R" Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-7a1d81dc0beso145989985a.2 for ; Fri, 09 Aug 2024 12:10:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen-com.20230601.gappssmtp.com; s=20230601; t=1723230625; x=1723835425; 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=2Zfyh9sb1bnT5AOZDmCrIADGqpbj2HcF73SygbadHf0=; b=uYA+/L7RTFZgX8NfVrQh9mJ6VZ8tc8fzhAeZaURwLkr95njqjSkhTQxmXAoSLFnuZP LZn3KD0cxc2V2KYPs5vLnC9R4izqsl17k1xCraa0+aa5R7ciLIapgNE6B8YrDIJLwN3+ 0r9qpEtjFvePVBk79KnYdgzGD0p+omYdLvHD4svxMd31XFn6Wywj3w3ZTTuQzcz160A+ WQSQtmgJAFXzHTAbdCDcJuEl1KtUD034GeVFQ05RFlJkElqJUZhTxLxHnBlF8f8D8vYv Ze84vc/+ir5innrRdMCrlvAegTBfz30dX4cxppG4ZTAZW3CKqNMR1d/rKShjhHK2bZGZ RjAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723230625; x=1723835425; 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=2Zfyh9sb1bnT5AOZDmCrIADGqpbj2HcF73SygbadHf0=; b=me+/Z6GIRrsUf3W0rj1wFd1JzodYM4ba8FDSc7nLtgZLtSpZgPpT0QKT4gDMkMW/Ut wCNOtIuUglPCRzZU/PbCJ0GP/s7kNGrFg2x7mHW9vI7OfOKBw+fUBD7KaXYXwUU4a7N4 lFf9yaBWm91H3AjyvL0JolAf1GS9P+edtlpVk/qWIYuhlZgr6fb6HRZh1bFIYYwZFHcr pk7p02682Oz+DTDSPdzsATtH+bpzZ/Mv8oX7svXs68/+wBP8LXw2hKYpnf3fDT6DgrZT ENKLLBGsymL72fAEm5M76xPvrg3DaMkR3cOz4VRS/UlIGswYfcMLONbrkNquYihKKS0s jpCw== X-Forwarded-Encrypted: i=1; AJvYcCV78gNLj0ENqhQSFJ2WDzyxk80mKdqvXcjJ3OI+2kj7HKVeC2xKOEh8PGtA1rIc9blW8QZTO5Vfd2RYUAx8ldlNVvDJch8FwPHU45Jc X-Gm-Message-State: AOJu0YzRlOw5DuXIFXpM6ic0TspNmg0fmMEWfuQHeYNRQYsiothE8xDw z4l5MItR3HUMhw2Nlfv01Nzmnt8yMlkYtDxnDSDxGElabesU8BGvN/Zb9/Y0h0I= X-Google-Smtp-Source: AGHT+IEpJ4kA1QWE3b+JfVVjir9Z6DC5086gWvGsdlrOs2CaZZLaGQY0jZT/CHJjcUlLTfdiOhrm+w== X-Received: by 2002:a05:620a:2486:b0:7a1:d9a6:a9af with SMTP id af79cd13be357-7a4c1860cf6mr306443585a.68.1723230624911; Fri, 09 Aug 2024 12:10:24 -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 af79cd13be357-7a4c7df5a55sm5522085a.86.2024.08.09.12.10.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Aug 2024 12:10:24 -0700 (PDT) From: Pasha Tatashin 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 v5 1/3] mm: don't account memmap on failure Date: Fri, 9 Aug 2024 19:10:18 +0000 Message-ID: <20240809191020.1142142-2-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.46.0.76.ge559c4bf1a-goog In-Reply-To: <20240809191020.1142142-1-pasha.tatashin@soleen.com> References: <20240809191020.1142142-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 we fail to allocate the mmemmap in alloc_vmemmap_page_list(), do not account any already-allocated pages: we're going to free all them before we return from the function. Fixes: 15995a352474 ("mm: report per-page metadata information") Signed-off-by: Pasha Tatashin Reviewed-by: Fan Ni Reviewed-by: Yosry Ahmed Acked-by: David Hildenbrand Acked-by: David Rientjes Reviewed-by: Muchun Song --- 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 829112b0a914..4f51e0596197 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 06:05:15 2026 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (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 2624715FCEB for ; Fri, 9 Aug 2024 19:10:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723230628; cv=none; b=A7FLjR4bkfHj6HJ2GlYaUTGBFxU9alcr06dc3WPbwVboiAyXC/thKhv/N6lHyN3qcNHr3ooqllg2laWzJumhRuLOCTJMGfWXA3XtGS43m3iW7/fuZDNUS1Bfc3DYMGxconA8r6etP/I/lwDU+yHzymG0U4pXkbLFbDeng0seWx8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723230628; c=relaxed/simple; bh=Aha4j24gTv25dSzcVlCBqTJydrCO5rRdT3UBoRvJktc=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G9kZv6DL6Qv4tZXlXB9nNkt00o8A+Cu7MnO0Uux7sqTxgPgTF2T4a5jmXSn+VU/4dDcGKe33fPvGw1lfqfvFCyHKBHEPjPEO0w916fIxTGad7xe/0HnXHHVLgoS3E+egZe613k265YcCTPoQkEEG3I4S5f58EBPeNvbcu5EMLVo= 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=W0SlrJ8d; arc=none smtp.client-ip=209.85.222.176 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="W0SlrJ8d" Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-7a20c529c77so147032285a.1 for ; Fri, 09 Aug 2024 12:10:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen-com.20230601.gappssmtp.com; s=20230601; t=1723230626; x=1723835426; 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=gDvms9T6MxTADOWyeqlGsrri9pz592+CY2RkeRJgrNo=; b=W0SlrJ8dbIHN45msSdxOC1t1XlDnfj5hJnvBnGs0v/8iPolrhGGVFH/ah3RZQsAqaZ P5QXoFhah9kmzTyAuqQiNZyZYp1l2uaY4g8k2rUaIIlx1Mkd6zxDecujY6sXXLdmBzoJ 6/iJICH0XNEzWKEoV0yo/Y/Ur1C2eEjA1ltBit+EQA1hH6R20gbogg4qAXwGZZqsDKGN iZ5I0RVpn+OoJkWCa0kv+JuWLHFOerxctwwROnnp5MgvrX2QZXOh+neV4M7ec6MjkO6g CqDtKUlm5b/Pbq21Wgi2ZADYG+Ju1EB7Xxpof5KV20e8mP9fC+iMT/ioOcv32qiCV5jx 34sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723230626; x=1723835426; 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=gDvms9T6MxTADOWyeqlGsrri9pz592+CY2RkeRJgrNo=; b=cT7LUf9gu6fXeGMVQjSUKHPxuTV7P26mttCeLeqkMkEUMzIGWxozl69wQg7/tCwmxH ZwmbZkB/FBWl2vw3Mose+yHSJLVw9dGDU9NWYMbU9ltIhmOP3j/Hc93/WqYSfi9H0TgZ XEdTxsbu2S1JQwMgTQSvjg1PSAIUazV9sgSK/S829aX3yfPnrEK+uMTjiD7tuXcLoVH1 MlorauA5Ul/NI2UL2itQvi/cuNrwvZfG+dK1Ty7X2tPCaLZJdXzw5TnizdJZ6HdjOX1v r62rg4/uLNKBztGdEsRm00PkZECgUqmx6R4B6p8j1Qqv6gOh9AwwjvYlB+S1y17hOIi4 tl/w== X-Forwarded-Encrypted: i=1; AJvYcCX0w7dXWGam+dSfyXV6IXiQlV4neC6QIgNceqSrniVTu5Rk8HFCy9Ff3Q8xBHOHOYrkinqz2Hghc561xf5RhCTlMkACLvKSU2Up3kHz X-Gm-Message-State: AOJu0YxWjM0gZV3S1E87BGhy/oLpJkwjdFznh2gGdn5AUcTlNZ9hyk2X K073Xw9MZ2mZ/q91+btX/O+eu0FAbijhJNxiuPI803SYf88PuMyjOZ5LUD6XVLI= X-Google-Smtp-Source: AGHT+IFVg6UC1VsS2RarQnkmKfDpYYqkAoGLJP6WPhI6t59slYlLQRhsj/YpVmXHJEFlokfsL93xgA== X-Received: by 2002:a05:620a:2495:b0:79f:67b:4fdc with SMTP id af79cd13be357-7a4c1791fd1mr330555485a.2.1723230626022; Fri, 09 Aug 2024 12:10:26 -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 af79cd13be357-7a4c7df5a55sm5522085a.86.2024.08.09.12.10.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Aug 2024 12:10:25 -0700 (PDT) From: Pasha Tatashin 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 v5 2/3] mm: add system wide stats items category Date: Fri, 9 Aug 2024 19:10:19 +0000 Message-ID: <20240809191020.1142142-3-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.46.0.76.ge559c4bf1a-goog In-Reply-To: <20240809191020.1142142-1-pasha.tatashin@soleen.com> References: <20240809191020.1142142-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" /proc/vmstat contains events and stats, events can only grow, but stats can grow and shrink. vmstat has the following: Acked-by: David Hildenbrand Acked-by: David Rientjes Suggested-by: Yosry Ahmed ------------------------- NR_VM_ZONE_STAT_ITEMS: per-zone stats NR_VM_NUMA_EVENT_ITEMS: per-numa events NR_VM_NODE_STAT_ITEMS: per-numa stats NR_VM_WRITEBACK_STAT_ITEMS: system-wide background-writeback and dirty-throttling tresholds. NR_VM_EVENT_ITEMS: system-wide events ------------------------- Rename NR_VM_WRITEBACK_STAT_ITEMS to NR_VM_STAT_ITEMS, to track the system-wide stats, we are going to add per-page metadata stats to this category in the next patch. Also delete unused writeback_stat_name() function. Suggested-by: Yosry Ahmed Signed-off-by: Pasha Tatashin Acked-by: David Hildenbrand --- include/linux/vmstat.h | 15 ++++----------- mm/vmstat.c | 6 +++--- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 23cd17942036..9ab4fa5e09b5 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -34,10 +34,11 @@ struct reclaim_stat { unsigned nr_lazyfree_fail; }; =20 -enum writeback_stat_item { +/* Stat data for system wide items */ +enum vm_stat_item { NR_DIRTY_THRESHOLD, NR_DIRTY_BG_THRESHOLD, - NR_VM_WRITEBACK_STAT_ITEMS, + NR_VM_STAT_ITEMS, }; =20 #ifdef CONFIG_VM_EVENT_COUNTERS @@ -514,21 +515,13 @@ static inline const char *lru_list_name(enum lru_list= lru) return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_" } =20 -static inline const char *writeback_stat_name(enum writeback_stat_item ite= m) -{ - return vmstat_text[NR_VM_ZONE_STAT_ITEMS + - NR_VM_NUMA_EVENT_ITEMS + - NR_VM_NODE_STAT_ITEMS + - item]; -} - #if defined(CONFIG_VM_EVENT_COUNTERS) || defined(CONFIG_MEMCG) static inline const char *vm_event_name(enum vm_event_item item) { return vmstat_text[NR_VM_ZONE_STAT_ITEMS + NR_VM_NUMA_EVENT_ITEMS + NR_VM_NODE_STAT_ITEMS + - NR_VM_WRITEBACK_STAT_ITEMS + + NR_VM_STAT_ITEMS + item]; } #endif /* CONFIG_VM_EVENT_COUNTERS || CONFIG_MEMCG */ diff --git a/mm/vmstat.c b/mm/vmstat.c index 04a1cb6cc636..6f8aa4766f16 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1257,7 +1257,7 @@ const char * const vmstat_text[] =3D { "pgdemote_khugepaged", "nr_memmap", "nr_memmap_boot", - /* enum writeback_stat_item counters */ + /* system-wide enum vm_stat_item counters */ "nr_dirty_threshold", "nr_dirty_background_threshold", =20 @@ -1790,7 +1790,7 @@ static const struct seq_operations zoneinfo_op =3D { #define NR_VMSTAT_ITEMS (NR_VM_ZONE_STAT_ITEMS + \ NR_VM_NUMA_EVENT_ITEMS + \ NR_VM_NODE_STAT_ITEMS + \ - NR_VM_WRITEBACK_STAT_ITEMS + \ + NR_VM_STAT_ITEMS + \ (IS_ENABLED(CONFIG_VM_EVENT_COUNTERS) ? \ NR_VM_EVENT_ITEMS : 0)) =20 @@ -1827,7 +1827,7 @@ static void *vmstat_start(struct seq_file *m, loff_t = *pos) =20 global_dirty_limits(v + NR_DIRTY_BG_THRESHOLD, v + NR_DIRTY_THRESHOLD); - v +=3D NR_VM_WRITEBACK_STAT_ITEMS; + v +=3D NR_VM_STAT_ITEMS; =20 #ifdef CONFIG_VM_EVENT_COUNTERS all_vm_events(v); --=20 2.46.0.76.ge559c4bf1a-goog From nobody Mon Feb 9 06:05:15 2026 Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (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 83AED1607B7 for ; Fri, 9 Aug 2024 19:10:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723230631; cv=none; b=sr0egHmTpCqwTwXtEgVXcb6J2eXCBgkdepnnY55Auz0HRAvYmyqZj1LflP7nTsMh8Wd5F1TsneLZnqa/AmtovjA8NXFTN4RyItLtx87qi9ppVaR32WtgBY7G9cuJWe7/bBc5+8yDkDnih8Jsew+rry1Zgv9Bal+QNTYppxzr850= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723230631; c=relaxed/simple; bh=6wosICAX5upSWdnUV4KS1ODEyn0GpvDE32NQy49q3CU=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tYzuj5u3nXPEqDK6BX89UBa+OJINzbTsVwMh/RWVxCslUTMoB3OkRDwHqoU/uuMLJaYvEuLGA5zs50yCk2wVr8vUmTbp6DJWjmDjJMx2AOWL92u0qQzqjKfaA479htXtyjIvQRE7BzvcYTN23kjIDtuGaGVJvBodGbq9JHZ+KQg= 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=OIWcB6oe; arc=none smtp.client-ip=209.85.222.173 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="OIWcB6oe" Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-7a1d42da3f7so139914785a.2 for ; Fri, 09 Aug 2024 12:10:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen-com.20230601.gappssmtp.com; s=20230601; t=1723230627; x=1723835427; 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=7scNbfOD3UNvIo9y0T+pYKNfJFgM2C7HW5kYHlU5U7s=; b=OIWcB6oek741WgmBJjIzKMySLERThB6hYMhFkIFUNkmyLk+nDygEeuyGvSo7ev4SLp vfI9+LsNESWRNkDWYVvnnCCE24D732QLNOb+/7IKHX1YUNFZMzLOYPThpnc959GE5iBf ELAGh9qlHi77mfPsxiOIT5t4jMycCsC0xui3HNFSWj3W2mYcb8gHQ5z0bDKDs47LsnTC khPdOMG8A2gD7cao3vad482NJlHJ2dNeGWeIDfI1sMndpanJatDHkBO5jviMqEyxDax+ d9Qjx0/8H3sW/XgnUb64jHafzgEy4/SVaBDXHhIRcpTlNtNZsepmbjgCB4/sZ5toMVpv nksQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723230627; x=1723835427; 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=7scNbfOD3UNvIo9y0T+pYKNfJFgM2C7HW5kYHlU5U7s=; b=lTPIitdAObG6CylyNjVKBref5qCABEVHa3ZOiV+/PozWZbd6Tzwbai9PcqGCJUCS/c ZdRwG3lCQ0HmbSEgHcKUdVNUETtgJ/5RK7cpS3+vWCKQsnuA0qm3TnNc6wYmY5wd8zXX 19k44epk9XUK0dqhfESMQhkeYt9iwdMmDwYS+YaJ/3ptUYiB2XJaK0jEBQqnlwIuVde5 4oS8dYqsewrDiMzucWceJ4CtSJyf6aO0IRPpQynJUbDGCNGuQ1xlXSj4Fv/r0H9Pm33n itMJXcM03YhLgZTnLMCx+DzfBSJ9vNMJ+g2snUXs2FTb1NwyJuoVnlpU8H01ZerXqKNo 9myQ== X-Forwarded-Encrypted: i=1; AJvYcCWnQa3BlypLf2AeTpO93Y1boxG/haxJIqSTNwPHFVCea8+jxOAyHtKgzd6tjZSWy39V5I2HHMYqp5kMMxGi0m04h+/9Qefz0IHgbmzR X-Gm-Message-State: AOJu0YwX91z9kO8xWjuIb5c/31/bnHbgxoTqGRnnwfjVlIZjumMYzHV3 JqbuObRGPGZVkYIiBjTEcs3AEiYTVfVTwBb4+CgHVSe/zEnEc5NseBlV3GsuepI= X-Google-Smtp-Source: AGHT+IG+izZuVqrrLECU59ZUsz/j/pq6H+/mhN6LagU3A3JWt/ctLE0qFWvHYBV7BwQjZPC1c0cfJA== X-Received: by 2002:a05:620a:2456:b0:79d:5f67:a836 with SMTP id af79cd13be357-7a4c17aafddmr317308185a.26.1723230627259; Fri, 09 Aug 2024 12:10:27 -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 af79cd13be357-7a4c7df5a55sm5522085a.86.2024.08.09.12.10.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Aug 2024 12:10:26 -0700 (PDT) From: Pasha Tatashin 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 v5 3/3] mm: don't account memmap per-node Date: Fri, 9 Aug 2024 19:10:20 +0000 Message-ID: <20240809191020.1142142-4-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.46.0.76.ge559c4bf1a-goog In-Reply-To: <20240809191020.1142142-1-pasha.tatashin@soleen.com> References: <20240809191020.1142142-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" Fix invalid access to pgdat during hot-remove operation: ndctl users reported a GPF when trying to destroy a namespace: $ ndctl destroy-namespace all -r all -f Segmentation fault dmesg: Oops: general protection fault, probably for non-canonical address 0xdffffc0000005650: 0000 [#1] PREEMPT SMP KASAN PTI KASAN: probably user-memory-access in range [0x000000000002b280-0x000000000002b287] CPU: 26 UID: 0 PID: 1868 Comm: ndctl Not tainted 6.11.0-rc1 #1 Hardware name: Dell Inc. PowerEdge R640/08HT8T, BIOS 2.20.1 09/13/2023 RIP: 0010:mod_node_page_state+0x2a/0x110 cxl-test users report a GPF when trying to unload the test module: $ modrpobe -r cxl-test dmesg BUG: unable to handle page fault for address: 0000000000004200 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: Oops: 0000 [#1] PREEMPT SMP PTI CPU: 0 UID: 0 PID: 1076 Comm: modprobe Tainted: G O N 6.11.0-rc1 #197 Tainted: [O]=3DOOT_MODULE, [N]=3DTEST Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/15 RIP: 0010:mod_node_page_state+0x6/0x90 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. For this we are going to be using global atomic counters, but given that memmap size is rarely modified, and normally is only modified either during early boot when there is only one CPU, or under a hotplug global mutex lock, therefore there is no need for per-cpu optimizations. Also, while we are here rename nr_memmap to nr_memmap_pages, and nr_memmap_boot to nr_memmap_boot_pages to be self explanatory that the units are in page count. 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 Tested-by: Dan Williams Tested-by: Alison Schofield Acked-by: David Hildenbrand Acked-by: David Rientjes Tested-by: Yi Zhang --- include/linux/mmzone.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 | 18 ++++------------- mm/sparse-vmemmap.c | 11 ++++------ mm/sparse.c | 5 ++--- mm/vmstat.c | 46 ++++++++++++++++++++---------------------- 9 files changed, 41 insertions(+), 60 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/vmstat.h b/include/linux/vmstat.h index 9ab4fa5e09b5..9eb77c9007e6 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -38,6 +38,8 @@ struct reclaim_stat { enum vm_stat_item { NR_DIRTY_THRESHOLD, NR_DIRTY_BG_THRESHOLD, + NR_MEMMAP_PAGES, /* page metadata allocated through buddy allocator */ + NR_MEMMAP_BOOT_PAGES, /* page metadata allocated through boot allocator */ NR_VM_STAT_ITEMS, }; =20 @@ -618,7 +620,6 @@ 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 memmap_boot_pages_add(long delta); +void memmap_pages_add(long delta); #endif /* _LINUX_VMSTAT_H */ diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 4f51e0596197..0c3f56b3578e 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)) { + memmap_boot_pages_add(-1); free_bootmem_page(page); - mod_node_page_state(page_pgdat(page), NR_MEMMAP_BOOT, -1); } else { + memmap_pages_add(-1); __free_page(page); - mod_node_page_state(page_pgdat(page), NR_MEMMAP, -1); } } =20 @@ -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); + memmap_pages_add(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); + memmap_pages_add(nr_pages); =20 return 0; out: diff --git a/mm/mm_init.c b/mm/mm_init.c index 75c3bd42799b..f9a60ffc5532 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)); + memmap_boot_pages_add(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 c191e490c401..641d93f6af4c 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)); + memmap_boot_pages_add(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) + memmap_pages_add(DIV_ROUND_UP(size, PAGE_SIZE)); =20 return addr; } @@ -323,25 +320,18 @@ static void free_page_ext(void *addr) { size_t table_size; struct page *page; - struct pglist_data *pgdat; =20 table_size =3D page_ext_size * PAGES_PER_SECTION; + memmap_pages_add(-1L * (DIV_ROUND_UP(table_size, PAGE_SIZE))); =20 if (is_vmalloc_addr(addr)) { - page =3D vmalloc_to_page(addr); - pgdat =3D page_pgdat(page); vfree(addr); } else { page =3D virt_to_page(addr); - pgdat =3D page_pgdat(page); 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) diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 1dda6c53370b..edcc7a6b0f6f 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) + memmap_boot_pages_add(DIV_ROUND_UP(end - start, PAGE_SIZE)); + else + memmap_pages_add(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..0f018c6f9ec5 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)); + memmap_boot_pages_add(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))); + memmap_pages_add(-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 6f8aa4766f16..e875f2a4915f 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1033,6 +1033,24 @@ unsigned long node_page_state(struct pglist_data *pg= dat, } #endif =20 +/* + * Count number of pages "struct page" and "struct page_ext" consume. + * nr_memmap_boot_pages: # of pages allocated by boot allocator + * nr_memmap_pages: # of pages that were allocated by buddy allocator + */ +static atomic_long_t nr_memmap_boot_pages =3D ATOMIC_LONG_INIT(0); +static atomic_long_t nr_memmap_pages =3D ATOMIC_LONG_INIT(0); + +void memmap_boot_pages_add(long delta) +{ + atomic_long_add(delta, &nr_memmap_boot_pages); +} + +void memmap_pages_add(long delta) +{ + atomic_long_add(delta, &nr_memmap_pages); +} + #ifdef CONFIG_COMPACTION =20 struct contig_page_info { @@ -1255,11 +1273,11 @@ const char * const vmstat_text[] =3D { "pgdemote_kswapd", "pgdemote_direct", "pgdemote_khugepaged", - "nr_memmap", - "nr_memmap_boot", /* system-wide enum vm_stat_item counters */ "nr_dirty_threshold", "nr_dirty_background_threshold", + "nr_memmap_pages", + "nr_memmap_boot_pages", =20 #if defined(CONFIG_VM_EVENT_COUNTERS) || defined(CONFIG_MEMCG) /* enum vm_event_item counters */ @@ -1827,6 +1845,8 @@ static void *vmstat_start(struct seq_file *m, loff_t = *pos) =20 global_dirty_limits(v + NR_DIRTY_BG_THRESHOLD, v + NR_DIRTY_THRESHOLD); + v[NR_MEMMAP_PAGES] =3D atomic_long_read(&nr_memmap_pages); + v[NR_MEMMAP_BOOT_PAGES] =3D atomic_long_read(&nr_memmap_boot_pages); v +=3D NR_VM_STAT_ITEMS; =20 #ifdef CONFIG_VM_EVENT_COUNTERS @@ -2285,25 +2305,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