Received: by 2002:ac0:950c:0:0:0:0:0 with SMTP id f12csp2268220imc; Tue, 12 Mar 2019 10:15:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqwQnawj4CJqV2uMdsqrhRi4eX9TepXF4wVv3lO73v1JBpMVYLIgZNnLYKxOJtfw5WHbB+No X-Received: by 2002:a62:cf02:: with SMTP id b2mr39291333pfg.71.1552410901336; Tue, 12 Mar 2019 10:15:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552410901; cv=none; d=google.com; s=arc-20160816; b=EFsfaP7WkRokb/rcg0Lr6DnHW06PSG92Qyxn8nv/QlS6HYTT4t+xzgoC6IlaaBQt9b 5Q1tNSFrYzVXRboFKQ1TN7TP2fwzAvT878HSSJOm1m1pU8GDzEDl0uaKzE7DwcQQncWF /tSKT6YvATC45tR8FcE1tVoR8aQ0lrspBEOtUgfB1ScC7NTF59YcozplR4J6b6VO3bDx Z7zJK8FscHmIwHt/CXNbrmfNQ0EZnruShxf+6SOHekJU2xvF4mCrgg5VSmHJSqHWoGlG CfErhaz/EkK51xwAFjY+iIz/j8LSmLzNu9uoIEWwKF+D1GbFBhFsO1GTcYmQvxv6X2En l6LA== 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=BPWQ0jRxIzUeLIz8jRUpbFGq2zqxCE5ga57mCR3NX24=; b=QxAr4Hu9PGy1cwKgWdzvUvxxm/Ug2U/3ElesNo7lt0FYLkQi73kU48kKC3d6S0idcO m8KfWknG+WAcx1n5gUAbZHgiOoDKXL4Enp3qpRgKpM8baPLE366uH98YHVpkMr3Ep3Yz KONoDUSOfsvDW0yTuUSK04ZLNApo6crP/liAbAPAtuWeoXHr+Cu/m5JAlngruviBSAfv exWasT9liSNkfcbEQH8Sd8+k6ulTkFIxKQif4C4R7ee0gBQuScYLFvTQaqah9jH5CDmg mRS8MALmDXx3HDC9eNIC3x+FZM5zCA/NhrdoDAwnJAUTmJrxY+BYrPvQPhI94u+SNvE9 W5yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=T1DlcjTp; 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 i6si7785466pgq.423.2019.03.12.10.14.44; Tue, 12 Mar 2019 10:15:01 -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=T1DlcjTp; 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 S1727598AbfCLRMl (ORCPT + 99 others); Tue, 12 Mar 2019 13:12:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:47440 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727420AbfCLRMX (ORCPT ); Tue, 12 Mar 2019 13:12:23 -0400 Received: from localhost (unknown [104.133.8.98]) (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 448A72184C; Tue, 12 Mar 2019 17:12:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552410742; bh=L2PIsHTZNFxCGffKuf3UuUo7Y0rNJ09W1UE6YPYQS3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T1DlcjTpkQiGap6AF5EWHV1Npw+WGrbwZYuIDr59SaTL7lfv/6aT8G9l7MEqbwZvU 1Xwm28V5TNspsIUyPdU7deZiJK8m5cGckgDfmVPIs+5z1nePGHfgaECyfsnEf/oRVC wjMsJgIzqjdjZOwMNXbDaz+SnKVN4ZBWDyNc9YMQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jan Kara , Michal Hocko , Andrew Morton , Al Viro , Linus Torvalds , Sasha Levin Subject: [PATCH 4.20 067/171] fs/drop_caches.c: avoid softlockups in drop_pagecache_sb() Date: Tue, 12 Mar 2019 10:07:27 -0700 Message-Id: <20190312170353.948978221@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190312170347.868927101@linuxfoundation.org> References: <20190312170347.868927101@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.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit c27d82f52f75fc9d8d9d40d120d2a96fdeeada5e ] When superblock has lots of inodes without any pagecache (like is the case for /proc), drop_pagecache_sb() will iterate through all of them without dropping sb->s_inode_list_lock which can lead to softlockups (one of our customers hit this). Fix the problem by going to the slow path and doing cond_resched() in case the process needs rescheduling. Link: http://lkml.kernel.org/r/20190114085343.15011-1-jack@suse.cz Signed-off-by: Jan Kara Acked-by: Michal Hocko Reviewed-by: Andrew Morton Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- fs/drop_caches.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/drop_caches.c b/fs/drop_caches.c index 82377017130f..d31b6c72b476 100644 --- a/fs/drop_caches.c +++ b/fs/drop_caches.c @@ -21,8 +21,13 @@ static void drop_pagecache_sb(struct super_block *sb, void *unused) spin_lock(&sb->s_inode_list_lock); list_for_each_entry(inode, &sb->s_inodes, i_sb_list) { spin_lock(&inode->i_lock); + /* + * We must skip inodes in unusual state. We may also skip + * inodes without pages but we deliberately won't in case + * we need to reschedule to avoid softlockups. + */ if ((inode->i_state & (I_FREEING|I_WILL_FREE|I_NEW)) || - (inode->i_mapping->nrpages == 0)) { + (inode->i_mapping->nrpages == 0 && !need_resched())) { spin_unlock(&inode->i_lock); continue; } @@ -30,6 +35,7 @@ static void drop_pagecache_sb(struct super_block *sb, void *unused) spin_unlock(&inode->i_lock); spin_unlock(&sb->s_inode_list_lock); + cond_resched(); invalidate_mapping_pages(inode->i_mapping, 0, -1); iput(toput_inode); toput_inode = inode; -- 2.19.1