Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1031769yba; Thu, 4 Apr 2019 02:52:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqxXyK05eapOf7xKrDOXdXZanCvta3/ArOm30+AaTBJeQFhqHCCAIXXjQYqBG3JeSNHr4Sya X-Received: by 2002:a17:902:784d:: with SMTP id e13mr5485740pln.152.1554371529181; Thu, 04 Apr 2019 02:52:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554371529; cv=none; d=google.com; s=arc-20160816; b=C3dYOV4DLNa5d4HsQ91lyj8VC0bI4n+LVAbNKu+2jxqZSRMKDeTpw2DrJPXxE7aABg +kZT/crdK614Qrw28hnRHtT00fJyX7KD49QtHxeJdNYZuDIT4bJFHY+hkq1q2RtvII0S Vhsj7eFIE5uA4qN6qz8wizNrsBm+5Tn7m3ZBvPtyc3QDcah27Siu5SpjTfNRWA4I81jY G7aElpTPS5+eAtG5dg1JhK6yAS6Xg9rY6beoxHQRZ1Eg9rm2c/2w5UWIyQwHUe48HI4b eJLL6s+2z3D0KGW9Lwyoi+V191v/wZ3NZeHY88SVnW/cywt6y23Ij6O3qwq8QGg549FF oFsA== 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=pNknbSt9Jbh0QT3Fl8AdoC2fNUm3xGYGfpBDMxXtYuY=; b=hOZbEROEYVtBlxTrKlRmxTmTXDBlLVvPiXJ47o20qBjgxIJ8ogFCvwNf0vFi8jP16A SG+1yy5RJw7GBn3EoBYTX38WGbKUs0oJeKu89C1oV3G4Gnib1Im7s8jjLeF4p7iR+a/D ZrXggyA13EXyWSf+I153xt1V8oik94VNu0ESFx4e3l+qVE+eNUF2zVSESs4opc5BcTm0 9205HzoDbGQApeuRhfRprUFEAwhONHBfVEhrefKDcwa+LuP1qsF9TIMvIZ1RrAtr4Ul0 ZA6oRCHeKSbWnjq9D8yYJYnYpSmAKn9SrrLXrcZFojoisaakXxGCnl0zvHVNCjhrUOoX FzKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mAxzpDDC; 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 q1si15892461pfh.125.2019.04.04.02.51.53; Thu, 04 Apr 2019 02:52:09 -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=mAxzpDDC; 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 S1729044AbfDDIzS (ORCPT + 99 others); Thu, 4 Apr 2019 04:55:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:58120 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729490AbfDDIzO (ORCPT ); Thu, 4 Apr 2019 04:55:14 -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 3B0FD217D4; Thu, 4 Apr 2019 08:55:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554368113; bh=FMVVaGvFtVSgZApcofTydT3nCShyD/NF9XvMig0I8gc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mAxzpDDCDdXKULTVCGpqczqo0CRTIU6zrPBdqYf2+ZDLNMpzQwbR7GGjC/PmpnPuN ELE3a1wsBe6blofLbB5tUKWukHD7Zguuo5op7PLWqkoSzMdmcQrADX7gzxSxFrZ1KC OqzU4ho/gSwihKlu5QlgyynLrYIB2YakYxqKCZZI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sahitya Tummala , Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 4.14 026/121] f2fs: do not use mutex lock in atomic context Date: Thu, 4 Apr 2019 10:46:54 +0200 Message-Id: <20190404084546.776090316@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190404084545.245659903@linuxfoundation.org> References: <20190404084545.245659903@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.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 9083977dabf3833298ddcd40dee28687f1e6b483 ] Fix below warning coming because of using mutex lock in atomic context. BUG: sleeping function called from invalid context at kernel/locking/mutex.c:98 in_atomic(): 1, irqs_disabled(): 0, pid: 585, name: sh Preemption disabled at: __radix_tree_preload+0x28/0x130 Call trace: dump_backtrace+0x0/0x2b4 show_stack+0x20/0x28 dump_stack+0xa8/0xe0 ___might_sleep+0x144/0x194 __might_sleep+0x58/0x8c mutex_lock+0x2c/0x48 f2fs_trace_pid+0x88/0x14c f2fs_set_node_page_dirty+0xd0/0x184 Do not use f2fs_radix_tree_insert() to avoid doing cond_resched() with spin_lock() acquired. Signed-off-by: Sahitya Tummala Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/trace.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/trace.c b/fs/f2fs/trace.c index bccbbf2616d2..8ac1851a21c0 100644 --- a/fs/f2fs/trace.c +++ b/fs/f2fs/trace.c @@ -61,6 +61,7 @@ void f2fs_trace_pid(struct page *page) set_page_private(page, (unsigned long)pid); +retry: if (radix_tree_preload(GFP_NOFS)) return; @@ -71,7 +72,12 @@ void f2fs_trace_pid(struct page *page) if (p) radix_tree_delete(&pids, pid); - f2fs_radix_tree_insert(&pids, pid, current); + if (radix_tree_insert(&pids, pid, current)) { + spin_unlock(&pids_lock); + radix_tree_preload_end(); + cond_resched(); + goto retry; + } trace_printk("%3x:%3x %4x %-16s\n", MAJOR(inode->i_sb->s_dev), MINOR(inode->i_sb->s_dev), -- 2.19.1