Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1888242iob; Thu, 5 May 2022 10:08:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFqKZ7St5ABB7wV4/i8KgMiurupSMIh8vMXpOaKvYu0QKVPAcUZ6u7WnI2n6vFOlZ2+uEr X-Received: by 2002:a17:90b:4a4e:b0:1dc:55ca:6f33 with SMTP id lb14-20020a17090b4a4e00b001dc55ca6f33mr7385105pjb.4.1651770491565; Thu, 05 May 2022 10:08:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651770491; cv=none; d=google.com; s=arc-20160816; b=gADpMgAMs4lqR0ehrW1LJuMG4GR2hd6M0ZXeGRZBYHEW1fbTKqH02L9mdgjf8h9ulh iktVV2kQXXQlXBFWt4k49JkXxr3EZ9+RloxHdwMQ4tBaPvFbMpvvp6tWJ4bJ3AnF97HK pbQwraj+KDKHwKtbgdpGSYf1iVWwq4KMiiUPy+dYPsejq0MeekARWpa/gVNCyfcDdo++ 0gYMh69xlzBIwzIf3kpUco2p7iwY5DfsAk+ZNyT3MPGM4aWOrjc0Yjx7GrEIUJ/lARzR o6+MhA8uur/c2APlcyCZEVgoRkH6ELP0mVo2Altund8D/suEhBYMrBPDtpCMfwf0N9jY oTUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rlgE+0sbVIbj2evNdcl9e1juXMftZ8ja/EgKnt2cLGQ=; b=zec2f8WUfaQZehOVIYUy+sUPo00+QiWiToI58lnh5N+AsRaeJRv9amti9ORY4gdAAe ysX4miPs6XTn8l1A+MkPf1Y9SGPSIeLntMTGXDtSW0zNDePDeZLpgLl6Iim9+XNSXw7x DuuAHYu/2ONDsI/2JjNw5FT0Vhr9WGpZpr3nV68nX1qD6tVZYC24X/SDcVNvyF9xIM0d BjrM8PbecrYD9dGxme60v9tmcmwWnmTpclRUuzZvBpRb9AGtV8P5NQaKNgWln1vJTzqK ULaTsyKfRiCrw9uNLMdCbdTygdpy0NO6NJIP00gHVG49QmNLn6aY0LeATX2nuZ2BJGnR Ypcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XNmM1dJJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y71-20020a638a4a000000b003ab6ae4fc23si2112769pgd.474.2022.05.05.10.07.55; Thu, 05 May 2022 10:08:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XNmM1dJJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376383AbiEDRyW (ORCPT + 99 others); Wed, 4 May 2022 13:54:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357589AbiEDRPH (ORCPT ); Wed, 4 May 2022 13:15:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 960B555223; Wed, 4 May 2022 09:58:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 122F8618F9; Wed, 4 May 2022 16:58:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B79FC385A4; Wed, 4 May 2022 16:58:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683502; bh=pUKhKiCMnYRgc5/EaLlA4UpUZolj//9SEQQIpczjhQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XNmM1dJJNSR9sJt6ljf5jWd47yVUB+hZ2Roerl98zyH6v3C+NKse7pzw1NroZAiPp s4Gmy50HwzQqBGmsvd322GFOyAQW38VpRozvw0Ljt4KRzkxSE3jioyKgIzgXLKtO5F e/8bO8fAq8oKq+oT0KRjTWD2UT0M0IxGlRtcRAgI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andreas Gruenbacher , Sasha Levin Subject: [PATCH 5.17 150/225] gfs2: No short reads or writes upon glock contention Date: Wed, 4 May 2022 18:46:28 +0200 Message-Id: <20220504153123.487325685@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andreas Gruenbacher [ Upstream commit 296abc0d91d8b65d42224dd33452ace14491ad08 ] Commit 00bfe02f4796 ("gfs2: Fix mmap + page fault deadlocks for buffered I/O") changed gfs2_file_read_iter() and gfs2_file_buffered_write() to allow dropping the inode glock while faulting in user buffers. When the lock was dropped, a short result was returned to indicate that the operation was interrupted. As pointed out by Linus (see the link below), this behavior is broken and the operations should always re-acquire the inode glock and resume the operation instead. Link: https://lore.kernel.org/lkml/CAHk-=whaz-g_nOOoo8RRiWNjnv2R+h6_xk2F1J4TuSRxk1MtLw@mail.gmail.com/ Fixes: 00bfe02f4796 ("gfs2: Fix mmap + page fault deadlocks for buffered I/O") Signed-off-by: Andreas Gruenbacher Signed-off-by: Sasha Levin --- fs/gfs2/file.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index fdc7eda0437a..fa071d738c78 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -991,8 +991,6 @@ static ssize_t gfs2_file_read_iter(struct kiocb *iocb, struct iov_iter *to) if (leftover != window_size) { if (gfs2_holder_queued(&gh)) goto retry_under_glock; - if (written) - goto out_uninit; goto retry; } } @@ -1069,8 +1067,6 @@ static ssize_t gfs2_file_buffered_write(struct kiocb *iocb, from->count = min(from->count, window_size - leftover); if (gfs2_holder_queued(gh)) goto retry_under_glock; - if (read && !(iocb->ki_flags & IOCB_DIRECT)) - goto out_uninit; goto retry; } } -- 2.35.1