From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFDB44534B9; Tue, 16 Jun 2026 16:03:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781625820; cv=none; b=MoBRbw1Fs9Uu5N4G11l3ibQzjAqC+dHqDBetQUKNIRvMf3NGBlL1YKbb2e0epbWdcRkWX49Zj6WHHVIFVdm/4DRpWP72BQZPD1NEXwrg/BlQhG8yf04T83dTKovhizwZ2ovTmXLT92BOpHNP4RJLkjEBMf3bOwaJUxbgBZ7CQOg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781625820; c=relaxed/simple; bh=wQoJgJidDrdmWGq7b5EWGoXfb7daU1bSBW7vCojn2c0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jeynVXPsgSAdjF5cjTkM0SrEbEda1uf4ANageJjkefusRLmMzXAECcVKVRhSHDNYS+82jbVQBUOwbZx1HnV+Lz6Cz/djjwuzYhBO5FnOJYxeHOeKnnGBeTIS5vxN744tJhuNILwXIRnPdeWHqjRUM+WMKYnnqlkPfIhOIp/fAfM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=c2erPEei; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="c2erPEei" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFEEE1F000E9; Tue, 16 Jun 2026 16:03:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781625818; bh=c0qqRZBuMdtqEjTj4xhi0KCCRWjAfvkLlw47xnqO7MI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=c2erPEeiOCGKu8MtPcC7qH9F96sk5vM0Gx2voMVbl4tJdcU8t9zJY3ub2G0W9DEaV eqDdCFjVw3/oJOClyQDCfSBkPE+nkR4Rab5UY7wHY/njMO5BAJ0sHG84VBUX9Aw5Vy fRJW2rdSyW7Kd37Ue+ea5fcvMgOiHYN65G0GqkZw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yin Tirui , Lorenzo Stoakes , "David Hildenbrand (arm)" , Lance Yang , Dev Jain , Baolin Wang , Barry Song , Chen Jun , Kefeng Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Vlastimil Babka , Yang Shi , Zi Yan , Andrew Morton Subject: [PATCH 6.18 183/325] mm/huge_memory: update file PMD counter before folio_put() Date: Tue, 16 Jun 2026 20:29:39 +0530 Message-ID: <20260616145107.007661714@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145057.827196531@linuxfoundation.org> References: <20260616145057.827196531@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yin Tirui commit 8d878059924f12c1bc24556a92ec56add74de3c8 upstream. __split_huge_pmd_locked() updates the file/shmem RSS counter after dropping the PMD mapping's folio reference. If folio_put() drops the last reference, mm_counter_file() can later read freed folio state via folio_test_swapbacked(). Move the counter update before folio_put(). Link: https://lore.kernel.org/20260526101337.1984081-1-yintirui@huawei.com Fixes: fadae2953072 ("thp: use mm_file_counter to determine update which rss counter") Signed-off-by: Yin Tirui Reviewed-by: Lorenzo Stoakes Acked-by: David Hildenbrand (arm) Reviewed-by: Lance Yang Reviewed-by: Dev Jain Cc: Baolin Wang Cc: Barry Song Cc: Chen Jun Cc: Kefeng Wang Cc: Liam R. Howlett Cc: Nico Pache Cc: Ryan Roberts Cc: Vlastimil Babka Cc: Yang Shi Cc: Zi Yan Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- mm/huge_memory.c | 2 ++ 1 file changed, 2 insertions(+) --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2877,7 +2877,9 @@ static void __split_huge_pmd_locked(stru if (!folio_test_referenced(folio) && pmd_young(old_pmd)) folio_set_referenced(folio); folio_remove_rmap_pmd(folio, page, vma); + add_mm_counter(mm, mm_counter_file(folio), -HPAGE_PMD_NR); folio_put(folio); + return; } add_mm_counter(mm, mm_counter_file(folio), -HPAGE_PMD_NR); return;