From patchwork Wed Apr 16 04:03:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: NeilBrown X-Patchwork-Id: 3997491 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BF44D9F2BA for ; Wed, 16 Apr 2014 04:21:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0685D2021A for ; Wed, 16 Apr 2014 04:21:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2378E20200 for ; Wed, 16 Apr 2014 04:21:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754292AbaDPETx (ORCPT ); Wed, 16 Apr 2014 00:19:53 -0400 Received: from cantor2.suse.de ([195.135.220.15]:38876 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754272AbaDPETv (ORCPT ); Wed, 16 Apr 2014 00:19:51 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 879F1AC2B; Wed, 16 Apr 2014 04:19:50 +0000 (UTC) From: NeilBrown To: linux-mm@kvack.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Date: Wed, 16 Apr 2014 14:03:37 +1000 Subject: [PATCH 17/19] VFS: set PF_FSTRANS while namespace_sem is held. Cc: xfs@oss.sgi.com Message-ID: <20140416040337.10604.86740.stgit@notabene.brown> In-Reply-To: <20140416033623.10604.69237.stgit@notabene.brown> References: <20140416033623.10604.69237.stgit@notabene.brown> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP namespace_sem can be taken while various i_mutex locks are held, so we need to avoid reclaim from blocking on an FS (particularly loop-back NFS). A memory allocation happens under namespace_sem at least in: [] kmem_cache_alloc+0x4f/0x290 [] alloc_vfsmnt+0x1f/0x1d0 [] clone_mnt+0x2a/0x310 [] copy_tree+0x53/0x380 [] copy_mnt_ns+0x7f/0x280 [] create_new_namespaces+0x5c/0x190 [] unshare_nsproxy_namespaces+0x59/0x90 So set PF_FSTRANS in namespace_lock() and restore in namespace_unlock(). Signed-off-by: NeilBrown --- fs/namespace.c | 4 ++++ 1 file changed, 4 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/namespace.c b/fs/namespace.c index 2ffc5a2905d4..83dcd5083dbb 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -63,6 +63,7 @@ static struct hlist_head *mount_hashtable __read_mostly; static struct hlist_head *mountpoint_hashtable __read_mostly; static struct kmem_cache *mnt_cache __read_mostly; static DECLARE_RWSEM(namespace_sem); +static unsigned long namespace_sem_pflags; /* /sys/fs */ struct kobject *fs_kobj; @@ -1196,6 +1197,8 @@ static void namespace_unlock(void) struct mount *mnt; struct hlist_head head = unmounted; + current_restore_flags_nested(&namespace_sem_pflags, PF_FSTRANS); + if (likely(hlist_empty(&head))) { up_write(&namespace_sem); return; @@ -1220,6 +1223,7 @@ static void namespace_unlock(void) static inline void namespace_lock(void) { down_write(&namespace_sem); + current_set_flags_nested(&namespace_sem_pflags, PF_FSTRANS); } /*