From patchwork Tue Dec 8 02:15:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 11957437 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E13FC433FE for ; Tue, 8 Dec 2020 02:17:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A4A623A33 for ; Tue, 8 Dec 2020 02:17:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727739AbgLHCQ7 (ORCPT ); Mon, 7 Dec 2020 21:16:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725877AbgLHCQ7 (ORCPT ); Mon, 7 Dec 2020 21:16:59 -0500 Received: from mail-ua1-x941.google.com (mail-ua1-x941.google.com [IPv6:2607:f8b0:4864:20::941]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3212CC0613D6; Mon, 7 Dec 2020 18:16:19 -0800 (PST) Received: by mail-ua1-x941.google.com with SMTP id t15so5164799ual.6; Mon, 07 Dec 2020 18:16:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m+1GohZiu08TBGb+QZ95Ht2UJWzVkthZE/EPME/oCwk=; b=p+Vo22Ajj0KnaKJDOjLCWdum9GRkWkLPGj0o9AcWdZtvcNVz5rGJDgCkqCrDKLb6HR 07gGPDmiz2npXEvGiA+LDy6Q3KvxzbzsexQe9RGeUpO4N8m7NixtQO6T5Dz0cArVtPAP eQRdT+IHaBkiCRTp+o+TxWgV9tKTj5kqEH+5oYd73+kY92dYa6nEvqMvMuHx56CTVnUr Hk0TaAwkFS0UZTfOtYx5/E5922Q+9vBv7uRctfagykQXrwS1p4y7enLf/R5hxBwuTvne +M4EURRe7uj3g2Bxb1bXSHY/XZ+1Fl+o3pZ42FIMuGw/YpMc4nNW9gP+ppH01AUZzEZ4 Le/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m+1GohZiu08TBGb+QZ95Ht2UJWzVkthZE/EPME/oCwk=; b=qhNq4x8/e3CbP0sBWB4HVWCEMGuR7m+TcmZ4Uz75oKGh8elIlAf1v3BMIQl7Zke1e2 puqJhJRF1LSYjkUF2I0JQuco/g8HnPg4a5QZC6poXV3rTjXHAaQiAOXonlQdu9+RxmLr aiIb3Sk7DZ6qYPZycZIlpLk6cSrrQnEZKbgi2vFyxhDNPTvf6SNGiKK0u3ONQU+M+jR0 U/9ZGaXac0Zwx13XIbe6uZ1aAM8Z2nRfDEep3cRAFvxW4GwuSxOzrQPnNMmmFh0iGq2N 4y103P+7m/Dli7wQipaHyMwx8Gf4HmXRWCwa/U7RsHMEHmE5uS26B+JjY6TNB7P0hs/l p+JA== X-Gm-Message-State: AOAM530w5XTpRoTo/pyiSYn44gEESqAsKrmlR6FuSdlIyNbPTRqQufce IVlRxRFAiG/WLRlS3mM2pto= X-Google-Smtp-Source: ABdhPJykWOCUKyytu1BnOcC+NQiG9kaP5230ROkGfHRFt5Xw95zgweMCGNA0vNbhM+PCV+YvuSadfg== X-Received: by 2002:a9f:26c5:: with SMTP id 63mr15305401uay.25.1607393778460; Mon, 07 Dec 2020 18:16:18 -0800 (PST) Received: from localhost.localdomain ([50.236.19.102]) by smtp.gmail.com with ESMTPSA id o192sm1936000vko.19.2020.12.07.18.16.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Dec 2020 18:16:17 -0800 (PST) From: Yafang Shao To: darrick.wong@oracle.com, willy@infradead.org, david@fromorbit.com, hch@infradead.org, mhocko@kernel.org, akpm@linux-foundation.org, dhowells@redhat.com, jlayton@redhat.com Cc: linux-fsdevel@vger.kernel.org, linux-cachefs@redhat.com, linux-xfs@vger.kernel.org, linux-mm@kvack.org, Michal Hocko , Christoph Hellwig , Yafang Shao Subject: [PATCH v10 1/4] mm: Add become_kswapd and restore_kswapd Date: Tue, 8 Dec 2020 10:15:40 +0800 Message-Id: <20201208021543.76501-2-laoar.shao@gmail.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201208021543.76501-1-laoar.shao@gmail.com> References: <20201208021543.76501-1-laoar.shao@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: "Matthew Wilcox (Oracle)" Since XFS needs to pretend to be kswapd in some of its worker threads, create methods to save & restore kswapd state. Don't bother restoring kswapd state in kswapd -- the only time we reach this code is when we're exiting and the task_struct is about to be destroyed anyway. Cc: Dave Chinner Acked-by: Michal Hocko Reviewed-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Yafang Shao --- fs/xfs/libxfs/xfs_btree.c | 14 ++++++++------ include/linux/sched/mm.h | 23 +++++++++++++++++++++++ mm/vmscan.c | 16 +--------------- 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c index 2d25bab68764..a04a44238aab 100644 --- a/fs/xfs/libxfs/xfs_btree.c +++ b/fs/xfs/libxfs/xfs_btree.c @@ -2813,8 +2813,9 @@ xfs_btree_split_worker( { struct xfs_btree_split_args *args = container_of(work, struct xfs_btree_split_args, work); + bool is_kswapd = args->kswapd; unsigned long pflags; - unsigned long new_pflags = PF_MEMALLOC_NOFS; + int memalloc_nofs; /* * we are in a transaction context here, but may also be doing work @@ -2822,16 +2823,17 @@ xfs_btree_split_worker( * temporarily to ensure that we don't block waiting for memory reclaim * in any way. */ - if (args->kswapd) - new_pflags |= PF_MEMALLOC | PF_SWAPWRITE | PF_KSWAPD; - - current_set_flags_nested(&pflags, new_pflags); + if (is_kswapd) + pflags = become_kswapd(); + memalloc_nofs = memalloc_nofs_save(); args->result = __xfs_btree_split(args->cur, args->level, args->ptrp, args->key, args->curp, args->stat); complete(args->done); - current_restore_flags_nested(&pflags, new_pflags); + memalloc_nofs_restore(memalloc_nofs); + if (is_kswapd) + restore_kswapd(pflags); } /* diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h index d5ece7a9a403..2faf03e79a1e 100644 --- a/include/linux/sched/mm.h +++ b/include/linux/sched/mm.h @@ -278,6 +278,29 @@ static inline void memalloc_nocma_restore(unsigned int flags) } #endif +/* + * Tell the memory management code that this thread is working on behalf + * of background memory reclaim (like kswapd). That means that it will + * get access to memory reserves should it need to allocate memory in + * order to make forward progress. With this great power comes great + * responsibility to not exhaust those reserves. + */ +#define KSWAPD_PF_FLAGS (PF_MEMALLOC | PF_SWAPWRITE | PF_KSWAPD) + +static inline unsigned long become_kswapd(void) +{ + unsigned long flags = current->flags & KSWAPD_PF_FLAGS; + + current->flags |= KSWAPD_PF_FLAGS; + + return flags; +} + +static inline void restore_kswapd(unsigned long flags) +{ + current->flags &= ~(flags ^ KSWAPD_PF_FLAGS); +} + #ifdef CONFIG_MEMCG DECLARE_PER_CPU(struct mem_cgroup *, int_active_memcg); /** diff --git a/mm/vmscan.c b/mm/vmscan.c index 1b8f0e059767..77bc1dda75bf 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3869,19 +3869,7 @@ static int kswapd(void *p) if (!cpumask_empty(cpumask)) set_cpus_allowed_ptr(tsk, cpumask); - /* - * Tell the memory management that we're a "memory allocator", - * and that if we need more memory we should get access to it - * regardless (see "__alloc_pages()"). "kswapd" should - * never get caught in the normal page freeing logic. - * - * (Kswapd normally doesn't need memory anyway, but sometimes - * you need a small amount of memory in order to be able to - * page out something else, and this flag essentially protects - * us from recursively trying to free more memory as we're - * trying to free the first piece of memory in the first place). - */ - tsk->flags |= PF_MEMALLOC | PF_SWAPWRITE | PF_KSWAPD; + become_kswapd(); set_freezable(); WRITE_ONCE(pgdat->kswapd_order, 0); @@ -3931,8 +3919,6 @@ static int kswapd(void *p) goto kswapd_try_sleep; } - tsk->flags &= ~(PF_MEMALLOC | PF_SWAPWRITE | PF_KSWAPD); - return 0; } From patchwork Tue Dec 8 02:15:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 11957439 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 096C4C0018C for ; Tue, 8 Dec 2020 02:17:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D158123A57 for ; Tue, 8 Dec 2020 02:17:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727763AbgLHCRG (ORCPT ); Mon, 7 Dec 2020 21:17:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727756AbgLHCRF (ORCPT ); Mon, 7 Dec 2020 21:17:05 -0500 Received: from mail-vs1-xe41.google.com (mail-vs1-xe41.google.com [IPv6:2607:f8b0:4864:20::e41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A315C061793; Mon, 7 Dec 2020 18:16:25 -0800 (PST) Received: by mail-vs1-xe41.google.com with SMTP id q10so8743849vsr.13; Mon, 07 Dec 2020 18:16:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MbRb9UGYEBMJgQFNsuSpH4CcNAaUWcOZHEAGHzS236w=; b=hZb2tm/kTIdovRc7XAQAQOXA3Lsolu9P/iz5+eipoETzaasWoJDdoFAGCsBVuWxFdG z9CpG1HpkTsDgY4NGgzWDPpqpSbuemLgbczGFFz1sRWX5frjklqEmHWAB9Xj2V/bLH7p I4Fw7IiqOG1KNoXtTzKY16b4j5Hl42jTvVGbIpjM+n/p6x3C6h+cdzyKJDhMfTZphjhE mWN7V6DgQZrBBrD3yrguz58tDemN0tj0CNhQ7LFZKWguEDFjvc7DbqNRSWd0dfx6jS7a q21zXmOPMRLPbGQuexSZJwmmoGONPwKEacF2pxO0IQzdx8Ftm7CWxENp12enEPt1nzgR vL0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MbRb9UGYEBMJgQFNsuSpH4CcNAaUWcOZHEAGHzS236w=; b=TVu02MWtp0KNx1envi6UuMMTPNFY79JagaOvEUbvmyTQlWtYTbPtU7FwHpqDno6ztu APgkCsyHj0J8d954go2y7VkFoth7YhY3F9kT3WG8Bx+TO4UOmE+VW74FYnUpdf0qbO9P j4LWRC76OkZcnGnR0Mu/TP4VSYEPUDiEEg0caSvZ6+NAXslCc7Q1OJI64Ow6P8+8+fLu wYtO6VsJP7aw0LBNUrwRtYcaqFbHEGHXt9Avc8cgioAxaK0UKu4Ew340D4aHNWeiLw4l 4I6V7DHPx75IuJLzNOkvTML/4YF+O0y2Lfq75w0oq9sNucb8+jxGZ01/uuIENsH9FHWg ZSzA== X-Gm-Message-State: AOAM531W74iW2OV0/7szoQGK1JYgRUUaZGQ7K7GnRECtkhN4cDDceWEC AwUw4wc0wvt3eoxUqX2gJp8= X-Google-Smtp-Source: ABdhPJzoFQQrWwYmxH07BCF6h5dYgYueSy8jYmjam/tcCZdFDmrmpk+XFikMvOFRZ9NGquZ2TbEt3w== X-Received: by 2002:a67:efd9:: with SMTP id s25mr14359523vsp.56.1607393784864; Mon, 07 Dec 2020 18:16:24 -0800 (PST) Received: from localhost.localdomain ([50.236.19.102]) by smtp.gmail.com with ESMTPSA id o192sm1936000vko.19.2020.12.07.18.16.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Dec 2020 18:16:24 -0800 (PST) From: Yafang Shao To: darrick.wong@oracle.com, willy@infradead.org, david@fromorbit.com, hch@infradead.org, mhocko@kernel.org, akpm@linux-foundation.org, dhowells@redhat.com, jlayton@redhat.com Cc: linux-fsdevel@vger.kernel.org, linux-cachefs@redhat.com, linux-xfs@vger.kernel.org, linux-mm@kvack.org, Yafang Shao , Christoph Hellwig Subject: [PATCH v10 2/4] xfs: use memalloc_nofs_{save,restore} in xfs transaction Date: Tue, 8 Dec 2020 10:15:41 +0800 Message-Id: <20201208021543.76501-3-laoar.shao@gmail.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201208021543.76501-1-laoar.shao@gmail.com> References: <20201208021543.76501-1-laoar.shao@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org memalloc_nofs_{save,restore} API is introduced in commit 7dea19f9ee63 ("mm: introduce memalloc_nofs_{save,restore} API"), which gives a better abstraction of the usage around PF_MEMALLOC_NOFS. We'd better use this API in XFS instead of using PF_MEMALLOC_NOFS directly as well. To prepare for the followup patch, two new helpers are introduced in XFS to wrap the memalloc_nofs_{save,restore} API, as follows, static inline void xfs_trans_context_set(struct xfs_trans *tp) { tp->t_pflags = memalloc_nofs_save(); } static inline void xfs_trans_context_clear(struct xfs_trans *tp) { memalloc_nofs_restore(tp->t_pflags); } These two new helpers are added into xfs_tans.h as they are used in xfs transaction only. Cc: Darrick J. Wong Cc: Matthew Wilcox (Oracle) Cc: Christoph Hellwig Cc: Dave Chinner Cc: Michal Hocko Signed-off-by: Yafang Shao --- fs/xfs/xfs_aops.c | 4 ++-- fs/xfs/xfs_linux.h | 4 ---- fs/xfs/xfs_trans.c | 13 +++++++------ fs/xfs/xfs_trans.h | 12 ++++++++++++ 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 4304c6416fbb..2371187b7615 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -62,7 +62,7 @@ xfs_setfilesize_trans_alloc( * We hand off the transaction to the completion thread now, so * clear the flag here. */ - current_restore_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS); + xfs_trans_context_clear(tp); return 0; } @@ -125,7 +125,7 @@ xfs_setfilesize_ioend( * thus we need to mark ourselves as being in a transaction manually. * Similarly for freeze protection. */ - current_set_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS); + xfs_trans_context_set(tp); __sb_writers_acquired(VFS_I(ip)->i_sb, SB_FREEZE_FS); /* we abort the update if there was an IO error */ diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h index 5b7a1e201559..6ab0f8043c73 100644 --- a/fs/xfs/xfs_linux.h +++ b/fs/xfs/xfs_linux.h @@ -102,10 +102,6 @@ typedef __u32 xfs_nlink_t; #define xfs_cowb_secs xfs_params.cowb_timer.val #define current_cpu() (raw_smp_processor_id()) -#define current_set_flags_nested(sp, f) \ - (*(sp) = current->flags, current->flags |= (f)) -#define current_restore_flags_nested(sp, f) \ - (current->flags = ((current->flags & ~(f)) | (*(sp) & (f)))) #define NBBY 8 /* number of bits per byte */ diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index c94e71f741b6..11d390f0d3f2 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c @@ -154,7 +154,7 @@ xfs_trans_reserve( bool rsvd = (tp->t_flags & XFS_TRANS_RESERVE) != 0; /* Mark this thread as being in a transaction */ - current_set_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS); + xfs_trans_context_set(tp); /* * Attempt to reserve the needed disk blocks by decrementing @@ -164,7 +164,7 @@ xfs_trans_reserve( if (blocks > 0) { error = xfs_mod_fdblocks(mp, -((int64_t)blocks), rsvd); if (error != 0) { - current_restore_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS); + xfs_trans_context_clear(tp); return -ENOSPC; } tp->t_blk_res += blocks; @@ -241,7 +241,7 @@ xfs_trans_reserve( tp->t_blk_res = 0; } - current_restore_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS); + xfs_trans_context_clear(tp); return error; } @@ -878,7 +878,7 @@ __xfs_trans_commit( xfs_log_commit_cil(mp, tp, &commit_lsn, regrant); - current_restore_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS); + xfs_trans_context_clear(tp); xfs_trans_free(tp); /* @@ -910,7 +910,8 @@ __xfs_trans_commit( xfs_log_ticket_ungrant(mp->m_log, tp->t_ticket); tp->t_ticket = NULL; } - current_restore_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS); + + xfs_trans_context_clear(tp); xfs_trans_free_items(tp, !!error); xfs_trans_free(tp); @@ -971,7 +972,7 @@ xfs_trans_cancel( } /* mark this thread as no longer being in a transaction */ - current_restore_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS); + xfs_trans_context_clear(tp); xfs_trans_free_items(tp, dirty); xfs_trans_free(tp); diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h index 084658946cc8..44b11c64a15e 100644 --- a/fs/xfs/xfs_trans.h +++ b/fs/xfs/xfs_trans.h @@ -268,4 +268,16 @@ xfs_trans_item_relog( return lip->li_ops->iop_relog(lip, tp); } +static inline void +xfs_trans_context_set(struct xfs_trans *tp) +{ + tp->t_pflags = memalloc_nofs_save(); +} + +static inline void +xfs_trans_context_clear(struct xfs_trans *tp) +{ + memalloc_nofs_restore(tp->t_pflags); +} + #endif /* __XFS_TRANS_H__ */ From patchwork Tue Dec 8 02:15:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 11957441 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65088C19437 for ; Tue, 8 Dec 2020 02:17:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2AB5723A57 for ; Tue, 8 Dec 2020 02:17:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727820AbgLHCRM (ORCPT ); Mon, 7 Dec 2020 21:17:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725877AbgLHCRM (ORCPT ); Mon, 7 Dec 2020 21:17:12 -0500 Received: from mail-ua1-x944.google.com (mail-ua1-x944.google.com [IPv6:2607:f8b0:4864:20::944]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00604C061794; Mon, 7 Dec 2020 18:16:31 -0800 (PST) Received: by mail-ua1-x944.google.com with SMTP id f16so5173332uav.12; Mon, 07 Dec 2020 18:16:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=17HkpCiChNHQ4avz8nKjAF3KcVK7dbos9sXYlvZmUH8=; b=n/6QvM94DVIaoeHBWFUPjpkUZ4j/O5mJ+jA51Lh73p9x0+uvtbpC0HoWRQmED0QNOq kbgfzNCduM870rEJF1Zc1TwG+7LcNlDmZGRxchpk/beFs1Gh54SOlns9uzuykTCO/BYk f5Afyptne44QeiapkKKJask7G5pp4eTafU585QQUqM+QZJ/0vUBVklkT6GGWJabA2Fco wguxfefiuacN/SobE+skErGhpSQKQp1gL34VJVhqYhtKNHprE8sEQZc66vfDv6bgXOwU RgMchxarJfGlW5KL/ScQydw2XNnuK9kB8NZkbiMHWUXJ1P7IOcyc3+TW/bYg/2tVpNMu yfTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=17HkpCiChNHQ4avz8nKjAF3KcVK7dbos9sXYlvZmUH8=; b=Ahgeml3KFA56mIz9QylQUd2VGEzkbzFGaAp2DDwxfV390F3epzmxpgdB4uopmk7utD nDHCPF1ETwK0mgPW72cRd7Z7+JIJ9LiQO8vV6tr8yuAV27gou6m2pyPdMueHjJGrjyDS zZ7SwnPkRb/fZ6bzTyHfMBJCQPQXarQrHBsxOqZdShw917mgLE05z9rjZ2/fvf5DHP7a Hu6VKGAfP+4SH4m+DOVcVK2UbHwvWI4LewRy91eicbGVEkf/gyfecf6RB+oiiFe5h+q4 /MzpMLYA3nu+RJSuNTwvlfaivu3sx9F32JfmlD8yVU7GnegqNRU9kOKfVKo7/K7cfrpX NNGQ== X-Gm-Message-State: AOAM5332sqE4w/bjP/q6njUGJqi3Kmm4jmppwtteahXzQK0wtrkGhnWi zXwXNA82CjIlmXAxmI/ApZg= X-Google-Smtp-Source: ABdhPJxAuBY/UnZNHubFCUfZmsEIfpluIuaN3ITsWJDSJ7t1vF3FgkWeihIAtqpg2YGnqcv789xk4w== X-Received: by 2002:ab0:558a:: with SMTP id v10mr6786221uaa.63.1607393791205; Mon, 07 Dec 2020 18:16:31 -0800 (PST) Received: from localhost.localdomain ([50.236.19.102]) by smtp.gmail.com with ESMTPSA id o192sm1936000vko.19.2020.12.07.18.16.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Dec 2020 18:16:30 -0800 (PST) From: Yafang Shao To: darrick.wong@oracle.com, willy@infradead.org, david@fromorbit.com, hch@infradead.org, mhocko@kernel.org, akpm@linux-foundation.org, dhowells@redhat.com, jlayton@redhat.com Cc: linux-fsdevel@vger.kernel.org, linux-cachefs@redhat.com, linux-xfs@vger.kernel.org, linux-mm@kvack.org, Yafang Shao , Christoph Hellwig Subject: [PATCH v10 3/4] xfs: refactor the usage around xfs_trans_context_{set,clear} Date: Tue, 8 Dec 2020 10:15:42 +0800 Message-Id: <20201208021543.76501-4-laoar.shao@gmail.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201208021543.76501-1-laoar.shao@gmail.com> References: <20201208021543.76501-1-laoar.shao@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org The xfs_trans context should be active after it is allocated, and deactive when it is freed. So these two helpers are refactored as, - xfs_trans_context_set() Used in xfs_trans_alloc() - xfs_trans_context_clear() Used in xfs_trans_free() This patch is based on Darrick's work to fix the issue in xfs/141 in the earlier version. [1] 1. https://lore.kernel.org/linux-xfs/20201104001649.GN7123@magnolia Cc: Darrick J. Wong Cc: Matthew Wilcox (Oracle) Cc: Christoph Hellwig Cc: Dave Chinner Signed-off-by: Yafang Shao --- fs/xfs/xfs_trans.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index 11d390f0d3f2..fe20398a214e 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c @@ -67,6 +67,9 @@ xfs_trans_free( xfs_extent_busy_sort(&tp->t_busy); xfs_extent_busy_clear(tp->t_mountp, &tp->t_busy, false); + /* Detach the transaction from this thread. */ + xfs_trans_context_clear(tp); + trace_xfs_trans_free(tp, _RET_IP_); if (!(tp->t_flags & XFS_TRANS_NO_WRITECOUNT)) sb_end_intwrite(tp->t_mountp->m_super); @@ -153,9 +156,6 @@ xfs_trans_reserve( int error = 0; bool rsvd = (tp->t_flags & XFS_TRANS_RESERVE) != 0; - /* Mark this thread as being in a transaction */ - xfs_trans_context_set(tp); - /* * Attempt to reserve the needed disk blocks by decrementing * the number needed from the number available. This will @@ -163,10 +163,9 @@ xfs_trans_reserve( */ if (blocks > 0) { error = xfs_mod_fdblocks(mp, -((int64_t)blocks), rsvd); - if (error != 0) { - xfs_trans_context_clear(tp); + if (error != 0) return -ENOSPC; - } + tp->t_blk_res += blocks; } @@ -241,8 +240,6 @@ xfs_trans_reserve( tp->t_blk_res = 0; } - xfs_trans_context_clear(tp); - return error; } @@ -284,6 +281,8 @@ xfs_trans_alloc( INIT_LIST_HEAD(&tp->t_dfops); tp->t_firstblock = NULLFSBLOCK; + /* Mark this thread as being in a transaction */ + xfs_trans_context_set(tp); error = xfs_trans_reserve(tp, resp, blocks, rtextents); if (error) { xfs_trans_cancel(tp); @@ -878,7 +877,6 @@ __xfs_trans_commit( xfs_log_commit_cil(mp, tp, &commit_lsn, regrant); - xfs_trans_context_clear(tp); xfs_trans_free(tp); /* @@ -911,7 +909,6 @@ __xfs_trans_commit( tp->t_ticket = NULL; } - xfs_trans_context_clear(tp); xfs_trans_free_items(tp, !!error); xfs_trans_free(tp); @@ -971,9 +968,6 @@ xfs_trans_cancel( tp->t_ticket = NULL; } - /* mark this thread as no longer being in a transaction */ - xfs_trans_context_clear(tp); - xfs_trans_free_items(tp, dirty); xfs_trans_free(tp); } From patchwork Tue Dec 8 02:15:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 11957443 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 395A9C433FE for ; Tue, 8 Dec 2020 02:18:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 065D323A33 for ; Tue, 8 Dec 2020 02:18:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727810AbgLHCRS (ORCPT ); Mon, 7 Dec 2020 21:17:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725877AbgLHCRS (ORCPT ); Mon, 7 Dec 2020 21:17:18 -0500 Received: from mail-vk1-xa41.google.com (mail-vk1-xa41.google.com [IPv6:2607:f8b0:4864:20::a41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E20FC06179C; Mon, 7 Dec 2020 18:16:38 -0800 (PST) Received: by mail-vk1-xa41.google.com with SMTP id w190so3611207vkg.13; Mon, 07 Dec 2020 18:16:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ud8rBXD383H8tEM/7RAKMWYYnbYnYvq5454vllAa0OE=; b=Qqo7OMfIODT0cQfm8dnnj7xuaz2fFGAPpLPtCbF+RJSR0PcsyCBCzFQcsYJ52hbBvn WP0NoKT9tH9GH3/0d0wKCcZU88ei84NxIU+3VX5TmXrfR92NWToMsLWs47+7pyolak72 mY5GLhKPbJMCf6a5MmUawtDm6FEsp3Zgm8CM1ItZbCbPIgLcS5C45RA4mLz6o4rimZZ5 9jG2vjB+ZXWG4DIEH8G4lM1QQHCq/0RISNpiYjD85MI31U8/fcNQ6xw/WA8OwicScduq So9NMhbU3b3/igZl5m/4Tr5DJNDrqZYAbCIIwC5TQvyxmKWbPQbVZLH2e80P/s4QAQxV dvtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ud8rBXD383H8tEM/7RAKMWYYnbYnYvq5454vllAa0OE=; b=Yyn1+GDxLKlkPyAhroOzaB1P0f96KRaNPaLvylJlNW6O9y06kxvIYrTpzPCOblMBNH zMbZ1OpNXfziiv7g2XQ9OC7B4kkceOO3ZFjEEbYLyTa5jafr/eYrvcy9tqMSRDeMLNo/ 5UXo01uFSGQu8ojoYrcdrYEF3xwWuQtaEgTBu66xNT6xDL0o6vAUP50YdjJu0Bbl01va MnxKrhWgp2XQGoncjh/LkNagZKooyGYK7BbGsiPrtSVcy6Iw+Vgnphej56YatCeoRePZ VaBCPz9YR5lHHVk3R8pi/Je0pPrWPKe/bHCQUY/eLqwzZh5rD/f6fxXGZXKjNVl4ZR1u 7Yhw== X-Gm-Message-State: AOAM532LG/gy38BUHe5elWWzRRdgg2n0PnqKAHrKrdw7OiD/gH3UiR0d Ujm0Yu0PmLynE44/K5QtHWBBvPtRfqHtIw== X-Google-Smtp-Source: ABdhPJwtzaP1P4kV/OMfdLX2VU8BtGy0weGaN3rGGYXb2OGURumF3K/0Y8TvDMi1DQu/8hTd0EjkSw== X-Received: by 2002:a1f:a541:: with SMTP id o62mr14930646vke.9.1607393797625; Mon, 07 Dec 2020 18:16:37 -0800 (PST) Received: from localhost.localdomain ([50.236.19.102]) by smtp.gmail.com with ESMTPSA id o192sm1936000vko.19.2020.12.07.18.16.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Dec 2020 18:16:37 -0800 (PST) From: Yafang Shao To: darrick.wong@oracle.com, willy@infradead.org, david@fromorbit.com, hch@infradead.org, mhocko@kernel.org, akpm@linux-foundation.org, dhowells@redhat.com, jlayton@redhat.com Cc: linux-fsdevel@vger.kernel.org, linux-cachefs@redhat.com, linux-xfs@vger.kernel.org, linux-mm@kvack.org, Yafang Shao , Christoph Hellwig Subject: [PATCH v10 4/4] xfs: use current->journal_info to avoid transaction reservation recursion Date: Tue, 8 Dec 2020 10:15:43 +0800 Message-Id: <20201208021543.76501-5-laoar.shao@gmail.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201208021543.76501-1-laoar.shao@gmail.com> References: <20201208021543.76501-1-laoar.shao@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org PF_FSTRANS which is used to avoid transaction reservation recursion, is dropped since commit 9070733b4efa ("xfs: abstract PF_FSTRANS to PF_MEMALLOC_NOFS") and commit 7dea19f9ee63 ("mm: introduce memalloc_nofs_{save,restore} API") and replaced by PF_MEMALLOC_NOFS which means to avoid filesystem reclaim recursion. As these two flags have different meanings, we'd better reintroduce PF_FSTRANS back. To avoid wasting the space of PF_* flags in task_struct, we can reuse the current->journal_info to do that, per Willy. As the check of transaction reservation recursion is used by XFS only, we can move the check into xfs_vm_writepage(s), per Dave. To better abstract that behavoir, two new helpers are introduced, as follows, - xfs_trans_context_active To check whehter current is in fs transcation or not - xfs_trans_context_swap Transfer the transaction context when rolling a permanent transaction These two new helpers are instroduced in xfs_trans.h. Cc: Darrick J. Wong Cc: Matthew Wilcox (Oracle) Cc: Christoph Hellwig Cc: Dave Chinner Cc: Michal Hocko Cc: David Howells Cc: Jeff Layton Signed-off-by: Yafang Shao --- fs/iomap/buffered-io.c | 7 ------- fs/xfs/xfs_aops.c | 17 +++++++++++++++++ fs/xfs/xfs_trans.c | 3 +++ fs/xfs/xfs_trans.h | 25 +++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 7 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 10cc7979ce38..3c53fa6ce64d 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -1458,13 +1458,6 @@ iomap_do_writepage(struct page *page, struct writeback_control *wbc, void *data) PF_MEMALLOC)) goto redirty; - /* - * Given that we do not allow direct reclaim to call us, we should - * never be called in a recursive filesystem reclaim context. - */ - if (WARN_ON_ONCE(current->flags & PF_MEMALLOC_NOFS)) - goto redirty; - /* * Is this page beyond the end of the file? * diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 2371187b7615..28db93d0da97 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -568,6 +568,16 @@ xfs_vm_writepage( { struct xfs_writepage_ctx wpc = { }; + /* + * Given that we do not allow direct reclaim to call us, we should + * never be called while in a filesystem transaction. + */ + if (xfs_trans_context_active()) { + redirty_page_for_writepage(wbc, page); + unlock_page(page); + return 0; + } + return iomap_writepage(page, wbc, &wpc.ctx, &xfs_writeback_ops); } @@ -579,6 +589,13 @@ xfs_vm_writepages( struct xfs_writepage_ctx wpc = { }; xfs_iflags_clear(XFS_I(mapping->host), XFS_ITRUNCATED); + /* + * Given that we do not allow direct reclaim to call us, we should + * never be called while in a filesystem transaction. + */ + if (xfs_trans_context_active()) + return 0; + return iomap_writepages(mapping, wbc, &wpc.ctx, &xfs_writeback_ops); } diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index fe20398a214e..08d4916ffb13 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c @@ -124,6 +124,9 @@ xfs_trans_dup( tp->t_rtx_res = tp->t_rtx_res_used; ntp->t_pflags = tp->t_pflags; + /* Associate the new transaction with this thread. */ + xfs_trans_context_swap(tp, ntp); + /* move deferred ops over to the new tp */ xfs_defer_move(ntp, tp); diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h index 44b11c64a15e..82c6735e40fc 100644 --- a/fs/xfs/xfs_trans.h +++ b/fs/xfs/xfs_trans.h @@ -268,16 +268,41 @@ xfs_trans_item_relog( return lip->li_ops->iop_relog(lip, tp); } +static inline bool +xfs_trans_context_active(void) +{ + /* Use journal_info to indicate current is in a transaction */ + if (WARN_ON_ONCE(current->journal_info != NULL)) + return true; + + return false; +} + static inline void xfs_trans_context_set(struct xfs_trans *tp) { + ASSERT(!current->journal_info); + current->journal_info = tp; tp->t_pflags = memalloc_nofs_save(); } static inline void xfs_trans_context_clear(struct xfs_trans *tp) { + ASSERT(current->journal_info == tp); + current->journal_info = NULL; memalloc_nofs_restore(tp->t_pflags); } +/* + * Transfer the transaction context when rolling a permanent + * transaction. + */ +static inline void +xfs_trans_context_swap(struct xfs_trans *tp, struct xfs_trans *ntp) +{ + ASSERT(current->journal_info == tp); + current->journal_info = ntp; +} + #endif /* __XFS_TRANS_H__ */