Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp989226yba; Thu, 4 Apr 2019 01:52:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqxXkwyZrd0LuxZjLAFAhvVQZZyOfXyIzIEyi02IMSq1TCb+E86qhypMY8O12TCUDsCf+Uy7 X-Received: by 2002:a17:902:e684:: with SMTP id cn4mr4974518plb.71.1554367945366; Thu, 04 Apr 2019 01:52:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554367945; cv=none; d=google.com; s=arc-20160816; b=h1GPDJ1NsTNJonkh9LNDYgzBFsGBvjvYXv0w5JGozXSobD8izw0aEzHmImi0dt6Kzl 0FV48zZvekgPWTh/wcVjqyzPuBr4ja3ckD2K7WEVsyv30gqfPQPz/pxlMcNJIFT2SNOS 9T00cdR46EJ7DAD/1CRspReRmJh+NQGkaqbdu4XxS8BYZOW5Zn2Lzj/G8XV23KbATwXS /yNB3giBZ7MP1WJFYKVTOcA1hqxdi4wMDpSgKk4dlgvTgmfUz2suZtcwpCVe+eZ4Y6Id JzYKz3W2bN65M5U0Q1+zoaD04aVxVgkiHI6aV9R/QgQ8bZHn5xQK9mMFgodkRFGnAli/ ct+g== 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=HLvs5ypWXf7YyPwbFtZCM8N0q+VrkCJAuSM/26DYtWM=; b=FIpugJ8r8o4jEZd5mhFR5IX6JbR75+HiIrAfx20uhtxVmTvRpujggtV5AlF+hAzFzp X02tXyww+7xq+qS5BhkdUdpi2TvYRSG57siC7MPPojnnCxdm8tqimqhG2BEvKdt7dnld 69CJiNXxy15NChOgtNNb3gNbScH0zdLdBF+IX8twFx/XYPRXG1bIcrODWFNI6ing6/RG MLvnu0usU/jooKpaBY7WN9O2OkqqmhwNnKhEnGFm32kfGeZp5/3CuaezKCpFtLsTtvNQ axU/oEuSuAlFtf59KNu3aP2U7SiMGFplcq6R3Jn9+hhqrxJz74RPAq0lE0FIBOOz6bN8 P9Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GABWeqtp; 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 g20si15187226pfh.226.2019.04.04.01.52.10; Thu, 04 Apr 2019 01:52:25 -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=GABWeqtp; 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 S1729224AbfDDIu6 (ORCPT + 99 others); Thu, 4 Apr 2019 04:50:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:52356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728842AbfDDIu4 (ORCPT ); Thu, 4 Apr 2019 04:50:56 -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 6103820855; Thu, 4 Apr 2019 08:50:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554367855; bh=ufUbYLr5n/7HmABUvTtGoAIJUry4UA0HUooIFTVgVFE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GABWeqtpgVxxOKF4zPL121qPPWCa1jwkEDdETpGT+2/+q+pJuigBrrVGgaAGfZW+t ZfJRNDFztw+5KvKWL3y3dkV7wBoln7XNbm6JvS1gGmx3TDe2KyT2rXYJHvUeWqsPfX XtCiKcWn2pbejIRMfHrvtvkH2z/bQkK+r8L6nKwg= 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.9 22/91] f2fs: do not use mutex lock in atomic context Date: Thu, 4 Apr 2019 10:47:06 +0200 Message-Id: <20190404084536.700737266@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190404084535.450029272@linuxfoundation.org> References: <20190404084535.450029272@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.9-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 73b4e1d1912a..501c283761d2 100644 --- a/fs/f2fs/trace.c +++ b/fs/f2fs/trace.c @@ -61,6 +61,7 @@ void f2fs_trace_pid(struct page *page) page->private = 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