From patchwork Tue Aug 6 22:14:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 1969694 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=soleen-com.20230601.gappssmtp.com header.i=@soleen-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=v/mkeimx; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=patchwork.ozlabs.org) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WdngB1QbVz1ydt for ; Wed, 7 Aug 2024 08:15:18 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=soleen-com.20230601.gappssmtp.com header.i=@soleen-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=v/mkeimx; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Wdng93Fz8z2ysg for ; Wed, 7 Aug 2024 08:15:17 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=soleen.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=soleen-com.20230601.gappssmtp.com header.i=@soleen-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=v/mkeimx; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=soleen.com (client-ip=2607:f8b0:4864:20::f32; helo=mail-qv1-xf32.google.com; envelope-from=pasha.tatashin@soleen.com; receiver=lists.ozlabs.org) Received: from mail-qv1-xf32.google.com (mail-qv1-xf32.google.com [IPv6:2607:f8b0:4864:20::f32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Wdnft69Yvz30T8 for ; Wed, 7 Aug 2024 08:15:01 +1000 (AEST) Received: by mail-qv1-xf32.google.com with SMTP id 6a1803df08f44-6b78c980981so6076066d6.2 for ; Tue, 06 Aug 2024 15:15:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen-com.20230601.gappssmtp.com; s=20230601; t=1722982498; x=1723587298; darn=lists.ozlabs.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=DpwrGsGSvnHFdGVf1tlm4Wyo1L4IUT4bE3I4p9OVTOM=; b=v/mkeimxZsjyD7uD5m8Un1S4kdi9LTA1BIJybiU7je+JPuIwBncP1NZBQ3dWDhLLcq 5IWv7QIYoOy1n7vC/TsKK39/ZjVsMYs6oB05r8H9AL8Lq6Ub4PqcDNAWqewlnWibkSNe 1usOxJ2/7rgbK7WSPAmvF73xn3Sb0XX+GqblysgUNRpP9cyRQi3bLRiYnPGJtKJnOQNr zeNCkyeGBtITucvULF2jHroUzTuXYjHKZarMHAFrhmqYG8JH4scTSv758KRFOq/7Ikf3 e/6FwTH0GpcxDMdBYhTX0hZZTDu8X3WjGvpJOm8YJTVvtiBJJjJToXyCNoELjJ311or+ Vrag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722982498; x=1723587298; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DpwrGsGSvnHFdGVf1tlm4Wyo1L4IUT4bE3I4p9OVTOM=; b=UNLJiQYEv8R5tKpGzyeW8XF+CyQi6cJXOoAJupgM27dEcR66H22crUobG/ecI1Uzhv +3o2PCkfVc1rf3SN1uWN+Q2JCLuhctKOBATacmU5saAmXtEZc9vVNPkqvRs2yBdufE1f WtRXJm59hNBgsaSFFheNnHCwdBzyqJ3F1ED+k/uSvFjmRyjDs7y0kOzPUozSblS+Dil6 Grhn2sXucYbRHgkOt4ZpKuq3Uu6CyghK+82PrYXY1iZeyUjuvhi5ElA2sG8VYpCnXGyC aOTo+xuRzEV4HpMJIi54AlQN65VltKyEPj3oWwEuDIe+5vhL/BztiRhNnPr0E32ogVvW C6vg== X-Forwarded-Encrypted: i=1; AJvYcCUiknqEywyxsobeHoCL0uTuNqW/r1HPmTuitV9OVE7DBEbZD9goVbilz8/lHTwBpp1yxZnBM0jahiCtnAutV2/w5esKiCR5KLp/mjmUCQ== X-Gm-Message-State: AOJu0YwFXGiQJ/c123q5OOM8LtllGJzX1tU9T398oa6+8c/l254PpJ3x obtdUVseOm9zfgQdHU2ApMWOM12zAPB4IKsVh17dCW2YWWs/RBCrNTRBT3dXgxc= X-Google-Smtp-Source: AGHT+IGvHhFLKBv+CzG3kEzbceETNjAkvAWmYHLIEUsuY6FkehJnB//a5YH4EciwSMoOH9WpYcIhcQ== X-Received: by 2002:a05:6214:5990:b0:6b0:86f9:64ad with SMTP id 6a1803df08f44-6bb98493eb3mr259732626d6.52.1722982497815; Tue, 06 Aug 2024 15:14:57 -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-6bb9c8778e1sm50584506d6.128.2024.08.06.15.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Aug 2024 15:14:57 -0700 (PDT) From: Pasha Tatashin To: agordeev@linux.ibm.com, akpm@linux-foundation.org, alexghiti@rivosinc.com, aou@eecs.berkeley.edu, ardb@kernel.org, arnd@arndb.de, bhe@redhat.com, bjorn@rivosinc.com, borntraeger@linux.ibm.com, bp@alien8.de, catalin.marinas@arm.com, chenhuacai@kernel.org, chenjiahao16@huawei.com, christophe.leroy@csgroup.eu, dave.hansen@linux.intel.com, david@redhat.com, dawei.li@shingroup.cn, gerald.schaefer@linux.ibm.com, gor@linux.ibm.com, hca@linux.ibm.com, hpa@zytor.com, kent.overstreet@linux.dev, kernel@xen0n.name, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, loongarch@lists.linux.dev, luto@kernel.org, maobibo@loongson.cn, mark.rutland@arm.com, mcgrof@kernel.org, mingo@redhat.com, mpe@ellerman.id.au, muchun.song@linux.dev, namcao@linutronix.de, naveen@kernel.org, npiggin@gmail.com, osalvador@suse.de, palmer@dabbelt.com, pasha.tatashin@soleen.com, paul.walmsley@sifive.com, peterz@infradead.org, philmd@linaro.org, rdunlap@infradead.org, rientjes@google.com, rppt@kernel.org, ryan.roberts@arm.com, souravpanda@google.com, svens@linux.ibm.com, tglx@linutronix.de, tzimmermann@suse.de, will@kernel.org, x86@kernel.org Subject: [PATCH 1/2] mm: update the memmap stat before page is freed Date: Tue, 6 Aug 2024 22:14:53 +0000 Message-ID: <20240806221454.1971755-1-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.46.0.76.ge559c4bf1a-goog MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 --- 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, unsigned 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); } } 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 = vmalloc_to_page(addr); pgdat = page_pgdat(page); + mod_node_page_state(pgdat, NR_MEMMAP, + -1L * (DIV_ROUND_UP(table_size, PAGE_SIZE))); vfree(addr); } else { page = virt_to_page(addr); pgdat = 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))); - } static void __free_page_ext(unsigned long pfn)