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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68A38EE49B8 for ; Fri, 25 Aug 2023 21:40:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231491AbjHYVj4 (ORCPT ); Fri, 25 Aug 2023 17:39:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231499AbjHYVjY (ORCPT ); Fri, 25 Aug 2023 17:39:24 -0400 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8DE7199F for ; Fri, 25 Aug 2023 14:39:21 -0700 (PDT) Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-68bec3a9bdbso1060362b3a.3 for ; Fri, 25 Aug 2023 14:39:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fromorbit-com.20221208.gappssmtp.com; s=20221208; t=1692999561; x=1693604361; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=o7dRQ9By/T99QWDW5xev9b8rVkM9NZXXwZrmSduoTKY=; b=TZVHksaQT5yCsIen/c2upIT1FV0UF6+iYRjZnJ0cteKZDwE34A1WOLCekowerwYt2D 28KLfuHOkrH+S7NXgfzrxv2wEPzVXNOx12BPZqI35ZFuqsHlPQT0hdOxe7PBQ/R8Z8I7 Cycu+HuPFm+mUEFOO5dkC4vMTGg4aTatYUmw68Y3LHfPOr8hVhEM365l3OrWTkvJGBZb 5D1QCHz94l8BO5g39/3dKaMICzlN3vzJKDu/jlyvNCJoapKfzcDa2usPFsy0xLkVtWp9 C/WP+vk1TDlUAeKjfLXf8xrX2y5IOGi5s/EUDBiS2oILvLXGaeUaWmrkMN+ppW3C8aB5 mqKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692999561; x=1693604361; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=o7dRQ9By/T99QWDW5xev9b8rVkM9NZXXwZrmSduoTKY=; b=bvQQVhFzDactkfPIamExnYHrD8wHO2m9rXkMz91mj4MhCFAJaLGbVmDkTyEDbQVgbG DIL+/zG949slpBIjIc0ixsgq/V6RBhhWo3oMoyUAJCdlUS4Zm6xwYCLFbaAesoBYX4Wx wGxK6Ikfuqk7q5JyVd0KC2bR2OMNiIUpzFCRn0tdPJV9N/vKjI3OON4cNnW1E+s4RxqT qZC7N8qIY2bGX5GIHY8HW5Qxoe1455TbgvEXvS25nuj/2Wi+2O5yMkMJNtYPd+1l2l5K ZP0c90mHhoRmwAk0HtJmrpxBldymsnikbsytaaIPDUf2Cni7BumYrE068EYS6lzC1XK2 skaw== X-Gm-Message-State: AOJu0YxjIq2DOjijJDcVqkSXy+o7YTp5zwptCe462L3TKAK78Rz4Z8t0 EXMcBovjJ0zl6SLrDpMxRuuV0Q== X-Google-Smtp-Source: AGHT+IFGwDu4J6IE5hfbjc7KSF4OfJEndquVBvBoV5vhWuIhyGy4zoBWcpcC8Lokr19GaOsT0RulfQ== X-Received: by 2002:a05:6a20:7fa0:b0:140:324c:124c with SMTP id d32-20020a056a207fa000b00140324c124cmr22387249pzj.62.1692999556447; Fri, 25 Aug 2023 14:39:16 -0700 (PDT) Received: from dread.disaster.area (pa49-195-66-88.pa.nsw.optusnet.com.au. [49.195.66.88]) by smtp.gmail.com with ESMTPSA id a14-20020a62bd0e000000b006875df4773fsm1997221pff.163.2023.08.25.14.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Aug 2023 14:39:15 -0700 (PDT) Received: from dave by dread.disaster.area with local (Exim 4.96) (envelope-from ) id 1qZeWO-006Uvd-0J; Sat, 26 Aug 2023 07:39:12 +1000 Date: Sat, 26 Aug 2023 07:39:12 +1000 From: Dave Chinner To: Hao Xu Cc: io-uring@vger.kernel.org, Jens Axboe , Dominique Martinet , Pavel Begunkov , Christian Brauner , Alexander Viro , Stefan Roesch , Clay Harris , "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: Re: [PATCH 02/29] xfs: rename XBF_TRYLOCK to XBF_NOWAIT Message-ID: References: <20230825135431.1317785-1-hao.xu@linux.dev> <20230825135431.1317785-3-hao.xu@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230825135431.1317785-3-hao.xu@linux.dev> Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On Fri, Aug 25, 2023 at 09:54:04PM +0800, Hao Xu wrote: > From: Hao Xu > > XBF_TRYLOCK means we need lock but don't block on it, Yes. > we can use it to > stand for not waiting for memory allcation. Rename XBF_TRYLOCK to > XBF_NOWAIT, which is more generic. No. Not only can XBF_TRYLOCK require memory allocation, it can require IO to be issued. We use TRYLOCK for -readahead- and so we *must* be able to allocate memory and issue IO under TRYLOCK caller conditions. [...] > diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c > index d440393b40eb..2ccb0867824c 100644 > --- a/fs/xfs/libxfs/xfs_attr_remote.c > +++ b/fs/xfs/libxfs/xfs_attr_remote.c > @@ -661,7 +661,7 @@ xfs_attr_rmtval_invalidate( > return error; > if (XFS_IS_CORRUPT(args->dp->i_mount, nmap != 1)) > return -EFSCORRUPTED; > - error = xfs_attr_rmtval_stale(args->dp, &map, XBF_TRYLOCK); > + error = xfs_attr_rmtval_stale(args->dp, &map, XBF_NOWAIT); > if (error) > return error; XBF_INCORE | XBF_NOWAIT makes no real sense. I mean, XBF_INCORE is exactly "find a cached buffer or fail" - it's not going to do any memory allocation or IO so NOWAIT smeantics don't make any sense here. It's the buffer lock that this lookup is explicitly avoiding, and so TRYLOCK describes exactly the semantics we want from this incore lookup. Indeed, this is a deadlock avoidance mechanism as the transaction may already have the buffer locked and so we don't want the xfs_buf_incore() lookup to try to lock the buffer again. TRYLOCK documents this pretty clearly - NOWAIT loses that context.... > diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c > index 6a6503ab0cd7..77c4f1d83475 100644 > --- a/fs/xfs/libxfs/xfs_btree.c > +++ b/fs/xfs/libxfs/xfs_btree.c > @@ -1343,7 +1343,7 @@ xfs_btree_read_buf_block( > int error; > > /* need to sort out how callers deal with failures first */ > - ASSERT(!(flags & XBF_TRYLOCK)); > + ASSERT(!(flags & XBF_NOWAIT)); > > error = xfs_btree_ptr_to_daddr(cur, ptr, &d); > if (error) > diff --git a/fs/xfs/scrub/repair.c b/fs/xfs/scrub/repair.c > index ac6d8803e660..9312cf3b20e2 100644 > --- a/fs/xfs/scrub/repair.c > +++ b/fs/xfs/scrub/repair.c > @@ -460,7 +460,7 @@ xrep_invalidate_block( > > error = xfs_buf_incore(sc->mp->m_ddev_targp, > XFS_FSB_TO_DADDR(sc->mp, fsbno), > - XFS_FSB_TO_BB(sc->mp, 1), XBF_TRYLOCK, &bp); > + XFS_FSB_TO_BB(sc->mp, 1), XBF_NOWAIT, &bp); My point exactly. xfs_buf_incore() is simply a lookup with XBF_INCORE set. (XBF_INCORE | XBF_TRYLOCK) has the exactly semantics of "return the buffer only if it is cached and we can lock it without blocking. It will not instantiate a new buffer (i.e. do memory allocation) or do IO because the if it is under IO the buffer lock will be held. So, essentially, this "NOWAIT" semantic you want is already supplied by (XBF_INCORE | XBF_TRYLOCK) buffer lookups. > if (error) > return 0; > > diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c > index 15d1e5a7c2d3..9f84bc3b802c 100644 > --- a/fs/xfs/xfs_buf.c > +++ b/fs/xfs/xfs_buf.c > @@ -228,7 +228,7 @@ _xfs_buf_alloc( > * We don't want certain flags to appear in b_flags unless they are > * specifically set by later operations on the buffer. > */ > - flags &= ~(XBF_UNMAPPED | XBF_TRYLOCK | XBF_ASYNC | XBF_READ_AHEAD); > + flags &= ~(XBF_UNMAPPED | XBF_NOWAIT | XBF_ASYNC | XBF_READ_AHEAD); > > atomic_set(&bp->b_hold, 1); > atomic_set(&bp->b_lru_ref, 1); > @@ -543,7 +543,7 @@ xfs_buf_find_lock( > struct xfs_buf *bp, > xfs_buf_flags_t flags) > { > - if (flags & XBF_TRYLOCK) { > + if (flags & XBF_NOWAIT) { > if (!xfs_buf_trylock(bp)) { > XFS_STATS_INC(bp->b_mount, xb_busy_locked); > return -EAGAIN; > @@ -886,7 +886,7 @@ xfs_buf_readahead_map( > struct xfs_buf *bp; > > xfs_buf_read_map(target, map, nmaps, > - XBF_TRYLOCK | XBF_ASYNC | XBF_READ_AHEAD, &bp, ops, > + XBF_NOWAIT | XBF_ASYNC | XBF_READ_AHEAD, &bp, ops, > __this_address); That will break readahead (which we use extensively in getdents operations) if we can't allocate buffers and issue IO under NOWAIT conditions. > } > > diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h > index 549c60942208..8cd307626939 100644 > --- a/fs/xfs/xfs_buf.h > +++ b/fs/xfs/xfs_buf.h > @@ -45,7 +45,7 @@ struct xfs_buf; > > /* flags used only as arguments to access routines */ > #define XBF_INCORE (1u << 29)/* lookup only, return if found in cache */ > -#define XBF_TRYLOCK (1u << 30)/* lock requested, but do not wait */ > +#define XBF_NOWAIT (1u << 30)/* mem/lock requested, but do not wait */ That's now a really poor comment. It doesn't describe the semantics or constraints that NOWAIT might imply. -Dave. -- Dave Chinner david@fromorbit.com