From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 42B1E1EABD4; Mon, 21 Oct 2024 10:41:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729507304; cv=none; b=bLyDHeH9/Sb7WdGRldE13aNbcrCIcx4EiTzef9tMcJxBTCix+lcWQvUh844CSWcJtBuUj3ys1G7ea6IlX3KFAa+vzU9vayX6q5aL0jvQ0iG2dH2R65FydpkMPI46FT3C/wQ8kvQZyoMTcFL4PsKr7VXSi9Uj1UiOubZKEHwKyxc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729507304; c=relaxed/simple; bh=WOchI3moU7LmVUGlWg5z/ph6qDoYU2cLaKCUhMoguqA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L/JOIEde3XsqmYG12sb8PE1CAXEGm7oT99G2C2L+9ZBdFIe2Q+nFvVuQAoWRCHJp2nK04kQiGELb6pepMm1kAyIAwqyc/3mjVoKC8lZCzXIm9IpXeJ4r8Oe1E5mY6ztc/rBk67qurT2gnLaUXlAH1vtsIM/JHi25TAaJtbITwXM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0vCxrVFh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0vCxrVFh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4E6EC4CEC3; Mon, 21 Oct 2024 10:41:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1729507304; bh=WOchI3moU7LmVUGlWg5z/ph6qDoYU2cLaKCUhMoguqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0vCxrVFh1FdtkjomJOmxAf/2iFcxgRKddiPccTgKOzSP9/ezcLtNxJH4FGDqjDOfS klvhVEi0IWJz1kvl/KZNOvdhDvGUAIt3MM+SZ9AuZb8xQ535W+saPanOjtuPd1f7se 5yIbGvYvokURSOWFkPIb0VS8m6rqdg8QuSAyL/Jw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Liu Shixin , Muchun Song , Naoya Horiguchi , Andrew Morton Subject: [PATCH 6.1 33/91] mm/swapfile: skip HugeTLB pages for unuse_vma Date: Mon, 21 Oct 2024 12:24:47 +0200 Message-ID: <20241021102251.117719100@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241021102249.791942892@linuxfoundation.org> References: <20241021102249.791942892@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Liu Shixin commit 7528c4fb1237512ee18049f852f014eba80bbe8d upstream. I got a bad pud error and lost a 1GB HugeTLB when calling swapoff. The problem can be reproduced by the following steps: 1. Allocate an anonymous 1GB HugeTLB and some other anonymous memory. 2. Swapout the above anonymous memory. 3. run swapoff and we will get a bad pud error in kernel message: mm/pgtable-generic.c:42: bad pud 00000000743d215d(84000001400000e7) We can tell that pud_clear_bad is called by pud_none_or_clear_bad in unuse_pud_range() by ftrace. And therefore the HugeTLB pages will never be freed because we lost it from page table. We can skip HugeTLB pages for unuse_vma to fix it. Link: https://lkml.kernel.org/r/20241015014521.570237-1-liushixin2@huawei.com Fixes: 0fe6e20b9c4c ("hugetlb, rmap: add reverse mapping for hugepage") Signed-off-by: Liu Shixin Acked-by: Muchun Song Cc: Naoya Horiguchi Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- mm/swapfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -2006,7 +2006,7 @@ static int unuse_mm(struct mm_struct *mm mmap_read_lock(mm); for_each_vma(vmi, vma) { - if (vma->anon_vma) { + if (vma->anon_vma && !is_vm_hugetlb_page(vma)) { ret = unuse_vma(vma, type); if (ret) break;