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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 EFF10C35642 for ; Fri, 21 Feb 2020 07:46:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2282208C4 for ; Fri, 21 Feb 2020 07:46:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582271207; bh=JqQmPfLAZJXhisUZizc6HtTiGx32zdBvxS/MOj0sltw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=m8Ltb2i0t2DQ5kJZG+wdHai9xPVMh2WWKPK0TMKhbQcmz7ezcm5C+Q+RAxH95wBrd BYlwAHJvgwfT9n0DTOHM8hIUQJWR6PIBP/csQeO65aoJrk3CnEsebHXqLE0QxEf0cL monNj+1a/ht/WQ7xZNcwwHANd84womKaEyVWjahI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728311AbgBUHqq (ORCPT ); Fri, 21 Feb 2020 02:46:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:42392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728779AbgBUHqp (ORCPT ); Fri, 21 Feb 2020 02:46:45 -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 2D773222C4; Fri, 21 Feb 2020 07:46:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582271204; bh=JqQmPfLAZJXhisUZizc6HtTiGx32zdBvxS/MOj0sltw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SJejF+TXCWh8SSMJoNU0TUOWEGwNgi/Rrdo2uYnqyc6CgraJuf3QxO1MI3IbD3CmX d7sDRh4pBtFsNXGng9QuWnPxhNY3nXmZqz36z9z7Xx8NbTahOF9fMIs22TevY3Bd/3 KSUoGaOBnakykI06Ks2q+3xqQSs21bGrBBvvuTuo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jan Kara , Matthew Bobrowski , Joseph Qi , Ritesh Harjani , Theodore Tso , Sasha Levin Subject: [PATCH 5.5 031/399] ext4: fix ext4_dax_read/write inode locking sequence for IOCB_NOWAIT Date: Fri, 21 Feb 2020 08:35:56 +0100 Message-Id: <20200221072405.381988654@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072402.315346745@linuxfoundation.org> References: <20200221072402.315346745@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ritesh Harjani [ Upstream commit f629afe3369e9885fd6e9cc7a4f514b6a65cf9e9 ] Apparently our current rwsem code doesn't like doing the trylock, then lock for real scheme. So change our dax read/write methods to just do the trylock for the RWF_NOWAIT case. This seems to fix AIM7 regression in some scalable filesystems upto ~25% in some cases. Claimed in commit 942491c9e6d6 ("xfs: fix AIM7 regression") Reviewed-by: Jan Kara Reviewed-by: Matthew Bobrowski Tested-by: Joseph Qi Signed-off-by: Ritesh Harjani Link: https://lore.kernel.org/r/20191212055557.11151-2-riteshh@linux.ibm.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/file.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 6a7293a5cda2d..977ac58dc718d 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -88,9 +88,10 @@ static ssize_t ext4_dax_read_iter(struct kiocb *iocb, struct iov_iter *to) struct inode *inode = file_inode(iocb->ki_filp); ssize_t ret; - if (!inode_trylock_shared(inode)) { - if (iocb->ki_flags & IOCB_NOWAIT) + if (iocb->ki_flags & IOCB_NOWAIT) { + if (!inode_trylock_shared(inode)) return -EAGAIN; + } else { inode_lock_shared(inode); } /* @@ -487,9 +488,10 @@ ext4_dax_write_iter(struct kiocb *iocb, struct iov_iter *from) bool extend = false; struct inode *inode = file_inode(iocb->ki_filp); - if (!inode_trylock(inode)) { - if (iocb->ki_flags & IOCB_NOWAIT) + if (iocb->ki_flags & IOCB_NOWAIT) { + if (!inode_trylock(inode)) return -EAGAIN; + } else { inode_lock(inode); } -- 2.20.1