From patchwork Mon Jul 17 16:29:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Van Hensbergen X-Patchwork-Id: 13315993 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 75435253DE for ; Mon, 17 Jul 2023 16:29:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34661C433C8; Mon, 17 Jul 2023 16:29:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689611345; bh=HtOElUNyoZNBTq+YJJPGA6QUAQwhzK9Ts0x7WmL3Ogs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hkI6fdXx+442oIfRvhPZtlwLRAzVGAH2TUWRkO0HgzibV3xnV7FtN3EEfECZKv1BD kotg7kLZd/xdqnt1cVqDuIvspSGamAURkn7SQFzKVPlt6a1ar2/QvMHVyIZlbWIci+ /XvOh+MAV8tKYulIdNsNARGdQWzRPrZ27FzsUQi8DTZE5gpFHlN0onNHE5LHYodRa6 2xddGuY49CzDvV0U5jomPjtnLsV3EbIWfYtg/lzuNk/AfLU/q6acEdXlMd8ZbFgWme C9sbZPEjrOHjPWg8T4T/tSCB7VgHsTJtDa47HHRSbaFdHPwiwA1QoIhKKMMe0Ys/vA z/7BQJS0AvIRQ== From: Eric Van Hensbergen Date: Mon, 17 Jul 2023 16:29:00 +0000 Subject: [PATCH 1/3] fs/9p: remove unecessary and overrestrictive check Precedence: bulk X-Mailing-List: v9fs@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230716-fixes-overly-restrictive-mmap-v1-1-0683b283b932@kernel.org> References: <20230716-fixes-overly-restrictive-mmap-v1-0-0683b283b932@kernel.org> In-Reply-To: <20230716-fixes-overly-restrictive-mmap-v1-0-0683b283b932@kernel.org> To: Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck Cc: v9fs@lists.linux.dev, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Robert Schwebel , Eric Van Hensbergen X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=733; i=ericvh@kernel.org; h=from:subject:message-id; bh=HtOElUNyoZNBTq+YJJPGA6QUAQwhzK9Ts0x7WmL3Ogs=; b=owEBbQKS/ZANAwAKAYj/1ftKX/+YAcsmYgBktWxPX9pZef4TUTigWeU3IyymFufia++0mC0aA cCwpcYpqxaJAjMEAAEKAB0WIQSWlvDRlqWQmKTK0VGI/9X7Sl//mAUCZLVsTwAKCRCI/9X7Sl// mHmSD/9B8p6xF2EFjQMbCX6wfXlqLY72QBgwxjLmcSJNov5L0lYLkg0kzZxkqX9ayV24SkeXDww T7XYiKG5Z9fkofZ/MqLNgOOIxGOHu/e6XKt4e5NQ/KApJecLM0NdYGGbw3pLY7L9kfx6on+CCvT SBUcguO7Jra30yIewz5WLmc1S8kDQSPQ3qRz2MYOczeI+f7s7Bp1kQeh287QJOpbPNhyIpoqsja F5p3ggxbSlSzeoWj37gouzpQO8ETr7LLELU4UAr7VDXG2D4SJ08hftpnySiQN/ZSu5xrPC4fGlI CcHVa53YvOdfBSF7YDEaMonpmp5TxxzElDDoe6n7LHKIrB+n5tun/sN674PbHLmA6GLnDXaJQZ0 MJ8OCc3dq5/nvSQQ2TeGOGrYWlB3elTKCMKwiqsT/eEM6gDoJv1OMcd5DJn839LtHPILc0wFZX4 +81bV3bUvPLSiZsYBlNOyTWuyKEgcUDnoRPfP6tzzMyI5dIABO0zS280WBixurkxoE2PRmqvR1a YRzotcC3Y/YDeUQ9Sdr6wyAO4Nu/BDffvU5ibl+v/8/1UgtmMnSpVzl7nrxUIzx/6chKYOb7lqv pRHW8T/ltnnL5DF3PAEpXxc0tXMov5H+ro6DVNzlpjWWpye24gFmWcJ252FUwQENgQJmEyOFu/i MRll+XH93fvfmWA== X-Developer-Key: i=ericvh@kernel.org; a=openpgp; fpr=9696F0D196A59098A4CAD15188FFD5FB4A5FFF98 This eliminates a check for shared that was overrestrictive and duplicated a check in generic_file_readonly_mmap. Signed-off-by: Eric Van Hensbergen Reviewed-by: Dominique Martinet Reviewed-by: Christian Schoenebeck --- fs/9p/vfs_file.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index 2996fb00387fa..bda3abd6646b8 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c @@ -506,8 +506,6 @@ v9fs_file_mmap(struct file *filp, struct vm_area_struct *vma) if (!(v9ses->cache & CACHE_WRITEBACK)) { p9_debug(P9_DEBUG_CACHE, "(no mmap mode)"); - if (vma->vm_flags & VM_MAYSHARE) - return -ENODEV; invalidate_inode_pages2(filp->f_mapping); return generic_file_readonly_mmap(filp, vma); } From patchwork Mon Jul 17 16:29:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Van Hensbergen X-Patchwork-Id: 13315994 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 136BA253C8 for ; Mon, 17 Jul 2023 16:29:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2BAE7C433CB; Mon, 17 Jul 2023 16:29:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689611346; bh=J5f/y73gbpYzAPzzqE3aQSPO6NaFKpqMLlK+5QoR/ac=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Jbsob+5eNtbIFKANOFOdj+SVGklOF2uuGBVENNkiCnH6O4NdsDh1SfnY0TFd4im4E 3geBuWgHoO0mRJ5BV/zvHzfnHBFK0wWd0Rhf5FrRn49iDiIvbTIpnw6Qiv0sgDavlV 3AJi5EJ+4BJVmhlUhVRPQ7MWLg9oMQkIQ2c5JmFyRVJ/SEfmuHViZl0YYIVc8Xehr7 ht1lBOOz6vtH9ZS7eagxjA82K9jzMb+7Bl5A+yxQcPlVr+Q41S/eVgyGUIMUv503Ob D5ZMMMB9oU8VhWC/l1z014kyx9NCc9OFC93JO5cA27UK9MY71Yw4PhTM2q2NuOcqgh 2X94XS0ev7iRA== From: Eric Van Hensbergen Date: Mon, 17 Jul 2023 16:29:01 +0000 Subject: [PATCH 2/3] fs/9p: fix typo in comparison logic for cache mode Precedence: bulk X-Mailing-List: v9fs@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230716-fixes-overly-restrictive-mmap-v1-2-0683b283b932@kernel.org> References: <20230716-fixes-overly-restrictive-mmap-v1-0-0683b283b932@kernel.org> In-Reply-To: <20230716-fixes-overly-restrictive-mmap-v1-0-0683b283b932@kernel.org> To: Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck Cc: v9fs@lists.linux.dev, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Robert Schwebel , Eric Van Hensbergen X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=801; i=ericvh@kernel.org; h=from:subject:message-id; bh=J5f/y73gbpYzAPzzqE3aQSPO6NaFKpqMLlK+5QoR/ac=; b=owEBbQKS/ZANAwAKAYj/1ftKX/+YAcsmYgBktWxPBdEw2pHkHpJf4Xrs3jq2I1uQxbOZVPS9P 0SXZzDTniqJAjMEAAEKAB0WIQSWlvDRlqWQmKTK0VGI/9X7Sl//mAUCZLVsTwAKCRCI/9X7Sl// mDCRD/9ikTI1Hr1beF9eb5g7a/YtQi7qfsc5Y7ivQJ7Y1EVQc2SnXcCmMNcL1QMqqPS/Mi9GOmc Knfagji4/igxXJxzv5X/3QQfyTsAnHUeU66Lza2/bqXbStwdyrPMxOxd0/DkWjHPe+yEKhZZyTT gTFyUze61f5frLrmupDaHkqbum5R8zbpns4UmKMOxcHh40QGfMmwFCJa3lVate72qecFe0HZ2im ECX19Mv5XSRJ0CkQu/DyFFyFGGNNRE2Lb12vdoj4jN0Ve4CEsuxIdeLjuSscy/INnPFahg9KOMM Q/5NpaPq9VHrAqqgRMM6kqI+W3qzj9FlTg8BtWEeEvKZ48/owazDkYRzwJyT4u93INDREraNfw+ I/v4QvmgI52LHDB4Bg4Jx4KIMW6iuqD6MOPJJNBrlAayGwhhpWq/r+nSrqWhJQeSsH6/O2J9U7V WG3DDqqxeZHzUqJaZNqqNueStcIl4i3qT+T7hHpSREX8d/UYqzw9Pgzfq1EGMpsQ+Rxy+f0FJZd YF0EvBRrJyvNfxmcCnwb6KGMHn4ndXYaSSumXr9D7oOag+btXlwjfpYngzhyV7b0BFr72pG+wD2 Y/vSlcQNXpSEPh1463LeNfg8wEnXGipjJvuo2EhMYPHb3zy/0/Vtefp1y/P0DKgaF8yUOs7pucP KwXH+8uf62IF9yw== X-Developer-Key: i=ericvh@kernel.org; a=openpgp; fpr=9696F0D196A59098A4CAD15188FFD5FB4A5FFF98 There appears to be a typo in the comparison statement for the logic which sets a file's cache mode based on mount flags. Signed-off-by: Eric Van Hensbergen Reviewed-by: Dominique Martinet Reviewed-by: Christian Schoenebeck --- fs/9p/fid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/9p/fid.h b/fs/9p/fid.h index 0c51889a60b33..297c2c377e3dd 100644 --- a/fs/9p/fid.h +++ b/fs/9p/fid.h @@ -57,7 +57,7 @@ static inline void v9fs_fid_add_modes(struct p9_fid *fid, int s_flags, (s_flags & V9FS_DIRECT_IO) || (f_flags & O_DIRECT)) { fid->mode |= P9L_DIRECT; /* no read or write cache */ } else if ((!(s_cache & CACHE_WRITEBACK)) || - (f_flags & O_DSYNC) | (s_flags & V9FS_SYNC)) { + (f_flags & O_DSYNC) || (s_flags & V9FS_SYNC)) { fid->mode |= P9L_NOWRITECACHE; } } From patchwork Mon Jul 17 16:29:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Van Hensbergen X-Patchwork-Id: 13315995 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47012253C8 for ; Mon, 17 Jul 2023 16:29:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E34DC433CA; Mon, 17 Jul 2023 16:29:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689611347; bh=oLQSaca6C3+dC9X6PrVs62lkR/VnjdA0ABRf6CYLTn4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=mF9WgaFHfh7/nkSXFaUSle/aJPwsbgCYu5sjEaKiau1FgvJi441GhLi7St8cF2Zv5 aaKKLmSTuVLFyFwz7u43uPYV96r6oDxm/f1i/1MkrrgqJ0BZIVKtnhHk9JLdVCMUUd g9jjf+sv846mlCkevsR0xcpDPxGsgWfSZ1438VRAYaAcx1SYVbXd/9e3sGuw344kXi AQkOhEcZ2S90xAuftc4/FlcheOY56GVg5ViJ1i4ZmpTAKOB/hmRVRDI77/GfcXa1G4 gORF6f9h+Qy4sMNrzcsAE/gzk9SONY5Gd+/os0hx+O1KJvX75JrBaO1P7Hb9AfhT/p Tk5UANY+Y9XVA== From: Eric Van Hensbergen Date: Mon, 17 Jul 2023 16:29:02 +0000 Subject: [PATCH 3/3] fs/9p: fix type mismatch in file cache mode helper Precedence: bulk X-Mailing-List: v9fs@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230716-fixes-overly-restrictive-mmap-v1-3-0683b283b932@kernel.org> References: <20230716-fixes-overly-restrictive-mmap-v1-0-0683b283b932@kernel.org> In-Reply-To: <20230716-fixes-overly-restrictive-mmap-v1-0-0683b283b932@kernel.org> To: Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck Cc: v9fs@lists.linux.dev, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Robert Schwebel , Eric Van Hensbergen X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=868; i=ericvh@kernel.org; h=from:subject:message-id; bh=oLQSaca6C3+dC9X6PrVs62lkR/VnjdA0ABRf6CYLTn4=; b=owEBbQKS/ZANAwAKAYj/1ftKX/+YAcsmYgBktWxPIC0EaLAznACdWpUQZhpLof/8y5QRbyo1C QtxwvZGd9qJAjMEAAEKAB0WIQSWlvDRlqWQmKTK0VGI/9X7Sl//mAUCZLVsTwAKCRCI/9X7Sl// mJsQD/oC9v+6jOyzJWP6TF7YZ4ZbDp44VBwwjLdS+s5gxEipUVbBCq4gn76JX1RR1GLCFwsTOpX HLxAFpWM+XPKORHARacmgzm3S1n74LX6ORqYOX1lyYEkc5kCAUhKOIwi0WVmxdq4NQcEqC9mW/r SGpgBb9vK4ZB9Xh7WFwlXQf64AuVRqTSoRUP2wnv//5bTx3BDnX8k8iY5ouw6Q1HhmUImxmOjO5 /shsp0gb385wt1CzlIz7FLS4OInE5cw4rTJsX/imwQCho4B/R48qrW4bWg57niVAjnH7hBIGoLg kvDjO1MPspB57+T/E+jT6OKLN7uBgPv1ruIaaco36A6cVCMOfwoOJwazOBO1h5d5n4FC4kR0Qiq tp29N6A8l58InIH7pN53rd2N3XR9Kxr2kaGtfHOKNltjqA17f5KlKlhK1AKeQYyGPlBq1VUjrIa 71gv44P90Gnee5qmmUSlBS3Dicw4KQCWE53rBn0ed89ATnzma20+cXjlR9WRnA1UuyAesVgueL9 VrcuQgOdLzYqGxImS/mEjGTn8Puxap6mbUIPCzpPP922XiLdMGbXNZ/0258Xvk+gc4Nv3GDsDmP sSS7k0l9gayH2basmCQMid1yTv7Fe3/S6P2retom9fo4bEK5FS5BA4flJn2O8iEB1VuwyLld3jt 8We55fT5hyekujQ== X-Developer-Key: i=ericvh@kernel.org; a=openpgp; fpr=9696F0D196A59098A4CAD15188FFD5FB4A5FFF98 There were two flags which had incorrect type in the paramaters of the file cache mode helper function. Signed-off-by: Eric Van Hensbergen Reviewed-by: Dominique Martinet --- fs/9p/fid.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/9p/fid.h b/fs/9p/fid.h index 297c2c377e3dd..29281b7c38870 100644 --- a/fs/9p/fid.h +++ b/fs/9p/fid.h @@ -46,8 +46,8 @@ static inline struct p9_fid *v9fs_fid_clone(struct dentry *dentry) * NOTE: these are set after open so only reflect 9p client not * underlying file system on server. */ -static inline void v9fs_fid_add_modes(struct p9_fid *fid, int s_flags, - int s_cache, unsigned int f_flags) +static inline void v9fs_fid_add_modes(struct p9_fid *fid, unsigned int s_flags, + unsigned int s_cache, unsigned int f_flags) { if (fid->qid.type != P9_QTFILE) return;