Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2957772imu; Mon, 19 Nov 2018 08:37:04 -0800 (PST) X-Google-Smtp-Source: AJdET5cR175OWTnHphTauxOPV2IeSFP73yfMCOeZmiIZ+H06rThnZPHyojL9wa2K9s0tkz6nOFNG X-Received: by 2002:a62:b9a:: with SMTP id 26mr11947705pfl.196.1542645423971; Mon, 19 Nov 2018 08:37:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542645423; cv=none; d=google.com; s=arc-20160816; b=VLPhAXyUNxk3YqmRpyyDmC/f4kEiNwvaCLEIKE9sMOYMpNVjXP2LAc3Ucd8O6sHG03 X3NjRk2TPBw4sAlhiKCgZ3n+wuSSX6blg0zHtQ1/ePIWlNlGp2reOGrZ0O5VPwNwNPjY t8UFsTiXMP4khjDsiiWrp0divJTkdCRhm/9acjAKFogpeVXTvu6pa3hGA3MPn2qEukHx 7uvpWLoldyq6g1/RCeXC1auyFbpS0gHFfYB5FplHbhaR7NQwwWw1V4OdG5J+I42h6SEq VqTBzYX9nYuuxyOooENB6jr0QDxoGiyuNX0SXs+H3BF/w9Ac7LS4eyDQJ3QhtCbZAeR+ lFhg== 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=cq5R3wEmdjJqmNlDexhgw8WznfLovYbqljIoF4WUM78=; b=chBE7CVllSLCOGyjWc/Fgw445qwmY1v9jxCEC0C2HlACQNvKta49sSHTh8fQA3MGRm p5tQbkl00kh+K0mjV9Y5s8u42h8qjFan+Wh+VUshrZ1KvvDeHWWqNnbNx93AFL3pY0qn VwJe+PuPT1tvK/5Ex7yWQq4KIHNmcax9ZfHNsrWWDPgZ8dmhtKbr2FJ7aWvHQr0xt2+M v0voJZTTaCKm/W070EmN49R7jvwZEJq2d3bzfeKbhoFWfNRFEPiAOGpaxp4jLHT1sZar gOKCsjkzakFbdUAQN4+EhTI0AJo2Gxee0TyNK0FKIrfE7x/RRxAiRH3L5uqTvrpZzHvm usrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZZlYIkAZ; 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 q61-v6si40523759plb.418.2018.11.19.08.36.49; Mon, 19 Nov 2018 08:37:03 -0800 (PST) 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=ZZlYIkAZ; 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 S1731664AbeKTC7e (ORCPT + 99 others); Mon, 19 Nov 2018 21:59:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:59090 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730350AbeKTC7d (ORCPT ); Mon, 19 Nov 2018 21:59:33 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 017AD208E3; Mon, 19 Nov 2018 16:35:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542645325; bh=uRHbX74fV5Gyh/80OMCnUyH2EqVtsdo38R7N3OhS/LY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZZlYIkAZsE5KFjgSE3vX51BfDhNS9wyJ5qpeETjg2Kuw0Tel/S4WowX5+yCz4XI0z 3AFROxnR/AUbzWoJIFb9PZjQKFvF95ClvbnxYH+NxM1ehaDWw/Cpu2J7JkHB+GGkF1 V11cP3uz1O34LT3G0/CP3+x2EpHPKMIYaoTp5GYU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michal Hocko , Johannes Thumshirn , Dan Williams , Andrew Morton , Linus Torvalds Subject: [PATCH 4.19 104/205] memory_hotplug: cond_resched in __remove_pages Date: Mon, 19 Nov 2018 17:26:51 +0100 Message-Id: <20181119162633.735472358@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181119162616.586062722@linuxfoundation.org> References: <20181119162616.586062722@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review 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: Michal Hocko commit dd33ad7b251f900481701b2a82d25de583867708 upstream. We have received a bug report that unbinding a large pmem (>1TB) can result in a soft lockup: NMI watchdog: BUG: soft lockup - CPU#9 stuck for 23s! [ndctl:4365] [...] Supported: Yes CPU: 9 PID: 4365 Comm: ndctl Not tainted 4.12.14-94.40-default #1 SLE12-SP4 Hardware name: Intel Corporation S2600WFD/S2600WFD, BIOS SE5C620.86B.01.00.0833.051120182255 05/11/2018 task: ffff9cce7d4410c0 task.stack: ffffbe9eb1bc4000 RIP: 0010:__put_page+0x62/0x80 Call Trace: devm_memremap_pages_release+0x152/0x260 release_nodes+0x18d/0x1d0 device_release_driver_internal+0x160/0x210 unbind_store+0xb3/0xe0 kernfs_fop_write+0x102/0x180 __vfs_write+0x26/0x150 vfs_write+0xad/0x1a0 SyS_write+0x42/0x90 do_syscall_64+0x74/0x150 entry_SYSCALL_64_after_hwframe+0x3d/0xa2 RIP: 0033:0x7fd13166b3d0 It has been reported on an older (4.12) kernel but the current upstream code doesn't cond_resched in the hot remove code at all and the given range to remove might be really large. Fix the issue by calling cond_resched once per memory section. Link: http://lkml.kernel.org/r/20181031125840.23982-1-mhocko@kernel.org Signed-off-by: Michal Hocko Acked-by: Johannes Thumshirn Cc: Dan Williams Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/memory_hotplug.c | 1 + 1 file changed, 1 insertion(+) --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -587,6 +587,7 @@ int __remove_pages(struct zone *zone, un for (i = 0; i < sections_to_remove; i++) { unsigned long pfn = phys_start_pfn + i*PAGES_PER_SECTION; + cond_resched(); ret = __remove_section(zone, __pfn_to_section(pfn), map_offset, altmap); map_offset = 0;