Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Stephen Brennan <stephen.s.brennan@oracle.com>
To:     Jan Kara <jack@suse.cz>
Cc:     linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
        Al Viro <viro@zeniv.linux.org.uk>,
        Stephen Brennan <stephen.s.brennan@oracle.com>,
        Amir Goldstein <amir73il@gmail.com>
Subject: [PATCH v4 2/5] fsnotify: Use d_find_any_alias to get dentry associated with inode
Date:   Fri, 11 Nov 2022 14:06:11 -0800
Message-Id: <20221111220614.991928-3-stephen.s.brennan@oracle.com>
In-Reply-To: <20221111220614.991928-1-stephen.s.brennan@oracle.com>
References: <20221028001016.332663-1-stephen.s.brennan@oracle.com>
 <20221111220614.991928-1-stephen.s.brennan@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LmipkT2K9W/wK6Q93AciZXsOHjEfZET4son8AuFN4fZNEus6nKPig3Hm87hz?=
 =?us-ascii?Q?jYrmsMWM8Kso9rk+4Z5WfHzaQM+bpAC4a6p7M7wiv6gkzjCbpwutQNc6n6f4?=
 =?us-ascii?Q?LvXMi60yahNAdMeZGnRfVpeJhQU6NaETsO+kyEJIomDn+8wT5trX2EYL5vql?=
 =?us-ascii?Q?sekCi4TdnCFQs0ec/+GXxksWh7a3uReX0c97n45eC8s7DX+tWVBFqcYn1YxX?=
 =?us-ascii?Q?N0l893PT/OkIpSgN4qFurtz8FTK/ZuZ3R9/1Z4HSw2RqhhX6NyZcwR0mBtk3?=
 =?us-ascii?Q?+gyS1efburfQU+iahIFWEJNcHHf3cNd0qFamUm4H/WS+e8S1ZzuQCtMMVMWY?=
 =?us-ascii?Q?Uf4KnShwINs7y2T+ELMvnOeo/so8uJeNjeZpD5FgvIPRmcR9ZUwdv/2YsahJ?=
 =?us-ascii?Q?OuKCJO+v0/kKmsr/Mhjm6M4+EkGMB3RjwkI6azyOsJe2SAr+k3IkSzZKrWHP?=
 =?us-ascii?Q?ayHm0dmevblX+hYZ6D+YfP22h8htR/00P5WaiUyjdNcj5jRkoy13b9SiEDHs?=
 =?us-ascii?Q?cO+kZdNy5Jpc/V2HZeNfAmdinuf+tVm4IoAhpafanj7S7nOLsqSilFazsV8E?=
 =?us-ascii?Q?gqIwZnAAbWEK7a5h625NdZ5XW/WE0GeQUSd5VhEGd/hbgFirZphEkq7aWH8n?=
 =?us-ascii?Q?2SZYftFBOXKe+2ZxhTzm4Up7szggD3jooePxJvzsov5fHGk6Exl7Ocz/xPMe?=
 =?us-ascii?Q?0NpCYBb5DPyAMYflS/JH+7fvtnyVFDaBt3nJ0YoMoCuccdIxoCy9xJkILCxm?=
 =?us-ascii?Q?RKtBdOqOsA7i4B8UJs+5UA88bGCNLbwBZgBdMH6d8bLNaqu/dW5YUjBiy0Hh?=
 =?us-ascii?Q?ciaAEWUD0NLjuowQr4FAr5WbbCx2a7eTQYOfquUdRNi1D157CP6EoUaTaoFB?=
 =?us-ascii?Q?OiRta3jIAsMkisi8cW5gL5YUcjbvm29K3jvxydbjdkLLtP8B0/RDtZK7oiHy?=
 =?us-ascii?Q?9V9aenlhOaLHoOWp+NuDxuZGdtrf8LEgAL7nXrQsHy9S44LjorK2Nr53lNDv?=
 =?us-ascii?Q?9KbycyVL8J2/7RTfKJt0Y1Qdopk2c91NjE1E6kZT22vptHk73sAqgowlrhvQ?=
 =?us-ascii?Q?KW02lWrHaHsrytREC44JOv83sGLv9TU06SDMRL2fQ+MBbGwlIEq74CD0aDHs?=
 =?us-ascii?Q?c1w1upLxHhEomIICAwBGCv87PrLuLz4Bc96G9mgGAHNVYUsaPLM/Wv1OAbvo?=
 =?us-ascii?Q?UlUsZXkD0D5TZTBa20YjxtL2np5F/zHLn/uOqK5O1Z8XvWrg4B9jWnCH+MMw?=
 =?us-ascii?Q?/17FJ3TK4CCIgTVZlMbOP7UdatlQphZDp0D7n4YuI68zhqPLS/5WdZhDe+u1?=
 =?us-ascii?Q?C5XI57Js50F6nlxmnYzrz+U14/8BznsSIN8uPDNsn1jYZA9LrbaznRGDTuGY?=
 =?us-ascii?Q?7rMqaxvSUQVlNcc8fNcPBxNwT/A87XPrgyCpfZmsYuDqzVWgpHBF45nhjBri?=
 =?us-ascii?Q?vTyo7p6/35t6roqtYdYkUZm8GxZDkMougq02Zr0FfBsuKG4bV9J/7A05K9W+?=
 =?us-ascii?Q?/+22DngOKvYV19WmFFR5Yo2MXStAqnS3bqy5HlWFvaZY7bD9aqaUi84ZL7BD?=
 =?us-ascii?Q?1GYW67wMEYel0kiwBlUW51MJ0y+I4J8dF0MxJI1ElsGN/7iSKhhqrAE5OMr/?=
 =?us-ascii?Q?PQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 3U9P0vb/279LHNv8TM6GLUVjUpv9Y+EFwe0j4bNyoTBn9LoZ24RifN30knIAxiGT9bS82j2rAMQoe0ENOwZ93otJx2p8ILsSy23ikVTLYslKwcJtxEPZ9zHCRPmoy/BPtNswCrX9PZIsS7CC7SYrq8gz4vxv5zHWJglTdyRR3+lhcWYsukL1FUzj6CigKQBmU7Z3Om5wMTZXXAYCEhQ8HGXh99K7YPocCpY3Gielb/hpNo5xdXS0qPfrmHNCPWa3Y1LaE+G4INAo4RCgMnN1jtOtYsw6TQo+qUBxC697H80Nv2YRYKLLQ1rOS6iY0HDKYl6cVitnKSxBXXH13TiWuop+Gs/r6xkSUS0MiHKc/lU6CcwuqRenA+m6k7i4v2Em/xKuHKXuE+FkOqrTpoFeL4N46jcElHa5mGkhvVYr7hN4onkaUSh4du/4O6jvc+62Sezx50kWl0GDIpNMymgnlyGqb7QU7rpRQaa36w5XFQZskz407va6ilejjJ8YXi2YjhX0mLKJocEpKa+4qlf18HbgtJGgVIEp+qzphGFczXIkXuh3qA4xDRrFVXU5xpT57HEgoLeB9JzXLhYmRgBs7mVDmHC6CSRWF9/SPA6eKp79KeNjHolSq831AH2SUlWsbu+LgJoe7lXHlq/y01PEcAzxFn7WioxS31xQs0it9V9Z1EQjWbgaMl1/e0hQhm3ermhziWCldS+lPPFgSaXMrcxOxrMaNyfv2R8mN7vvVyq2HeQmBxCcvZn84sLoS21XEMVHs4weUcMHkpWzaBoc/0HaVA60I5B9GyrueLYWP63AJZ3J5+wqXXv5orB9k9JhuVu7sAqJqY7owBEQT95sZIP/62TWfcJCQ7IKx+vfuQSm99vLbp6vPMjPsKfy1hCcPaWXxKa5WRWxb+I0vcgz/w==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5036e0a7-4f56-45fe-6efd-08dac430f729
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4166.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2022 22:06:21.1758
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: CbDyTeGGLxRsO6BGI6Four0J2yrlWvYpT+aZGePRzj6QkPSvFCAj9E1dM2bFYURAWrRK/9eKBxihUMpeowfIZrI6OsCkWZq+U50xi2HvuCc=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4535
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-11-11_11,2022-11-11_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 spamscore=0
 bulkscore=0 suspectscore=0 adultscore=0 malwarescore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000
 definitions=main-2211110149
X-Proofpoint-GUID: CVkloTK151cW8yO6y7JXXcHrtvwDu6A9
X-Proofpoint-ORIG-GUID: CVkloTK151cW8yO6y7JXXcHrtvwDu6A9
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Rather than iterating over the inode's i_dentry (requiring holding the
i_lock for the entire duration of the function), we know that there
should be only one item in the list. Use d_find_any_alias() and no
longer hold i_lock.

Signed-off-by: Stephen Brennan <stephen.s.brennan@oracle.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
---

Notes:
    Changes in v4:
    - Bail out if d_find_any_alias() returns NULL
    - Rebase on Amir's patch
    Changes in v3:
    - Add newlines in block comment
    - d_find_any_alias() returns a reference, which I was leaking. Add
      a dput(alias) at the end.
    - Add Amir's R-b

 fs/notify/fsnotify.c | 46 ++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c
index 2c50e9e50d35..409d479cbbc6 100644
--- a/fs/notify/fsnotify.c
+++ b/fs/notify/fsnotify.c
@@ -105,35 +105,35 @@ void fsnotify_sb_delete(struct super_block *sb)
  */
 void fsnotify_update_children_dentry_flags(struct inode *inode, bool watched)
 {
-	struct dentry *alias;
+	struct dentry *alias, *child;
 
 	if (!S_ISDIR(inode->i_mode))
 		return;
 
-	spin_lock(&inode->i_lock);
-	/* run all of the dentries associated with this inode.  Since this is a
-	 * directory, there damn well better only be one item on this list */
-	hlist_for_each_entry(alias, &inode->i_dentry, d_u.d_alias) {
-		struct dentry *child;
-
-		/* run all of the children of the original inode and fix their
-		 * d_flags to indicate parental interest (their parent is the
-		 * original inode) */
-		spin_lock(&alias->d_lock);
-		list_for_each_entry(child, &alias->d_subdirs, d_child) {
-			if (!child->d_inode)
-				continue;
+	/* Since this is a directory, there damn well better only be one child */
+	alias = d_find_any_alias(inode);
+	if (!alias)
+		return;
 
-			spin_lock_nested(&child->d_lock, DENTRY_D_LOCK_NESTED);
-			if (watched)
-				child->d_flags |= DCACHE_FSNOTIFY_PARENT_WATCHED;
-			else
-				child->d_flags &= ~DCACHE_FSNOTIFY_PARENT_WATCHED;
-			spin_unlock(&child->d_lock);
-		}
-		spin_unlock(&alias->d_lock);
+	/*
+	 * run all of the children of the original inode and fix their
+	 * d_flags to indicate parental interest (their parent is the
+	 * original inode)
+	 */
+	spin_lock(&alias->d_lock);
+	list_for_each_entry(child, &alias->d_subdirs, d_child) {
+		if (!child->d_inode)
+			continue;
+
+		spin_lock_nested(&child->d_lock, DENTRY_D_LOCK_NESTED);
+		if (watched)
+			child->d_flags |= DCACHE_FSNOTIFY_PARENT_WATCHED;
+		else
+			child->d_flags &= ~DCACHE_FSNOTIFY_PARENT_WATCHED;
+		spin_unlock(&child->d_lock);
 	}
-	spin_unlock(&inode->i_lock);
+	spin_unlock(&alias->d_lock);
+	dput(alias);
 }
 
 /*
-- 
2.34.1