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 73DC7D711BC for ; Wed, 20 Nov 2024 16:02:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 033506B0095; Wed, 20 Nov 2024 11:02:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F22C36B0099; Wed, 20 Nov 2024 11:02:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DEAD96B009A; Wed, 20 Nov 2024 11:02:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C52236B0095 for ; Wed, 20 Nov 2024 11:02:52 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 51E8FAE60A for ; Wed, 20 Nov 2024 16:02:52 +0000 (UTC) X-FDA: 82806941280.29.BB38F1E Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf03.hostedemail.com (Postfix) with ESMTP id 406E720031 for ; Wed, 20 Nov 2024 16:02:25 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=cPL8HFP6; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=CeqAFCN+; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=cPL8HFP6; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=CeqAFCN+; spf=pass (imf03.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1732118420; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=AmP2A+ShM59AJ2PeA+C8ggNciw9KPOOhXEG938mquuE=; b=OkXP6dgNtf2COmMqxUgS340LoskzDzI4mAIvCoLzdL6KdFa5mUoKNL7uxlWj5kaVXK3kCG FPvBpS64Tigg2LFKCh8DhS9iUpC2Ln4pFLiXTzL1Ri4D2BK4R2o/CzLrJpcaX6cl4f+DlH iKCrsx2kD1Vsy+0sXLRZI6nshN6MriU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1732118420; a=rsa-sha256; cv=none; b=oZRhGMygMwue1ldvG6qD/Iwqu4UGk/QqaLxOolUlPdSgyJ2msvzSXHprNHc4X4iSFehPpZ FyhhTrMttVkWE/TqkYdN3cTmNslMZ/BrtbsOD1F3mEBZ91oybxbrV3QMuFVUfjPiCK9bYV +1NWW3DkSpPRi6PFAp9K+MmS05Alu4o= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=cPL8HFP6; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=CeqAFCN+; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=cPL8HFP6; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=CeqAFCN+; spf=pass (imf03.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 653D5219D2; Wed, 20 Nov 2024 16:02:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1732118568; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=AmP2A+ShM59AJ2PeA+C8ggNciw9KPOOhXEG938mquuE=; b=cPL8HFP6J7v/QnK9pgvClidCMVHk1Zp32roF7o0Edg5tZgSEtfU8F/QdPP6Q9qD+3LwLGR QrnY+koK8lg3QXn+oAqBawaUPtlBXzkTC/EiGb1pwHorQyy8J9uF0vRj67mWu6/QBSZkHY rvEja+P50fOl3SFAKNHs93jswrd0zQ4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1732118568; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=AmP2A+ShM59AJ2PeA+C8ggNciw9KPOOhXEG938mquuE=; b=CeqAFCN+l4TeJ7YA7twpK9X/7BztbIh5T8H3kto7+IGsAz4hbFaxvocNBMALmVg4mJIi9V xsnhKTaUfUVe8vBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1732118568; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=AmP2A+ShM59AJ2PeA+C8ggNciw9KPOOhXEG938mquuE=; b=cPL8HFP6J7v/QnK9pgvClidCMVHk1Zp32roF7o0Edg5tZgSEtfU8F/QdPP6Q9qD+3LwLGR QrnY+koK8lg3QXn+oAqBawaUPtlBXzkTC/EiGb1pwHorQyy8J9uF0vRj67mWu6/QBSZkHY rvEja+P50fOl3SFAKNHs93jswrd0zQ4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1732118568; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=AmP2A+ShM59AJ2PeA+C8ggNciw9KPOOhXEG938mquuE=; b=CeqAFCN+l4TeJ7YA7twpK9X/7BztbIh5T8H3kto7+IGsAz4hbFaxvocNBMALmVg4mJIi9V xsnhKTaUfUVe8vBA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 53CF7137CF; Wed, 20 Nov 2024 16:02:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id sQnyEygIPmdiTgAAD6G6ig (envelope-from ); Wed, 20 Nov 2024 16:02:48 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 06A94A08A2; Wed, 20 Nov 2024 17:02:48 +0100 (CET) Date: Wed, 20 Nov 2024 17:02:47 +0100 From: Jan Kara To: Josef Bacik Cc: kernel-team@fb.com, linux-fsdevel@vger.kernel.org, jack@suse.cz, amir73il@gmail.com, brauner@kernel.org, torvalds@linux-foundation.org, viro@zeniv.linux.org.uk, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-mm@kvack.org, linux-ext4@vger.kernel.org Subject: Re: [PATCH v8 03/19] fsnotify: add helper to check if file is actually being watched Message-ID: <20241120160247.sdvonyxkpmf4wnt2@quack3> References: <2ddcc9f8d1fde48d085318a6b5a889289d8871d8.1731684329.git.josef@toxicpanda.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2ddcc9f8d1fde48d085318a6b5a889289d8871d8.1731684329.git.josef@toxicpanda.com> X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 406E720031 X-Stat-Signature: r16frjr7xwin1ijuw6wqiz3kp1xnzt9s X-HE-Tag: 1732118545-195136 X-HE-Meta: U2FsdGVkX19sNLxVLHo5w1vDd5j+CElPw0nNhpReQdctJnjGUB1rli2yXv3+/R6shcWBFwrbm+1rtGXlGaptq6iNXOz2yQVUCppWWsOnUAAgUMH7ojssuXiTRREpcbj0xI6YFTopU2sGd4niXa4GQI9OBZU+MVftTwpdJplerab1q/y8BVoEVSDB5tnL17jfg1iQ5b2HPAVT61X8l51Zst0hfo3VfdxIL1FW5UIEUTkTxfrqau5vJVFijJwf5StOXZXazKOBAa4Th6xcvUcd5eQ3WgEhn8RytRxX0gsSOFRoskM7BC+CHeL6nAMvClvWogbnFUVRnRzuXVIbWZG5eASFgnzHDIjO0bkwXRZ4nakmFi15sXsURBcVrx11vr6cOo1SMEV0xokcVJXTQhX3ZUMCApq8QzQLLs6yq8MXNLvJCbJsErTfsmgUHTI/vHR1eeWjRfSWTcUBYxo2aB5NE80J9JB56mwHoARMmxYeAFQ5b/tJfBwdhT9QJ2quWXtkkmKLlUzDmG0+hRi6BnxLWiOjnZRW2gHx1heDdqoe6cQIw0MjV8/lC9Qcx1WCVr8B0XuoQAQr8b8sN2prhq/N2HZUezkytEquAW69M4+bzarN6Xax1BBE8avyhECIEx0RE02Gn4Ny+ZrT7/rODzdsmHUA8YlgNzvedGAFBgYBtL9vGxq3z2tvHsWKUUPbEZQprumBJzJeh2CrBvOxUkIgY0iNXZ5Dn+G8/bLGy4Z3DeD4yX/IEU+k/CiKxwhnB/151QunkJbBujzEqlF7vOpVh1gf3EJ3uV2wjFjvGV0fYwD3nSKz9B23WbAGOfqfjE+YVNHVTeSEtLES3VmSEnQWad5Z2xqiieYH3Yk7ql2PWXntLxXuZtLcxm0OE/o33WdFb6dqtnKCqo2j6dohMEJBV5MspWbjHSujqQnoLsDRM/EpeviuNSPHLwIalsWmEjB8eOzQgo8WZYz3MjERThc G0Xgpauv FHSvc8xd3LG5x8bHxj2ZXPd6zIH7PkLzB3Prn1/OrFiXElszkAFhZCzxoJineFjoQih5sFoUVkKlhES6mXnJg7mUCdzH/tVKKbLcmxQmIvjd16v8WEvz3zpXwKi8k+IbdWpwCMNuaks1Orv3xiSXlYVXx4N4tcLFmGdPxRCcf7YKzaiza5jOVNa/pi7cPUpnCUnNDzyo1wf66wKlpXe+hfTeuf9etDiplRC06DAk3GmylDgYBH+3fyfwBctazBq20jK8XYwoU6F92iYgVv+o9oJMlaUq+t0WrjzYzNITwMvYQu1+GjUsJLsuJXNlBmR9sWbY/SMEFjZcbXPvTX4/RwJCHNUZHj4yTJoNtGvY/H3uJHnQ= 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: On Fri 15-11-24 10:30:16, Josef Bacik wrote: > From: Amir Goldstein > > So far, we set FMODE_NONOTIFY_ flags at open time if we know that there > are no permission event watchers at all on the filesystem, but lack of > FMODE_NONOTIFY_ flags does not mean that the file is actually watched. > > To make the flags more accurate we add a helper that checks if the > file's inode, mount, sb or parent are being watched for a set of events. > > This is going to be used for setting FMODE_NONOTIFY_HSM only when the > specific file is actually watched for pre-content events. > > Signed-off-by: Amir Goldstein I did some changes here as well. See below: > -/* Are there any inode/mount/sb objects that are interested in this event? */ > -static inline bool fsnotify_object_watched(struct inode *inode, __u32 mnt_mask, > - __u32 mask) > +/* Are there any inode/mount/sb objects that watch for these events? */ > +static inline __u32 fsnotify_object_watched(struct inode *inode, __u32 mnt_mask, > + __u32 events_mask) > { > __u32 marks_mask = READ_ONCE(inode->i_fsnotify_mask) | mnt_mask | > READ_ONCE(inode->i_sb->s_fsnotify_mask); > > - return mask & marks_mask & ALL_FSNOTIFY_EVENTS; > + return events_mask & marks_mask; > } > > +/* Are there any inode/mount/sb/parent objects that watch for these events? */ > +__u32 fsnotify_file_object_watched(struct file *file, __u32 events_mask) > +{ > + struct dentry *dentry = file->f_path.dentry; > + struct dentry *parent; > + __u32 marks_mask, mnt_mask = > + READ_ONCE(real_mount(file->f_path.mnt)->mnt_fsnotify_mask); > + > + marks_mask = fsnotify_object_watched(d_inode(dentry), mnt_mask, > + events_mask); > + > + if (likely(!(dentry->d_flags & DCACHE_FSNOTIFY_PARENT_WATCHED))) > + return marks_mask; > + > + parent = dget_parent(dentry); > + marks_mask |= fsnotify_inode_watches_children(d_inode(parent)); > + dput(parent); > + > + return marks_mask & events_mask; > +} > +EXPORT_SYMBOL_GPL(fsnotify_file_object_watched); I find it confusing that fsnotify_object_watched() does not take parent into account while fsnotify_file_object_watched() does. Furthermore the naming doesn't very well reflect the fact we are actually returning a mask of events. I've ended up dropping this helper (it's used in a single place anyway) and instead doing the same directly in file_set_fsnotify_mode(). @@ -658,6 +660,27 @@ void file_set_fsnotify_mode(struct file *file) file->f_mode |= FMODE_NONOTIFY | FMODE_NONOTIFY_PERM; return; } + + /* + * OK, there are some pre-content watchers. Check if anybody can be + * watching for pre-content events on *this* file. + */ + mnt_mask = READ_ONCE(real_mount(file->f_path.mnt)->mnt_fsnotify_mask); + if (likely(!(dentry->d_flags & DCACHE_FSNOTIFY_PARENT_WATCHED) && + !fsnotify_object_watched(d_inode(dentry), mnt_mask, + FSNOTIFY_PRE_CONTENT_EVENTS))) { + file->f_mode |= FMODE_NONOTIFY | FMODE_NONOTIFY_PERM; + return; + } + + /* Even parent is not watching for pre-content events on this file? */ + parent = dget_parent(dentry); + p_mask = fsnotify_inode_watches_children(d_inode(parent)); + dput(parent); + if (!(p_mask & FSNOTIFY_PRE_CONTENT_EVENTS)) { + file->f_mode |= FMODE_NONOTIFY | FMODE_NONOTIFY_PERM; + return; + } } Honza -- Jan Kara SUSE Labs, CR