From patchwork Wed Aug 28 21:02:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13781954 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B987C7113C for ; Wed, 28 Aug 2024 21:03:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E6BAF6B0093; Wed, 28 Aug 2024 17:03:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E1B866B0095; Wed, 28 Aug 2024 17:03:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE30C6B0096; Wed, 28 Aug 2024 17:03:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B2A906B0093 for ; Wed, 28 Aug 2024 17:03:29 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 6FAF01C4CF3 for ; Wed, 28 Aug 2024 21:03:29 +0000 (UTC) X-FDA: 82502880138.01.BB582DE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf14.hostedemail.com (Postfix) with ESMTP id 98C68100014 for ; Wed, 28 Aug 2024 21:03:27 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eonLIneL; spf=pass (imf14.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724878919; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=SffgkMs/hp1KXQEZaoQRSa21BzPv6+eMsTbdq3Ogtdc=; b=ilbRn6PKC9LwFno/eWFj1hesFF+uHfm4/MTVWTKVFzCkj+cNJPe9Msp0L6TpXd7mXOmZPZ jRbTxB6Qk+8Gk4xeI8ts9PLem2YMIL5pjA2dmL/27ejyNMWxkHytXMZXqffarNS11kAGJU LCjzOpxIITJPlFcXiVpbHJBRxoUcqOg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724878919; a=rsa-sha256; cv=none; b=OnIUYTXzOM2DKcP+BXznuA4N4tBS2lbIEQCRqFQh1bspq0Thv9xfZGGuG1g88EhURYQngk Z4WtwHllnwjJmcsvChpXKKzX1RHBAul2QeL860oggGS5+LM09yyIDZFeZ4hLJ9FzgSWtSC l+08BohS3a+zInlx5Uwhya/mTAynhOE= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eonLIneL; spf=pass (imf14.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724879006; 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=SffgkMs/hp1KXQEZaoQRSa21BzPv6+eMsTbdq3Ogtdc=; b=eonLIneLgV34pw2NDgKbqtobNIGvn2ShZP18i4iDmDR+r4nft8zAjWwu6yXN0eLvaCn1eX xGrnKd5TajF2LGuKkyGu7Tu5qnz0fQV6qymi0oYSOdY+4JwoI3aKYEmKa43HkUTcHUXNxL 2VlDFVft4KPJLSb1n8BybbbzyYTRsd0= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-408-vTkglQjNNRCmXpRkS29Zvg-1; Wed, 28 Aug 2024 17:03:18 -0400 X-MC-Unique: vTkglQjNNRCmXpRkS29Zvg-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5A8181955D4E; Wed, 28 Aug 2024 21:03:14 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.30]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 115191955BF2; Wed, 28 Aug 2024 21:03:08 +0000 (UTC) From: David Howells To: Christian Brauner , Steve French Cc: David Howells , Paulo Alcantara , Tom Talpey , Dominique Martinet , Jeff Layton , Matthew Wilcox , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] netfs, cifs: Fix handling of short DIO read Date: Wed, 28 Aug 2024 22:02:43 +0100 Message-ID: <20240828210249.1078637-3-dhowells@redhat.com> In-Reply-To: <20240828210249.1078637-1-dhowells@redhat.com> References: <20240828210249.1078637-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Stat-Signature: qniwycbpotwjrnzm6c1ffekhi9dc1dby X-Rspamd-Queue-Id: 98C68100014 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1724879007-661943 X-HE-Meta: U2FsdGVkX18+laldmH0BZow+5BtZttvSdFlamhfiRo2DjuP5iz5ns3lLU9D4dCkKPED+E0QmsI1J7mQm2F4AhqYmI3/2iI+XX3cjkInCJTG+L3h01s8i2v3+kWRi+TKjNHsiCjGsCNAcUBVDihDu+wE9S59EaeRxvigDWkTm0ZwmWY4Wv6RW2BiGTJCNN9IfnrB37zKiF6nZi4vGvuQzHpte9jDDEo2KMWefKCy3JLu9s3VIYDwAg9cGnWWrhV7h/mVnoLyAHBc6UFvm5GVhnRkx+5+HXHIm1woaAYBgVlQYoZtKtnPDKMAs/X5sWFIC1qe8WcZZuvvLdv4tQzbED9vCIU1FHYo2NbQsi1lWaF17QFwGpif4sizJDUfOQ4jlwQ3Nn6CgBveM6u1vCdUbv+gf9PXZaJJviD0S6HvVceM1AL20xRsY5kCI7DsttylRT2Vomcsu8n1BcmDko2r5whaY3tNfNtZ8JwmddLhPazr+5UrXbwYmP6UehTJwXtHQOOiEMXK1piPWof/2JxtYvLIKMfT0BtDRGbSUd9nzzYdYDyHAntGZQ01EvYlOR65kN+zh36u8fV98JXzlCGEvCIxWjurTaOYwRQEQvWo5t35byWvIB443Eq/OdpZmXJXjnYkS7kg0AntnsHd/0XMsoT/0KNqdl5wKSUawGr9MACX7b+s5qHZcgbhQXelHkk2xobm8m17v4va3HYbwhktQQQQlOI4oW1iR5zE2x+4mKtGZW7cjghvj9OjGn1oJa8v4UCMcraZPyorPedOSNRlU1Q0ql/8tP5KRj/S6JNChp27oCoSMHCUBnWuw0GlOPeMoKA1xP92e8JKyCwtEseVTXYpz4f1tD5snLEPViCvVLrvqgb1yLgIDvMFMmk8eoF0G0R9Ued7yL+Gq+S4jrmB0LgfTgPlDMd9lzv46ImzRbzgDgiglrS4oTuox5UIKBzyDZgL4WyaWw9ZSKUZC3MI Uzx/CkTo oNQqklQLxvP8EHQEPZfhEKUnAybp165erDieQTcgdwfLvm4PzQfhNqFQo8FgJPj0TAYZiF58hlGj+nZBrlyICnNH4XlT3ZQLlvJqjCg543LTmIcQHHu9e/2bbV1KgLpED04Ib9OB6yR9LuasetpatB/pTcVFZ4f+PrxB/d/Woi6plZxDyas72Zv7SrEd0nAX8PctKz6sLbpbfezsIJqhKiWTVKx4h96OSbPuNQS79fKG9MILdwX9S9XIIw4QGBPOG0mnHUvg/8wb4XOL2wx2US/CLC282rxWTV21zzxlSZfeUtJpYkw2vUNBye2TMN6Vwm9X6o4va+gdZY6yFX7mZquU1EsMr+WlUTgJ6qTaJmsCuMlKW6pSV4zTZyMy0vs5kM1hYEFE/b2ZW5MsW85LYEDCxh5cbNpxHmwp3gCrg1vl5vch/68xEpF66SevFNAu2EIGSObdQ7QW1wAIRpiAj/49eRTO3XRWC09L95GF8MizIc/zH9wcJUW0baqgbzYCOs1Yu X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Short DIO reads, particularly in relation to cifs, are not being handled correctly by cifs and netfslib. This can be tested by doing a DIO read of a file where the size of read is larger than the size of the file. When it crosses the EOF, it gets a short read and this gets retried, and in the case of cifs, the retry read fails, with the failure being translated to ENODATA. Fix this by the following means: (1) Add a flag, NETFS_SREQ_HIT_EOF, for the filesystem to set when it detects that the read did hit the EOF. (2) Make the netfslib read assessment stop processing subrequests when it encounters one with that flag set. (3) Return rreq->transferred, the accumulated contiguous amount read to that point, to userspace for a DIO read. (4) Make cifs set the flag and clear the error if the read RPC returned ENODATA. (5) Make cifs set the flag and clear the error if a short read occurred without error and the read-to file position is now at the remote inode size. Fixes: 69c3c023af25 ("cifs: Implement netfslib hooks") Signed-off-by: David Howells cc: Steve French cc: Paulo Alcantara cc: Jeff Layton cc: linux-cifs@vger.kernel.org cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/netfs/io.c | 17 +++++++++++------ fs/smb/client/smb2pdu.c | 13 +++++++++---- include/linux/netfs.h | 1 + 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/fs/netfs/io.c b/fs/netfs/io.c index 3303b515b536..943128507af5 100644 --- a/fs/netfs/io.c +++ b/fs/netfs/io.c @@ -368,7 +368,8 @@ static void netfs_rreq_assess_dio(struct netfs_io_request *rreq) if (subreq->error || subreq->transferred == 0) break; transferred += subreq->transferred; - if (subreq->transferred < subreq->len) + if (subreq->transferred < subreq->len || + test_bit(NETFS_SREQ_HIT_EOF, &subreq->flags)) break; } @@ -503,7 +504,8 @@ void netfs_subreq_terminated(struct netfs_io_subrequest *subreq, subreq->error = 0; subreq->transferred += transferred_or_error; - if (subreq->transferred < subreq->len) + if (subreq->transferred < subreq->len && + !test_bit(NETFS_SREQ_HIT_EOF, &subreq->flags)) goto incomplete; complete: @@ -782,10 +784,13 @@ int netfs_begin_read(struct netfs_io_request *rreq, bool sync) TASK_UNINTERRUPTIBLE); ret = rreq->error; - if (ret == 0 && rreq->submitted < rreq->len && - rreq->origin != NETFS_DIO_READ) { - trace_netfs_failure(rreq, NULL, ret, netfs_fail_short_read); - ret = -EIO; + if (ret == 0) { + if (rreq->origin == NETFS_DIO_READ) { + ret = rreq->transferred; + } else if (rreq->submitted < rreq->len) { + trace_netfs_failure(rreq, NULL, ret, netfs_fail_short_read); + ret = -EIO; + } } } else { /* If we decrement nr_outstanding to 0, the ref belongs to us. */ diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c index be7a1a9c691d..88dc49d67037 100644 --- a/fs/smb/client/smb2pdu.c +++ b/fs/smb/client/smb2pdu.c @@ -4507,6 +4507,7 @@ static void smb2_readv_callback(struct mid_q_entry *mid) { struct cifs_io_subrequest *rdata = mid->callback_data; + struct netfs_inode *ictx = netfs_inode(rdata->rreq->inode); struct cifs_tcon *tcon = tlink_tcon(rdata->req->cfile->tlink); struct TCP_Server_Info *server = rdata->server; struct smb2_hdr *shdr = @@ -4599,11 +4600,15 @@ smb2_readv_callback(struct mid_q_entry *mid) rdata->got_bytes); if (rdata->result == -ENODATA) { - /* We may have got an EOF error because fallocate - * failed to enlarge the file. - */ - if (rdata->subreq.start < rdata->subreq.rreq->i_size) + __set_bit(NETFS_SREQ_HIT_EOF, &rdata->subreq.flags); + rdata->result = 0; + } else { + if (rdata->got_bytes < rdata->actual_len && + rdata->subreq.start + rdata->subreq.transferred + rdata->got_bytes == + ictx->remote_i_size) { + __set_bit(NETFS_SREQ_HIT_EOF, &rdata->subreq.flags); rdata->result = 0; + } } trace_smb3_rw_credits(rreq_debug_id, subreq_debug_index, rdata->credits.value, server->credits, server->in_flight, diff --git a/include/linux/netfs.h b/include/linux/netfs.h index 983816608f15..c47443e7a97e 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -198,6 +198,7 @@ struct netfs_io_subrequest { #define NETFS_SREQ_NEED_RETRY 9 /* Set if the filesystem requests a retry */ #define NETFS_SREQ_RETRYING 10 /* Set if we're retrying */ #define NETFS_SREQ_FAILED 11 /* Set if the subreq failed unretryably */ +#define NETFS_SREQ_HIT_EOF 12 /* Set if we hit the EOF */ }; enum netfs_io_origin {