From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B47FC433F5 for ; Thu, 4 Nov 2021 18:57:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E875060E05 for ; Thu, 4 Nov 2021 18:57:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E875060E05 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 536E76B006C; Thu, 4 Nov 2021 14:57:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4E5D96B0072; Thu, 4 Nov 2021 14:57:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3AD646B0073; Thu, 4 Nov 2021 14:57:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0115.hostedemail.com [216.40.44.115]) by kanga.kvack.org (Postfix) with ESMTP id 2B07D6B006C for ; Thu, 4 Nov 2021 14:57:06 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id DEB8074CF5 for ; Thu, 4 Nov 2021 18:57:05 +0000 (UTC) X-FDA: 78772155210.11.DFE7D9E Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf27.hostedemail.com (Postfix) with ESMTP id 76BEF70000B4 for ; Thu, 4 Nov 2021 18:57:05 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 36E7060EBD; Thu, 4 Nov 2021 18:50:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1636051852; bh=neeyNxkuI99HaYVUJyM0NkweIy5VQIlUtanbkesCaL8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=pD6sXSSIH34QdxUdpLgNTVFDwxFMNTSnvBAjo5xd9a7q29h9WuNCIRyAdFwR1Q7h2 Fyznb7S4RU0uDaYb/MihAGk56g+k37fxw6Adg45bdSIcpHTfdnLNl88qbPPKVDQYzD DspIGM2sGXiY0SCs1V/cSPrBd4iaXRyBhPwXRerM= Date: Thu, 4 Nov 2021 19:50:49 +0100 From: Greg KH To: Yang Shi Cc: HORIGUCHI =?utf-8?B?TkFPWUEo5aCA5Y+jIOebtOS5nyk=?= , Hugh Dickins , "Kirill A. Shutemov" , Matthew Wilcox , Oscar Salvador , Peter Xu , Andrew Morton , stable , Linux MM , Linux Kernel Mailing List Subject: Re: [stable 5.10 PATCH] mm: hwpoison: remove the unnecessary THP check Message-ID: References: <20211101194856.305642-1-shy828301@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=pD6sXSSI; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf27.hostedemail.com: domain of gregkh@linuxfoundation.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 76BEF70000B4 X-Stat-Signature: yzy36rupidz31yjexegzcgw5jxmtbkmp X-HE-Tag: 1636052225-816878 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, Nov 04, 2021 at 11:07:05AM -0700, Yang Shi wrote: > On Thu, Nov 4, 2021 at 10:43 AM Yang Shi wrote: > > > > On Thu, Nov 4, 2021 at 9:53 AM Greg KH wrote: > > > > > > On Wed, Nov 03, 2021 at 10:46:24AM +0100, Greg KH wrote: > > > > On Mon, Nov 01, 2021 at 12:48:56PM -0700, Yang Shi wrote: > > > > > commit c7cb42e94473aafe553c0f2a3d8ca904599399ed upstream. > > > > > > > > > > When handling THP hwpoison checked if the THP is in allocation or free > > > > > stage since hwpoison may mistreat it as hugetlb page. After commit > > > > > 415c64c1453a ("mm/memory-failure: split thp earlier in memory error > > > > > handling") the problem has been fixed, so this check is no longer > > > > > needed. Remove it. The side effect of the removal is hwpoison may > > > > > report unsplit THP instead of unknown error for shmem THP. It seems not > > > > > like a big deal. > > > > > > > > > > The following patch "mm: filemap: check if THP has hwpoisoned subpage > > > > > for PMD page fault" depends on this, which fixes shmem THP with > > > > > hwpoisoned subpage(s) are mapped PMD wrongly. So this patch needs to be > > > > > backported to -stable as well. > > > > > > > > > > Link: https://lkml.kernel.org/r/20211020210755.23964-2-shy828301@gmail.com > > > > > Signed-off-by: Yang Shi > > > > > Suggested-by: Naoya Horiguchi > > > > > Acked-by: Naoya Horiguchi > > > > > Cc: Hugh Dickins > > > > > Cc: Kirill A. Shutemov > > > > > Cc: Matthew Wilcox > > > > > Cc: Oscar Salvador > > > > > Cc: Peter Xu > > > > > Cc: > > > > > Signed-off-by: Andrew Morton > > > > > Signed-off-by: Linus Torvalds > > > > > --- > > > > > mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault.patch > > > > > depends on this one. > > > > > > > > Both now queued up, thanks. > > > > > > This breaks the build, see: > > > https://lore.kernel.org/r/acabc414-164b-cd65-6a1a-cf912d8621d7@roeck-us.net > > > > > > so I'm going to drop both of these now. Please fix this up and resend a > > > tested series. > > > > Thanks for catching this. It is because I accidentally left the > > PAGEFLAG_* macros into CONFIG_TRANSHUGE_PAGE section, so it is: > > > > #ifdef CONFIG_TRANSHUGE_PAGE > > ... > > #if defined(CONFIG_MEMORY_FAILURE) && defined(CONFIG_TRANSHUGE_PAGE) > > PAGEFLAG_xxx > > #else > > PAGEFLAG_FALSE_xxx > > #endif > > ... > > #endif > > > > So when THP is disabled the PAGEFLAG_FALSE_xxx macro is actually absent. > > > > The upstream has the same issue, will send a patch to fix it soon, and > > send fixes (folded the new fix in) to -stable later. Sorry for the > > inconvenience. > > Further looking shows the upstream is good. I did *NOT* add the code > in CONFIG_TRANSHUGE_PAGE section. It seems the code section was moved > around when the patch was applied to 5.10. > > Could you please fold the below patch into > mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault.patch? > Or I could prepare a patch for you. I need a working patch series please. thanks, greg k-h