From patchwork Thu May 25 13:51:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Punit Agrawal X-Patchwork-Id: 9748415 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8B32F6032C for ; Thu, 25 May 2017 13:52:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79CB92766D for ; Thu, 25 May 2017 13:52:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E5D628066; Thu, 25 May 2017 13:52:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DA3352766D for ; Thu, 25 May 2017 13:52:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=AYnirNjEqnVP3/5JxTCTNac4ngvEVxcCdpfrP1mUL38=; b=a5N vmgzk9tBU88ZnI9tdF7RsOPpiHzW0wwo2+CzakiI9t3vRKs/a0QicuPPueNwbVgI9Ly89cP6+gPJS SVwtv4p+tfSzxymNcnfhChN5XPjGx4ICBQQ1J3x/TEtlgDBSlkaCS5Cpho7Zpyj0/iiUJJG9P2OdU IA59Jt7nHMUKjtdkmpEEpyrQLp46zwWZ3aPTLRstcyCbSDE9W/vgYb8F840lvpoW013ZHjUafrt20 ZI+zBcYzco4chzVfwVJKGV8khsxWAkrUxi78IxHcL6AlF8iBmoQ8+xrTtUmTODGfuIfEvWm6eFAZO NBrY6boy+XA1o7OvfMPe4LXQgS80fhg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dDtBf-0005Wi-Kw; Thu, 25 May 2017 13:52:23 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dDtBb-0005SC-Q8 for linux-arm-kernel@lists.infradead.org; Thu, 25 May 2017 13:52:21 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2EDBE2B; Thu, 25 May 2017 06:51:59 -0700 (PDT) Received: from localhost (e105922-lin.cambridge.arm.com [10.1.207.56]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id F0A533F578; Thu, 25 May 2017 06:51:58 -0700 (PDT) From: Punit Agrawal To: Andrew Morton Subject: [PATCH v2] mm/migrate: Fix ref-count handling when !hugepage_migration_supported() Date: Thu, 25 May 2017 14:51:46 +0100 Message-Id: <20170525135146.32011-1-punit.agrawal@arm.com> X-Mailer: git-send-email 2.11.0 X-ARM-No-Footer: FoSSMail X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170525_065219_873010_98222F82 X-CRM114-Status: GOOD ( 11.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christoph Lameter , tbaicar@codeaurora.org, catalin.marinas@arm.com, Punit Agrawal , will.deacon@arm.com, linux-kernel@vger.kernel.org, "# v3 . 14+" , linux-mm@kvack.org, Wanpeng Li , Joonsoo Kim , n-horiguchi@ah.jp.nec.com, timur@qti.qualcomm.com, linux-arm-kernel@lists.infradead.org, manoj.iyer@canonical.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On failing to migrate a page, soft_offline_huge_page() performs the necessary update to the hugepage ref-count. When !hugepage_migration_supported() , unmap_and_move_hugepage() also decrements the page ref-count for the hugepage. The combined behaviour leaves the ref-count in an inconsistent state. This leads to soft lockups when running the overcommitted hugepage test from mce-tests suite. Soft offlining pfn 0x83ed600 at process virtual address 0x400000000000 soft offline: 0x83ed600: migration failed 1, type 1fffc00000008008 (uptodate|head) INFO: rcu_preempt detected stalls on CPUs/tasks: Tasks blocked on level-0 rcu_node (CPUs 0-7): P2715 (detected by 7, t=5254 jiffies, g=963, c=962, q=321) thugetlb_overco R running task 0 2715 2685 0x00000008 Call trace: [] dump_backtrace+0x0/0x268 [] show_stack+0x24/0x30 [] sched_show_task+0x134/0x180 [] rcu_print_detail_task_stall_rnp+0x54/0x7c [] rcu_check_callbacks+0xa74/0xb08 [] update_process_times+0x34/0x60 [] tick_sched_handle.isra.7+0x38/0x70 [] tick_sched_timer+0x4c/0x98 [] __hrtimer_run_queues+0xc0/0x300 [] hrtimer_interrupt+0xac/0x228 [] arch_timer_handler_phys+0x3c/0x50 [] handle_percpu_devid_irq+0x8c/0x290 [] generic_handle_irq+0x34/0x50 [] __handle_domain_irq+0x68/0xc0 [] gic_handle_irq+0x5c/0xb0 Address this by changing the putback_active_hugepage() in soft_offline_huge_page() to putback_movable_pages(). Reported-by: Manoj Iyer Suggested-by: Naoya Horiguchi Signed-off-by: Punit Agrawal Cc: Joonsoo Kim Cc: Wanpeng Li Cc: Christoph Lameter Cc: # v3.14+ --- Changes since v1: * Added stable tag * Updated patch to use putback_movable_pages() in soft_offline_huge_page() in place of dropping putback_active_hugepage() when hugepage migration is not enabled. This patch was tested on v4.12-rc2 with the series to enable memory corruption handling[0]. [0] https://www.spinics.net/lists/arm-kernel/msg581657.html --- mm/memory-failure.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 44a6a33af219..89f9924777fa 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1603,7 +1603,8 @@ static int soft_offline_huge_page(struct page *page, int flags) * only one hugepage pointed to by hpage, so we need not * run through the pagelist here. */ - putback_active_hugepage(hpage); + if (!list_empty(&pagelist)) + putback_movable_pages(&pagelist); if (ret > 0) ret = -EIO; } else {