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 us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7B614C83F1E for ; Tue, 29 Aug 2023 08:41:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693298475; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Ex7XLonsdjSMKqQtTcZJtBrAcWxu6ezblmhps2tlk4Q=; b=F0sW1/JVxcAD1kluwkdG7aib5EaGjXBEWZiqZKri2fHehUvxOeoCoHq8dP3DeSygdsCILt DX0DBCTLx6uBQ/nyDDCk4/dJD4AVlfbi6Bn54AZtcTr9+Pp14lGBhh/3b/IGERmLPH9WN3 AOLcqQIYHrEf7ochmx1LOg+VZhvrhQg= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-304-JVqym1mePnSTn7kMa0fW2g-1; Tue, 29 Aug 2023 04:41:12 -0400 X-MC-Unique: JVqym1mePnSTn7kMa0fW2g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 55594280C288; Tue, 29 Aug 2023 08:41:11 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45DFC40C6F53; Tue, 29 Aug 2023 08:41:11 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E848919466DF; Tue, 29 Aug 2023 08:41:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BE76919465A8 for ; Sun, 27 Aug 2023 13:35:38 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A272740C2071; Sun, 27 Aug 2023 13:35:38 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9B00B40C2070 for ; Sun, 27 Aug 2023 13:35:38 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7D882101A52E for ; Sun, 27 Aug 2023 13:35:38 +0000 (UTC) Received: from out-248.mta1.migadu.com (out-248.mta1.migadu.com [95.215.58.248]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-569-RrY1vfa6Pii9ShrCJUt05g-1; Sun, 27 Aug 2023 09:35:36 -0400 X-MC-Unique: RrY1vfa6Pii9ShrCJUt05g-1 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Hao Xu To: io-uring@vger.kernel.org, Jens Axboe Date: Sun, 27 Aug 2023 21:28:34 +0800 Message-Id: <20230827132835.1373581-11-hao.xu@linux.dev> In-Reply-To: <20230827132835.1373581-1-hao.xu@linux.dev> References: <20230827132835.1373581-1-hao.xu@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mailman-Approved-At: Tue, 29 Aug 2023 08:41:07 +0000 Subject: [Cluster-devel] [PATCH 10/11] vfs: trylock inode->i_rwsem in iterate_dir() to support nowait X-BeenThere: cluster-devel@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: "\[Cluster devel\]" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wanpeng Li , "Darrick J . Wong" , Dominique Martinet , Dave Chinner , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Stefan Roesch , Clay Harris , linux-s390@vger.kernel.org, linux-nilfs@vger.kernel.org, codalist@coda.cs.cmu.edu, cluster-devel@redhat.com, linux-cachefs@redhat.com, linux-ext4@vger.kernel.org, devel@lists.orangefs.org, linux-cifs@vger.kernel.org, ecryptfs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-block@vger.kernel.org, Alexander Viro , Christian Brauner , netdev@vger.kernel.org, samba-technical@lists.samba.org, linux-unionfs@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mtd@lists.infradead.org, bpf@vger.kernel.org, Pavel Begunkov , linux-btrfs@vger.kernel.org Errors-To: cluster-devel-bounces@redhat.com Sender: "Cluster-devel" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="US-ASCII"; x-default=true From: Hao Xu Trylock inode->i_rwsem in iterate_dir() to support nowait semantics and error out -EAGAIN when there is contention. Signed-off-by: Hao Xu --- fs/readdir.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/fs/readdir.c b/fs/readdir.c index 6469f076ba6e..664ecd9665a1 100644 --- a/fs/readdir.c +++ b/fs/readdir.c @@ -43,6 +43,8 @@ int iterate_dir(struct file *file, struct dir_context *ct= x) =09struct inode *inode =3D file_inode(file); =09bool shared =3D false; =09int res =3D -ENOTDIR; +=09bool nowait; + =09if (file->f_op->iterate_shared) =09=09shared =3D true; =09else if (!file->f_op->iterate) @@ -52,16 +54,22 @@ int iterate_dir(struct file *file, struct dir_context *= ctx) =09if (res) =09=09goto out; =20 -=09if (shared) -=09=09res =3D down_read_killable(&inode->i_rwsem); -=09else -=09=09res =3D down_write_killable(&inode->i_rwsem); -=09if (res) +=09nowait =3D ctx->flags & DIR_CONTEXT_F_NOWAIT; +=09if (nowait) { +=09=09res =3D shared ? down_read_trylock(&inode->i_rwsem) : +=09=09=09 down_write_trylock(&inode->i_rwsem); +=09=09if (!res) +=09=09=09res =3D -EAGAIN; +=09} else { +=09=09res =3D shared ? down_read_killable(&inode->i_rwsem) : +=09=09=09 down_write_killable(&inode->i_rwsem); +=09} +=09if (res < 0) =09=09goto out; =20 =09res =3D -ENOENT; =09if (!IS_DEADDIR(inode)) { -=09=09res =3D file_accessed(file, ctx->flags & DIR_CONTEXT_F_NOWAIT); +=09=09res =3D file_accessed(file, nowait); =09=09if (res =3D=3D -EAGAIN) =09=09=09goto out_unlock; =20 --=20 2.25.1