From patchwork Fri Jul 31 17:46:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Mayhew X-Patchwork-Id: 11695301 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 592011575 for ; Fri, 31 Jul 2020 17:46:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3750221744 for ; Fri, 31 Jul 2020 17:46:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bDxq42QB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387469AbgGaRqT (ORCPT ); Fri, 31 Jul 2020 13:46:19 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:57908 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387429AbgGaRqT (ORCPT ); Fri, 31 Jul 2020 13:46:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596217578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qFPO+Z15nztX6EIfKvMpKcaydKBsQ7RALeC0PvYnrFg=; b=bDxq42QBiT0nkQXN7Yo2loNlBEvnVVALVFTijsHtyXDMW+79m91oawySvfzXnlgxEjE/QO YNFqqaWvRW3hTwRAxLzJaeQlJc3SwWuhxVzShG13oUsvYono71igDBjOcmd8Tj5r3EFsL/ uxhhNVxAjRBH8hYN+g9X13qt7OKlKKU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-347-VdaqVV9jNKyEAvrC9yiT6Q-1; Fri, 31 Jul 2020 13:46:16 -0400 X-MC-Unique: VdaqVV9jNKyEAvrC9yiT6Q-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7C92618839CD; Fri, 31 Jul 2020 17:46:15 +0000 (UTC) Received: from aion.usersys.redhat.com (ovpn-115-198.rdu2.redhat.com [10.10.115.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 612425BAC3; Fri, 31 Jul 2020 17:46:15 +0000 (UTC) Received: by aion.usersys.redhat.com (Postfix, from userid 1000) id 7857C1A0005; Fri, 31 Jul 2020 13:46:14 -0400 (EDT) From: Scott Mayhew To: trond.myklebust@hammerspace.com, anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH 1/2] nfs: ensure correct writeback errors are returned on close() Date: Fri, 31 Jul 2020 13:46:13 -0400 Message-Id: <20200731174614.1299346-2-smayhew@redhat.com> In-Reply-To: <20200731174614.1299346-1-smayhew@redhat.com> References: <20200731174614.1299346-1-smayhew@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org nfs_wb_all() calls filemap_write_and_wait(), which uses filemap_check_errors() to determine the error to return. filemap_check_errors() only looks at the mapping->flags and will therefore only return either -ENOSPC or -EIO. To ensure that the correct error is returned on close(), nfs{,4}_file_flush() should call file_check_and_advance_wb_err() which looks at the errseq value in mapping->wb_err. Fixes: 6fbda89b257f ("NFS: Replace custom error reporting mechanism with generic one") Signed-off-by: Scott Mayhew --- fs/nfs/file.c | 3 ++- fs/nfs/nfs4file.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/nfs/file.c b/fs/nfs/file.c index f96367a2463e..eeef6580052f 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -148,7 +148,8 @@ nfs_file_flush(struct file *file, fl_owner_t id) return 0; /* Flush writes to the server and return any errors */ - return nfs_wb_all(inode); + nfs_wb_all(inode); + return file_check_and_advance_wb_err(file); } ssize_t diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c index 8e5d6223ddd3..77bf9c12734c 100644 --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c @@ -125,7 +125,8 @@ nfs4_file_flush(struct file *file, fl_owner_t id) return filemap_fdatawrite(file->f_mapping); /* Flush writes to the server and return any errors */ - return nfs_wb_all(inode); + nfs_wb_all(inode); + return file_check_and_advance_wb_err(file); } #ifdef CONFIG_NFS_V4_2 From patchwork Fri Jul 31 17:46:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Mayhew X-Patchwork-Id: 11695305 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 668391575 for ; Fri, 31 Jul 2020 17:46:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4F5DF21744 for ; Fri, 31 Jul 2020 17:46:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hQGw2lJk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387476AbgGaRqV (ORCPT ); Fri, 31 Jul 2020 13:46:21 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:37478 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729018AbgGaRqV (ORCPT ); Fri, 31 Jul 2020 13:46:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596217580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5rCgyPvN75bBTdUNtUGmsTPrHkuqaykQ50uu30gYKSk=; b=hQGw2lJkq9GumaGt4ozVgbS3W0iW8FYvJjT4VOoOwB74XqBFHa/fqCR9v9u1FtIxYY4mXI RqMJIi16khpU/y+8hc5mRtHdainaeXJ5xo3gSHPjGQWM8zbYat6WZ4FCWrFp8e0fATGpLL poH7N8shVhP94i6Wlu2JqJdzJh/AQIs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-300-EAUx7jjSMiihieM2QmkB2g-1; Fri, 31 Jul 2020 13:46:16 -0400 X-MC-Unique: EAUx7jjSMiihieM2QmkB2g-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5CD0D18839CB; Fri, 31 Jul 2020 17:46:15 +0000 (UTC) Received: from aion.usersys.redhat.com (ovpn-115-198.rdu2.redhat.com [10.10.115.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 43D946179C; Fri, 31 Jul 2020 17:46:15 +0000 (UTC) Received: by aion.usersys.redhat.com (Postfix, from userid 1000) id 7BEA11A0008; Fri, 31 Jul 2020 13:46:14 -0400 (EDT) From: Scott Mayhew To: trond.myklebust@hammerspace.com, anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH 2/2] nfs: nfs_file_write() should check for writeback errors Date: Fri, 31 Jul 2020 13:46:14 -0400 Message-Id: <20200731174614.1299346-3-smayhew@redhat.com> In-Reply-To: <20200731174614.1299346-1-smayhew@redhat.com> References: <20200731174614.1299346-1-smayhew@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org The NFS_CONTEXT_ERROR_WRITE flag (as well as the check of said flag) was removed by commit 6fbda89b257f. The absence of an error check allows writes to be continually queued up for a server that may no longer be able to handle them. Fix it by adding an error check using the generic error reporting functions. Fixes: 6fbda89b257f ("NFS: Replace custom error reporting mechanism with generic one") Signed-off-by: Scott Mayhew --- fs/nfs/file.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/fs/nfs/file.c b/fs/nfs/file.c index eeef6580052f..c6496f21d1e2 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -588,12 +588,14 @@ static const struct vm_operations_struct nfs_file_vm_ops = { .page_mkwrite = nfs_vm_page_mkwrite, }; -static int nfs_need_check_write(struct file *filp, struct inode *inode) +static int nfs_need_check_write(struct file *filp, struct inode *inode, + int error) { struct nfs_open_context *ctx; ctx = nfs_file_open_context(filp); - if (nfs_ctx_key_to_expire(ctx, inode)) + if (nfs_error_is_fatal_on_server(error) || + nfs_ctx_key_to_expire(ctx, inode)) return 1; return 0; } @@ -604,6 +606,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) struct inode *inode = file_inode(file); unsigned long written = 0; ssize_t result; + errseq_t since; + int error; result = nfs_key_timeout_notify(file, inode); if (result) @@ -628,6 +632,7 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) if (iocb->ki_pos > i_size_read(inode)) nfs_revalidate_mapping(inode, file->f_mapping); + since = filemap_sample_wb_err(file->f_mapping); nfs_start_io_write(inode); result = generic_write_checks(iocb, from); if (result > 0) { @@ -646,7 +651,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) goto out; /* Return error values */ - if (nfs_need_check_write(file, inode)) { + error = filemap_check_wb_err(file->f_mapping, since); + if (nfs_need_check_write(file, inode, error)) { int err = nfs_wb_all(inode); if (err < 0) result = err;