From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=95.215.58.148 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795039333; b=r5SQ0xs60nNY9A+u02W2NqOwEFmAUsM3Cj0sBWxn831ZEWgnkCGMDRueF+RPh/bvDUa7 lRJKzTqHEXr8QHB/Hul8loIvVBRkACIJdR+jdwi5WUx940EDywo2BwyVsINs8IMCfYpLC uI/xo4h1i0v6cmAzLSN+UUwby0pY1Kl+svsAwL7ikoDEVJB7+x4el9svyZ7s5g74WVHn2 QrMexS/T2ptShPhCp3ERaao0z+fdHOMHLtV/6X3/mSXVTHU0jUTvzPu5dFK4/JMV47JPP dptAXLgGOq9hKgablUbYDDM4L5eqgkCXvmNzQqZpMvQTl4+FEMQrnofgBOEF4WIO1IQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795039333; h=DMARC-Filter:X-Envelope-To:DKIM-Signature:X-Envelope-To:Received: X-Mizu-Trace-ID:X-Migadu-Flow:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=1qf7uSDTfTPQk21efhm/tBhbA5RvbiTTxPmHSCVNVdY=; b=RpB/D+XZVn9U/H7QUIQePb9XvSuoV5V/Bk7eP5PN8+SplQukBrpCHyBV/8CXCyaFIARk uRSlMRq3MfKbw6Eumd/EHJK/i03UKFxJldrYoEhuSndOfcKi5ZctDMSfYkqvxEJytA3F8 FkekSFV7S0QMrS6DdJ881S30WIbb4CdADCvZ24cyAikBCmbC8cvbRmJWtwdXjU7fKNJyu uxsP2tWMoykmEgHwvbJPVWCWLd9mSyoCsX7cYKjRL2JhmirBAxmwndHXCsM2/c5+K6qqO u1f7g/6ouU3m46uwF+OVR/ct8Csb+WDWyaUF1iYRZ3+7H8orqOaqKE4JL5PYe8ouBUw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=hxHgjYM2; arc=none smtp.remote-ip=95.215.58.148 Received: from mta1.migadu.com (out-148.mta1.migadu.com [95.215.58.148]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3ACCB60A260C for ; Wed, 18 Nov 2026 22:02:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 3ACCB60A260C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=hxHgjYM2 X-Envelope-To: driver-core@lists.linux.dev DKIM-Signature: a=rsa-sha256; bh=eU2UIWc/uDPlgdmNIZspsaWM4Vgx4y9vwFWYm84K9e4=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1795039331; v=1; x=1795644131; b=hxHgjYM2anoEq74CI9NwQcPpC6JjbuySHHxCHdrvnKt8whXC+LRgApCTd+8/Vc6L+z2zzkTO 1+qJ1dU/T2VRCYSfCn2jQi6m2N2qqUw73L2u1iwLoLWxw5BD4WY1KP6+AWxu8hnhkpq2hbL+Swq MOlBdYLYXEiBTWxwXVtliWi8= X-Envelope-To: driver-core@lists.linux.dev Received: by smtp.migadu.com with ESMTPS id b8c0479c3466e940; Wed, 18 Nov 2026 22:02:11 +0000 X-Mizu-Trace-ID: b8c0479c3466e940 X-Migadu-Flow: FLOW_OUT From: Shakeel Butt To: Christian Brauner Cc: Greg Kroah-Hartman , Tejun Heo , Jori Koolstra , Ian Kent , "T . J . Mercier" , Meta kernel team , linux-fsdevel@vger.kernel.org, driver-core@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] kernfs: don't take kernfs_iattr_rwsem to publish KERNFS_REMOVING Date: Wed, 18 Nov 2026 14:01:51 -0800 Message-ID: <20261118220154.2965621-5-shakeel.butt@linux.dev> X-Mailer: git-send-email 2.53.1 In-Reply-To: <20261118220154.2965621-1-shakeel.butt@linux.dev> References: <20261118220154.2965621-1-shakeel.butt@linux.dev> X-Mailing-List: driver-core@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit __kernfs_remove() takes kernfs_iattr_rwsem for writing while it marks a subtree KERNFS_REMOVING, inside kernfs_rwsem. Commit 507d8ce13f5b ("kernfs: Don't set_nlink for directories being removed") added it so that a refresh would not set the i_nlink of a directory whose removal has started. The refresh no longer sets i_nlink, so the lock is not needed. The flag is only set here, under kernfs_rwsem. Inode setup reads it under kernfs_rwsem. getattr reads it without and reports the old link count or 0, either of which is right for a stat() racing the removal. Drop the lock, mark the store and the load, and read the flags once in kernfs_dir_nlink(), as the type bits share the word. kernfs_iattr_rwsem write acquisitions (lock_stat), before -> after: 5 dummy netdevs created and removed 1110 -> 740 100 cgroup mkdirs and 100 rmdirs 4500 -> 3000 Signed-off-by: Shakeel Butt --- fs/kernfs/dir.c | 10 ++++++---- fs/kernfs/inode.c | 7 +++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c index ef23eac684c6..890aca5d8d70 100644 --- a/fs/kernfs/dir.c +++ b/fs/kernfs/dir.c @@ -1604,15 +1604,17 @@ static void __kernfs_remove(struct kernfs_node *kn) pr_debug("kernfs %s: removing\n", kernfs_rcu_name(kn)); - /* prevent new usage by marking all nodes removing and deactivating */ - down_write(&kernfs_root(kn)->kernfs_iattr_rwsem); + /* + * Prevent new usage by marking all nodes removing and deactivating. + * KERNFS_REMOVING is only set here, under kernfs_rwsem. + * kernfs_dir_nlink() reads it without that lock. + */ pos = NULL; while ((pos = kernfs_next_descendant_post(pos, kn))) { - pos->flags |= KERNFS_REMOVING; + WRITE_ONCE(pos->flags, pos->flags | KERNFS_REMOVING); if (kernfs_active(pos)) atomic_add(KN_DEACTIVATED_BIAS, &pos->active); } - up_write(&kernfs_root(kn)->kernfs_iattr_rwsem); /* deactivate and unlink the subtree node-by-node */ do { diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c index 2f463c0354a5..ca234f69882b 100644 --- a/fs/kernfs/inode.c +++ b/fs/kernfs/inode.c @@ -165,9 +165,12 @@ static inline void set_inode_attr(struct inode *inode, */ static bool kernfs_dir_nlink(struct kernfs_node *kn, unsigned int *nlink) { - if (kernfs_type(kn) != KERNFS_DIR) + /* KERNFS_REMOVING can be set concurrently; read the flags once. */ + unsigned short flags = READ_ONCE(kn->flags); + + if ((flags & KERNFS_TYPE_MASK) != KERNFS_DIR) return false; - *nlink = (kn->flags & KERNFS_REMOVING) ? 0 : + *nlink = (flags & KERNFS_REMOVING) ? 0 : READ_ONCE(kn->dir.subdirs) + 2; return true; } -- 2.53.1-Meta