From mboxrd@z Thu Jan 1 00:00:00 1970 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.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 616A2C433E0 for ; Thu, 28 Jan 2021 09:30:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2301A64DEF for ; Thu, 28 Jan 2021 09:30:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232449AbhA1Ja3 (ORCPT ); Thu, 28 Jan 2021 04:30:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232597AbhA1J2o (ORCPT ); Thu, 28 Jan 2021 04:28:44 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02BB6C0613D6; Thu, 28 Jan 2021 01:28:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=RSaE20MTVKoIECxENvXHDc3MDGyLuUpJPvHpNOIsTJo=; b=YlOBHBIUr3mwVNm52+54YtSUE+ h0IwI6xuYxStA41dTKYR8+uKky4na3QlCNzPt2yi0kA7ZuskZidpBGm/RgdIzBchn1SgmQbRQmU8g 3xfi6GwJqtMfaWzV5o2CIdMgXfQTbLgjllz2ZgKq6nfX4xWm7QyoF8KLpHMevTJnp0RztEfy2O1nW eX1LME59elKAjVb7g2pex7pndEwmxy39IMY61vUXjHU0SCa97EccFgj72igXAgswFH8eqb4ouuF0r VzmTWpNnV7gLJ2VQX3tHQn3Az5NNWi/I7ytk1mIfIqRMaIU8VXs/H8LaZFWqrPyvMVqIt3TZbHtgQ 7NRJMnuA==; Received: from hch by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l53ao-008GCf-Qo; Thu, 28 Jan 2021 09:27:58 +0000 Date: Thu, 28 Jan 2021 09:27:58 +0000 From: Christoph Hellwig To: "Darrick J. Wong" Cc: Dave Chinner , linux-xfs@vger.kernel.org, hch@infradead.org, david@fromorbit.com, bfoster@redhat.com, Tejun Heo , Lai Jiangshan , linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2] xfs: set WQ_SYSFS on all workqueues in debug mode Message-ID: <20210128092758.GD1967319@infradead.org> References: <161181380539.1525344.442839530784024643.stgit@magnolia> <161181381679.1525344.10913812775756159263.stgit@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <161181381679.1525344.10913812775756159263.stgit@magnolia> X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Wed, Jan 27, 2021 at 10:03:36PM -0800, Darrick J. Wong wrote: > From: Darrick J. Wong > > When CONFIG_XFS_DEBUG=y, set WQ_SYSFS on all workqueues that we create > so that we (developers) have a means to monitor cpu affinity and whatnot > for background workers. In the next patchset we'll expose knobs for > some of the workqueues publicly and document it, but not now. And I still think this is a horrible idea. > Signed-off-by: Darrick J. Wong > Reviewed-by: Dave Chinner > --- > fs/xfs/xfs_log.c | 5 +++-- > fs/xfs/xfs_mru_cache.c | 2 +- > fs/xfs/xfs_super.c | 23 ++++++++++++++--------- > fs/xfs/xfs_super.h | 6 ++++++ > 4 files changed, 24 insertions(+), 12 deletions(-) > > > diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c > index d8b814227734..9aa30e7cd314 100644 > --- a/fs/xfs/xfs_log.c > +++ b/fs/xfs/xfs_log.c > @@ -1492,8 +1492,9 @@ xlog_alloc_log( > log->l_iclog->ic_prev = prev_iclog; /* re-write 1st prev ptr */ > > log->l_ioend_workqueue = alloc_workqueue("xfs-log/%s", > - WQ_MEM_RECLAIM | WQ_FREEZABLE | WQ_HIGHPRI, 0, > - mp->m_super->s_id); > + XFS_WQFLAGS(WQ_FREEZABLE | WQ_MEM_RECLAIM | > + WQ_HIGHPRI), > + 0, mp->m_super->s_id); > if (!log->l_ioend_workqueue) > goto out_free_iclog; > > diff --git a/fs/xfs/xfs_mru_cache.c b/fs/xfs/xfs_mru_cache.c > index a06661dac5be..34c3b16f834f 100644 > --- a/fs/xfs/xfs_mru_cache.c > +++ b/fs/xfs/xfs_mru_cache.c > @@ -294,7 +294,7 @@ int > xfs_mru_cache_init(void) > { > xfs_mru_reap_wq = alloc_workqueue("xfs_mru_cache", > - WQ_MEM_RECLAIM|WQ_FREEZABLE, 1); > + XFS_WQFLAGS(WQ_MEM_RECLAIM | WQ_FREEZABLE), 1); > if (!xfs_mru_reap_wq) > return -ENOMEM; > return 0; > diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c > index aed74a3fc787..8959561351ca 100644 > --- a/fs/xfs/xfs_super.c > +++ b/fs/xfs/xfs_super.c > @@ -495,33 +495,37 @@ xfs_init_mount_workqueues( > struct xfs_mount *mp) > { > mp->m_buf_workqueue = alloc_workqueue("xfs-buf/%s", > - WQ_MEM_RECLAIM|WQ_FREEZABLE, 1, mp->m_super->s_id); > + XFS_WQFLAGS(WQ_FREEZABLE | WQ_MEM_RECLAIM), > + 1, mp->m_super->s_id); > if (!mp->m_buf_workqueue) > goto out; > > mp->m_unwritten_workqueue = alloc_workqueue("xfs-conv/%s", > - WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_super->s_id); > + XFS_WQFLAGS(WQ_FREEZABLE | WQ_MEM_RECLAIM), > + 0, mp->m_super->s_id); > if (!mp->m_unwritten_workqueue) > goto out_destroy_buf; > > mp->m_cil_workqueue = alloc_workqueue("xfs-cil/%s", > - WQ_MEM_RECLAIM | WQ_FREEZABLE | WQ_UNBOUND, > + XFS_WQFLAGS(WQ_FREEZABLE | WQ_MEM_RECLAIM | WQ_UNBOUND), > 0, mp->m_super->s_id); > if (!mp->m_cil_workqueue) > goto out_destroy_unwritten; > > mp->m_reclaim_workqueue = alloc_workqueue("xfs-reclaim/%s", > - WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_super->s_id); > + XFS_WQFLAGS(WQ_FREEZABLE | WQ_MEM_RECLAIM), > + 0, mp->m_super->s_id); > if (!mp->m_reclaim_workqueue) > goto out_destroy_cil; > > mp->m_eofblocks_workqueue = alloc_workqueue("xfs-eofblocks/%s", > - WQ_MEM_RECLAIM|WQ_FREEZABLE, 0, mp->m_super->s_id); > + XFS_WQFLAGS(WQ_FREEZABLE | WQ_MEM_RECLAIM), > + 0, mp->m_super->s_id); > if (!mp->m_eofblocks_workqueue) > goto out_destroy_reclaim; > > - mp->m_sync_workqueue = alloc_workqueue("xfs-sync/%s", WQ_FREEZABLE, 0, > - mp->m_super->s_id); > + mp->m_sync_workqueue = alloc_workqueue("xfs-sync/%s", > + XFS_WQFLAGS(WQ_FREEZABLE), 0, mp->m_super->s_id); > if (!mp->m_sync_workqueue) > goto out_destroy_eofb; > > @@ -2085,11 +2089,12 @@ xfs_init_workqueues(void) > * max_active value for this workqueue. > */ > xfs_alloc_wq = alloc_workqueue("xfsalloc", > - WQ_MEM_RECLAIM|WQ_FREEZABLE, 0); > + XFS_WQFLAGS(WQ_MEM_RECLAIM | WQ_FREEZABLE), 0); > if (!xfs_alloc_wq) > return -ENOMEM; > > - xfs_discard_wq = alloc_workqueue("xfsdiscard", WQ_UNBOUND, 0); > + xfs_discard_wq = alloc_workqueue("xfsdiscard", XFS_WQFLAGS(WQ_UNBOUND), > + 0); > if (!xfs_discard_wq) > goto out_free_alloc_wq; > > diff --git a/fs/xfs/xfs_super.h b/fs/xfs/xfs_super.h > index b552cf6d3379..1ca484b8357f 100644 > --- a/fs/xfs/xfs_super.h > +++ b/fs/xfs/xfs_super.h > @@ -75,6 +75,12 @@ extern void xfs_qm_exit(void); > XFS_ASSERT_FATAL_STRING \ > XFS_DBG_STRING /* DBG must be last */ > > +#ifdef DEBUG > +# define XFS_WQFLAGS(wqflags) (WQ_SYSFS | (wqflags)) > +#else > +# define XFS_WQFLAGS(wqflags) (wqflags) > +#endif > + > struct xfs_inode; > struct xfs_mount; > struct xfs_buftarg; > ---end quoted text---