From patchwork Fri Aug 25 13:54:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Xu X-Patchwork-Id: 13365811 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24271C71133 for ; Fri, 25 Aug 2023 14:01:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A3B192800CC; Fri, 25 Aug 2023 10:01:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9EB6D8E0019; Fri, 25 Aug 2023 10:01:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8B4A92800CC; Fri, 25 Aug 2023 10:01:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 78B998E0019 for ; Fri, 25 Aug 2023 10:01:08 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4BF2A14068B for ; Fri, 25 Aug 2023 14:01:08 +0000 (UTC) X-FDA: 81162788616.15.3E634E6 Received: from out-252.mta1.migadu.com (out-252.mta1.migadu.com [95.215.58.252]) by imf11.hostedemail.com (Postfix) with ESMTP id 4802840016 for ; Fri, 25 Aug 2023 14:01:06 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=T5TsYuTv; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf11.hostedemail.com: domain of hao.xu@linux.dev designates 95.215.58.252 as permitted sender) smtp.mailfrom=hao.xu@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692972066; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=8gDZUIYfeApELVxpIbTdhBYkuCUYVAI89qfTIaKdMRE=; b=nnnhdIepowXfCFiQSV/6n/f05YBP7bKOiW/d8PV2ZQkBckiFdldsVS1S/C1TTUhdDC5t2r 3pz0EmMn7MIZWfwooTfMWj1wFx0jUmHX4Q2CnX+jvjDE140xvPi04XQkFr+eutTP+GyNOs pqqJswocknC2mPorlY/l+jlCuTKKrQk= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=T5TsYuTv; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf11.hostedemail.com: domain of hao.xu@linux.dev designates 95.215.58.252 as permitted sender) smtp.mailfrom=hao.xu@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692972066; a=rsa-sha256; cv=none; b=0CTQKYAKgb/KI0LFi0h+dw6YTCefR30fCFJTNbgkRIGg/0PKMAA8HTGnJCFWqnNRLMGig0 PzvT6m0Y3SU+Mj/U0aOCzkhX6pAeT/1v9r8MSFnJGLUpy2/pntvShAl+V6JnHS+TtEmC8O SOcKRIrzI5+Bxk1njhuAvfqWxRnWgSs= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1692972064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8gDZUIYfeApELVxpIbTdhBYkuCUYVAI89qfTIaKdMRE=; b=T5TsYuTvtADJBxiHqsewoSqqKK2UBuXMKNSoxaDNp/NJgc7Q8+g8JEetIByTzkVFCGvNzG tWnxRnfXklKMFPsrmWvd4eLQKArJQqjl9a4PVTfDC36l8fZblJzTpI0+nRJbIbwH5cYBhh 1gSrwgjCBl1L9hu8cUoTezmUDMAfEak= From: Hao Xu To: io-uring@vger.kernel.org, Jens Axboe Cc: Dominique Martinet , Pavel Begunkov , Christian Brauner , Alexander Viro , Stefan Roesch , Clay Harris , Dave Chinner , "Darrick J . Wong" , linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-cachefs@redhat.com, ecryptfs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-unionfs@vger.kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-btrfs@vger.kernel.org, codalist@coda.cs.cmu.edu, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-mm@kvack.org, linux-nilfs@vger.kernel.org, devel@lists.orangefs.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-mtd@lists.infradead.org, Wanpeng Li Subject: [PATCH 13/29] xfs: make xfs_trans_alloc() support nowait semantics Date: Fri, 25 Aug 2023 21:54:15 +0800 Message-Id: <20230825135431.1317785-14-hao.xu@linux.dev> In-Reply-To: <20230825135431.1317785-1-hao.xu@linux.dev> References: <20230825135431.1317785-1-hao.xu@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 4802840016 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 9wyqmf8gs46g1mxteo65koy5m3us1f65 X-HE-Tag: 1692972066-318999 X-HE-Meta: U2FsdGVkX19hSpET2RoL4T3/qo/rdK2gievJe8qxk4afHd22nBLbVshPBM29cWc1Sg1co5EQbN4a5Pq2871qDdmN9eTDOD5VlJPpBj2Ty6RK7eJu+8y3jdkCXqsH/CUzNYiLhqh5HcBArvwDuYUHkdPbj3OcAEaYmj/QmRxOPyWNnOUuenS4XXY+7cAcTpSlve5BjowgWDgMXXVtzldUVdZylp+RXFaDKCsDuZg/m8ghrJF9WMoObCBVOuyD1HmGYZrRqLW5Vn33/3mLfE9BjZttyLBR3oTzyaO2NY92+zRf81zy7zDMPA6991QdYRw6ECj7WRw0752yvHsL7v7MEEu9/ipob1BfmK9rM1uh5uZrLbPpbOMo/DDw/URJYALvhJvSY3ULmPu9UpsvVrsjVfg7P9Yw/RsXs2iWh6GsVR/5PCi74NeZs53EPUev1TZj6NCe4ODnzUxT3BIATmPgBr/HIOxdrPYDpONb9jv7d6Z2nbhn0pXn4+XSedBde+kASqvkOwe/YRJpd7F9t1yUgGSu9p+iwLda7WdO3laNtGRCewlNFGP2rvp8cbPlAFVTNckHmaBmM8bjcHyeVaCQXj0/fK9FCMuM+GWKpcWZi3/S92JEwnV0FRdbnxQq61LSyDK0dCCFNhA3Dt/52rdvahZIdRzGqsv1jYs+/VeWB3pOf9OhqJmbFCCZiMtvxTpb6wnbFI6df4vmdDKKDMBEKxJJgTLStMqrR1kcRVEnMZ8VVmrZKSHi0PFb/BNosw7W7f9du+lCh0Ju8kygn57GFOX9ocjkIYYty7EhAi7dW8034EPJDlM/ePijpoG5/86GGn4TiQwQ4d4S739h1/hhn9TdQH8jCUd82/gzM9XbdmX4U7XG4O4DlOB9mAIU/Bgfp6FoxPvjh60MlsPSaScAswWMMLux+zg1VFItZ0vx/juYcBQVONgNTxcXzpw5RsaMQN4Y1DnlQo9+3ZMsTCA EaP0a2Ck k7y7tU62Q6YCpPBFvwnENQm5xmgQXja6dlNpwkJ1dfHsMzCV7pe3NS5ywX+ZT3tXUsnDn0AAno6QpMRR2TsxPZMHpCikn2Lew8/QEyObXQKsB0STebXTjo/MejuVFjAVpLbtpHSQVux//zz0ZidKjU7y1xD2pyIE/d1dOwfDmnfeMIzMFBMIllpb18s7gZXBwAFs4pJa+WlZqJTdl07grK2L36r2ZGqJB/kTPYIPF2U0XtxV4Ha5M8Hp/71wfS1RNk28K X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Hao Xu There are locks in xfs_trans_alloc(), spot them and apply trylock logic. Make them return -EAGAIN when it would block. To achieve this, add nowait parameter for those functions in the path. Besides, add a generic transaction flag XFS_TRANS_NOWAIT to deliver nowait info. Signed-off-by: Hao Xu --- fs/xfs/libxfs/xfs_shared.h | 2 ++ fs/xfs/xfs_iops.c | 3 ++- fs/xfs/xfs_trans.c | 21 ++++++++++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/fs/xfs/libxfs/xfs_shared.h b/fs/xfs/libxfs/xfs_shared.h index c4381388c0c1..0ba3d6f53405 100644 --- a/fs/xfs/libxfs/xfs_shared.h +++ b/fs/xfs/libxfs/xfs_shared.h @@ -83,6 +83,8 @@ void xfs_log_get_max_trans_res(struct xfs_mount *mp, * made then this algorithm will eventually find all the space it needs. */ #define XFS_TRANS_LOWMODE 0x100 /* allocate in low space mode */ +/* Transaction should follow nowait semantics */ +#define XFS_TRANS_NOWAIT (1u << 9) /* * Field values for xfs_trans_mod_sb. diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 5fa391083de9..47b4fd5f8f5c 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -1054,7 +1054,8 @@ xfs_vn_update_time( if (nowait) old_pflags = memalloc_noio_save(); - error = xfs_trans_alloc(mp, &M_RES(mp)->tr_fsyncts, 0, 0, 0, &tp); + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_fsyncts, 0, 0, + nowait ? XFS_TRANS_NOWAIT : 0, &tp); if (error) goto out; diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index 8c0bfc9a33b1..dbec685f4f4a 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c @@ -251,6 +251,9 @@ xfs_trans_alloc( struct xfs_trans *tp; bool want_retry = true; int error; + bool nowait = flags & XFS_TRANS_NOWAIT; + gfp_t gfp_flags = GFP_KERNEL | + (nowait ? 0 : __GFP_NOFAIL); /* * Allocate the handle before we do our freeze accounting and setting up @@ -258,9 +261,21 @@ xfs_trans_alloc( * by doing GFP_KERNEL allocations inside sb_start_intwrite(). */ retry: - tp = kmem_cache_zalloc(xfs_trans_cache, GFP_KERNEL | __GFP_NOFAIL); - if (!(flags & XFS_TRANS_NO_WRITECOUNT)) - sb_start_intwrite(mp->m_super); + tp = kmem_cache_zalloc(xfs_trans_cache, gfp_flags); + if (!tp) + return -EAGAIN; + if (!(flags & XFS_TRANS_NO_WRITECOUNT)) { + if (nowait) { + bool locked = sb_start_intwrite_trylock(mp->m_super); + + if (!locked) { + xfs_trans_cancel(tp); + return -EAGAIN; + } + } else { + sb_start_intwrite(mp->m_super); + } + } xfs_trans_set_context(tp); /*