Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp585713img; Fri, 22 Mar 2019 04:35:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqzudytogoqEhszm7Jtqzq7BgmjYg92XucRxnoxgsdq2axIH05FGQXd5lgpLYXwHoesTz78+ X-Received: by 2002:a62:3849:: with SMTP id f70mr5652810pfa.46.1553254505083; Fri, 22 Mar 2019 04:35:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553254505; cv=none; d=google.com; s=arc-20160816; b=c0L7XIUJKcW0TioHXd0gGAd8EY8oq0Rf/jHLGxLLkE+xe7R8xyEm2eV49QmAr/AdiF fqCZ0zM6M5R0HmFrzHCcN1Tc1o1gHPyrQDPUbKUuxPfY0a6/nt1lnSFkTLL7trkaeXIF pBCugsVglLr+hw5+0yHDMru1fdaYntp8nQZrc8rU+MoVL9k+fAkAkVG6mZU089W1xww4 q1cMPZ7pskjM9n5fouy5wpDfk/+N7k7UiVViqb8/9jOTWXzAk1fhJl336xP8tk6f4VBN +irAhd341c2e8OL0BQgJ0s9UWTf3jZcoYNFxxmPg4fOGC7qneA8QJ/sCnO9BQj1E5BzB zvFQ== 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=xo/6QPMttwI7GFI8nixMFs4L/J0LBbNtPxWEGXYWIIE=; b=jn2RFlRtgJo6OGtEhl/wwwIolzeinuLpEpNKSMaejvumuZ3RSzRUCCd9yhKzBQ6HSr 5AZwE9JWVw40osxDeKULTZEHdVAKZ+PSt8SY2Ya8jLSrZ+Zn78fn/3hacw1NUF8K9PB+ e2iJWY/h8ZWll+fSXtKPrhLeUuQDQyBdm1K03++JLWFjLjc9p6tlgRr6XTjkXkdhve6u K9m0jm0ZBKHQ+OrFjyo+tnp3YxRm4EG19qYWne9qnFPhL4nX0Y41yKlcKLy6QY+EwFn/ f/ihBGuc+2pvcQCUTFP5FelLoVFf0HbqmymVA4p1+jo2u2cDTYXEKybsedggvEgKZ1uI /EYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ob1ACvUa; 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 1si6784542ply.232.2019.03.22.04.34.49; Fri, 22 Mar 2019 04:35:05 -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=ob1ACvUa; 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 S1729169AbfCVLdE (ORCPT + 99 others); Fri, 22 Mar 2019 07:33:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:33320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729850AbfCVLc5 (ORCPT ); Fri, 22 Mar 2019 07:32:57 -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 4AC3D21916; Fri, 22 Mar 2019 11:32:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553254376; bh=+30MAuQ7nltHmuicCYJBWvPkZme67F0dnfzcFFudATo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ob1ACvUaT9fQrHMFjqDMSUx28cD0sfQ6SR05V6FMsIZYdyq2J1ude978TRWlhyMkK 9PbKTesobLvPFvVG5xtrDXYEdz7TVy6b8aM38d8n29/wUlUFxi4ob1vzpaM0cm820U yOmdsgN0pH+WSsvJdNYTMqwrepGgyUshygXAgUNg= 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.4 102/230] fs/drop_caches.c: avoid softlockups in drop_pagecache_sb() Date: Fri, 22 Mar 2019 12:14:00 +0100 Message-Id: <20190322111243.754326698@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111236.796964179@linuxfoundation.org> References: <20190322111236.796964179@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.4-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 d72d52b90433..280460fef066 100644 --- a/fs/drop_caches.c +++ b/fs/drop_caches.c @@ -20,8 +20,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; } @@ -29,6 +34,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