Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp611146img; Fri, 22 Mar 2019 05:08:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqxwFQDtRGRL7Ami4L0GumaRsIN+sYx2X5xEu5Oti680ptiMgw8mycQ/2GJf8hghs7M2eARf X-Received: by 2002:a17:902:586:: with SMTP id f6mr8993232plf.68.1553256483692; Fri, 22 Mar 2019 05:08:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553256483; cv=none; d=google.com; s=arc-20160816; b=KlZWI3Bretr7HT1tf2o+nLsp716g+V4YVZsf6Jd+4cAlG40uqab8slkunUXBLD4G46 BaockMiFQS+PWFfkykmloreGX5uHBCy/0K7C4pNhgaDTowevVOoT3AxN3+qSR4WaSdcH u9xmtx9VjuVO7NkwMqT7r/x/xHHz1u6gVkorBvuSx5IOXKzvu7qGtEa8MOrVuYFtvoxu Sjp950JLQUWn0fMPh//BBqvy3zeONafkyEf/NcKX34NzdJZMiz0h2rwNiuLTOqPdFucC HAshsn6WIOITcjWTWxBuXpcUbjezPYdnd0Mqtq7nXJcIIefpseBKGCWaD6T9gvN45i/i 9dRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PSOvVwAMKnA4fRWwJTroNESOVS4cVJhHVxtNXmpCDw4=; b=cg0vbZOZJ6isnoCsSWFidjWnl8PQz1Rwxy0GNdaPgN6HCLg9iWqoS2fwxyl4y4hLt6 s/1QrfqkMcL7VCIpQHutrKnxs23EhIXwU9C0ntLnu4zMdqyBolSZ4mAser9sidyxlgx8 srLoxfjK7b4YS0N6McRTQM++HjesOg6q8HlR9izdd+riz8WJ6mDdOpOa9FUGv66TQn10 4tR32VJBNsXLyHuzEydATZLW+35soVcOEN97VlYdUD3bVUbPs8QrHUp5UYnvz/SGGhzQ EFxARdsNqAWYGpteiYkAFwK9c6cwmOz7Q+Whv+z6gg6pJeD6CMeUkgJgkNftAyC8/lxH gUtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wI5fW52x; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c11si6482707pfc.39.2019.03.22.05.07.47; Fri, 22 Mar 2019 05:08:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wI5fW52x; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388943AbfCVMGp (ORCPT + 99 others); Fri, 22 Mar 2019 08:06:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:45140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388475AbfCVMGn (ORCPT ); Fri, 22 Mar 2019 08:06:43 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AFBF521916; Fri, 22 Mar 2019 12:06:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553256402; bh=4v41zYViiNjDLv0PYtAgmrL5oYVfXU8Yamuqjydcg5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wI5fW52xY/WbRIyTg1VbkrGy/RUoikRB3lqmKlcKiiMH2kAzGRkrAg6l2giIYHZ87 NaxvVpL91xf28YD5k1pwDZ8yCfO6rVTJTPlU++0yRsW7VkKbYNEYxXACNCfNcxA8S7 oRFY4GD58YR6/KAPX/mndaJCInbwC9B+YYmXHu7E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, zhongjiang , Naoya Horiguchi , Michal Hocko , Hugh Dickins , "Kirill A. Shutemov" , Andrea Arcangeli , Andrew Morton , Linus Torvalds Subject: [PATCH 4.19 200/280] mm: hwpoison: fix thp split handing in soft_offline_in_use_page() Date: Fri, 22 Mar 2019 12:15:53 +0100 Message-Id: <20190322111330.551251778@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111306.356185024@linuxfoundation.org> References: <20190322111306.356185024@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: zhongjiang commit 46612b751c4941c5c0472ddf04027e877ae5990f upstream. When soft_offline_in_use_page() runs on a thp tail page after pmd is split, we trigger the following VM_BUG_ON_PAGE(): Memory failure: 0x3755ff: non anonymous thp __get_any_page: 0x3755ff: unknown zero refcount page type 2fffff80000000 Soft offlining pfn 0x34d805 at process virtual address 0x20fff000 page:ffffea000d360140 count:0 mapcount:0 mapping:0000000000000000 index:0x1 flags: 0x2fffff80000000() raw: 002fffff80000000 ffffea000d360108 ffffea000d360188 0000000000000000 raw: 0000000000000001 0000000000000000 00000000ffffffff 0000000000000000 page dumped because: VM_BUG_ON_PAGE(page_ref_count(page) == 0) ------------[ cut here ]------------ kernel BUG at ./include/linux/mm.h:519! soft_offline_in_use_page() passed refcount and page lock from tail page to head page, which is not needed because we can pass any subpage to split_huge_page(). Naoya had fixed a similar issue in c3901e722b29 ("mm: hwpoison: fix thp split handling in memory_failure()"). But he missed fixing soft offline. Link: http://lkml.kernel.org/r/1551452476-24000-1-git-send-email-zhongjiang@huawei.com Fixes: 61f5d698cc97 ("mm: re-enable THP") Signed-off-by: zhongjiang Acked-by: Naoya Horiguchi Cc: Michal Hocko Cc: Hugh Dickins Cc: Kirill A. Shutemov Cc: Andrea Arcangeli Cc: [4.5+] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/memory-failure.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1823,19 +1823,17 @@ static int soft_offline_in_use_page(stru struct page *hpage = compound_head(page); if (!PageHuge(page) && PageTransHuge(hpage)) { - lock_page(hpage); - if (!PageAnon(hpage) || unlikely(split_huge_page(hpage))) { - unlock_page(hpage); - if (!PageAnon(hpage)) + lock_page(page); + if (!PageAnon(page) || unlikely(split_huge_page(page))) { + unlock_page(page); + if (!PageAnon(page)) pr_info("soft offline: %#lx: non anonymous thp\n", page_to_pfn(page)); else pr_info("soft offline: %#lx: thp split failed\n", page_to_pfn(page)); - put_hwpoison_page(hpage); + put_hwpoison_page(page); return -EBUSY; } - unlock_page(hpage); - get_hwpoison_page(page); - put_hwpoison_page(hpage); + unlock_page(page); } /*