From patchwork Fri Aug 25 13:54:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Xu X-Patchwork-Id: 13365929 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 75411C79F60 for ; Fri, 25 Aug 2023 14:05:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F0DA680004; Fri, 25 Aug 2023 10:05:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 09F84680001; Fri, 25 Aug 2023 10:05:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA997680004; Fri, 25 Aug 2023 10:05:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id DD119680001 for ; Fri, 25 Aug 2023 10:05:25 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id A2C8E80706 for ; Fri, 25 Aug 2023 14:05:25 +0000 (UTC) X-FDA: 81162799410.21.FE6E09F Received: from out-243.mta1.migadu.com (out-243.mta1.migadu.com [95.215.58.243]) by imf14.hostedemail.com (Postfix) with ESMTP id 95313100021 for ; Fri, 25 Aug 2023 14:05:23 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=KEbezTf0; spf=pass (imf14.hostedemail.com: domain of hao.xu@linux.dev designates 95.215.58.243 as permitted sender) smtp.mailfrom=hao.xu@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692972323; 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=6/Nd9xxoGpB2Y5m9xwXDJRTcGKza/1aMnRr8dKaa6VQ=; b=AfLccUPdCNg7KnWn6nNUM1ErMg6HQNSl3Omp7288V/XgL2/yn+IhbbfaCtNjgwJ3BLbgkp R63dokiejBJtlNlCpbYLbOmeGXXv/W3Jj6LNYVnfwu7fdB7EwGdNszzWBGRe6/2iMzqxvX z66cRKaqSBf4ujxBpIqRW0QSlEJbJis= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692972323; a=rsa-sha256; cv=none; b=FR7pghYEpNsmX2bz1j5A1KH//0+BLfWdLvv6G0wBjZMy9yBD7oD+itWuVuRmp21Yd+Nrb4 usP5BLo8k8f8btQXnjeEGDWFzKom0IMguusXdHmB5DXKjOpdJODzMeaDvQQ0RY5JtwrXRV tqlMCRLRLUurQx1jHFidwXlTtK07HvE= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=KEbezTf0; spf=pass (imf14.hostedemail.com: domain of hao.xu@linux.dev designates 95.215.58.243 as permitted sender) smtp.mailfrom=hao.xu@linux.dev; dmarc=pass (policy=none) header.from=linux.dev 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=1692972321; 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=6/Nd9xxoGpB2Y5m9xwXDJRTcGKza/1aMnRr8dKaa6VQ=; b=KEbezTf0obDqS0d0+ZY03Au9A3+XAlHMaifao/gSyVuoHlKJlTUkwmI81DvHZmrTrUQaLF sGTDWP5rChj2LFxWYHnJBky5ZudbW2OzCc+00JgxX/lbJXlYqo7/5HQVTOk8DmfuG/wY54 UCC6hfeA7Mu6K3Y30dgBdV885aCoMfc= 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 25/29] xfs: support nowait for xfs_buf_item_init() Date: Fri, 25 Aug 2023 21:54:27 +0800 Message-Id: <20230825135431.1317785-26-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: 95313100021 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: yn45cc796dk3hkngpypw9i95pfosikxr X-HE-Tag: 1692972323-846627 X-HE-Meta: U2FsdGVkX19AGtBCFAgVapxzRAktwe27bHYC4i3y1jsg24nMLH/BG9pzXu8Ea+3Bi93gMPXYTD29kGMo/HNx0k0HRHZq1WFcyn/UWVxkjvfpxDUbrYyu0f51C2283p3x3m7hIxToajAEXQqMwFxoNlG7fZNPzuyl6NhkXFyBuIlRt/VkfZcsDx5oqGDMdwfgxtZiBRWnY4mSFia9McMp4ckDKR82gSN/ovkXC4cqwl9DvK+YKbkRSk3Mim1edYsHTFrWmEVh8IgRAzN9TgVOJPMSzPxsSKEbd2gn8lEBVpPg7zt9VyArxtlmg8qmvTyYQ6dNu86p9V49otglGGG4bHTA8F7guhtZruoBfLb4fRyjQNocUsBUdOsHhI7HpFXBwg3w7OgDo01f62lYXNBfd9HzIror76V/uM0uAst9SO+QB+UBv5e3NyYAjn1/WbWePCdbRx6Ht06zeLlHuCJtA0hqaJw7G3Jh7BAcjhLO2s5pIDyu4tjy8F/58pJ4z7ZhaH1v42HC2k7emiaRJs1qC6gaYnnLEoSy3noz+8hQ5YeL7YkVysPgmEq39KKlX0cKyHL90NJMwN8DGmjf4PjKttY9cThq5auyeJc2h0Fk6RB3gPIHcG0brybHaezGefIjrluapvN2ayIff5G19Op+q6L8Yr+gFYIiZNlAnwE0znNNZlXi4yHvJoeSih6Uexv6Y2tUu33Pi5Luq4b6c+j7pjdITgJOTkQzeXVDi/g1MxmCyJGYnv/xZbW84AXlX1YVPNZDJAcFhAhpj0uDmFOpXQwSwyo/bgpzRr9l1QNV+vUj8gHqphtj9lh6OsxnRHRCfReAOM5v7LJpo27zVqB7OvRJ0XHKSTozus69B/99JSiDn9gn9qi4JGHsEWH0KuhG9+fTdC5gOq7Jvo5tycSL1lo8t2WodTYe2E8VcdGTdqH6DGWQcUnko4TzYVxE48enZRW++p7zbJCcCFrRX1Z +XZ1Yd5T sT37VJDioMhr0pI1p1HySQ+psNK9Kv4+aty+glNdJYHIsEbRQQZh2qdLNFllJzeZSGqrCc1DMeyxlq0XuSb6yKjwfJYZ+ZMsIaRR3BoIeNvpsQVT60nASLXs/xodxnSRlRnP9xDDptloKd35HwkzR3oXdIhh2+fiXX8Nqmsb2iNVYiJTvBW0ivqDF1OZ9SB+hFuC12lPKZ0jKHrXUsM+sBpuKNqwpDBjyFHPX27UMymd4yOPPzqReYp9JrsA5kIqDtYUS 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 support nowait for xfs_buf_item_init() and error out -EAGAIN to _xfs_trans_bjoin() when it would block. Signed-off-by: Hao Xu --- fs/xfs/xfs_buf_item.c | 9 +++++++-- fs/xfs/xfs_buf_item.h | 2 +- fs/xfs/xfs_buf_item_recover.c | 2 +- fs/xfs/xfs_trans_buf.c | 16 +++++++++++++--- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c index 023d4e0385dd..b1e63137d65b 100644 --- a/fs/xfs/xfs_buf_item.c +++ b/fs/xfs/xfs_buf_item.c @@ -827,7 +827,8 @@ xfs_buf_item_free_format( int xfs_buf_item_init( struct xfs_buf *bp, - struct xfs_mount *mp) + struct xfs_mount *mp, + bool nowait) { struct xfs_buf_log_item *bip = bp->b_log_item; int chunks; @@ -847,7 +848,11 @@ xfs_buf_item_init( return 0; } - bip = kmem_cache_zalloc(xfs_buf_item_cache, GFP_KERNEL | __GFP_NOFAIL); + bip = kmem_cache_zalloc(xfs_buf_item_cache, + GFP_KERNEL | (nowait ? 0 : __GFP_NOFAIL)); + if (!bip) + return -EAGAIN; + xfs_log_item_init(mp, &bip->bli_item, XFS_LI_BUF, &xfs_buf_item_ops); bip->bli_buf = bp; diff --git a/fs/xfs/xfs_buf_item.h b/fs/xfs/xfs_buf_item.h index 4d8a6aece995..b1daf8988280 100644 --- a/fs/xfs/xfs_buf_item.h +++ b/fs/xfs/xfs_buf_item.h @@ -47,7 +47,7 @@ struct xfs_buf_log_item { struct xfs_buf_log_format __bli_format; /* embedded in-log header */ }; -int xfs_buf_item_init(struct xfs_buf *, struct xfs_mount *); +int xfs_buf_item_init(struct xfs_buf *bp, struct xfs_mount *mp, bool nowait); void xfs_buf_item_done(struct xfs_buf *bp); void xfs_buf_item_relse(struct xfs_buf *); bool xfs_buf_item_put(struct xfs_buf_log_item *); diff --git a/fs/xfs/xfs_buf_item_recover.c b/fs/xfs/xfs_buf_item_recover.c index 43167f543afc..aa64d5a499d6 100644 --- a/fs/xfs/xfs_buf_item_recover.c +++ b/fs/xfs/xfs_buf_item_recover.c @@ -429,7 +429,7 @@ xlog_recover_validate_buf_type( struct xfs_buf_log_item *bip; bp->b_flags |= _XBF_LOGRECOVERY; - xfs_buf_item_init(bp, mp); + xfs_buf_item_init(bp, mp, false); bip = bp->b_log_item; bip->bli_item.li_lsn = current_lsn; } diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c index 016371f58f26..a1e4f2e8629a 100644 --- a/fs/xfs/xfs_trans_buf.c +++ b/fs/xfs/xfs_trans_buf.c @@ -57,13 +57,14 @@ xfs_trans_buf_item_match( * If the buffer does not yet have a buf log item associated with it, * then allocate one for it. Then add the buf item to the transaction. */ -STATIC void +STATIC int _xfs_trans_bjoin( struct xfs_trans *tp, struct xfs_buf *bp, int reset_recur) { struct xfs_buf_log_item *bip; + int ret; ASSERT(bp->b_transp == NULL); @@ -72,7 +73,11 @@ _xfs_trans_bjoin( * it doesn't have one yet, then allocate one and initialize it. * The checks to see if one is there are in xfs_buf_item_init(). */ - xfs_buf_item_init(bp, tp->t_mountp); + ret = xfs_buf_item_init(bp, tp->t_mountp, + tp->t_flags & XFS_TRANS_NOWAIT); + if (ret < 0) + return ret; + bip = bp->b_log_item; ASSERT(!(bip->bli_flags & XFS_BLI_STALE)); ASSERT(!(bip->__bli_format.blf_flags & XFS_BLF_CANCEL)); @@ -92,6 +97,7 @@ _xfs_trans_bjoin( xfs_trans_add_item(tp, &bip->bli_item); bp->b_transp = tp; + return 0; } void @@ -309,7 +315,11 @@ xfs_trans_read_buf_map( } if (tp) { - _xfs_trans_bjoin(tp, bp, 1); + error = _xfs_trans_bjoin(tp, bp, 1); + if (error) { + xfs_buf_relse(bp); + return error; + } trace_xfs_trans_read_buf(bp->b_log_item); } ASSERT(bp->b_ops != NULL || ops == NULL);