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 9C683CD3420 for ; Sun, 1 Sep 2024 16:33:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E4478D004E; Sun, 1 Sep 2024 12:33:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2937D8D002D; Sun, 1 Sep 2024 12:33:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 134758D004E; Sun, 1 Sep 2024 12:33:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E99528D002D for ; Sun, 1 Sep 2024 12:33:05 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 723CFC1593 for ; Sun, 1 Sep 2024 16:33:05 +0000 (UTC) X-FDA: 82516713930.05.AA25C27 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf03.hostedemail.com (Postfix) with ESMTP id 94B7F2000C for ; Sun, 1 Sep 2024 16:33:03 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b="mCuJa/Cs"; spf=pass (imf03.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 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=1725208361; 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=90tvoFzIgRKTPesGnNOX9ebczx77231ubrESIvuenic=; b=ZzT51vbxZG6reOG/br0ZamJL4GurASv9VsmIhKjzK1kyZKTyRO1IkMgaX5xi4PwIsYWjUD V88uP2OuheTgCuqKwavtYUJBF2ukPE3LDZhsOWfn5YhS77cpe7YAjrbdG8u6x7bQjAjBJg 7e58id3blFX3PefRZ2eMrz1LiDY/0ck= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b="mCuJa/Cs"; spf=pass (imf03.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 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=1725208361; a=rsa-sha256; cv=none; b=h6/S6yRebBxC2sNEYnbXBLcq1D6R5NF5mPmfeppCmzuGwB25riOmveSoC+31byYlw3PJ4h rHWcnt0JZPMy8Fx5C///lxss5svroG1y8oRDNrR95BdDXMU+5IKtZU67bWe6c+BW8/JM8u I77seWLnfQw7RuGjEfLc5LrrYOIfnkA= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 579B65C46D1; Sun, 1 Sep 2024 16:32:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA702C4CEC3; Sun, 1 Sep 2024 16:33:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725208382; bh=qFxpFqMLZ+DFLfzfGFyOQUXyeGsxg2sLnyFJ5vtrwBM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mCuJa/CsG6480KfuMjYtyvW2OfMBCmySkvqeSUTmYGLHSCUvMAzupEbsYwuSudeHq BVacgOp7QFw0GmbwV7FtInGcVipiOxGv5Oppngm7LCnLQ3ysJs8zLRur+o7ajaWeIl lOGeqltbuu6l0fT4nm2yzgjGbtc0RXxp9ooDuDac= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Howells , "Matthew Wilcox (Oracle)" , Pankaj Raghav , Jeff Layton , Marc Dionne , linux-afs@lists.infradead.org, netfs@lists.linux.dev, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Christian Brauner , Sasha Levin Subject: [PATCH 6.10 066/149] afs: Fix post-setattr file edit to do truncation correctly Date: Sun, 1 Sep 2024 18:16:17 +0200 Message-ID: <20240901160819.949225099@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240901160817.461957599@linuxfoundation.org> References: <20240901160817.461957599@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-Stat-Signature: q1pepdbncsmaaa7x4g1fzganqj64ase1 X-Rspamd-Queue-Id: 94B7F2000C X-Rspamd-Server: rspam11 X-HE-Tag: 1725208383-438891 X-HE-Meta: U2FsdGVkX19Fvm2xcspa/XbaX+RA2pFtPDMwIWPMK1DA+Pti03j3k2HNazb1CLeCBvsH7Pe0QSwnZo+HEeD0XmiVMMYVnntZxAKz+KBdaAWEn23ohKBJ0fGsSnAal90UJKelGGuZ5s2dddOm4tNLA7SOm0pW7R00mtGu5QGW6im+2f8pohjAn21oj4NDOwhWZR2cYnpAs9GD6Z/V1lElUWpf2Sv4FSLfFPWon0DkhJnGWN837TsP9Zbt8MVnUYu1sY/YmZk90aS9bgQ/iDP6q/r4M0roGm/0DacIkB3WSrQOwP2W+jswWPxV6iTWqd48I+/wk0cJh/kAwWFZKamWlXW8uFkBs7ER1qrQhQpQPzjGHhaqaib3ueXlIZWHvEQQmCwl/q8BmDtsOc7BddfBKkBrvHjJnMWig0MsFLJvNwiwgKFYzBVoULVJoXdlh4IYZKGvCZwwvMLP2Sy3NtDNcKU+qE7NnIKvmKng3Jvqjgiikj8S61EaPRoWmFcANFWIvP73sXaPaWfIq7dZ2Nkda44ZrjG4luSeAKhLIyd9ueRlGCuMfXZs4YS20KG8QStW+CC3cuBeNlH1uN2bcmOEzCxjufV4nhmI+MfclvnNj+YnfdVxFL2sQKs9UHpZHPOJcKNqd4TmSnO42RGNbG+k5xPOJQaVALLyTYbdOp+SQt/ap+09ZorWqEugfqv5KFi7ciu+tu5YroNSTb++Fwwy2jKju8Ps1Bsl2gpstcLnEqrB/CEPEz+e3lSMwbZlDh4Vst9QhoEikYDIDBy2eyINmcsvhqgXZaBqYxT8VcNFjtaQfnhP9WbweE1VBTxLU1zd4MvDR18W/8ats1iA/m8bO4u4V3QALfBHiSu93WnkuiY1VUKLsbY74l+L6VRZFHc5imw7nBpOE3vq986QdS1zmvW3e5qa8Vxgcaa/R55+wT8LypzBDv+p8usoHvZ2UMd0UBQbiWhYlhjDjW5lpL4 kX4xWnYc FefC/oLkXquT5DpUEeO8V8n2pt6g6G/qzuHhViwbwmx+HrfljjfyU1NnapMwqL0o8rNKi1IrABIuUc45ELi2D863fYu2OmC7wEA7GvGMZhVhNsxtjz5/d8k3IpP1uBn6YGbqH/Jz5x3t+S6uV5SOUSCbbTuQEVQV0TdG2U0sxoPpwAN6CZYloLDk6hJG3QbPKRMuCj2hI8GHBpUHT98qKrdOc3upXo6eAhpx5xgtbn862E1kqXh4XzkRdOE5bNVGOHrFKkCK1AekpTJSOgL0US/JxrGqoTBETB/URShtM13r2hEbeZbTNW2ID1o1jJAjRU8uxqg76gf6TtVcPamZIeCAbXih5e1BQ3tJJCoKG4TOU7tNlbSrR97hFmsrstmctMGtwfZr0bB2jDBOLnCO9y9Cs5i977wR/QGmw8a2+PZb9us8Rr6qDUveZ9eFGw8K2DUmWubYZA32Hmf8+IZwiErw9w6hV4az+XyaS 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.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Howells [ Upstream commit a74ee0e878e262c0276966528d72d4e887174410 ] At the end of an kAFS RPC operation, there is an "edit" phase (originally intended for post-directory modification ops to edit the local image) that the setattr VFS op uses to fix up the pagecache if the RPC that requested truncation of a file was successful. afs_setattr_edit_file() calls truncate_setsize() which sets i_size, expands the pagecache if needed and truncates the pagecache. The first two of those, however, are redundant as they've already been done by afs_setattr_success() under the io_lock and the first is also done under the callback lock (cb_lock). Fix afs_setattr_edit_file() to call truncate_pagecache() instead (which is called by truncate_setsize(), thereby skipping the redundant parts. Fixes: 100ccd18bb41 ("netfs: Optimise away reads above the point at which there can be no data") Signed-off-by: David Howells Link: https://lore.kernel.org/r/20240823200819.532106-3-dhowells@redhat.com cc: Matthew Wilcox (Oracle) cc: Pankaj Raghav cc: Jeff Layton cc: Marc Dionne cc: linux-afs@lists.infradead.org cc: netfs@lists.linux.dev cc: linux-mm@kvack.org cc: linux-fsdevel@vger.kernel.org Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- fs/afs/inode.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/afs/inode.c b/fs/afs/inode.c index 3acf5e0500728..a95e77670b494 100644 --- a/fs/afs/inode.c +++ b/fs/afs/inode.c @@ -695,13 +695,18 @@ static void afs_setattr_edit_file(struct afs_operation *op) { struct afs_vnode_param *vp = &op->file[0]; struct afs_vnode *vnode = vp->vnode; + struct inode *inode = &vnode->netfs.inode; if (op->setattr.attr->ia_valid & ATTR_SIZE) { loff_t size = op->setattr.attr->ia_size; - loff_t i_size = op->setattr.old_i_size; + loff_t old = op->setattr.old_i_size; + + /* Note: inode->i_size was updated by afs_apply_status() inside + * the I/O and callback locks. + */ - if (size != i_size) { - truncate_setsize(&vnode->netfs.inode, size); + if (size != old) { + truncate_pagecache(inode, size); netfs_resize_file(&vnode->netfs, size, true); fscache_resize_cookie(afs_vnode_cache(vnode), size); } -- 2.43.0