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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 DB0EAC3276C for ; Thu, 2 Jan 2020 22:23:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AEA73222C3 for ; Thu, 2 Jan 2020 22:23:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578003832; bh=bM3yZUBVUr9Q9zX5/Cv/jK9Pdngg3VbaUWLDtozTXk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iNnEwTbXZ5ZXSJ3rQuRio7R6Wo3WZy9XqKTLX8fjqPxEIiDkpP57Rr38gHZ0GtroI 0c/uLuQZxpzJDD8WHVtOy0A++UvivZtkh0mk6+ChrprFbCubcx5zch+AqVULxhWg2l U3yu13kbFQWZfg6cz3YtttiFOPDS9GuaSqC8B1e4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729331AbgABWXv (ORCPT ); Thu, 2 Jan 2020 17:23:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:46668 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729321AbgABWXr (ORCPT ); Thu, 2 Jan 2020 17:23:47 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 593B220863; Thu, 2 Jan 2020 22:23:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578003826; bh=bM3yZUBVUr9Q9zX5/Cv/jK9Pdngg3VbaUWLDtozTXk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a5l8JgiDD2SNNgkjUJZ9yZv8/N4NvV9Enz0qxW+Fvzs3dCmgpsFvzx6rL5L7PnWfD Nrinj6f4Xmc+IEC+EpoXmeF8Vpm/8OxQm6vwpUlKM4+koZ0JPJgWCelkyAJlZRPbyo 5ZlQ3zzzWIw9lIE6Kk98jGZRaLr4cLbxL+JSH+HA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matthew Bobrowski , Jan Kara , Ritesh Harjani , Theodore Tso , Sasha Levin Subject: [PATCH 4.14 16/91] ext4: update direct I/O read lock pattern for IOCB_NOWAIT Date: Thu, 2 Jan 2020 23:06:58 +0100 Message-Id: <20200102220414.036786948@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220356.856162165@linuxfoundation.org> References: <20200102220356.856162165@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthew Bobrowski [ Upstream commit 548feebec7e93e58b647dba70b3303dcb569c914 ] This patch updates the lock pattern in ext4_direct_IO_read() to not block on inode lock in cases of IOCB_NOWAIT direct I/O reads. The locking condition implemented here is similar to that of 942491c9e6d6 ("xfs: fix AIM7 regression"). Fixes: 16c54688592c ("ext4: Allow parallel DIO reads") Signed-off-by: Matthew Bobrowski Reviewed-by: Jan Kara Reviewed-by: Ritesh Harjani Link: https://lore.kernel.org/r/c5d5e759f91747359fbd2c6f9a36240cf75ad79f.1572949325.git.mbobrowski@mbobrowski.org Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/inode.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index c2920cbfa3bf..a91b8404d3dc 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3796,7 +3796,13 @@ static ssize_t ext4_direct_IO_read(struct kiocb *iocb, struct iov_iter *iter) * writes & truncates and since we take care of writing back page cache, * we are protected against page writeback as well. */ - inode_lock_shared(inode); + if (iocb->ki_flags & IOCB_NOWAIT) { + if (!inode_trylock_shared(inode)) + return -EAGAIN; + } else { + inode_lock_shared(inode); + } + ret = filemap_write_and_wait_range(mapping, iocb->ki_pos, iocb->ki_pos + count - 1); if (ret) -- 2.20.1