Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Stephen Brennan <stephen.s.brennan@oracle.com>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     Konrad Wilk <konrad.wilk@oracle.com>,
        Alexander Viro <viro@zeniv.linux.org.uk>,
        Stephen Brennan <stephen.s.brennan@oracle.com>,
        linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH v6 1/1] proc: Allow pid_revalidate() during LOOKUP_RCU
Date:   Mon,  4 Oct 2021 10:56:29 -0700
Message-Id: <20211004175629.292270-2-stephen.s.brennan@oracle.com>
In-Reply-To: <20211004175629.292270-1-stephen.s.brennan@oracle.com>
References: <20211004175629.292270-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?k5uiFNzSmoswzpLvGjibsI7hCZhawsNh2Ov3b5bfe04zHjiI2HxVKphopHve?=
 =?us-ascii?Q?tpe0HVad6xy0QZ1dPW3iMVk1NfBaISQyARSOUiEWL4KT0sD3Q0cnaqG/qJ7C?=
 =?us-ascii?Q?XIrW+aQfdqElZh3yYs0xp8KyB4s+LCpX6CMST8SQb+CcA5I2UILIc1pfDQe2?=
 =?us-ascii?Q?efHmgJA886Q85lR34OUGfXgLIO+qTqLz+KD2uSwL4QvXxIcqKa723eCVZyo6?=
 =?us-ascii?Q?9hEcJX1KGVziqVxyXDlhBiX+pxQGElDvJkJtNbIIhIYhOLkN2F5je2vgf34H?=
 =?us-ascii?Q?0sLZ0oMhhI6zJJ/YhMMe1oX9IT2IXlITwA/RIkjyYKAzQ6pYB1NGbVg3HPLx?=
 =?us-ascii?Q?qXcO4PfW9FPyd5OjpMpGRQMMgvplX0YUBRh7II+YPfjEE8cC8j/HOim2it2Q?=
 =?us-ascii?Q?6ZSFfXjQLLUFuwB88/jEaVR8HUiE7O8pyYJMxv1A2ZweKMziiy8N2mP5KUTd?=
 =?us-ascii?Q?arvEgBQsMkZeCRYSHVDb9UiTksO22Blvfq9+E/hes/aIv3G8k4j9DF+fP1y/?=
 =?us-ascii?Q?8WRLbQqnwp2vQCxLvUQYliRdUX8CglTYbkH/amZoKMnDe3kjO+UgwBKo/t3a?=
 =?us-ascii?Q?HuyvaVEqPZjEBeUzj3odMOhnA4jgmb/glrp96gUlMBFGa756Ryvfn5Vq2vhk?=
 =?us-ascii?Q?QToXixeKl0ZVZHKHTEMRYnwDJmKRlzW2R3I/JhfMVdiTOa4y4AHoXdhgNsTe?=
 =?us-ascii?Q?dRqzb5+KKCP8k+fjilSoBISHnXZAUHlZ1F/s1Nmdi8EtChpGmLsFmB6iBh9Y?=
 =?us-ascii?Q?lBavvfeYu5iNtFJu3bJfVJMz0JfioahI+Om+JhOF57JRxfBWXtgR+Jigax5V?=
 =?us-ascii?Q?150NS7+bCwbdMuAvUF1Kk40oWk5rPKwGz5nZUi2J5cQCyd2Do4A/99puRa+O?=
 =?us-ascii?Q?CnEg0lJnaQTpkgy9Vx2+m1qMQ9cCehH5U/2cK0/Gs8m42Shp/gW9Mv7lWl5w?=
 =?us-ascii?Q?yRepwJMHulXBU4rDDmQ1DuMheOM99XZR8njHu1iWFnH36KDcgUrPZ7SVbrol?=
 =?us-ascii?Q?blhl8oOQsmkMTd1+L4Npr/IROVnnxgdLqDVMhgZdZc+F3yE+P/Mjvw4c/p94?=
 =?us-ascii?Q?MUVL0G5bJXVAzhc4sSrwK04oA+80JOufJNEJh9hBjKqRoW+uT8G0kyWdVl5u?=
 =?us-ascii?Q?zoeIET0K8XpAZXZMo3NEjFXWLB5X6YDpfuwTiXzXmFdQDWljkwmiZUmp30hu?=
 =?us-ascii?Q?KKwe/gxoZJygVDhlKNZvF36QSCu5pLuvuaKKifRRJFMO3Z2oogRHX1qmw0vb?=
 =?us-ascii?Q?u20OIxxfZycyslgd9/XR/zkDPTUoc8mdjJcFAEawm9Q1CXp+K6q1E4Qz41nd?=
 =?us-ascii?Q?iP1NdBknNQHoG1sOHjHLDBjd?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ef0efbcb-0aea-4562-2171-08d987604e06
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4166.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2021 17:56:34.6833
 (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: LWZs4vWtkrYV25WG4NPqqr24Dk0FJ24iTUN/XYePWmsvhYMNEt4lf/UldBboJ1HFwpMV69+Q9mn5J0xw3E6HdNZyR/fuMFRfJpkHKIiSO30=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB4278
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10127 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 mlxlogscore=607 adultscore=0
 bulkscore=0 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001
 definitions=main-2110040124
X-Proofpoint-GUID: Rdcs0Jn-o_01l8qR2ucbQ7eqcYFUbHmk
X-Proofpoint-ORIG-GUID: Rdcs0Jn-o_01l8qR2ucbQ7eqcYFUbHmk
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The pid_revalidate() function drops from RCU into REF lookup mode. When
many threads are resolving paths within /proc in parallel, this can
result in heavy spinlock contention on d_lockref as each thread tries to
grab a reference to the /proc dentry (and drop it shortly thereafter).

Investigation indicates that it is not necessary to drop RCU in
pid_revalidate(), as no RCU data is modified and the function never
sleeps. So, remove the LOOKUP_RCU check.

Signed-off-by: Stephen Brennan <stephen.s.brennan@oracle.com>
---
 fs/proc/base.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 533d5836eb9a..3042ab418c31 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1979,19 +1979,21 @@ static int pid_revalidate(struct dentry *dentry, unsigned int flags)
 {
 	struct inode *inode;
 	struct task_struct *task;
+	int ret = 0;
 
-	if (flags & LOOKUP_RCU)
-		return -ECHILD;
-
-	inode = d_inode(dentry);
-	task = get_proc_task(inode);
+	rcu_read_lock();
+	inode = d_inode_rcu(dentry);
+	if (!inode)
+		goto out;
+	task = pid_task(proc_pid(inode), PIDTYPE_PID);
 
 	if (task) {
 		pid_update_inode(task, inode);
-		put_task_struct(task);
-		return 1;
+		ret = 1;
 	}
-	return 0;
+out:
+	rcu_read_unlock();
+	return ret;
 }
 
 static inline bool proc_inode_is_dead(struct inode *inode)
-- 
2.30.2