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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D640AC25B75 for ; Thu, 6 Jun 2024 14:11:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5A19E6B009D; Thu, 6 Jun 2024 10:11:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 54DB86B00A0; Thu, 6 Jun 2024 10:11:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 43D156B00A1; Thu, 6 Jun 2024 10:11:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 277CC6B009D for ; Thu, 6 Jun 2024 10:11:17 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 8AD834174C for ; Thu, 6 Jun 2024 14:11:16 +0000 (UTC) X-FDA: 82200650952.30.DE0032A Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf18.hostedemail.com (Postfix) with ESMTP id 2D4561C002D for ; Thu, 6 Jun 2024 14:11:13 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=sZs+KFHs; spf=pass (imf18.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717683074; 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=GwTVvKSRzng5gdUv40C7usNybnahNJ58vFetBA/gvBY=; b=XKXABDCD97GotwJpHEihvW6PGUDKWeoqeEW8n2Vsmiz2kROy3fsEjPQ9XYqudG42TlXZlQ eSRQO+mCZ7ABGwoXHBPfLLtvh0uhCwR5fR+yYDMG38SIRHfoNfyCJ3X/uxGzeOvPRjHVl9 fsf/XLDo8VpBGjyauXo5cU7P4+hoyEk= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=sZs+KFHs; spf=pass (imf18.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717683074; a=rsa-sha256; cv=none; b=EhCbOTgQy9V05ZnqiiL44zIR/1DSLK7xGw4B5NBK0OikjUHb/J2asxxyTRd4Wi6JLGkPAj v2MnMoiFGiu/OzqK/bSe/CK66bVUnc1/pZ3aJStbeig9Ifppx8/+8LRl5kjz1hql/jzXh0 8gNXjHyzg8yJlidzPotsx6zc/PL4qVY= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 5988CCE1BC7; Thu, 6 Jun 2024 14:11:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3273CC4AF08; Thu, 6 Jun 2024 14:11:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717683065; bh=U3tvp00cBml/3/LozcTj/aStuQPzsTggVXKu4P/7SSI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sZs+KFHsdkWIs7kmCbAYPgru3XNGPrKkim6FCG3qMCFn9P05DuhPl9Wt/els4jQwk 6OKalOMHL05nV+Hnb0Bb7Qv1Q6kwltB5OPrJy4c+BbowjgO3Otkn0gskQSm/PLfpWx VKbxEPWnTiodV3roZxx/z1/3fiRgJWs/ChiPq8NU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Howells , Steve French , Shyam Prasad N , Rohith Surabattula , Jeff Layton , linux-cifs@vger.kernel.org, netfs@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Sasha Levin Subject: [PATCH 6.9 278/374] cifs: Set zero_point in the copy_file_range() and remap_file_range() Date: Thu, 6 Jun 2024 16:04:17 +0200 Message-ID: <20240606131701.206658882@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131651.683718371@linuxfoundation.org> References: <20240606131651.683718371@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 2D4561C002D X-Stat-Signature: fxarhxhbywcjarotzmn4ha4h9i9iyqqu X-HE-Tag: 1717683073-746330 X-HE-Meta: U2FsdGVkX1+Nc1fP843JqDHfqGklNE2mXpmxNQWTA1AwSb0y/U6QrcXrIKOYpn4xFWbWTu5tCkQjRQOgxIrmYWndHzuzRxegTahDJA9S09FjB1im/daNTkxbUEpxpOUdw3uIUbVz+WaKuAUbngeMhufHXE25Y8sa/ozvlsaXduhnGlpAUBIA4J7W6qkmNrB5MoEzqx8sB0MYM4hO5fZCLSWAzNr2ueoqt8FYnMuAiUsPd7fEoi5lCVaWI1+y6w5yZNf+Rl+7C8HM7S59Cu0e1Vbfgkw8jU5SzfmoUYWAi917hbWeXpSL9EZQ+1WgIYSOLRYMSuL2djHA64aztinf6iW+Tkig/v9bKZomQ1R9oXgF1ukZUq6L2brt+VD96t1XBcCUEBNpby+6azGwVP0fk6C/Fyn5evnLUQA0g90VAsb9nH6chk2W4RmHEghRmfH5xt3PORx5/M8DdFMwMW6RLHqb6bZk9n+Ffk8mXyMDNKcXzxc3ScEWlVv2RcrIZ6FkIQORtzKc4H6kxiGXEjj3+n5uuWTBPrcUajasgRDbJYD/KDzV1Xwr2tTGOAosV5x8FgcHxHEsM/rNjF/2Pjnr098Cp8hRlhfHaUVCeOEqswe3wzZ91aYpZtycLEyVu4wQ6PYXk9UL6LrFAoFTQeesrFr4Cyo9TCaEOVFHCvYljJ1Wt1tdoF37XgOcXn9mqpRxYBZkjKQ6y9wwDfPXL8/EppxQ18mh4++lIi5Kj6TPj4S/ZbLN0J0SKMzFIqtHICsWl24OuJNh1JcdQvs21YDsaCO1VKn5/KfvBrAJ/x7iNlowt2RVyCX6DPBiddHZIQFpaatFy09UnUQWBiy/Rxlqj0Nc0eFvlkWnrYY5w3SWEPZhiVPbfeeaUdfvcs12G5lDARFBDZkvt7BTaaIrIrrzGMc0DVnMw2yE8LoDc7yBJ2+SfBheQKhKFzDnlreu0nPe5f0bYXChb2+20TShShf MshL1qQH NLzXOba/F7zEvFkV5mufgKW1WnLpCL7QNmtl5vs5fYR0TIhRMDz5uEhCe5XenpHaIfF2WtuypmYc3ixBYXbVGBaIkWOdcA11TF7SzFehaNIais3eramvApI3mYzKQkv+d3o/mMIrpwEoB5Omate4sgjsZY27eCt6S/9czxJEqYkH3WHwYZ1btzzhs9pjOBWRaanRmdyJmUWhOVZWLthZVRItnxyoZ5QpqnZrOE6Ba5kaJCewd6RtyMtF01byy97W9SDDm1G4s/aAw1eM8ChpDl1naBJinGNbav4XtKf7cfqdny965EEzoNaAo6YWz1jExJE3LLEnYOfvWS/g4lB8QpH/1pFTVVuIbMCkmjUG5/CK84nOjF2cVJp9TG5QQ2VlaB0aklSczwKawUS4PpDIkbnmwOR0CMw30u/bsJ1ZbntVA5XFjFfDMsVnXNjGtkWWb0ATb8zu8/I0HjBrltqDQggbNTSvX/t5ASYro5equ6ZReW7QdPm07wv5lgmMrExhS54fmz1aiCgqwAIGceaYJres/Gmp8TOok84KERyOUW/8y/Nc= 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: 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Howells [ Upstream commit 3758c485f6c9124d8ad76b88382004cbc28a0892 ] Set zero_point in the copy_file_range() and remap_file_range() implementations so that we don't skip reading data modified on a server-side copy. Signed-off-by: David Howells cc: Steve French cc: Shyam Prasad N cc: Rohith Surabattula cc: Jeff Layton cc: linux-cifs@vger.kernel.org cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org Stable-dep-of: 93a43155127f ("cifs: Fix missing set of remote_i_size") Signed-off-by: Sasha Levin --- fs/smb/client/cifsfs.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c index 39277c37185ca..c8449f43856c5 100644 --- a/fs/smb/client/cifsfs.c +++ b/fs/smb/client/cifsfs.c @@ -1342,6 +1342,8 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off, rc = cifs_flush_folio(target_inode, destend, &fstart, &fend, false); if (rc) goto unlock; + if (fend > target_cifsi->netfs.zero_point) + target_cifsi->netfs.zero_point = fend + 1; /* Discard all the folios that overlap the destination region. */ cifs_dbg(FYI, "about to discard pages %llx-%llx\n", fstart, fend); @@ -1360,6 +1362,8 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off, fscache_resize_cookie(cifs_inode_cookie(target_inode), new_size); } + if (rc == 0 && new_size > target_cifsi->netfs.zero_point) + target_cifsi->netfs.zero_point = new_size; } /* force revalidate of size and timestamps of target file now @@ -1451,6 +1455,8 @@ ssize_t cifs_file_copychunk_range(unsigned int xid, rc = cifs_flush_folio(target_inode, destend, &fstart, &fend, false); if (rc) goto unlock; + if (fend > target_cifsi->netfs.zero_point) + target_cifsi->netfs.zero_point = fend + 1; /* Discard all the folios that overlap the destination region. */ truncate_inode_pages_range(&target_inode->i_data, fstart, fend); -- 2.43.0