From nobody Mon Jun 22 20:26:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6BB6C4321E for ; Thu, 17 Mar 2022 07:27:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230218AbiCQH17 (ORCPT ); Thu, 17 Mar 2022 03:27:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230185AbiCQH1z (ORCPT ); Thu, 17 Mar 2022 03:27:55 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CB5C1C16CE for ; Thu, 17 Mar 2022 00:26:34 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22H3BUbP006900; Thu, 17 Mar 2022 07:26:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=Rn1R+m57vsxO+HybZdH268QV8XR21e8GYGjpc3ENDqo=; b=VuQxxT9KVBF6sKf1yg9xRCfKnSWy7chhN8P84agTPFGwyBeRFqOSJODRyqBpxkLk0/HS fmdN9Sw3ECb04ylxwjYPG6Gf8BZHPI/wXiK6pHPpnpZyiJhC6iqDJ9z/aXSWI7Plj2Qp 6d4LV77BeZV2AOcI/dYTFi3XcZtvU83w8YpFmnkdODidIwrlcyEOfqzaY8bCdXs0CT3k lwr3J2iebWIwv7kUHQZRpazn9ZPcPtn/SEdQVODAJLOY3MuLUnC6GEGcAv10IUXeauao eIcfChvwqLNz1QtcpmUcmjDxt6MnlTuD5qjpqnuki8jmEaDDxKlZ2sJ7sH68akGPZGPW 6A== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3et52q0dv5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:29 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 22H7AuHT137978; Thu, 17 Mar 2022 07:26:27 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2105.outbound.protection.outlook.com [104.47.70.105]) by userp3020.oracle.com with ESMTP id 3et659b1q4-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Je9pohHaEQTmQGc+mtRWMs+V5/Cv8sHPVzo9umNpYy8iB68dIN4s2WPSEdrVTtotun1KEhWaVhho73GEvtD+T/YAXp18gC/OkX98VyEw3nA7EewEu231YY3gph9+kY4t3bAaMdskzaTKJsqWJrKl37S5p43zFJH9BHLoL8AKUJVrnkCBA15tFJP8KxTPISvlyKnpud7GxHfAJPY68eA1KV60ZZvHFCu/VDuRDY+vghcz3cxLufDVvwnd64c/86z1oviLjilf+Djt8vGsKp2kKcM1ib64Q2yngD0jvVL43SZwbPy7wR9NQkp26mJc2WtzyW1mcW9jrmDQ8mEDSX7nWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Rn1R+m57vsxO+HybZdH268QV8XR21e8GYGjpc3ENDqo=; b=VHHsMRr7GcBPiSGViGXV93EwbmykoSdqhVGtDsbrQSNIZ3H7gXFI//Y4uuZCacDIiie1I16v+WVvl/GMSUUIlUH+4YhOXv0LkLxj0eXcxLZNSsikTKnWycL3g/aQMYJQNg9BAdDe8lDMNhsMpiffOa16Id9EXlzsL5H24z093hupODJ6Ozvng72P6BeuTxjlnF4rxtJI25Rg/AMg6MliRln4KFfEZYDLYezOJodm9A+3iPT1Nj4/gSHI8KkBvW3uoBm+slyib5cNGMpV1v4Mqo3kJPRcnfGEpDSWOWuK5Rc4fQ6UmMUmiMaP4JteUDn0LCr80EQz16YEKlGwyT6S/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Rn1R+m57vsxO+HybZdH268QV8XR21e8GYGjpc3ENDqo=; b=OwJmqqVl6w/fbeORyQ6LP4pd1USGsQqKpOF48sF8k9G2eRn/wH4rGmP1CJG4Gqa9MkqwGkb9uub71Lfjd/JPTnUvfeG72SQu+60qcZx3B3O54PshlA/IFPVumTBs0STUhxTVp7vQ/i78thqZzx/bjj/VRirL4qYiX1JngHXRI5A= Received: from CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) by DM6PR10MB4332.namprd10.prod.outlook.com (2603:10b6:5:220::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.17; Thu, 17 Mar 2022 07:26:26 +0000 Received: from CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa]) by CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa%9]) with mapi id 15.20.5081.017; Thu, 17 Mar 2022 07:26:26 +0000 From: Imran Khan To: tj@kernel.org, viro@zeniv.linux.org.uk Cc: gregkh@linuxfoundation.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v7 1/8] kernfs: Introduce interface to access global kernfs_open_file_mutex. Date: Thu, 17 Mar 2022 18:26:05 +1100 Message-Id: <20220317072612.163143-2-imran.f.khan@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220317072612.163143-1-imran.f.khan@oracle.com> References: <20220317072612.163143-1-imran.f.khan@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SY6PR01CA0035.ausprd01.prod.outlook.com (2603:10c6:10:eb::22) To CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38bb39e5-f3d2-4163-696a-08da07e77248 X-MS-TrafficTypeDiagnostic: DM6PR10MB4332:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FSvGzvkuzWWW9AgtSQf5G9qcEJG9tnEvZqBatl5bxyQVG4NqIioXoAyjBksJD/jk17mv+GkkQTKvRuFmPMJRAfz3N3eWWuSm9e9rdxKSeEXmDZk/GTn5U/MUP7EN4d14CRz7ZG+wA1Hx3pazRDjekyAj+du8iduw6PLw70Z7Cig8/cF8T9hsDsTlWwmMGufEBRb22A0jdN/3ZbQ222M4CyqhxS6CR5SP1jN+dmDNZPabLhnUmeXL/TcekGcybBXNs8zby3Mg1aFtdD/IsGIr+tr+nMqCS/aBNHwV6XWHeaEA063aOmnzKHJmABe/pfhdX5WHeyWA8CXiW+A9FLdwFfyO3zZ0y9jH95uD85M6t9rYl+7GcxgiLf7gt6pNlltF4OqNarNbg07MdSmmLdY2sGP6wz7TM42V3EvPNTnET+JbGhlg07NP6zXb7As+LExPcd2GfX9yc/r51FX5iZP+4IigQFEgQmwP9hZuuIBadVpXykuZueLmvVYq0NTK+x3slfuMC9LMQvILCPWNJ0tVYryQj9sEjUEZGYKyD4BFWV524P7m5mkkt7mi8m7MzQzQmzvFvIQrjl+UQR/YkBiIl7RLy9iEATh0wT3FmlohpIYL4b+yqeP4XsZ8XsrVlxW/lQ0/KYf6diPXLbmhHh2LzRVU8lbeyj1/BVVDLCyw4b93zSz9Q008/9dOOu6GXNLwT6tAcbxYeSZou3sneR61rg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4468.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6512007)(2906002)(8936002)(26005)(52116002)(36756003)(38100700002)(316002)(186003)(38350700002)(103116003)(6506007)(86362001)(6666004)(83380400001)(1076003)(5660300002)(4326008)(66946007)(6486002)(8676002)(66556008)(66476007)(508600001)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/HmUVUJ6ORrlhQRC1/F3mMLtLdNdujbYQJM+PWG6ts/WnqXf9omh2/28xC/m?= =?us-ascii?Q?Ll/dOTcoV2Bu1bW+EAWGOQdKOar0C0MTSOJ6VCNEc+qHnnLNTg1zw4uSRhvL?= =?us-ascii?Q?/cuvM0OV8N8GQ3dPmQomH7sahEulKPvggT1UJc1V8d4zQ+wiC9Wzz7xwdVS2?= =?us-ascii?Q?K/YrNkxbNEzxaTl1FjoYhs2QL8JVgexIR6MABQUIgL34sxG0F44sre6AyCkh?= =?us-ascii?Q?lJpQtDjxjbWnCqLRnPODvFjuQjeOH0hyJsQ2g9x4CqP3S22RHqaqAZmnw1R7?= =?us-ascii?Q?9iZNfP3eb2L49hL+j/uMdB/MPohoUqRgRq4zSo3qiH9Cor2TWceRufh3yJj9?= =?us-ascii?Q?7oSDYUO+jBkjHUrqEEbxWZ2By6rGAdeVIhNkBc6kSAnTEAIZEh+UODtvuxr+?= =?us-ascii?Q?SeJ4tun2BrOrNtd47ihHvJNsDIfA21eXlzDArYfOxaYW+EEzz4yDqj5oSw2z?= =?us-ascii?Q?2oB4YQIHhS2t0rW/NAZgDLk5sfdkd+yaYhNAXMdQTolv94qWf7HSzzFVjBqN?= =?us-ascii?Q?7Ge/4KOjP46EkqUj7MgpK2Sm2iDm7mzFeXqWRsJKZFHARpNv1OStJoE5QQvw?= =?us-ascii?Q?+/QAlTpNOUQvvR/qjQ+gewwQcuiAQ8fIQKYQs/HTG3yC2ksYNpGcg8fFQcUN?= =?us-ascii?Q?P8SIZWCCUFlFX5ahjRv4JqHNJn3ratrGnphHpxzxRs5AgE9sQKZd6i1tXW/w?= =?us-ascii?Q?1XWMHB6oFUMQ/sm9wN8yPQrK2Sen6xuXOKFB2gL7yQ9ZFenIbBPIlANxWb/i?= =?us-ascii?Q?TZ16oHn4UcIMofVOnNmk5yEnkCYNRLq8iMwK2SUqfbylTNiz734SQXQ/PgfM?= =?us-ascii?Q?LE2uzE5ghyEUpgZcFm6kqDUMdkChK4saDYhEz4UqsdOmMH9gjUA+Ojgj/1xa?= =?us-ascii?Q?5X5DM13NlJu2qJMv66+HnnvYtjBhzO6SAJQB32+LlDh4fp9LTnPjDKGWUxkC?= =?us-ascii?Q?4yAjGLJwqwDi8dTk5WV/MNKagUy48n701d+657txldvRJsoK5P9AlzZcpyi8?= =?us-ascii?Q?NaFFToTiFzFd+ggbXex7Tp6ojTDWyOuMq4s4qF+yoMSg9W/IIBA8eRAn751m?= =?us-ascii?Q?iVpnW89AR9854m+25re0f7wgpKaCfwwm8yXvtOtzh1842S9zypraFHbicTKu?= =?us-ascii?Q?oZMCehNmO/wKmgdVc5Qph7Czb7cHqRnGo/HfDHReoKeuHvsBmP/Gc9XOsZDd?= =?us-ascii?Q?A2xo7E7QfCBrLQG2ZSDrZCzy9tOU3gBHMCMtsuSwa+5sgio6eVZ8UTLHkgHl?= =?us-ascii?Q?0KUhTJc5LC6N7Hdsa0P+IUVeyyaaOYvBC6WUnBYCd0kyHDnNrkczrXzZ9yU8?= =?us-ascii?Q?syYGjwLaKzgVpbH9m8rGyBRLWndRMaeuhkWrNHIbbZ049xM6sp95+q6sy/xu?= =?us-ascii?Q?D0KT1giaYw4dMEbC9ndqrE453RtzTigkZO7YvgVK0xcbUAIvIRptzoZ4twzA?= =?us-ascii?Q?hFjsreFVqTg9bm2RBFpFt0dHDPPar3uMT/8vZG6wBHSUchjKlDHBPw=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38bb39e5-f3d2-4163-696a-08da07e77248 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2022 07:26:26.4096 (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: bLhK8IFOAHnVJdYxCvnLoahmDwkYTdXWCDxNPgwailSIWed2tmVcRzeoYsZGDg0WrZWesZtcBHb/dHZ1hZs+Lw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4332 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10288 signatures=693715 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0 malwarescore=0 adultscore=0 bulkscore=0 mlxscore=0 mlxlogscore=972 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203170042 X-Proofpoint-GUID: V1BTvk8l3aRyqykTlyQzM1OP2j0Peigz X-Proofpoint-ORIG-GUID: V1BTvk8l3aRyqykTlyQzM1OP2j0Peigz Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This allows to change underlying mutex locking, without needing to change the users of the lock. For example next patch modifies this interface to use hashed mutexes in place of a single global kernfs_open_file_mutex. Signed-off-by: Imran Khan --- fs/kernfs/file.c | 26 +++++++++++++++----------- fs/kernfs/kernfs-internal.h | 18 ++++++++++++++++++ 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index 7aefaca876a0..99793c32abc3 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -30,7 +30,7 @@ * kernfs_open_node->files, which is protected by kernfs_open_file_mutex. */ static DEFINE_SPINLOCK(kernfs_open_node_lock); -static DEFINE_MUTEX(kernfs_open_file_mutex); +DEFINE_MUTEX(kernfs_open_file_mutex); =20 struct kernfs_open_node { atomic_t refcnt; @@ -519,9 +519,10 @@ static int kernfs_get_open_node(struct kernfs_node *kn, struct kernfs_open_file *of) { struct kernfs_open_node *on, *new_on =3D NULL; + struct mutex *mutex =3D NULL; =20 retry: - mutex_lock(&kernfs_open_file_mutex); + mutex =3D kernfs_open_file_mutex_lock(kn); spin_lock_irq(&kernfs_open_node_lock); =20 if (!kn->attr.open && new_on) { @@ -536,7 +537,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn, } =20 spin_unlock_irq(&kernfs_open_node_lock); - mutex_unlock(&kernfs_open_file_mutex); + mutex_unlock(mutex); =20 if (on) { kfree(new_on); @@ -570,9 +571,10 @@ static void kernfs_put_open_node(struct kernfs_node *k= n, struct kernfs_open_file *of) { struct kernfs_open_node *on =3D kn->attr.open; + struct mutex *mutex =3D NULL; unsigned long flags; =20 - mutex_lock(&kernfs_open_file_mutex); + mutex =3D kernfs_open_file_mutex_lock(kn); spin_lock_irqsave(&kernfs_open_node_lock, flags); =20 if (of) @@ -584,7 +586,7 @@ static void kernfs_put_open_node(struct kernfs_node *kn, on =3D NULL; =20 spin_unlock_irqrestore(&kernfs_open_node_lock, flags); - mutex_unlock(&kernfs_open_file_mutex); + mutex_unlock(mutex); =20 kfree(on); } @@ -724,11 +726,11 @@ static void kernfs_release_file(struct kernfs_node *k= n, /* * @of is guaranteed to have no other file operations in flight and * we just want to synchronize release and drain paths. - * @kernfs_open_file_mutex is enough. @of->mutex can't be used + * @open_file_mutex is enough. @of->mutex can't be used * here because drain path may be called from places which can * cause circular dependency. */ - lockdep_assert_held(&kernfs_open_file_mutex); + lockdep_assert_held(kernfs_open_file_mutex_ptr(kn)); =20 if (!of->released) { /* @@ -745,11 +747,12 @@ static int kernfs_fop_release(struct inode *inode, st= ruct file *filp) { struct kernfs_node *kn =3D inode->i_private; struct kernfs_open_file *of =3D kernfs_of(filp); + struct mutex *lock =3D NULL; =20 if (kn->flags & KERNFS_HAS_RELEASE) { - mutex_lock(&kernfs_open_file_mutex); + lock =3D kernfs_open_file_mutex_lock(kn); kernfs_release_file(kn, of); - mutex_unlock(&kernfs_open_file_mutex); + mutex_unlock(lock); } =20 kernfs_put_open_node(kn, of); @@ -764,6 +767,7 @@ void kernfs_drain_open_files(struct kernfs_node *kn) { struct kernfs_open_node *on; struct kernfs_open_file *of; + struct mutex *mutex =3D NULL; =20 if (!(kn->flags & (KERNFS_HAS_MMAP | KERNFS_HAS_RELEASE))) return; @@ -776,7 +780,7 @@ void kernfs_drain_open_files(struct kernfs_node *kn) if (!on) return; =20 - mutex_lock(&kernfs_open_file_mutex); + mutex =3D kernfs_open_file_mutex_lock(kn); =20 list_for_each_entry(of, &on->files, list) { struct inode *inode =3D file_inode(of->file); @@ -788,7 +792,7 @@ void kernfs_drain_open_files(struct kernfs_node *kn) kernfs_release_file(kn, of); } =20 - mutex_unlock(&kernfs_open_file_mutex); + mutex_unlock(mutex); =20 kernfs_put_open_node(kn, NULL); } diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs-internal.h index eeaa779b929c..df00a5f5a367 100644 --- a/fs/kernfs/kernfs-internal.h +++ b/fs/kernfs/kernfs-internal.h @@ -164,4 +164,22 @@ void kernfs_drain_open_files(struct kernfs_node *kn); */ extern const struct inode_operations kernfs_symlink_iops; =20 +extern struct mutex kernfs_open_file_mutex; + +static inline struct mutex *kernfs_open_file_mutex_ptr(struct kernfs_node = *kn) +{ + return &kernfs_open_file_mutex; +} + +static inline struct mutex *kernfs_open_file_mutex_lock(struct kernfs_node= *kn) +{ + struct mutex *lock; + + lock =3D kernfs_open_file_mutex_ptr(kn); + + mutex_lock(lock); + + return lock; +} + #endif /* __KERNFS_INTERNAL_H */ --=20 2.30.2 From nobody Mon Jun 22 20:26:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53E53C433FE for ; Thu, 17 Mar 2022 07:27:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230235AbiCQH2E (ORCPT ); Thu, 17 Mar 2022 03:28:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230206AbiCQH1z (ORCPT ); Thu, 17 Mar 2022 03:27:55 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 413AD1C16D2 for ; Thu, 17 Mar 2022 00:26:36 -0700 (PDT) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22H3W20E001976; Thu, 17 Mar 2022 07:26:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=w9v6Okrw47UDDstUUTI8u1jBGKw4bPhhow4H3bw/SpQ=; b=XhPxFbdj6rnEZ/X6swcLJePxxDd/Y7jnpwknNGifZO3Ts8VhfEXorrbz08oT+k90SsFF oU4/qGBscpKdht2MhYDsOWoAEImoCH00sKQcqkff1sf/cKirBtNuP59sTlq5+FbyAgeR 0QLmGPQfDil3E9JKToGXwSa5FjFbxCXdOQ9e8o55atZbIsLXPQHdgH/AKvDAd+maiur0 5U9WEYXdRJkLWlcZojGgbqAo5Dt9mqfYYn92Z4/rm9qrHEHQF4oEhH8qAVTPy5GWe0F5 Ti0zn6mFbBNyCADsOh1ew2WLp35eFCOkg8Wh3rThbBguD3d99A504tSoKt1p1YjRYSJI zQ== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3et5xwr4ax-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:31 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 22H7CDfd012724; Thu, 17 Mar 2022 07:26:30 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2108.outbound.protection.outlook.com [104.47.70.108]) by aserp3020.oracle.com with ESMTP id 3et64m4wvg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ab23S7bQTRpoqEpL7FNrwBYqoYI9dMf+R1kU9HtZ/9/8AZd/BIa4VWHFRQ5xCjQACkMLbsfzzg1Z4mNQTel7yGAWdhlrU/qNvgNRP2URG5o0X6x9lyCl9lmHn76iMAX9JabzU2K/iBOfmNBDJM77FXj27hNxLIynihRft6Pm4BRrXxc5NOFEOZHWowbgR19MTZ+ygP74b07uhKNhonW9zEGs8z5M1T7c8zmgNznveh/KeMrY+8czDrU3c5IDsuiA3kjBFabEdKdBVQaUKbartQgeMw7b2X6Jk9M1ztPioWNf1b7hjFu16ICK7lJ00dM/D7XW2m6rRPL+mgBFoiSQJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=w9v6Okrw47UDDstUUTI8u1jBGKw4bPhhow4H3bw/SpQ=; b=Gx8/0WGdSscqCM/lXz2les82GrlusRvkxXBYUMauapkTVqJbU1e9Ql3/jbGTARlRkCBKcFiWSk8butHKAw5eNFBesmohF1585Wh9Tv6VCF8PkRfNP0VtzvT8O4QdLmy8k7k5BN8CW+Q8HdLUvKoidnKCG2VjlhA9tSHfX7bcBVbNUhZI6mrHKzJlTJH05gDBVwdNjukQHNRLcOQkC2yQN46uVhLQUmnV44Vxx8CqMgoMB/5vH9Fsntg4ZDXlYWyg64w0QLvTESL93Rp9/X2tuMZ3YVQskHAjtAr5EFwbpNyhmkShWR6Ew64MArcIiF1PKtfNLI8+Tpdvkhm30kM1aQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=w9v6Okrw47UDDstUUTI8u1jBGKw4bPhhow4H3bw/SpQ=; b=wc9uOVMFJIiAyINo10fUNDSwllly/O3Ycxm3f9GOJ0/DMnr5yRneG/YYZ8+2qmDkWGOhSS4zEE5UHsCGiJox+Bq9gc6zGjmRBFE6Dribt7UIjYA3drXxaX/VJPCjNNVto9nrcrqpGqDVhm2DrQ7R0WpP7kZ/WKK2vR0HbnR2jcg= Received: from CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) by DM6PR10MB4332.namprd10.prod.outlook.com (2603:10b6:5:220::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.17; Thu, 17 Mar 2022 07:26:28 +0000 Received: from CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa]) by CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa%9]) with mapi id 15.20.5081.017; Thu, 17 Mar 2022 07:26:28 +0000 From: Imran Khan To: tj@kernel.org, viro@zeniv.linux.org.uk Cc: gregkh@linuxfoundation.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v7 2/8] kernfs: Replace global kernfs_open_file_mutex with hashed mutexes. Date: Thu, 17 Mar 2022 18:26:06 +1100 Message-Id: <20220317072612.163143-3-imran.f.khan@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220317072612.163143-1-imran.f.khan@oracle.com> References: <20220317072612.163143-1-imran.f.khan@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SY6PR01CA0035.ausprd01.prod.outlook.com (2603:10c6:10:eb::22) To CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: decfdbe2-7900-4250-7d18-08da07e77372 X-MS-TrafficTypeDiagnostic: DM6PR10MB4332:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +0VYJMf42BY4Q4t4V9zC4Oa6EzxBP3/w74uozNiiLosT3t0qvr1/9ZF+guyMrmhqkJr/qxT3n9Ft+Rlh1AoWR23NSTXJYpTFeq/5OQdFdDX0fDlyTyztIcXNrSWO0WLdV6xKIpiZ4vjr6SGevoIP8Qle6ZTNGJutGcBKZOJ03fNA53MdxWNffYqG0baf1JhI0xRHrjLBUPtjok808DXhmRpUhqG6gXR2j4OCZyf+D/vlEII+AYIJJH9+iQ/Z/MoS/Z/BoU2IcJ1bq5e8Yzy81OC5fArxmVTxfM7BNoqe0hyJ9h77aXsrFYLEg+MKraG4wQBF0uT94gud2ZMaCOWoYmekkNeJ8SNlAZV6iEBlC824oVkpwy+up9RNygWo7FNQ2FuFM02diJQBlvCy81FhcbOpM47i4hJLzrYWSJo5AjsnjGHK3SClIXvmCWpGhxtkN5r9I5vtPlR+h81GBQInOyP3QULI5378tGqp0+frsQkTISY9TbWmd+5/ptsxBc4dvWe4UY/0Ft9J4vJgBvL/am4bHIed642gNgn/cEVq8Q0iJFCDqAvcL7wBC0tiZPNGYP21qMUA/62jZFbFRmMmzwbAf/GyfcYQAaErzBs6DEpvWcwX6co5Cs9/vs1t94eP1j71/eDCUatSaJppvtxXt2GeC/NGJSJiaEwIPSmmcc3PBdkS4SCgsqUvpjKmNnyWcoGqU0XIXt4N42FE5OmDcA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4468.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6512007)(2906002)(8936002)(26005)(52116002)(36756003)(38100700002)(316002)(186003)(38350700002)(103116003)(6506007)(86362001)(6666004)(83380400001)(1076003)(5660300002)(4326008)(66946007)(6486002)(8676002)(66556008)(66476007)(508600001)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?At9tqtj9JepwWv5OcgKvA5YSlzh0xLQv0qTBv9uJgFzPqJXbjwtq0o74nO0i?= =?us-ascii?Q?VvYto9wYToTz+VNipP4FZPgZXbBeJNfAu6CBmxh/xMxsmpV2EgfecWrflrv6?= =?us-ascii?Q?EUKIcsjVrbbw/3zuspHyrlLOQdQKl7W89w0EZM0euv79n/QZEsFJjrg1SlGf?= =?us-ascii?Q?RhjhwnylYDMjPirIYhtcVeAaafxs9HD1nGd49wATNsrnYNLevN/tbL1/OPl8?= =?us-ascii?Q?95Hi44vnGWyb+VmZxX94tHbCPen+oihnBx3qNxj7LSCGMm0MvK7yb5jBTouo?= =?us-ascii?Q?NHEqOCSm75EnbU7wjMCxOxQxuyVEImjNfjALPtHNZJNCFj87x7wUrOGkhyKe?= =?us-ascii?Q?y1SHG4SvDCTYilM/L5fPx01eAdr89mNz+Ablpwwlt5+Bhho/7hDWkMPIEDsa?= =?us-ascii?Q?tETTxiJ0AgM4E3lphU3+1CSBa9hUBZKNo044aC2WyjIzX5raOf2suClZO3ox?= =?us-ascii?Q?MtWWUGGu0smjd//SUP1m+KnG6O4NQvwJt8HXH+swyZm3zN4BFIUftLQLf4Nb?= =?us-ascii?Q?nd9s3Z6jlcKP3QGuFPAHkC7FaKRJr0NmBPN7gorO/oT+sqQNE4YFrOUCCCUK?= =?us-ascii?Q?SCNI0XMwtnx8Dzs5rt2Y0F9JRCS7NBy8j3eFiLlUJufxuVVSWVtbQFMxA4c8?= =?us-ascii?Q?W92HU+b5zuWHjgkuT9afpj0sKRdDHSI3Y82zpyUx5LDE93VUGKndq59EUfHb?= =?us-ascii?Q?8HhfXtJVr46R+1rmw6Y33WFuo33i4qVaAzQsnHDxq6DBs3IYdKfusAmB98vc?= =?us-ascii?Q?7BYroC64mDhHt87vPXxZ5c/i4WsnXcfOXczGbW2tN9Qzk8s8EUBept6KDGMS?= =?us-ascii?Q?jmJp4ybdTRFMQlIMOyU5jEHXadQG7B5+Itq90HvG3krkBDStdCUNCQfProZC?= =?us-ascii?Q?OH6eoG2RZeVspbkKmcqVAzkrODXtxnXhoqyAh0GuLfMNz43IwENt0ci4BpvQ?= =?us-ascii?Q?Vi5xY4Jypt/p/ztGwpXr1V7o57+e6z4XkH/oLsQIgHJaWcphWiRWydZNMPq/?= =?us-ascii?Q?9oTRReaP8BHGEDoJTa5rVTa0cJ1tvVc8Cp0hHi2/1RSWyAFm2bB8G4snKJwP?= =?us-ascii?Q?b2zHTzTxtZbIymL5W6hGvDOWButMCPFnn/+CW8IUL2w0LME4/eQ/Dc6jjkym?= =?us-ascii?Q?YmmL8SSkrf4UHdxXsVZX9TaLkxUAqQbv2bbOTh9KHUCrskOw8M5qZy0bAKxv?= =?us-ascii?Q?CiLHNg6CFHe2Z2WlkCJ3bArgL0uRJSR6xghzW0IStTY+9Qd1YBA9Kpvs60D0?= =?us-ascii?Q?zPUJ3UvbDgrKDizUTCc9FGpfRKPTY9IEAPGTgJgNkilts/+EOjsLptZO/xyv?= =?us-ascii?Q?V55ro3edMrOH6O+foP8IrNch1g7LJo6kOICyR0goLd6TAP5wQKHRgU1KCYTy?= =?us-ascii?Q?uBWQ3Sj+nu8ssfsRseYT7G5l72TaHpvIWTmnQZm4WzZtywi8vh8+ntrgWmQt?= =?us-ascii?Q?lO4YVZaLw4K2Q6fqMkT8+xr3KSdcniYnXzeiBVxoMEUvCZMfQzmurA=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: decfdbe2-7900-4250-7d18-08da07e77372 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2022 07:26:28.3475 (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: iXZUdfxd7TL+pEJ6sap4Kk6CKNPmrqFlOYOStOZel5lnhdGOxvdgaOXmmOntoMdK5q9qXxfHAc3FuJLEwJmDVw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4332 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10288 signatures=693715 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0 malwarescore=0 mlxscore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203170042 X-Proofpoint-GUID: iR_-V1OYfp-2R79s5-7Yy7OJlHiDDCTJ X-Proofpoint-ORIG-GUID: iR_-V1OYfp-2R79s5-7Yy7OJlHiDDCTJ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In current kernfs design a single mutex, kernfs_open_file_mutex, protects the list of kernfs_open_file instances corresponding to a sysfs attribute. So even if different tasks are opening or closing different sysfs files they can contend on osq_lock of this mutex. The contention is more apparent in large scale systems with few hundred CPUs where most of the CPUs have running tasks that are opening, accessing or closing sysfs files at any point of time. Using hashed mutexes in place of a single global mutex, can significantly reduce contention around global mutex and hence can provide better scalability. Moreover as these hashed mutexes are not part of kernfs_node objects we will not see any singnificant change in memory utilization of kernfs based file systems like sysfs, cgroupfs etc. Modify interface introduced in previous patch to make use of hashed mutexes. Use kernfs_node address as hashing key. Signed-off-by: Imran Khan --- fs/kernfs/file.c | 7 +---- fs/kernfs/kernfs-internal.h | 9 ++++-- fs/kernfs/mount.c | 13 ++++++++ include/linux/kernfs.h | 59 +++++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 8 deletions(-) diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index 99793c32abc3..8996b00568c3 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -19,18 +19,13 @@ #include "kernfs-internal.h" =20 /* - * There's one kernfs_open_file for each open file and one kernfs_open_node - * for each kernfs_node with one or more open files. - * * kernfs_node->attr.open points to kernfs_open_node. attr.open is * protected by kernfs_open_node_lock. * * filp->private_data points to seq_file whose ->private points to - * kernfs_open_file. kernfs_open_files are chained at - * kernfs_open_node->files, which is protected by kernfs_open_file_mutex. + * kernfs_open_file. */ static DEFINE_SPINLOCK(kernfs_open_node_lock); -DEFINE_MUTEX(kernfs_open_file_mutex); =20 struct kernfs_open_node { atomic_t refcnt; diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs-internal.h index df00a5f5a367..4ab696fb2040 100644 --- a/fs/kernfs/kernfs-internal.h +++ b/fs/kernfs/kernfs-internal.h @@ -164,11 +164,16 @@ void kernfs_drain_open_files(struct kernfs_node *kn); */ extern const struct inode_operations kernfs_symlink_iops; =20 -extern struct mutex kernfs_open_file_mutex; +/* + * kernfs locks + */ +extern struct kernfs_global_locks *kernfs_locks; =20 static inline struct mutex *kernfs_open_file_mutex_ptr(struct kernfs_node = *kn) { - return &kernfs_open_file_mutex; + int idx =3D hash_ptr(kn, NR_KERNFS_LOCK_BITS); + + return &kernfs_locks->open_file_mutex[idx].lock; } =20 static inline struct mutex *kernfs_open_file_mutex_lock(struct kernfs_node= *kn) diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c index cfa79715fc1a..fa3fa22c95b2 100644 --- a/fs/kernfs/mount.c +++ b/fs/kernfs/mount.c @@ -20,6 +20,7 @@ #include "kernfs-internal.h" =20 struct kmem_cache *kernfs_node_cache, *kernfs_iattrs_cache; +struct kernfs_global_locks *kernfs_locks; =20 static int kernfs_sop_show_options(struct seq_file *sf, struct dentry *den= try) { @@ -387,6 +388,17 @@ void kernfs_kill_sb(struct super_block *sb) kfree(info); } =20 +void __init kernfs_lock_init(void) +{ + int count; + + kernfs_locks =3D kmalloc(sizeof(struct kernfs_global_locks), GFP_KERNEL); + WARN_ON(!kernfs_locks); + + for (count =3D 0; count < NR_KERNFS_LOCKS; count++) + mutex_init(&kernfs_locks->open_file_mutex[count].lock); +} + void __init kernfs_init(void) { kernfs_node_cache =3D kmem_cache_create("kernfs_node_cache", @@ -397,4 +409,5 @@ void __init kernfs_init(void) kernfs_iattrs_cache =3D kmem_cache_create("kernfs_iattrs_cache", sizeof(struct kernfs_iattrs), 0, SLAB_PANIC, NULL); + kernfs_lock_init(); } diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h index 62aff082dc3f..1de54f4bdcc5 100644 --- a/include/linux/kernfs.h +++ b/include/linux/kernfs.h @@ -18,6 +18,7 @@ #include #include #include +#include =20 struct file; struct dentry; @@ -34,6 +35,62 @@ struct kernfs_fs_context; struct kernfs_open_node; struct kernfs_iattrs; =20 +/* + * NR_KERNFS_LOCK_BITS determines size (NR_KERNFS_LOCKS) of hash + * table of locks. + * Having a small hash table would impact scalability, since + * more and more kernfs_node objects will end up using same lock + * and having a very large hash table would waste memory. + * + * At the moment size of hash table of locks is being set based on + * the number of CPUs as follows: + * + * NR_CPU NR_KERNFS_LOCK_BITS NR_KERNFS_LOCKS + * 1 1 2 + * 2-3 2 4 + * 4-7 4 16 + * 8-15 6 64 + * 16-31 8 256 + * 32 and more 10 1024 + * + * The above relation between NR_CPU and number of locks is based + * on some internal experimentation which involved booting qemu + * with different values of smp, performing some sysfs operations + * on all CPUs and observing how increase in number of locks impacts + * completion time of these sysfs operations on each CPU. + */ +#ifdef CONFIG_SMP +#define NR_KERNFS_LOCK_BITS (2 * (ilog2(NR_CPUS < 32 ? NR_CPUS : 32))) +#else +#define NR_KERNFS_LOCK_BITS 1 +#endif + +#define NR_KERNFS_LOCKS (1 << NR_KERNFS_LOCK_BITS) + +/* + * There's one kernfs_open_file for each open file and one kernfs_open_node + * for each kernfs_node with one or more open files. + * + * filp->private_data points to seq_file whose ->private points to + * kernfs_open_file. + * kernfs_open_files are chained at kernfs_open_node->files, which is + * protected by kernfs_open_file_mutex.lock. + */ + +struct kernfs_open_file_mutex { + struct mutex lock; +} ____cacheline_aligned_in_smp; + +/* + * To reduce possible contention in sysfs access, arising due to single + * locks, use an array of locks and use kernfs_node object address as + * hash keys to get the index of these locks. + */ + +struct kernfs_global_locks { + struct kernfs_open_file_mutex open_file_mutex[NR_KERNFS_LOCKS]; +}; + enum kernfs_node_type { KERNFS_DIR =3D 0x0001, KERNFS_FILE =3D 0x0002, @@ -417,6 +474,8 @@ void kernfs_kill_sb(struct super_block *sb); =20 void kernfs_init(void); =20 +void kernfs_lock_init(void); + struct kernfs_node *kernfs_find_and_get_node_by_id(struct kernfs_root *roo= t, u64 id); #else /* CONFIG_KERNFS */ --=20 2.30.2 From nobody Mon Jun 22 20:26:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93AD6C43217 for ; Thu, 17 Mar 2022 07:27:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230246AbiCQH2L (ORCPT ); Thu, 17 Mar 2022 03:28:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230031AbiCQH15 (ORCPT ); Thu, 17 Mar 2022 03:27:57 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 698881C16D9 for ; Thu, 17 Mar 2022 00:26:38 -0700 (PDT) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22H3H1g6018273; Thu, 17 Mar 2022 07:26:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=vjIy2CZyR2qcJnnZPwnQbvvc5WyJj/N15QAe5S32D3c=; b=runQVVMf216Y6a5RO3D4c02KjS2xpFEfzEIbE9YLBvvqfvm4vtrG5dM3CEW26N+SnavU +5Goij/6AaVNvpT9e+6CelSdLLO7c7MCZrRnUGp5mfsyujWXz3f7DKCrbRbOmwu0skh3 ChRHvpHa2zJ7VCtzC8DN0NRWhNumHLwqbLrOUghOE9sLLy2fh5aWnjCYo2DqDbGTZdoL +qttSOtRmZ3q3SQxBEb7RIkXeCyr9jOBvkexXkiV1du/OyYvaYTZ4Ob5dcYHzTgOH8B/ kgbSL32XKNV4ClfkyUz3f02rZNQKYfczCpdSR/MU31dXXxtUZtXluZOwpUUh6duPyFMy 4g== Received: from aserp3030.oracle.com ([141.146.126.71]) by mx0b-00069f02.pphosted.com with ESMTP id 3et60rrdkk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:34 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 22H7C5CB131035; Thu, 17 Mar 2022 07:26:33 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2103.outbound.protection.outlook.com [104.47.70.103]) by aserp3030.oracle.com with ESMTP id 3et64u19xp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UxbVo5gBJCtUUqoTt16YKBrkuY0wHC+bncWSpTOkSDlwsu0nmQVg7fdZv0dMN0iTZIouWXaSOqs/ef1CgJGF8emSXBbzjUl1LkpWl9DJKWbYmq6dol0vQKVNKH67iXMplOSZCE1lxX0ZzVJCEk8DYrCC5WqZzjcoyWGby5BPEGDpcT23Xjo2YtETmYu/I2qeKA9B2fASnzN/Jj245V45ox3wpVf3+lEphbQKUT0IjvxnmH4tOgqQnRkUlt8GPH0H0frH9wH/3UqPKc9Zt0dT2fRqv07WMI8ai0mVvk+3ZYEtZDConbu3zV0TWdnQcPllLidkWHc/GQbeMstnZbcOmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vjIy2CZyR2qcJnnZPwnQbvvc5WyJj/N15QAe5S32D3c=; b=d73wZQsZRqKjhTxcER4VJWoi7qqcGR+8hawJEqt3aWEE1Wk+SEh2qu3MLaaxUR6/FtiGmWaGbVCz4XNUosqsKSXHrf93l2QNDDuXjLKGGg644d3bpv3/4xi7PvFB+g5cjRpof5lJBqsJwz4sy1196c/FopnuRfP9/aEylv2uN4a1l+/Ls4Xlrkv3MSPGjaddBb7imSygZ/6/dA8Kk/rf2AVwpRyixgyFc40UJHVfC+Bdzk+UddfqbJRIBO6sE9KbDJ88HVQOttYWoiw7LgTdGsBMlw3DmgFvslZseAsRU8+81S4PDqMogE5LY0304HqSGP+26yWF0RHgLKivdrt05Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vjIy2CZyR2qcJnnZPwnQbvvc5WyJj/N15QAe5S32D3c=; b=Hw4SxUTZJQnbYf2Zoqpr6s9RiNicWuv6AZh6Oux1IsJgpWVzf8Nyctj5P7xzikr6gloXVF/96DwdhE5O/9ywholSUQRCft2DRKrwFMF7FYX8u2e63lHlo6TVPdb9Xm/ZGtycmU7qQTbMUhMthUqmJm9lCF2W6rVigUMdQTAko1I= Received: from CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) by DM6PR10MB3067.namprd10.prod.outlook.com (2603:10b6:5:6e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.26; Thu, 17 Mar 2022 07:26:30 +0000 Received: from CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa]) by CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa%9]) with mapi id 15.20.5081.017; Thu, 17 Mar 2022 07:26:30 +0000 From: Imran Khan To: tj@kernel.org, viro@zeniv.linux.org.uk Cc: gregkh@linuxfoundation.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v7 3/8] kernfs: Introduce interface to access kernfs_open_node_lock. Date: Thu, 17 Mar 2022 18:26:07 +1100 Message-Id: <20220317072612.163143-4-imran.f.khan@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220317072612.163143-1-imran.f.khan@oracle.com> References: <20220317072612.163143-1-imran.f.khan@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SY6PR01CA0035.ausprd01.prod.outlook.com (2603:10c6:10:eb::22) To CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 687b6bf4-ae1f-4cad-416b-08da07e7749a X-MS-TrafficTypeDiagnostic: DM6PR10MB3067:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NGitE4NQmhabD/CvzWImO4S8WD0+zWSOp6gsSdt3Z5djgj98qagS33PM2U08AKxYkt8T0Jmphm4HhaMlNFvFo4bIOsP3QyY9mzk/cz38si1O7qvf8OXT3/Wj6be1rlEyBAVJk9k0M/CyKKNW0vUuBZ7h5QL5P6jYF5AuLe+x5rJpr71KyCgLC8sKQil2OVRuipvLH1W/6v4qaA0WYhU+aFJUt9ywNCtO7kr6AU5l8KfZASZsWk7ZoOeAKK1u/xJCAD6cjtdP1/42hMMpHnL3HxvEPqJBW27vXxid5keVzLNcoAowMRZAO6pPHwUmUU4v3N4Jqv+dCAB7E5I2cfOl6tbt3v7OjaMvsCDHwjVGNSOs/BM/Pxwgd0LcebCbyozb51hEydEw0+8450D6jNhUH5jzg/I67qcNVEsa/PKqQ4xhrCUY1iu3iUKGzx3NEwLnsoikb1zV6vS4vFIolXhAOtrAU1dvCVWOspmXBdecYwKIYYIC+l24AwWfmujdlJLEQONFmqX/UpnBr1jKYhtbI+tpjvreedKxEiOq4fqQmq5yvI09L5pvpULB4CFhW5VJAiZqRSaE/vku/Md7d6PcJIYLCKvqyvpNZnGUbFYdNvgc8nfyhQzIz01/x8YOzVnesX+Bjl3O46BqJwUUzUHa+tAmdVzEa4gSmcNeIl7rVi2wRtI5hcjCcswVSczbYtnDBay2QI63Wj/U3Jim7eRa/Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4468.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(1076003)(2616005)(26005)(186003)(6506007)(6512007)(6666004)(52116002)(2906002)(83380400001)(5660300002)(8936002)(508600001)(6486002)(66476007)(66946007)(66556008)(4326008)(8676002)(316002)(38350700002)(38100700002)(103116003)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RxQlHNYJy+StmEo+G2reDnGrezG1ki4UPZPzDCKgn/2MhdWn3iRrqEv1zkfM?= =?us-ascii?Q?CB4SsHOvsKzmRYTrrVS7OQS+xgbb9rwQyW2XuBv+1PN0KpI7jYDp6YoakSKO?= =?us-ascii?Q?iffUI9thvbmpadyB/aIaE5gOFPRXHjk/XnADJaUMgAwp0xl0h97E0cUkg7QU?= =?us-ascii?Q?YSgUtldvX4Zg14ZGkMdEnJXGpDUSsjVNhaW5rN0KfnzF+BDaRooU05MpXoV+?= =?us-ascii?Q?oQDHOFDNBel1IT1xuqxS9shJLzapleD+pcZDLvJdgJGxk74lB5L4KGm4XKKF?= =?us-ascii?Q?KrTlEq0e+MUJcbQJ0B0BOjHIbkK6MbNbfu+HrqteZxWT8ZfisO4CkVQvbWJC?= =?us-ascii?Q?kU10PEGvvjCPCbJaDC6ImDPrH33yKt46W46Jzgu+2KUC1PKG/sE61YTU8TVB?= =?us-ascii?Q?1gGNNQ2vLU5t7vjxd0gDnFerYkwrOl7pw21s+DhGT1oJhyEo6SjGREBzD0A4?= =?us-ascii?Q?BqVZ9942K58RlvDaMAIJkBTwmejEHUxK/HMt937AeLuslZ0oiGEWBGDSFT9x?= =?us-ascii?Q?mvUrBIbauoMadLInFr2w6K5gjIz3SKGL3YzzMeqeu76JgaXdReE84v1N2flH?= =?us-ascii?Q?qXuAwsNyJcKdsCpzhrmcHQujRjNo9eHKg+xht+H9wjGo/FU6zr3MR3oXjrC+?= =?us-ascii?Q?2EJZblbQBfvqmKgmaX4iM9n190H5u9YNq2tRozIKYvZ7ZCZb91nObceNSQ/C?= =?us-ascii?Q?H9UpK/xUtBqKhqxUae3CvAbGqy3tBpNnbrSJQLdxVKsElSi5fI6WtMAnHfq9?= =?us-ascii?Q?Zg72H6BVIJWj0/674yznGpIZRggxhGi47GijmKP5ZZwMswVTKCvt4w3y1/IG?= =?us-ascii?Q?U95T9UuZsIAeh3ayOJ/sJJ3cmBpz9aXsZe6G5Cl/zQ9IjX6PBl/kvE7/cMmn?= =?us-ascii?Q?Qy5bbxoW2HSswvYbxIFpm5QfMvduO9hbSJ3FXDmGHlQ406Nz/bve5Bc7uSjH?= =?us-ascii?Q?i4mL41IuxiyiMHd/q0YhTJK05Qi4DUEmA+j7la3r9qDZ62QvjPSKmiSOnb+F?= =?us-ascii?Q?ExkvcrueWIoOB3MRGRvZY3gseP5k2vNHvOvP1UM+ntysA5/TFGbgnY3dgXlV?= =?us-ascii?Q?gt+b8pFc/x8iknFHSY3graWAWYji6SYu9u9idyR3c71dH6XzybKOKMW+YvZL?= =?us-ascii?Q?lHAiCDDIOiLyxBWbdB4UN8qWSrYNmgTqPACD16CkQ2wh0Aixq3u0o0fLTzQ+?= =?us-ascii?Q?Xib/DQDI5Jt9yzrDqa88J0QHG/AbTJ87dUdV0tv9M3M/NZwHjf1sBg0XwA9a?= =?us-ascii?Q?23JxFP7S5rVyFSsR1PWTI82LdlerFMLDxHNQxoWbJf9fZ2UmSp3uTWuQqGkR?= =?us-ascii?Q?mvhF0vBJuK2oFr4nljEMcEaxFabig3UWPItvzzyNvsyuahX/Q21nsCVqhCej?= =?us-ascii?Q?urP0m3I83lb555RGGbVSYnMjfm45h2jn+/sTh+FWjH0HadLKuo6Ej18LPHu7?= =?us-ascii?Q?DzrD7+X3/fjCZJhQuC1jkVkYc6m4SB5Wf1Wa5gfa3PxXkvSnTe3yzA=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 687b6bf4-ae1f-4cad-416b-08da07e7749a X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2022 07:26:30.2858 (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: HDxuMk92FwwlSkgnAwa0SYBOKXRaERYsKU3ZpEqMNnKxwQ/dXDHfcxEYVxS4TjxpaMHLaPWFP9djExiWmIiDjg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3067 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10288 signatures=693715 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 phishscore=0 suspectscore=0 mlxscore=0 adultscore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203170042 X-Proofpoint-ORIG-GUID: HfGnwrlny1sOAU--EMYFdkXzdq0JKNBy X-Proofpoint-GUID: HfGnwrlny1sOAU--EMYFdkXzdq0JKNBy Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Having an interface allows to change the underlying locking mechanism without needing to change the user of the lock. For example next patch modifies this interface to make use of hashed spinlocks in place of global kernfs_open_node_lock. Signed-off-by: Imran Khan --- fs/kernfs/file.c | 23 ++++++++++++++--------- fs/kernfs/kernfs-internal.h | 18 ++++++++++++++++++ 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index 8996b00568c3..1658bfa048df 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -25,7 +25,7 @@ * filp->private_data points to seq_file whose ->private points to * kernfs_open_file. */ -static DEFINE_SPINLOCK(kernfs_open_node_lock); +DEFINE_SPINLOCK(kernfs_open_node_lock); =20 struct kernfs_open_node { atomic_t refcnt; @@ -515,10 +515,11 @@ static int kernfs_get_open_node(struct kernfs_node *k= n, { struct kernfs_open_node *on, *new_on =3D NULL; struct mutex *mutex =3D NULL; + spinlock_t *lock =3D NULL; =20 retry: mutex =3D kernfs_open_file_mutex_lock(kn); - spin_lock_irq(&kernfs_open_node_lock); + lock =3D kernfs_open_node_spinlock(kn); =20 if (!kn->attr.open && new_on) { kn->attr.open =3D new_on; @@ -531,7 +532,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn, list_add_tail(&of->list, &on->files); } =20 - spin_unlock_irq(&kernfs_open_node_lock); + spin_unlock_irq(lock); mutex_unlock(mutex); =20 if (on) { @@ -567,10 +568,13 @@ static void kernfs_put_open_node(struct kernfs_node *= kn, { struct kernfs_open_node *on =3D kn->attr.open; struct mutex *mutex =3D NULL; + spinlock_t *lock =3D NULL; unsigned long flags; =20 mutex =3D kernfs_open_file_mutex_lock(kn); - spin_lock_irqsave(&kernfs_open_node_lock, flags); + lock =3D kernfs_open_node_spinlock_ptr(kn); + + spin_lock_irqsave(lock, flags); =20 if (of) list_del(&of->list); @@ -580,7 +584,7 @@ static void kernfs_put_open_node(struct kernfs_node *kn, else on =3D NULL; =20 - spin_unlock_irqrestore(&kernfs_open_node_lock, flags); + spin_unlock_irqrestore(lock, flags); mutex_unlock(mutex); =20 kfree(on); @@ -763,15 +767,16 @@ void kernfs_drain_open_files(struct kernfs_node *kn) struct kernfs_open_node *on; struct kernfs_open_file *of; struct mutex *mutex =3D NULL; + spinlock_t *lock =3D NULL; =20 if (!(kn->flags & (KERNFS_HAS_MMAP | KERNFS_HAS_RELEASE))) return; =20 - spin_lock_irq(&kernfs_open_node_lock); + lock =3D kernfs_open_node_spinlock(kn); on =3D kn->attr.open; if (on) atomic_inc(&on->refcnt); - spin_unlock_irq(&kernfs_open_node_lock); + spin_unlock_irq(lock); if (!on) return; =20 @@ -916,13 +921,13 @@ void kernfs_notify(struct kernfs_node *kn) return; =20 /* kick poll immediately */ - spin_lock_irqsave(&kernfs_open_node_lock, flags); + spin_lock_irqsave(kernfs_open_node_spinlock_ptr(kn), flags); on =3D kn->attr.open; if (on) { atomic_inc(&on->event); wake_up_interruptible(&on->poll); } - spin_unlock_irqrestore(&kernfs_open_node_lock, flags); + spin_unlock_irqrestore(kernfs_open_node_spinlock_ptr(kn), flags); =20 /* schedule work to kick fsnotify */ spin_lock_irqsave(&kernfs_notify_lock, flags); diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs-internal.h index 4ab696fb2040..60404a93c28a 100644 --- a/fs/kernfs/kernfs-internal.h +++ b/fs/kernfs/kernfs-internal.h @@ -169,6 +169,8 @@ extern const struct inode_operations kernfs_symlink_iop= s; */ extern struct kernfs_global_locks *kernfs_locks; =20 +extern spinlock_t kernfs_open_node_lock; + static inline struct mutex *kernfs_open_file_mutex_ptr(struct kernfs_node = *kn) { int idx =3D hash_ptr(kn, NR_KERNFS_LOCK_BITS); @@ -187,4 +189,20 @@ static inline struct mutex *kernfs_open_file_mutex_loc= k(struct kernfs_node *kn) return lock; } =20 +static inline spinlock_t *kernfs_open_node_spinlock_ptr(struct kernfs_node= *kn) +{ + return &kernfs_open_node_lock; +} + +static inline spinlock_t *kernfs_open_node_spinlock(struct kernfs_node *kn) +{ + spinlock_t *lock; + + lock =3D kernfs_open_node_spinlock_ptr(kn); + + spin_lock_irq(lock); + + return lock; +} + #endif /* __KERNFS_INTERNAL_H */ --=20 2.30.2 From nobody Mon Jun 22 20:26:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 784B6C433EF for ; Thu, 17 Mar 2022 07:27:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230253AbiCQH2P (ORCPT ); Thu, 17 Mar 2022 03:28:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230209AbiCQH16 (ORCPT ); Thu, 17 Mar 2022 03:27:58 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBAF21C16DA for ; Thu, 17 Mar 2022 00:26:38 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22H3QShl011957; Thu, 17 Mar 2022 07:26:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=aKKfsoguAZ+NCAuCve7CTRrQl855Qm/5JqQcqayjUlc=; b=wvFSW7MfyBF9JyeVjojHF+oXq96VZltCxuwRw1jr2t9vLRXvMEdHg3pDUNdXZjDfm6Z3 /w1I+xVVkgbBRgW3p0DkjtTx5rIFKHptNVU8LIi0s0C2gx2txwLkEvhoLmHHU/BQRMC4 Et3kIkNOHUf3JrpnKCG5olMN5SwUZYueJ+wsliiZqsXyYK1gyr4gkbmYS/jE6bmDFiF2 1zz6gghkI/ugfH6QuEU8lrrwwLsULwJg6JuzLnXArhbFtk8bi5Px94FLnRemqB/FZG/x kWjMbKJvuk0qACxP5sKJUvj3TT9DJqZI947vWYwVw/k8d6DZEsd9MupOUmljaQdc+ksA DQ== Received: from aserp3030.oracle.com ([141.146.126.71]) by mx0b-00069f02.pphosted.com with ESMTP id 3et60rg5yf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:34 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 22H7C5CC131035; Thu, 17 Mar 2022 07:26:33 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2103.outbound.protection.outlook.com [104.47.70.103]) by aserp3030.oracle.com with ESMTP id 3et64u19xp-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DdTetOx/7031LxdsIXaTQYYvRooLtFp2xIZzOdr2CSBbCVpJVjczp/MsfwaWJtRBGFWVHUVAPUBuWeCNz7hyXek6r6VVlzaIiAclYprinvyBo7Xket974ipNeo9VtbyNZDg8UGcwFUqo6i+K76uch0LvVic5HIS0FEgXLNCZBOJmT/eTLn5Sb7Hj2UXzcIlkNKl3u4fdALsPKzJytNH9PIxKvqvt2uL74XYeuJpRVWuEgav63zBhbKJfELsBQtNw/j4ehazLLNWjnr/H+plC1yOqlKhebRg+RDeItdZfEgtQHtZen5RQALKwHvMompXcOBtnARVFpJlN9VeT3IqWpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=aKKfsoguAZ+NCAuCve7CTRrQl855Qm/5JqQcqayjUlc=; b=hOwJIanoUo4HlBBV4qeEUvGQ/Hq2KpUUJPmq4o+5h8glTu/zLGxoh1Oa0Ydwu47Lrb8QfCiCZk9BbOB17OvLl0l+MNPGe52sOqWiromaBCanQQwT4tsd1WWKEewOggIRhqSu27oheHi9RfNMp/6oHoqDNs/lTxKOQVPNP4R3z5gewbxl0YjG0UkTZXfPYE93rvU/ceyi7NVhIguqUY7cvv41fpB99zBOq1gU4gESajAaJK/Li6dp/7SWxb3G1obCSSHHhThHpzM0WnwHnYVB0Hs5NT640szbbaMQwWoCnks9fWhhNyNIy+SihGphx2NIOSTStqIbMmSitASiMRNyGw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aKKfsoguAZ+NCAuCve7CTRrQl855Qm/5JqQcqayjUlc=; b=uTAVtfpihoZZ+78LgWM2DHapkrTRYiUhN1dH+eVHwu0gO8zMXYdM5pEN150Qm8lxvw+bfpDAWs9E5nTn89HRa6bSPAFS1jk2Cg6XqPJvLHUp4LEPPDp9oryuac0J/B4fZwFz1m+AdXcdNm6ASvZ7d6SetRYphVWtkSBORwjGZb0= Received: from CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) by DM6PR10MB3067.namprd10.prod.outlook.com (2603:10b6:5:6e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.26; Thu, 17 Mar 2022 07:26:32 +0000 Received: from CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa]) by CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa%9]) with mapi id 15.20.5081.017; Thu, 17 Mar 2022 07:26:32 +0000 From: Imran Khan To: tj@kernel.org, viro@zeniv.linux.org.uk Cc: gregkh@linuxfoundation.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v7 4/8] kernfs: Replace global kernfs_open_node_lock with hashed spinlocks. Date: Thu, 17 Mar 2022 18:26:08 +1100 Message-Id: <20220317072612.163143-5-imran.f.khan@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220317072612.163143-1-imran.f.khan@oracle.com> References: <20220317072612.163143-1-imran.f.khan@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SY6PR01CA0035.ausprd01.prod.outlook.com (2603:10c6:10:eb::22) To CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ea79e9bd-9ef0-4d2e-4464-08da07e775bd X-MS-TrafficTypeDiagnostic: DM6PR10MB3067:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8z+pVpXb2sF0gdIby8X56InvN1i3iGOlpljXsSXScCMOn8MVrEFgBjeD4FHr0v4Rq8xjL7CUnJZvBbGgDOBJL9ALAtgP4frANTKs2mgB60JcXNPQY2Gv48Ui2ArS0QgEhAQHYXJC7Hq11HqHArO4nB5ZUmio6gwqw5z1YZ77Ds48RM9eG+phka6tIy/Bp32FSHT2OhMi4TzVp4gba2gXT69Xk6Z3Cz2gIXDqX9GCycxNsSiZyR6MCWlsAU1xXxZAXC19CQtlfzrxiiyL5W5a4mojJ7A83BaL2R/3MVwl4xoqsWDpCEv8gDNntsiMKm7A2sBra7d430+Qi6ADTP4cgTl2tmq/uWvOblFPrtr9J+GboHbF1fwAcbg4RCMHmd9Ya9GnUIXphWS5emeLPknX9cGFJ/jCLUb9O+983Uj4IAiX9L/C0ZrehSz7NucAiv8ZMkIPJgUIh5MpHnJLo4zQQ+ujcvYXfmWRt9UFmdveWuAjYCfygbTRfiFFhit74m3qnliamio04wz3dInKSnd/01aDQMT9sFvT/d5+J5mOmoOQ4wJHaEOOdSOuPBZKEfeQXpllg5zU8QbQkwf7tjUA9ZzlPOalmmXpNwhBtbBP2KnzkEdAuDuwm9FcUM13YOpqDgMwdfeCoZ2O3ShietSB+5mkYIGCmJTOam7RaNwQgsNXxb8CXLxSAN3zeR9PvBBf0iYqiNl7lLQykX7oMBgY7A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4468.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(1076003)(2616005)(26005)(186003)(6506007)(6512007)(6666004)(52116002)(2906002)(83380400001)(5660300002)(8936002)(508600001)(6486002)(66476007)(66946007)(66556008)(4326008)(8676002)(316002)(38350700002)(38100700002)(103116003)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JAqQx+NBqWrJIL+oUI7bB9qzifUuHPGITQIWhJ62sFG/lpui9GMdahQGD+p+?= =?us-ascii?Q?CYj9vGT2dv8r4CVFrAGylpeB1IIsnsDM7yVA5B/xcrDSYof3q829u7sja7Na?= =?us-ascii?Q?okHX+Sux1ElbCpI6Djq12xmPTsV4DwOXBGZsrSUuxviW4w+dS9bBtdtPYq3x?= =?us-ascii?Q?XIofeLBxdlhlvh2SE2pBjbPAZBzZtlkenM61UilR7ATGUoGYdrP7bGOn1dpb?= =?us-ascii?Q?/BFI8OYvoT/fnBGMSOQboSNOqPe3/SrOo5OwgpcOX3lF9E9bMZDGtDKgieH+?= =?us-ascii?Q?y4es8+kY8drD5u6CMMLJwSXr4v9Q3hdkLcNWbYVxZGU/LrNsAHTVBbIbaiMv?= =?us-ascii?Q?xhUx1lZdy7eYzSaAoLT6SuN0gvRl9PhVOeRDBx6fB3Wb/eEpf+VhRM0jAAEO?= =?us-ascii?Q?lI33fD8rH8CKKKa3LKVLDm1QkAzHm9Z32IH/URvEeZWyBYf8WhWv2wvKsQP7?= =?us-ascii?Q?kf6c7Z3xNWQttcxHf44RbO/2lwuCg4Azb595Ac4REGAVPi+m0JzLvio73+ad?= =?us-ascii?Q?lhiZ3/LhS2pExTSDaCnfmAOqA0sH1HnjzIyfJPobX6yKc6aisimpFP1/2SC4?= =?us-ascii?Q?P/iOCvXcSgaYrrG9rePTC0eT3fZslEmmbaMzeKw0wIhfgZlbpJbedK98gEkg?= =?us-ascii?Q?WQZ9oSJ1xSc1tSSfs/j5rcdWsLhgHR5OO8yD0Baw35Kzml4y05nXu78YXv5m?= =?us-ascii?Q?TBrI+0fa3T2UarbEARFEtKVlAtrjyARzuIF28Vgac20G0iicWnRM20lFsiKI?= =?us-ascii?Q?75UKiZ+haytMEljxlNLgOm31Fsmy/BRBgKxiAHdmtey0vHyMiwdJs1RiVRVy?= =?us-ascii?Q?E+AgvWsy0RJfvxVFNvbODWZjXZmwNYk5Wm7HlcoUG5zoMUpW1iI/W9UsnID9?= =?us-ascii?Q?SsLILJuK2x6V0kCsYskU0PTreDekmHBmMURhuXmDCnPSfyBVIDBDMRuzUqyj?= =?us-ascii?Q?6Dg9v8TT87gI1Z2ED/SydPqiG/35Tkyf/W482KYF8NMTOuoGL3x8UUc7e2ie?= =?us-ascii?Q?ZCprf8JsIRL72ei5qgpk99FLwm+M1+vlsFJoP5w9xkNQjEMx3S8F2I5mKJpy?= =?us-ascii?Q?3Tutk0A8S5qk9JorfXjNi7NAoBfKaUt072fVIDAkrn6V5BtbJ6UrwanCVjb2?= =?us-ascii?Q?oRIpVBAJ1nsaaW+4c+llCMOqgswpNSzEpWwKyHsic1tu8eZrNYRiMJ8oooCp?= =?us-ascii?Q?abe0QlfVQPgRKPI+ZYlc3FusvBnmQz/13Zh47krcjqOvCv5CjXoT9G/HmYMD?= =?us-ascii?Q?h0wFNn79coDljudO7zambHpzqvgUdYgQl8HkYksfgbD3rHIFYuFkBt4+7fu8?= =?us-ascii?Q?eSlVt95y9fcL2Y6Qo/K3LwMBiyn02dausREzYc+C3UJPndkK6HRRacIeuD0P?= =?us-ascii?Q?mEQ0c+Ohx1W0jw/kJ11DNIGhxHVCLVB31c1l0SEHEsPaQltfN5ujl8UbSiBW?= =?us-ascii?Q?m04sCMDv/6qE1R9eECUirhAy7wYVUM/bGT1r+A/xIrQFf0a1wbs/FA=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea79e9bd-9ef0-4d2e-4464-08da07e775bd X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2022 07:26:32.1929 (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: ykfQXR0Sw1cfyIc6aDl+br66Tj8puvHYqqthlQWx+nw7wAT3NQEVLtSiT3IWVUrrfFt/lDGg2Eb96O4wNLTCuQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3067 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10288 signatures=693715 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 phishscore=0 suspectscore=0 mlxscore=0 adultscore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203170042 X-Proofpoint-GUID: xofnCzL-nS6Bea0raId9d86jhVlp0PtC X-Proofpoint-ORIG-GUID: xofnCzL-nS6Bea0raId9d86jhVlp0PtC Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In current kernfs design a single spinlock, kernfs_open_node_lock, protects the kernfs_node->attr.open i.e kernfs_open_node instances corresponding to a sysfs attribute. So separate tasks, which are opening or closing separate sysfs files, can contend on this spinlock. The contention is more apparent in large scale systems with few hundred CPUs where most of the CPUs have running tasks that are opening, accessing or closing sysfs files at any point of time. Using hashed spinlocks in place of a single global spinlock, can reduce contention around global spinlock and hence provide better scalability. Moreover as these hashed spinlocks are not part of kernfs_node objects we will not see any singnificant change in memory utilization of kernfs based file systems like sysfs, cgroupfs etc. Modify interface introduced in previous patch to make use of hashed spinlocks. Use kernfs_node address as hashing key. Signed-off-by: Imran Khan --- fs/kernfs/file.c | 9 --------- fs/kernfs/kernfs-internal.h | 6 +++--- fs/kernfs/mount.c | 4 +++- include/linux/kernfs.h | 10 +++++++++- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index 1658bfa048df..95426df9f030 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -18,15 +18,6 @@ =20 #include "kernfs-internal.h" =20 -/* - * kernfs_node->attr.open points to kernfs_open_node. attr.open is - * protected by kernfs_open_node_lock. - * - * filp->private_data points to seq_file whose ->private points to - * kernfs_open_file. - */ -DEFINE_SPINLOCK(kernfs_open_node_lock); - struct kernfs_open_node { atomic_t refcnt; atomic_t event; diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs-internal.h index 60404a93c28a..25c3329bd60e 100644 --- a/fs/kernfs/kernfs-internal.h +++ b/fs/kernfs/kernfs-internal.h @@ -169,8 +169,6 @@ extern const struct inode_operations kernfs_symlink_iop= s; */ extern struct kernfs_global_locks *kernfs_locks; =20 -extern spinlock_t kernfs_open_node_lock; - static inline struct mutex *kernfs_open_file_mutex_ptr(struct kernfs_node = *kn) { int idx =3D hash_ptr(kn, NR_KERNFS_LOCK_BITS); @@ -191,7 +189,9 @@ static inline struct mutex *kernfs_open_file_mutex_lock= (struct kernfs_node *kn) =20 static inline spinlock_t *kernfs_open_node_spinlock_ptr(struct kernfs_node= *kn) { - return &kernfs_open_node_lock; + int idx =3D hash_ptr(kn, NR_KERNFS_LOCK_BITS); + + return &kernfs_locks->open_node_locks[idx].lock; } =20 static inline spinlock_t *kernfs_open_node_spinlock(struct kernfs_node *kn) diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c index fa3fa22c95b2..809b738739b1 100644 --- a/fs/kernfs/mount.c +++ b/fs/kernfs/mount.c @@ -395,8 +395,10 @@ void __init kernfs_lock_init(void) kernfs_locks =3D kmalloc(sizeof(struct kernfs_global_locks), GFP_KERNEL); WARN_ON(!kernfs_locks); =20 - for (count =3D 0; count < NR_KERNFS_LOCKS; count++) + for (count =3D 0; count < NR_KERNFS_LOCKS; count++) { mutex_init(&kernfs_locks->open_file_mutex[count].lock); + spin_lock_init(&kernfs_locks->open_node_locks[count].lock); + } } =20 void __init kernfs_init(void) diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h index 1de54f4bdcc5..e82e57c007e9 100644 --- a/include/linux/kernfs.h +++ b/include/linux/kernfs.h @@ -19,6 +19,7 @@ #include #include #include +#include =20 struct file; struct dentry; @@ -75,20 +76,27 @@ struct kernfs_iattrs; * kernfs_open_file. * kernfs_open_files are chained at kernfs_open_node->files, which is * protected by kernfs_open_file_mutex.lock. + * + * kernfs_node->attr.open points to kernfs_open_node. attr.open is + * protected by kernfs_open_node_lock.lock. */ =20 struct kernfs_open_file_mutex { struct mutex lock; } ____cacheline_aligned_in_smp; =20 +struct kernfs_open_node_lock { + spinlock_t lock; +} ____cacheline_aligned_in_smp; + /* * To reduce possible contention in sysfs access, arising due to single * locks, use an array of locks and use kernfs_node object address as * hash keys to get the index of these locks. */ - struct kernfs_global_locks { struct kernfs_open_file_mutex open_file_mutex[NR_KERNFS_LOCKS]; + struct kernfs_open_node_lock open_node_locks[NR_KERNFS_LOCKS]; }; =20 enum kernfs_node_type { --=20 2.30.2 From nobody Mon Jun 22 20:26:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9ECD8C433EF for ; Thu, 17 Mar 2022 07:27:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230271AbiCQH20 (ORCPT ); Thu, 17 Mar 2022 03:28:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230212AbiCQH16 (ORCPT ); Thu, 17 Mar 2022 03:27:58 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5236E1266 for ; Thu, 17 Mar 2022 00:26:41 -0700 (PDT) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22H3Rgg3030868; Thu, 17 Mar 2022 07:26:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=BY8LCocKc1lJTuCSvV1cG3vOF5DxrJVlY7bCZOXl4xQ=; b=pFlTpVYNwTLK7ztQIR2ckYXWjNn/FQhkmjTGWyuKoWobkO7JAyVKugOdrY8IJwhUrqLX FZJSM3jOxxAlFsnMtjUKjkgn5HrNm9lrbpvZUIAV694kUdpY2eyPv8ah3cvU6HGmdHLR sXgekSlQwjw+3b3UbQSUtpDJnbx5alPuG/Zr9KZPoqhOFtRyViJ3GAwQ6YFCdXX6T34y 0sZvc05vFWMzPA6vx4Ngn0W159JWXg5ls9rTXjT2er49Is0qVMVy9/o7GKBYJGMjoSmN n89ANe7daUfSNqwfCyJd71CEs2fKcX0oRXl/z/q91ZQ3zWXAqbgFcg/SrxxCiq+wTAfF DA== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80] (may be forged)) by mx0b-00069f02.pphosted.com with ESMTP id 3et5s6reud-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:37 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 22H7BtLh180978; Thu, 17 Mar 2022 07:26:36 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2107.outbound.protection.outlook.com [104.47.70.107]) by userp3030.oracle.com with ESMTP id 3et65q1va9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Et4WlHJmJXkHd3U0rBRWLqpvNyypJUJIGxOOm3o3bcz2XBi7XI49g8+cPkIhLPBfxG2VttJMfIeVw2xJV7VYJDG7vJEjeLeuA75ononcXw7Tq3hNwoDcBfpkWBAFILYUnvUE0cRCH2FzFoVkdX3omthxdpyoassEd0O72SGQrYSAsfATl5xx90V37/ckOvrrrWz6HAW6aUpURfY5j1sCLi1irOrsV3k0VXaEk4wKCiYKl6rJtlsVxR9PYdW1Y40eAtlmEkvLxr6GVOiiMY5FfbjO6/7DYkq8c7oybb6tSg//WVJ6Edxmb9UWGXri2dfx3LDiXCtCoJsdoJ6H+kx9Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BY8LCocKc1lJTuCSvV1cG3vOF5DxrJVlY7bCZOXl4xQ=; b=e6pTtAveyyh5db7goHIja0c6roeMwTErlualjEJUkP86h6+YoN7CvAJ+hzpwbEpXi87oabtMawQlw5qoqzDpk8NAhETlkoXeN5gQhXbzL/MF09oYZGn1cSFtlcUOfbRIwI/U7n1iWNnmlxj5X+BklPf70u4F8xnKjG+xVD7L4oJHY3PmZdE6AEb5S+eHWU8HYmMCROtd0xoE9cex7zIRNK94yozLNzPkpJyDtQaCvM5T06xaxd8j/cxQC1lZGJ+0mkOhtVnpItQnyXXWl8maWSbl9fFZWJuTzlMd/Pv+mGqEKu7klSKISGySitZN4WnZzDgH0AuIAXFY9mlzVcgspw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BY8LCocKc1lJTuCSvV1cG3vOF5DxrJVlY7bCZOXl4xQ=; b=jedf1Lk8Sqhp47UVaS0nERLw/5Y8aPzbLc8P/anFpDZl4ZG6AVjw7DZDw0aBti6RzpEhsTtOrrEClYUBnnD/prHQ7GMCN+fbMAPuxNDTvubKKLfJ3Wb1I6MvHapDoI7/H5rBT8V20unJNXuVMIknHnewbUNa/w6c/dfFQ+IYnbo= Received: from CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) by DM6PR10MB3067.namprd10.prod.outlook.com (2603:10b6:5:6e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.26; Thu, 17 Mar 2022 07:26:34 +0000 Received: from CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa]) by CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa%9]) with mapi id 15.20.5081.017; Thu, 17 Mar 2022 07:26:34 +0000 From: Imran Khan To: tj@kernel.org, viro@zeniv.linux.org.uk Cc: gregkh@linuxfoundation.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v7 5/8] kernfs: Use a per-fs rwsem to protect per-fs list of kernfs_super_info. Date: Thu, 17 Mar 2022 18:26:09 +1100 Message-Id: <20220317072612.163143-6-imran.f.khan@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220317072612.163143-1-imran.f.khan@oracle.com> References: <20220317072612.163143-1-imran.f.khan@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SY6PR01CA0035.ausprd01.prod.outlook.com (2603:10c6:10:eb::22) To CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 90972759-7b9a-41d3-9896-08da07e776ec X-MS-TrafficTypeDiagnostic: DM6PR10MB3067:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 07XR1ckCCVy+zs8Sq3udXBW3vF9WmXQjmSGL0ImdouOHKTApNentSpYnzSSTkxCpx6m5zbU3zqJgUaSWqKPAsiLacdDAyi2ehfiuYA2g8t4ChUgFDt3LkuXvXLQUcr6xwe/U8ECTsZONl3ml/fYhz0ZrYyTHAPFk9mraY6vBYSQ2Zhedfqu5Hev7tswyTG2XkNvwiryLjvhg/eVS91mWVslrf15nguReQSaT2ye3EspiYBHs1p0I8N1NpX0CNpbWqPS2A2yOffsolBNJPUsvJL/n/+wLqdn+SlZj11qjBMuhiCLvubpfPZ1hjbGv+LcMtY3iKsfrQrZg8xiE5hZpFdu53kj81xLCJo5l058whqJxcmLK2SINq+H4iBvdn66t06qQIJleGf19oYaq5ZYhm+eQRTTXxmucWFXeok1kMYZmx+BnAw0ZZpZTV3FfcY4f9EsTWAV20A+nbBFb2fSm5Mf8Db4qRnfhhAOVSbvgE7XWWBs/5HNCtTPtQ6gcqkDZNA1Syhn24UR/R4vO5UybEK0MnSjCJwwivzxsSyehpdXtQnDYSXweF6c02cns4I710bQpLWwNvSvvJVZhei8JvpCdWJEWdD9eAHTaeyBgshW8L4Nu06eB7yLRef3h2NJQzJujkclFfs8zNZEe6irXSdKhcXVeMkIrp8YGzmjKrVGo0teHJQh2Th2WOkiBnN/eFR/jKvj6FRvV//qPGPobRg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4468.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(1076003)(2616005)(26005)(186003)(6506007)(6512007)(6666004)(52116002)(2906002)(83380400001)(5660300002)(8936002)(508600001)(6486002)(66476007)(66946007)(66556008)(4326008)(8676002)(316002)(38350700002)(38100700002)(103116003)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qhN5PC4ud7KKpG4kbCGinVDkUL44hvyUtqE80wkYbeU/rak++3nPdjmRvmei?= =?us-ascii?Q?s+i5E5GEmpFaC6lqKlwuFcozLjm5qfGQxCW7SyWzIUDTKN3BGOjRIPOSH923?= =?us-ascii?Q?9IoOGtkkITA/+V0VCbNxk9CzQQSC9fg/I3m3RhmYloJXHkb19p1SCsiR6pJX?= =?us-ascii?Q?xewk09xKi/tJVi33YGgP3Z1ao+XnygenXTNwaBpi1n8wUshlvSFJSKny8Leb?= =?us-ascii?Q?lUTJXHE9lr/7OdlKXd3mi2GKpfxzXhAc5pNDZr8RAHJQln+leqlubj6gQRQ2?= =?us-ascii?Q?w2x/QZA8xMouzocjClXntfELv3jCYlQ5IhAUWnHUlufxuP7+th60gHEK2n/I?= =?us-ascii?Q?dUjI5BKPXsmK/ovQ5uB/hObE77au3nDCMJpFQMxi8u9YkOtHkQqYcQSecpW0?= =?us-ascii?Q?f/tIxm15a7iNCYg+qMTME+11hTpjeAgy96sUrvHQanpWMJHLdeBekSy/lbRD?= =?us-ascii?Q?b1eaNrMZRe8tQKFSyX/1VXvhrEgPs9oCmb5qoZqE3SXkEdbcPB+cHLuhtccB?= =?us-ascii?Q?eYe6hDTrR51ryl+nvWFKvLfJlNL+KE1YUt8DfsMnwq8onlCizQ0V3iX4GPB1?= =?us-ascii?Q?7LtglFYiN6kjC0ogoUc5GIRK/SOenx0GGikkwtsg3FHXFQEjXwngw2Y8xFgS?= =?us-ascii?Q?gWppkabS9wOOa1WMsBXai4kIb6AuSpnc4SnYva42fvUffQussJUcMf5mod5h?= =?us-ascii?Q?RnoXTv1LTT/Dr+swa2Rmp1wet59H2aVAk2Vetag00WaJgYUHwNs7hmFtUV5N?= =?us-ascii?Q?IQly4EHjNeHbUZndNSaE4xNgdedENFgpgCXG/OfRO7tjf+i8dCYDA3H2P9vH?= =?us-ascii?Q?4anef04vRYVE++2jubsFsfy/S4ftvnRzbQ2mF+u6eYroFYJwU8Vvkh1rjqJm?= =?us-ascii?Q?1QfNNWjJczLlZMDpuzYh2GXTsxiRpTunLL+y/2kTcz8Ur7b8PXp+kG+R9d/m?= =?us-ascii?Q?p1bmgWp10qBm3ir9W1CDI05mxx0J+cMAZh35Ju9n+IKGXltjOpjUqCys64GJ?= =?us-ascii?Q?EoEAQZ9shHfzaOxMjmnXzVY2Vsw6w6i90NEixIGuUwhJrthzGVB4yOvhrMDq?= =?us-ascii?Q?2YUIZmb3PwCkjdlR/EuqTNFlFV7mTtDuTJ4/61kNkrjKUzHfxMWtARl0KZTr?= =?us-ascii?Q?szaDdC0Zf9g1rK/vl7T9FzyHMIS3CuraznxK6Vyu0h2Ve1pyuaV8AJVAkXp1?= =?us-ascii?Q?E0a1vIIWdo4iFz8pI62seb5cbNquhkQiWRVRdIkEoDqU6wD1h0BLE/lerMmT?= =?us-ascii?Q?efjKy8aVz9breVqMXjUBmYyuUChTkfNVuo6ZuzHQa1A6zM3MIZzO+gseVUKB?= =?us-ascii?Q?uc03bo4IncWdentXcKqXf3IoM0/ptYkfBuT3B2Gk1FX4p6N73ffQ3+hFNj+G?= =?us-ascii?Q?7jrRaApikxINppcCbTBRfMZRj9/+AqnqaVW+YGSpUTreEJ4XmGoeqnANizXz?= =?us-ascii?Q?PsZoyPaBAGO5S989/klkouNM/Zislp//s2djdrJHa90PiXMtYI79tw=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 90972759-7b9a-41d3-9896-08da07e776ec X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2022 07:26:34.2444 (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: cikg3ytatxaaj9wx9eLmjE4WSDpjqhTiaX6a2wdPuMAqOmzGE9tGVjjyYzE56umdgSiT66nwwhwF2hIvVFSQKg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3067 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10288 signatures=693715 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 suspectscore=0 adultscore=0 spamscore=0 bulkscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203170042 X-Proofpoint-GUID: 1xu4gxu9_iuBgM3bgUZO7bTY6qQ33CQ5 X-Proofpoint-ORIG-GUID: 1xu4gxu9_iuBgM3bgUZO7bTY6qQ33CQ5 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Right now per-fs kernfs_rwsem protects list of kernfs_super_info instances for a kernfs_root. Since kernfs_rwsem is used to synchronize several other operations across kernfs and since most of these operations don't impact kernfs_super_info, we can use a separate per-fs rwsem to synchronize access to list of kernfs_super_info. This helps in reducing contention around kernfs_rwsem and also allows operations that change/access list of kernfs_super_info to proceed without contending for kernfs_rwsem. Signed-off-by: Imran Khan --- fs/kernfs/dir.c | 1 + fs/kernfs/file.c | 2 ++ fs/kernfs/kernfs-internal.h | 1 + fs/kernfs/mount.c | 8 ++++---- include/linux/kernfs.h | 1 + 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c index 61a8edc4ba8b..17b438498c0b 100644 --- a/fs/kernfs/dir.c +++ b/fs/kernfs/dir.c @@ -917,6 +917,7 @@ struct kernfs_root *kernfs_create_root(struct kernfs_sy= scall_ops *scops, idr_init(&root->ino_idr); init_rwsem(&root->kernfs_rwsem); INIT_LIST_HEAD(&root->supers); + init_rwsem(&root->supers_rwsem); =20 /* * On 64bit ino setups, id is ino. On 32bit, low 32bits are ino. diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index 95426df9f030..07003d47343d 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -854,6 +854,7 @@ static void kernfs_notify_workfn(struct work_struct *wo= rk) /* kick fsnotify */ down_write(&root->kernfs_rwsem); =20 + down_write(&root->supers_rwsem); list_for_each_entry(info, &kernfs_root(kn)->supers, node) { struct kernfs_node *parent; struct inode *p_inode =3D NULL; @@ -889,6 +890,7 @@ static void kernfs_notify_workfn(struct work_struct *wo= rk) =20 iput(inode); } + up_write(&root->supers_rwsem); =20 up_write(&root->kernfs_rwsem); kernfs_put(kn); diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs-internal.h index 25c3329bd60e..6e6398a72578 100644 --- a/fs/kernfs/kernfs-internal.h +++ b/fs/kernfs/kernfs-internal.h @@ -47,6 +47,7 @@ struct kernfs_root { =20 wait_queue_head_t deactivate_waitq; struct rw_semaphore kernfs_rwsem; + struct rw_semaphore supers_rwsem; }; =20 /* +1 to avoid triggering overflow warning when negating it */ diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c index 809b738739b1..d35142226c34 100644 --- a/fs/kernfs/mount.c +++ b/fs/kernfs/mount.c @@ -347,9 +347,9 @@ int kernfs_get_tree(struct fs_context *fc) } sb->s_flags |=3D SB_ACTIVE; =20 - down_write(&root->kernfs_rwsem); + down_write(&root->supers_rwsem); list_add(&info->node, &info->root->supers); - up_write(&root->kernfs_rwsem); + up_write(&root->supers_rwsem); } =20 fc->root =3D dget(sb->s_root); @@ -376,9 +376,9 @@ void kernfs_kill_sb(struct super_block *sb) struct kernfs_super_info *info =3D kernfs_info(sb); struct kernfs_root *root =3D info->root; =20 - down_write(&root->kernfs_rwsem); + down_write(&root->supers_rwsem); list_del(&info->node); - up_write(&root->kernfs_rwsem); + up_write(&root->supers_rwsem); =20 /* * Remove the superblock from fs_supers/s_instances diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h index e82e57c007e9..9f0926f553fc 100644 --- a/include/linux/kernfs.h +++ b/include/linux/kernfs.h @@ -267,6 +267,7 @@ struct kernfs_root { =20 wait_queue_head_t deactivate_waitq; struct rw_semaphore kernfs_rwsem; + struct rw_semaphore supers_rwsem; }; #endif =20 --=20 2.30.2 From nobody Mon Jun 22 20:26:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 062BCC433EF for ; Thu, 17 Mar 2022 07:27:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230281AbiCQH2a (ORCPT ); Thu, 17 Mar 2022 03:28:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230231AbiCQH2D (ORCPT ); Thu, 17 Mar 2022 03:28:03 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE1991C16D9 for ; Thu, 17 Mar 2022 00:26:46 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22H3VavG012048; Thu, 17 Mar 2022 07:26:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=tuwhzupYn9MdHEhN7xuseMBuIqIbpn7WFU30TKjjxqQ=; b=bsHS4Ljf4TlUMvu8VmuQDYKFO0Zj4W2gkKdPT8J8GEUjYzpEIc6Kw1FKJKv3nKlpYEVs gHeeCNeyPcYy2RoqWf/as57bq3LZmgJuaeXOTkOQ1a9vAxmxGIQDlztwytDZcR+pGWTv sO6MHQOh2h3yOdi7CpCVzT5cR0ZmsF3u9Yln7BrFSfFIUGCBCprKc8kAEmcSV6I6KTHY mTvhVRhfcKCa2cKC++tq98k/H4BoGVGJRu74VgDO7n67ofZDnMHinrRr8CQgFxJ0x7L1 bFZsFA5h0GfY8o+/kz1kUcT6Tk8ZNKZjdW+LqgF4DeZETLNTObecZl+Drkzw8vjcI3gq OQ== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80] (may be forged)) by mx0b-00069f02.pphosted.com with ESMTP id 3et60rg5yq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:39 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 22H7BW5e180504; Thu, 17 Mar 2022 07:26:38 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2109.outbound.protection.outlook.com [104.47.58.109]) by userp3030.oracle.com with ESMTP id 3et65q1vab-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GMKa8lvYpU58utb9VkmC1LJfBqpCli+bSPJve5XWH+ldUdmbOSanDpXznkr1vGB0c4+FHWW8q3l3yRoPI4fo3na42V6OvCmxl6DW4pYpk8oi8fAAz+qrtkgG3mXDVtQjvomsdiW04PlG3Pn9wJraC00Jh9kqvjtaYzAEkCWYXQ/CAlzHR5keytf0nxuGgaZ1B6VyN1qDJWFIdZ/cDsNqJacCTNhYOTiM8jxaesFdWAJOFhd5T6X+hHffsJ8pOVvJrtp/wIT1Y4zPQIXtAB2V2NlDsVl9qyPhrZ2xxu8qVV1mgbVaww3Vl/ncIvRsoSril6ZxDPHWtgioHiwk/2A0/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tuwhzupYn9MdHEhN7xuseMBuIqIbpn7WFU30TKjjxqQ=; b=gYaJAcYUpdas7aBuYOAcZb3mCofKePBDJ3wHXhzQdT/PAvj/lCqFO4iPcGouiBYlICMBSAOt9Loxx3LoQ9SxOiMo0tS4YyYdRREVLM5X1CxHJEhfZ34Q2dRDgz2k62sYgYUGYUNBbmAMc4DHGBe69SU6xz8p8ZF3E/ouh5DkF3aNpA5Lm85iCQfrslWv89Y1asjESZCQxKOGRAqyLGnDVIoBEZmZv8TuvJHO8UTdAlSEMyDhs067ro3NlK+2WkKiw3StS2yznUmDEOUCop1U15J3g4C9HML3hka4J+UBhOZXzsuadaQcwUwPrT0DQn/gU0y26TUjGo5b0bIQP1hXsw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tuwhzupYn9MdHEhN7xuseMBuIqIbpn7WFU30TKjjxqQ=; b=Ji9HZsV9BXQsVQPxiPvNJiU96gcHkf/cY7oCWZwDtLvHCYloAtVf1OfEN5DOShlTtTh7Ahe3rJuAt/EuYHkLMCLqFyxW0c3GcQ+8H8aJusahRFhNiaWAvALTtCa7ATL4Ti4hn2wCT+8llkVbJ77X8xHZSK8+MK4l3LgzH6i0e0w= Received: from CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) by DM6PR10MB4332.namprd10.prod.outlook.com (2603:10b6:5:220::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.17; Thu, 17 Mar 2022 07:26:36 +0000 Received: from CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa]) by CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa%9]) with mapi id 15.20.5081.017; Thu, 17 Mar 2022 07:26:36 +0000 From: Imran Khan To: tj@kernel.org, viro@zeniv.linux.org.uk Cc: gregkh@linuxfoundation.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v7 6/8] kernfs: Introduce interface to access per-fs rwsem. Date: Thu, 17 Mar 2022 18:26:10 +1100 Message-Id: <20220317072612.163143-7-imran.f.khan@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220317072612.163143-1-imran.f.khan@oracle.com> References: <20220317072612.163143-1-imran.f.khan@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SY6PR01CA0035.ausprd01.prod.outlook.com (2603:10c6:10:eb::22) To CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: efd8c823-a3fb-4664-5673-08da07e77814 X-MS-TrafficTypeDiagnostic: DM6PR10MB4332:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zQUrLm5hJRlegYuqJJBT/r0xY0LXJAlGa8P6a4Z+B11MSkdYqPJzcQOwGXNUVirtldVBVTgl7cZP22jhLLf3yerqbqdUxlk/oBWKGjQDhpWzW5SfATzyXAWrCf3FRFwSU2Hh9XXzwZUtgmNJKxUphwM+vReqlj7Bv/icwWaeTu5wvA6GFYK9+IoYc+g4v8A5VJ83SjcIyr9wccNSyRpQTvXZYIsL1Rwte51UWdVuOrWn/Z2KJeS0gxuXciQqo6Azhd6YToVLpuNJEqozKxNNR6PMTgFjN5LW0I+9JFd6AGDNuyesLMXlkfWjU413lshj+tdPVgGa0Hh16vFyLstHSJTqGRy8yc6hKM/7r8Jy3UhkZZLg2p83VwrA3tswpw7JSZG6dDSa0UUr9ZfDgXzmzhju+bCM5xWagjZNIGO557uFzF3VZUgnAJZDFfVbiqltRAE1BExudZSQvYIMxl6t3gomMSopHtF69zRCTH9n3G10/f+qns+szdSgVspPksnHhOSdMCMO74mnKHNlbisx7pFy7zmq/otDQ2QKhTcwCxH9jJ2H3prUHWxtKpAk4LPkZ8Q5sCx/CNRWjqzdZJcKPk/5xxKYO9+0Mw7r87aiBU059XGga8y06nh349aWYGYRnIdaZGoWtz/Vmao/UhrFT53tJtI6ZI9hQt3eOFdWUbLRnDA+SarklLwIiWULwVW2DcgIR6Hfa6j9Yyq5rGeFeA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4468.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6512007)(2906002)(8936002)(26005)(52116002)(36756003)(38100700002)(316002)(186003)(38350700002)(103116003)(6506007)(86362001)(6666004)(83380400001)(1076003)(5660300002)(30864003)(4326008)(66946007)(6486002)(8676002)(66556008)(66476007)(508600001)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?P2TZYhw8ZFfgrGvFg5PQyqlIGkWrX+In/gic70UwFUKR653q4nwPPVky0NKF?= =?us-ascii?Q?h3bOA9uLs6bxXaU1uyrAcj36oVtz8lckLeap7NnhsZSuPz1LXCBiIVtHWpQC?= =?us-ascii?Q?bRD21r80xLNMyi6tSXGIpLKs6yLxDwLqU8KGrl63GwVvXUP0sDZdSp0YgYNi?= =?us-ascii?Q?eZyK97+Mwse6h2+/qCsBlCy86aaqmUL9hB9aA+rzQs0negm/AvHlxY6cnhyT?= =?us-ascii?Q?LA70oGd5q2L/lZCSDjoeQvXrbSxLoA/s7q+rSF6+jNa4LPoECN6uih5aXkUf?= =?us-ascii?Q?3FRDR4Jn5+lG2wVDTpxAQnyL35RBFOMDtQVzv9cQzOQnmuFDeY9dytlj1YWt?= =?us-ascii?Q?P2s0ZnNCafnRmE1Zq7Ppr91wtCFR++Gp3O3qKNh1lbrNCHdD/rdzeu7g3eLR?= =?us-ascii?Q?1AJww1xoRY2WwDHx9Vf/kqSFicJ/s9NIU1QT8YAN+nAY6YZiXm1Qz1pGx8dS?= =?us-ascii?Q?RdR8UySoKp24uTpEm0aJFMxgu3AcFtd1mSDybKkggNGQIkmWoq2GakCh9Oua?= =?us-ascii?Q?gn47qGd3+WurMwBTrJc2l/Jhsv+gVrUPI7q2Yev9URmMdpyGPD5Z2S3FHep+?= =?us-ascii?Q?IiJh3a9L3phFYBhMNLWqdUFkVR3DFLI3T+r5gDP/EN8DKNHkWojFraZ1slbK?= =?us-ascii?Q?0qH4e7T4nuK3w+DplwvgMf5PjosHbnhxnMlMIOgnas4c0bGbBeSpgg5flniA?= =?us-ascii?Q?1IYaipOVA9dCIhsxbw+FwPRr/FudGwp0HgBiSZDUA5+88UKhU2ErSvu63hsU?= =?us-ascii?Q?jt2q7RZkDNmKKRhjcLl+ZahGoztPXdS2k1mYPbevS4OQMQLdr6dWb5Qd3oar?= =?us-ascii?Q?sfpsm/d4pmQEMYVO9Eb1xHaHvoi/MeIBVMAdSqtsu96BmH6v8htQA9SEiiiA?= =?us-ascii?Q?W7bxrvILdgsD5zXULcbcYJrqGg8LZRf6GDSNKev3XMflrpK9mbXr1aKd6qK3?= =?us-ascii?Q?rzAwMoimvYT7H4CmNIkq4HSWzXEEhLIjmYHkkEOFB7G5Peff7gRGzmhiVkXj?= =?us-ascii?Q?Q15Hv9yCYoY8Ma0lAFSbpoCkFiMkUuHmCF08jJU0mmG+UQmCQNUJ+La9OuT4?= =?us-ascii?Q?8fcbwE4JoOaF0jwN05xy0ZcR1/TLPoZ2Iimmfj6oq6WLOaiXOweXpe1jrO9K?= =?us-ascii?Q?GZbP5U8LmmGASu883aoTVDHUk/McM00YiwOGKXidz4mo5CkmHbxtTWqz0AbE?= =?us-ascii?Q?dv1AQB7vf0JuKw9DcOiNNYoF4XUUwxVBMnOQ1zwbGiF9ijAnr6ShNqVZy8YO?= =?us-ascii?Q?pthgkLG7RihfcFS40X/e4zPdqpP/iARIdXFFjuVFc8vTKICMD2gqjcW9wHtt?= =?us-ascii?Q?kkB81PEJRrue7aHdQEzJaL2L4CvdhUVV6TrNn/2dwV8hoiG52kzb5gUAbFcb?= =?us-ascii?Q?/H+aTt3BhlwFW5bD4c7ADOEFnHlP9MW9GrO0uDm17cO5eyNWfJIF9d60x7zL?= =?us-ascii?Q?+s+NXZdtAn5t/WiIy/hSZMQqSnZvhp/QS7luiOrqxKovuGq+9AIheQ=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: efd8c823-a3fb-4664-5673-08da07e77814 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2022 07:26:36.1359 (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: 9uypESRAzb6yWZu3Pb8W+BPNFeUJwf86i4OaogN4uaiiqXLmWMo3S5xfmB3ljsoAgfhzcveDDYFg7hnYQs4zWA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4332 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10288 signatures=693715 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 suspectscore=0 adultscore=0 spamscore=0 bulkscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203170042 X-Proofpoint-GUID: IzPj4xcaNHpXhIZmIqDVbY6dT_BhsWiC X-Proofpoint-ORIG-GUID: IzPj4xcaNHpXhIZmIqDVbY6dT_BhsWiC Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" per-fs rwsem is used across kernfs for synchronization purposes. Having an interface to access it not only avoids code duplication, it can also help in changing the underlying locking mechanism without needing to change the lock users. For example next patch modifies this interface to make use of hashed rwsems in place of per-fs rwsem. Signed-off-by: Imran Khan --- fs/kernfs/dir.c | 114 ++++++++++++++++++------------------ fs/kernfs/file.c | 5 +- fs/kernfs/inode.c | 26 ++++---- fs/kernfs/kernfs-internal.h | 78 ++++++++++++++++++++++++ fs/kernfs/mount.c | 6 +- fs/kernfs/symlink.c | 6 +- 6 files changed, 156 insertions(+), 79 deletions(-) diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c index 17b438498c0b..5dce041b10c3 100644 --- a/fs/kernfs/dir.c +++ b/fs/kernfs/dir.c @@ -25,7 +25,7 @@ static DEFINE_SPINLOCK(kernfs_idr_lock); /* root->ino_idr= */ =20 static bool kernfs_active(struct kernfs_node *kn) { - lockdep_assert_held(&kernfs_root(kn)->kernfs_rwsem); + kernfs_rwsem_assert_held(kn); return atomic_read(&kn->active) >=3D 0; } =20 @@ -461,10 +461,16 @@ static void kernfs_drain(struct kernfs_node *kn) { struct kernfs_root *root =3D kernfs_root(kn); =20 - lockdep_assert_held_write(&root->kernfs_rwsem); + /** + * kn has the same root as its ancestor, so it can be used to get + * per-fs rwsem. + */ + struct rw_semaphore *rwsem =3D kernfs_rwsem_ptr(kn); + + kernfs_rwsem_assert_held_write(kn); WARN_ON_ONCE(kernfs_active(kn)); =20 - up_write(&root->kernfs_rwsem); + kernfs_up_write(rwsem); =20 if (kernfs_lockdep(kn)) { rwsem_acquire(&kn->dep_map, 0, 0, _RET_IP_); @@ -483,7 +489,7 @@ static void kernfs_drain(struct kernfs_node *kn) =20 kernfs_drain_open_files(kn); =20 - down_write(&root->kernfs_rwsem); + kernfs_down_write(kn); } =20 /** @@ -718,12 +724,12 @@ struct kernfs_node *kernfs_find_and_get_node_by_id(st= ruct kernfs_root *root, int kernfs_add_one(struct kernfs_node *kn) { struct kernfs_node *parent =3D kn->parent; - struct kernfs_root *root =3D kernfs_root(parent); struct kernfs_iattrs *ps_iattr; + struct rw_semaphore *rwsem; bool has_ns; int ret; =20 - down_write(&root->kernfs_rwsem); + rwsem =3D kernfs_down_write(parent); =20 ret =3D -EINVAL; has_ns =3D kernfs_ns_enabled(parent); @@ -754,7 +760,7 @@ int kernfs_add_one(struct kernfs_node *kn) ps_iattr->ia_mtime =3D ps_iattr->ia_ctime; } =20 - up_write(&root->kernfs_rwsem); + kernfs_up_write(rwsem); =20 /* * Activate the new node unless CREATE_DEACTIVATED is requested. @@ -768,7 +774,7 @@ int kernfs_add_one(struct kernfs_node *kn) return 0; =20 out_unlock: - up_write(&root->kernfs_rwsem); + kernfs_up_write(rwsem); return ret; } =20 @@ -789,7 +795,7 @@ static struct kernfs_node *kernfs_find_ns(struct kernfs= _node *parent, bool has_ns =3D kernfs_ns_enabled(parent); unsigned int hash; =20 - lockdep_assert_held(&kernfs_root(parent)->kernfs_rwsem); + kernfs_rwsem_assert_held(parent); =20 if (has_ns !=3D (bool)ns) { WARN(1, KERN_WARNING "kernfs: ns %s in '%s' for '%s'\n", @@ -821,7 +827,7 @@ static struct kernfs_node *kernfs_walk_ns(struct kernfs= _node *parent, size_t len; char *p, *name; =20 - lockdep_assert_held_read(&kernfs_root(parent)->kernfs_rwsem); + kernfs_rwsem_assert_held_read(parent); =20 /* grab kernfs_rename_lock to piggy back on kernfs_pr_cont_buf */ spin_lock_irq(&kernfs_rename_lock); @@ -860,12 +866,12 @@ struct kernfs_node *kernfs_find_and_get_ns(struct ker= nfs_node *parent, const char *name, const void *ns) { struct kernfs_node *kn; - struct kernfs_root *root =3D kernfs_root(parent); + struct rw_semaphore *rwsem; =20 - down_read(&root->kernfs_rwsem); + rwsem =3D kernfs_down_read(parent); kn =3D kernfs_find_ns(parent, name, ns); kernfs_get(kn); - up_read(&root->kernfs_rwsem); + kernfs_up_read(rwsem); =20 return kn; } @@ -885,12 +891,12 @@ struct kernfs_node *kernfs_walk_and_get_ns(struct ker= nfs_node *parent, const char *path, const void *ns) { struct kernfs_node *kn; - struct kernfs_root *root =3D kernfs_root(parent); + struct rw_semaphore *rwsem; =20 - down_read(&root->kernfs_rwsem); + rwsem =3D kernfs_down_read(parent); kn =3D kernfs_walk_ns(parent, path, ns); kernfs_get(kn); - up_read(&root->kernfs_rwsem); + kernfs_up_read(rwsem); =20 return kn; } @@ -1055,7 +1061,7 @@ struct kernfs_node *kernfs_create_empty_dir(struct ke= rnfs_node *parent, static int kernfs_dop_revalidate(struct dentry *dentry, unsigned int flags) { struct kernfs_node *kn; - struct kernfs_root *root; + struct rw_semaphore *rwsem; =20 if (flags & LOOKUP_RCU) return -ECHILD; @@ -1071,13 +1077,12 @@ static int kernfs_dop_revalidate(struct dentry *den= try, unsigned int flags) parent =3D kernfs_dentry_node(dentry->d_parent); if (parent) { spin_unlock(&dentry->d_lock); - root =3D kernfs_root(parent); - down_read(&root->kernfs_rwsem); + rwsem =3D kernfs_down_read(parent); if (kernfs_dir_changed(parent, dentry)) { - up_read(&root->kernfs_rwsem); + kernfs_up_read(rwsem); return 0; } - up_read(&root->kernfs_rwsem); + kernfs_up_read(rwsem); } else spin_unlock(&dentry->d_lock); =20 @@ -1088,8 +1093,7 @@ static int kernfs_dop_revalidate(struct dentry *dentr= y, unsigned int flags) } =20 kn =3D kernfs_dentry_node(dentry); - root =3D kernfs_root(kn); - down_read(&root->kernfs_rwsem); + rwsem =3D kernfs_down_read(kn); =20 /* The kernfs node has been deactivated */ if (!kernfs_active(kn)) @@ -1108,10 +1112,10 @@ static int kernfs_dop_revalidate(struct dentry *den= try, unsigned int flags) kernfs_info(dentry->d_sb)->ns !=3D kn->ns) goto out_bad; =20 - up_read(&root->kernfs_rwsem); + kernfs_up_read(rwsem); return 1; out_bad: - up_read(&root->kernfs_rwsem); + kernfs_up_read(rwsem); return 0; } =20 @@ -1125,12 +1129,11 @@ static struct dentry *kernfs_iop_lookup(struct inod= e *dir, { struct kernfs_node *parent =3D dir->i_private; struct kernfs_node *kn; - struct kernfs_root *root; struct inode *inode =3D NULL; const void *ns =3D NULL; + struct rw_semaphore *rwsem; =20 - root =3D kernfs_root(parent); - down_read(&root->kernfs_rwsem); + rwsem =3D kernfs_down_read(parent); if (kernfs_ns_enabled(parent)) ns =3D kernfs_info(dir->i_sb)->ns; =20 @@ -1141,7 +1144,7 @@ static struct dentry *kernfs_iop_lookup(struct inode = *dir, * create a negative. */ if (!kernfs_active(kn)) { - up_read(&root->kernfs_rwsem); + kernfs_up_read(rwsem); return NULL; } inode =3D kernfs_get_inode(dir->i_sb, kn); @@ -1156,7 +1159,7 @@ static struct dentry *kernfs_iop_lookup(struct inode = *dir, */ if (!IS_ERR(inode)) kernfs_set_rev(parent, dentry); - up_read(&root->kernfs_rwsem); + kernfs_up_read(rwsem); =20 /* instantiate and hash (possibly negative) dentry */ return d_splice_alias(inode, dentry); @@ -1279,7 +1282,7 @@ static struct kernfs_node *kernfs_next_descendant_pos= t(struct kernfs_node *pos, { struct rb_node *rbn; =20 - lockdep_assert_held_write(&kernfs_root(root)->kernfs_rwsem); + kernfs_rwsem_assert_held_write(root); =20 /* if first iteration, visit leftmost descendant which may be root */ if (!pos) @@ -1314,9 +1317,9 @@ static struct kernfs_node *kernfs_next_descendant_pos= t(struct kernfs_node *pos, void kernfs_activate(struct kernfs_node *kn) { struct kernfs_node *pos; - struct kernfs_root *root =3D kernfs_root(kn); + struct rw_semaphore *rwsem; =20 - down_write(&root->kernfs_rwsem); + rwsem =3D kernfs_down_write(kn); =20 pos =3D NULL; while ((pos =3D kernfs_next_descendant_post(pos, kn))) { @@ -1330,14 +1333,14 @@ void kernfs_activate(struct kernfs_node *kn) pos->flags |=3D KERNFS_ACTIVATED; } =20 - up_write(&root->kernfs_rwsem); + kernfs_up_write(rwsem); } =20 static void __kernfs_remove(struct kernfs_node *kn) { struct kernfs_node *pos; =20 - lockdep_assert_held_write(&kernfs_root(kn)->kernfs_rwsem); + kernfs_rwsem_assert_held_write(kn); =20 /* * Short-circuit if non-root @kn has already finished removal. @@ -1407,11 +1410,11 @@ static void __kernfs_remove(struct kernfs_node *kn) */ void kernfs_remove(struct kernfs_node *kn) { - struct kernfs_root *root =3D kernfs_root(kn); + struct rw_semaphore *rwsem; =20 - down_write(&root->kernfs_rwsem); + rwsem =3D kernfs_down_write(kn); __kernfs_remove(kn); - up_write(&root->kernfs_rwsem); + kernfs_up_write(rwsem); } =20 /** @@ -1497,9 +1500,9 @@ void kernfs_unbreak_active_protection(struct kernfs_n= ode *kn) bool kernfs_remove_self(struct kernfs_node *kn) { bool ret; - struct kernfs_root *root =3D kernfs_root(kn); + struct rw_semaphore *rwsem; =20 - down_write(&root->kernfs_rwsem); + rwsem =3D kernfs_down_write(kn); kernfs_break_active_protection(kn); =20 /* @@ -1527,9 +1530,9 @@ bool kernfs_remove_self(struct kernfs_node *kn) atomic_read(&kn->active) =3D=3D KN_DEACTIVATED_BIAS) break; =20 - up_write(&root->kernfs_rwsem); + kernfs_up_write(rwsem); schedule(); - down_write(&root->kernfs_rwsem); + rwsem =3D kernfs_down_write(kn); } finish_wait(waitq, &wait); WARN_ON_ONCE(!RB_EMPTY_NODE(&kn->rb)); @@ -1542,7 +1545,7 @@ bool kernfs_remove_self(struct kernfs_node *kn) */ kernfs_unbreak_active_protection(kn); =20 - up_write(&root->kernfs_rwsem); + kernfs_up_write(rwsem); return ret; } =20 @@ -1559,7 +1562,7 @@ int kernfs_remove_by_name_ns(struct kernfs_node *pare= nt, const char *name, const void *ns) { struct kernfs_node *kn; - struct kernfs_root *root; + struct rw_semaphore *rwsem; =20 if (!parent) { WARN(1, KERN_WARNING "kernfs: can not remove '%s', no directory\n", @@ -1567,14 +1570,13 @@ int kernfs_remove_by_name_ns(struct kernfs_node *pa= rent, const char *name, return -ENOENT; } =20 - root =3D kernfs_root(parent); - down_write(&root->kernfs_rwsem); + rwsem =3D kernfs_down_write(parent); =20 kn =3D kernfs_find_ns(parent, name, ns); if (kn) __kernfs_remove(kn); =20 - up_write(&root->kernfs_rwsem); + kernfs_up_write(rwsem); =20 if (kn) return 0; @@ -1593,16 +1595,15 @@ int kernfs_rename_ns(struct kernfs_node *kn, struct= kernfs_node *new_parent, const char *new_name, const void *new_ns) { struct kernfs_node *old_parent; - struct kernfs_root *root; const char *old_name =3D NULL; + struct rw_semaphore *rwsem; int error; =20 /* can't move or rename root */ if (!kn->parent) return -EINVAL; =20 - root =3D kernfs_root(kn); - down_write(&root->kernfs_rwsem); + rwsem =3D kernfs_down_write(kn); =20 error =3D -ENOENT; if (!kernfs_active(kn) || !kernfs_active(new_parent) || @@ -1656,7 +1657,7 @@ int kernfs_rename_ns(struct kernfs_node *kn, struct k= ernfs_node *new_parent, =20 error =3D 0; out: - up_write(&root->kernfs_rwsem); + kernfs_up_write(rwsem); return error; } =20 @@ -1727,14 +1728,13 @@ static int kernfs_fop_readdir(struct file *file, st= ruct dir_context *ctx) struct dentry *dentry =3D file->f_path.dentry; struct kernfs_node *parent =3D kernfs_dentry_node(dentry); struct kernfs_node *pos =3D file->private_data; - struct kernfs_root *root; const void *ns =3D NULL; + struct rw_semaphore *rwsem; =20 if (!dir_emit_dots(file, ctx)) return 0; =20 - root =3D kernfs_root(parent); - down_read(&root->kernfs_rwsem); + rwsem =3D kernfs_down_read(parent); =20 if (kernfs_ns_enabled(parent)) ns =3D kernfs_info(dentry->d_sb)->ns; @@ -1751,12 +1751,12 @@ static int kernfs_fop_readdir(struct file *file, st= ruct dir_context *ctx) file->private_data =3D pos; kernfs_get(pos); =20 - up_read(&root->kernfs_rwsem); + kernfs_up_read(rwsem); if (!dir_emit(ctx, name, len, ino, type)) return 0; - down_read(&root->kernfs_rwsem); + rwsem =3D kernfs_down_read(parent); } - up_read(&root->kernfs_rwsem); + kernfs_up_read(rwsem); file->private_data =3D NULL; ctx->pos =3D INT_MAX; return 0; diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index 07003d47343d..f46c25fb789f 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -838,6 +838,7 @@ static void kernfs_notify_workfn(struct work_struct *wo= rk) struct kernfs_node *kn; struct kernfs_super_info *info; struct kernfs_root *root; + struct rw_semaphore *rwsem; repeat: /* pop one off the notify_list */ spin_lock_irq(&kernfs_notify_lock); @@ -852,7 +853,7 @@ static void kernfs_notify_workfn(struct work_struct *wo= rk) =20 root =3D kernfs_root(kn); /* kick fsnotify */ - down_write(&root->kernfs_rwsem); + rwsem =3D kernfs_down_write(kn); =20 down_write(&root->supers_rwsem); list_for_each_entry(info, &kernfs_root(kn)->supers, node) { @@ -892,7 +893,7 @@ static void kernfs_notify_workfn(struct work_struct *wo= rk) } up_write(&root->supers_rwsem); =20 - up_write(&root->kernfs_rwsem); + kernfs_up_write(rwsem); kernfs_put(kn); goto repeat; } diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c index 3d783d80f5da..efe5ae98abf4 100644 --- a/fs/kernfs/inode.c +++ b/fs/kernfs/inode.c @@ -99,11 +99,11 @@ int __kernfs_setattr(struct kernfs_node *kn, const stru= ct iattr *iattr) int kernfs_setattr(struct kernfs_node *kn, const struct iattr *iattr) { int ret; - struct kernfs_root *root =3D kernfs_root(kn); + struct rw_semaphore *rwsem; =20 - down_write(&root->kernfs_rwsem); + rwsem =3D kernfs_down_write(kn); ret =3D __kernfs_setattr(kn, iattr); - up_write(&root->kernfs_rwsem); + kernfs_up_write(rwsem); return ret; } =20 @@ -112,14 +112,13 @@ int kernfs_iop_setattr(struct user_namespace *mnt_use= rns, struct dentry *dentry, { struct inode *inode =3D d_inode(dentry); struct kernfs_node *kn =3D inode->i_private; - struct kernfs_root *root; + struct rw_semaphore *rwsem; int error; =20 if (!kn) return -EINVAL; =20 - root =3D kernfs_root(kn); - down_write(&root->kernfs_rwsem); + rwsem =3D kernfs_down_write(kn); error =3D setattr_prepare(&init_user_ns, dentry, iattr); if (error) goto out; @@ -132,7 +131,7 @@ int kernfs_iop_setattr(struct user_namespace *mnt_usern= s, struct dentry *dentry, setattr_copy(&init_user_ns, inode, iattr); =20 out: - up_write(&root->kernfs_rwsem); + kernfs_up_write(rwsem); return error; } =20 @@ -187,14 +186,14 @@ int kernfs_iop_getattr(struct user_namespace *mnt_use= rns, { struct inode *inode =3D d_inode(path->dentry); struct kernfs_node *kn =3D inode->i_private; - struct kernfs_root *root =3D kernfs_root(kn); + struct rw_semaphore *rwsem; =20 - down_read(&root->kernfs_rwsem); + rwsem =3D kernfs_down_read(kn); spin_lock(&inode->i_lock); kernfs_refresh_inode(kn, inode); generic_fillattr(&init_user_ns, inode, stat); spin_unlock(&inode->i_lock); - up_read(&root->kernfs_rwsem); + kernfs_up_read(rwsem); =20 return 0; } @@ -277,22 +276,21 @@ void kernfs_evict_inode(struct inode *inode) int kernfs_iop_permission(struct user_namespace *mnt_userns, struct inode *inode, int mask) { + struct rw_semaphore *rwsem; struct kernfs_node *kn; - struct kernfs_root *root; int ret; =20 if (mask & MAY_NOT_BLOCK) return -ECHILD; =20 kn =3D inode->i_private; - root =3D kernfs_root(kn); =20 - down_read(&root->kernfs_rwsem); + rwsem =3D kernfs_down_read(kn); spin_lock(&inode->i_lock); kernfs_refresh_inode(kn, inode); ret =3D generic_permission(&init_user_ns, inode, mask); spin_unlock(&inode->i_lock); - up_read(&root->kernfs_rwsem); + kernfs_up_read(rwsem); =20 return ret; } diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs-internal.h index 6e6398a72578..8b24bc7e36c2 100644 --- a/fs/kernfs/kernfs-internal.h +++ b/fs/kernfs/kernfs-internal.h @@ -206,4 +206,82 @@ static inline spinlock_t *kernfs_open_node_spinlock(st= ruct kernfs_node *kn) return lock; } =20 +static inline struct rw_semaphore *kernfs_rwsem_ptr(struct kernfs_node *kn) +{ + struct kernfs_root *root =3D kernfs_root(kn); + + return &root->kernfs_rwsem; +} + +static inline void kernfs_rwsem_assert_held(struct kernfs_node *kn) +{ + lockdep_assert_held(kernfs_rwsem_ptr(kn)); +} + +static inline void kernfs_rwsem_assert_held_write(struct kernfs_node *kn) +{ + lockdep_assert_held_write(kernfs_rwsem_ptr(kn)); +} + +static inline void kernfs_rwsem_assert_held_read(struct kernfs_node *kn) +{ + lockdep_assert_held_read(kernfs_rwsem_ptr(kn)); +} + +/** + * kernfs_down_write() - Acquire kernfs rwsem + * + * @kn: kernfs_node for which rwsem needs to be taken + * + * Return: pointer to acquired rwsem + */ +static inline struct rw_semaphore *kernfs_down_write(struct kernfs_node *k= n) +{ + struct rw_semaphore *rwsem =3D kernfs_rwsem_ptr(kn); + + down_write(rwsem); + + return rwsem; +} + +/** + * kernfs_up_write - Release kernfs rwsem + * + * @rwsem: address of rwsem to release + * + * Return: void + */ +static inline void kernfs_up_write(struct rw_semaphore *rwsem) +{ + up_write(rwsem); +} + +/** + * kernfs_down_read() - Acquire kernfs rwsem + * + * @kn: kernfs_node for which rwsem needs to be taken + * + * Return: pointer to acquired rwsem + */ +static inline struct rw_semaphore *kernfs_down_read(struct kernfs_node *kn) +{ + struct rw_semaphore *rwsem =3D kernfs_rwsem_ptr(kn); + + down_read(rwsem); + + return rwsem; +} + +/** + * kernfs_up_read - Release kernfs rwsem + * + * @rwsem: address of rwsem to release + * + * Return: void + */ +static inline void kernfs_up_read(struct rw_semaphore *rwsem) +{ + up_read(rwsem); +} + #endif /* __KERNFS_INTERNAL_H */ diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c index d35142226c34..f88dc4e26ffb 100644 --- a/fs/kernfs/mount.c +++ b/fs/kernfs/mount.c @@ -237,9 +237,9 @@ struct dentry *kernfs_node_dentry(struct kernfs_node *k= n, static int kernfs_fill_super(struct super_block *sb, struct kernfs_fs_cont= ext *kfc) { struct kernfs_super_info *info =3D kernfs_info(sb); - struct kernfs_root *kf_root =3D kfc->root; struct inode *inode; struct dentry *root; + struct rw_semaphore *rwsem; =20 info->sb =3D sb; /* Userspace would break if executables or devices appear on sysfs */ @@ -257,9 +257,9 @@ static int kernfs_fill_super(struct super_block *sb, st= ruct kernfs_fs_context *k sb->s_shrink.seeks =3D 0; =20 /* get root inode, initialize and unlock it */ - down_read(&kf_root->kernfs_rwsem); + rwsem =3D kernfs_down_read(info->root->kn); inode =3D kernfs_get_inode(sb, info->root->kn); - up_read(&kf_root->kernfs_rwsem); + kernfs_up_read(rwsem); if (!inode) { pr_debug("kernfs: could not get root inode\n"); return -ENOMEM; diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c index 0ab13824822f..9d4103602554 100644 --- a/fs/kernfs/symlink.c +++ b/fs/kernfs/symlink.c @@ -113,12 +113,12 @@ static int kernfs_getlink(struct inode *inode, char *= path) struct kernfs_node *kn =3D inode->i_private; struct kernfs_node *parent =3D kn->parent; struct kernfs_node *target =3D kn->symlink.target_kn; - struct kernfs_root *root =3D kernfs_root(parent); + struct rw_semaphore *rwsem; int error; =20 - down_read(&root->kernfs_rwsem); + rwsem =3D kernfs_down_read(parent); error =3D kernfs_get_target_path(parent, target, path); - up_read(&root->kernfs_rwsem); + kernfs_up_read(rwsem); =20 return error; } --=20 2.30.2 From nobody Mon Jun 22 20:26:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B941C433EF for ; Thu, 17 Mar 2022 07:27:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230286AbiCQH2d (ORCPT ); Thu, 17 Mar 2022 03:28:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230233AbiCQH2E (ORCPT ); Thu, 17 Mar 2022 03:28:04 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 025BB1C16DA for ; Thu, 17 Mar 2022 00:26:46 -0700 (PDT) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22H3Rgg4030868; Thu, 17 Mar 2022 07:26:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=EKUFwlNv1FDedFXl72t1Pb4S/z4RfOsXGDuAp0EdtYA=; b=XuRhJe9XbVrPaSTMox+1vaGPuo4uxBTjMw8YnSd7xTGQySZSb/ABGayd0MvbUe+84cyZ GHNKhHau2PIcGHZkV8I52NgbciGWlY4KzUBOziuSPpuNZ2tKuwEcxZPa0u4zQIfWa5DS FbY9A+U3HNZFfTmEDofGR8sh2WkOgWBPYoTEoxU/LcUQPJLVmw2oZFM09EGuvSBj0AZ4 4k7cgVQdMKdPmRpc66PjLJBZ0jJ0ZPrC+3crGkcB7pFOV9TC+qXFsXbdZC3yp6U7DLzG dKl2hkRKItVdac0M35d+MPw0lfDpA/XU7S+sMnWL1I/99jcDT+yBquL2VwVqlUFFeLKy xQ== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80] (may be forged)) by mx0b-00069f02.pphosted.com with ESMTP id 3et5s6reug-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:41 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 22H7BW5f180504; Thu, 17 Mar 2022 07:26:40 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2104.outbound.protection.outlook.com [104.47.58.104]) by userp3030.oracle.com with ESMTP id 3et65q1vae-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BcJcXbjDtxpGf0SpLx1PW1J3Qy9Lmlm61NOPNQaEPxGG+ehUvRr/L7qv4X8gBnOFpNNXwny4F+1Tx+6wYERog0OprMKnmCllSjjAklb7iqb4WhwCY6RZ2j30/Yr79SmuYMF9eLck48ExZlaYUBJslOqk7dv2oyQjI2oo/eHM75ImPIKTGKZX0fwYnNvpVrwaXXN/7FU11KTTR2uWYDn/kWUL7Pf2uh0fDJ3fWOSVx4rVtXWotmsckUkcuTT+wHAyXldMWtD1lWYKIB+Td+sdTiFSTaiBLlPVY4YVHpgzj3prBx0n3pGxWemMphs0/k9CmGDOhSCQwMPI1Ekw2CgoFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EKUFwlNv1FDedFXl72t1Pb4S/z4RfOsXGDuAp0EdtYA=; b=A+XK+OhrVi0BDPHAEUeoSQNGs8QqjW55fQ9yEj7fxouDuzgj0g4n0DREZ3bUFmCHfLbENsX2YPSbBa6eE3TokAo9+Qq7CA5zLPYlaX7kobmZYX8D1piusECMxUkNhCiT5ijvQ6OP6SrMOL0Z7cUHe0K9/CM/2lCNJKYomSFyuy1ukVemVHVbEXyKWXXJ0+++IzCYjNu5i022JAKNAjU4srChc3/wvNTwLFqepzEZPymd4RX50pRDPCCHd54YzbWC8AlNevOZi1vo6XvM3Pgy0PTblU/WSfhY0FAp5VDko0QXfL1wMaWY5E45eLzgvqR+nd43bnvRqfCbSztwMI7lqw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EKUFwlNv1FDedFXl72t1Pb4S/z4RfOsXGDuAp0EdtYA=; b=dNDXBSSIr3Dd5o98Ay4jAGhB0Eul37NmaK5+hLPbxaLat22NPwzhOaNyxsmFOKUB3DW8yHHkAkzZ46E/1OVgnulVLVS2T44PeqzP4bhZhFV696CB13caLvg3FZ5F9Lig5sYQf88Y44wXu62GTjZ0IWTf8G1M64tm4vo5S7NSs0w= Received: from CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) by DM6PR10MB4332.namprd10.prod.outlook.com (2603:10b6:5:220::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.17; Thu, 17 Mar 2022 07:26:38 +0000 Received: from CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa]) by CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa%9]) with mapi id 15.20.5081.017; Thu, 17 Mar 2022 07:26:38 +0000 From: Imran Khan To: tj@kernel.org, viro@zeniv.linux.org.uk Cc: gregkh@linuxfoundation.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v7 7/8] kernfs: Replace per-fs rwsem with hashed rwsems. Date: Thu, 17 Mar 2022 18:26:11 +1100 Message-Id: <20220317072612.163143-8-imran.f.khan@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220317072612.163143-1-imran.f.khan@oracle.com> References: <20220317072612.163143-1-imran.f.khan@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SY6PR01CA0035.ausprd01.prod.outlook.com (2603:10c6:10:eb::22) To CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 25c81cbb-291a-429d-1138-08da07e7794e X-MS-TrafficTypeDiagnostic: DM6PR10MB4332:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2AMoFWB7Uo5Pr4ATkYOkdcbnxfLg+UJeR6I+MI+wxbl0ZMJ9GckyKmHzk5qiTKjN0bFJYJhy8mHTWWNSwrhbaDvLSnvN/TOxcHJwMrGu0TdbNlqFKiRZ+Yce6WcZuy3nP2a/ITisljWBBJd2Z+C6Vabqp7eR+wYIecwlMYsMq4I8++yOTXIQhr7DAtMnPXRQEQfrgy17dab7+GvrH/wvzokIgmbgBw1sROKVkTLzkXLVsarE4BvFedT6jzfUYPpIQZTjp/H9csIRCIjwy9K82ru/Re8JBKR043DFsQE6y+FQXZNz1qXJnqsIOlUmlgwWnp3bf4BrXUoxSn2+lxwJv1YLxZ9aOsI6kioUKoOwjL4e3BOUOYT+20jGQ42uRICcQl/oFttToHNflTOJ9vkte6ITMRb3lx49gUrCk0Ph76FMFBSxn/3GFOOnQwJ/Bfi//+OkkrUjpNJ2iAUqC/+5tRwzC7EGNvUqG+db+hDR96vzVoqZTUekdpmnBqnAwvFUtu8J9ezNyA3spi/tAfcM4kovlIUoSmxxmjRYUU1LgLhvYzHllqe7elgVMwq0Sy/reDVAENEaKkDeFUKT3n0RWOHBno+Pk96YI9IIlarbEMyXeqQnGL/ecMocCuVpvN3gO1T4GLNiS9zuedb5tvOVovMVz9i4NVypmtd0pQ2MO7pFQByY4u3aYKsDDXf0TLcZsnchCO6iavIc8jyF2SYpGQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4468.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6512007)(2906002)(8936002)(26005)(52116002)(36756003)(38100700002)(316002)(186003)(38350700002)(103116003)(6506007)(86362001)(6666004)(83380400001)(1076003)(5660300002)(30864003)(4326008)(66946007)(6486002)(8676002)(66556008)(66476007)(508600001)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Doucg1r1G4zcUKEzvK2G0U5lBcKxwc9trJo9TuNXe59KG6ZbNiVLFd7Oj0UU?= =?us-ascii?Q?dIPTqFq6edKOM/eHtTzYoHhcZj4UweZ+xTPLNDtlv5tsaTK0CVc8Cb/Q+Q+G?= =?us-ascii?Q?CfqngC+c3cA/7hnFC3w8MLGPdbkaMdx8zKcE9KxIK2LD+YQVcZIwhs6Vy9kk?= =?us-ascii?Q?gymeO3OOhUXuOsh8Tr29XP0+sQZ8bqbzv0z/FFOZxvCR8fSvtkyxJ+rsiEce?= =?us-ascii?Q?e5yLD6xT82jmtgDEjzOFDqqUQovJkhpkz7XPzKlXj/7bS8ga+3lIAeqG6kSs?= =?us-ascii?Q?wpkCbWyCXaz+a8N9pAQVrvknM6K56y/zAgaiybFm7WAsZGF3k94nbPZpuO9n?= =?us-ascii?Q?PZCgCKHg0BLwW7vkn5+H2CwgMzrJozsBodUserCoQ7kn757WwKhmmpvNnEZg?= =?us-ascii?Q?Wi4kLlcZrHDtuURGEF9Ce5PgGlbTb8JjnLaxoUOlV0UJqPnAadZ8MwtcGkYo?= =?us-ascii?Q?+WU1QwDHrs1KImvaEYSjieoqGUz2d+z+CgfRyT1gdPuj8IQQ+s2LKc0QPvO7?= =?us-ascii?Q?xB9e3rsCUJLGgP6j9aIQWhPFFrX8afVuG74Fc3BhOGAK3aYn98KfTBxbJ4P2?= =?us-ascii?Q?E5mfP04+yfj5DwWimQCSDNLNBchirREsqjB2W5lL3DeXbKCJDCdq6qVK2F0g?= =?us-ascii?Q?gtHDDr8Pozfnpq+mqs6ub9dok7nl4Kr/OAtQVjAfZFLnDR4jPd76n5Frr4le?= =?us-ascii?Q?LgA0zThhLNrzvzqG0p2RLcVCoi0qynPqdcq1xSdFsw0fLIRD6JNcPkSUJCIH?= =?us-ascii?Q?h3vfLbFEHIBPb73W6QzxdYZ/QCEd6rQSxyOhXmdITB7DfIHTDQU8vnECwNBD?= =?us-ascii?Q?FSBlpG+3lKFqAdnfp9zCMpJowr9QoEzr1vQSuJ8Isuuf002gDC8Gt3lL5Nv2?= =?us-ascii?Q?ffm/8Fj1JjxNLKzv25cY5vZ35yF5gNl4A2KtZcp0s4psTM3gudwHksXBuXdQ?= =?us-ascii?Q?acgDvnbtGvsReA6UAdQFDiPaIthV5jecpEifX3lBWXy9+xNBJwY17qqUssOx?= =?us-ascii?Q?clnTryeVxi10PnJnZUBBWjQ0PlbLp0bSeYuWxsvl8SyjbCzHklWfiZ65zUxa?= =?us-ascii?Q?/ndjQxu0tY4E0yPrKq8B7I0EpLTow++DDfXCoDyMQXVrOP7iLfbRu8Wcssl+?= =?us-ascii?Q?+L39E1UAPDXv5iWAdKFDfv5fDH8C6P2G35jBcBXnfjvXVclKkMpQgb1TXvqW?= =?us-ascii?Q?sVx+LhgiF/9hOg5rfLYoied0DPkLK3D9S5FV9F/shsQPJAB7Xb1dWZo2iVyJ?= =?us-ascii?Q?b022NeeeJH0SIWq2vBApFPBUbeZL2fFHDaRj8aSQG/fylGrnGL/kijfctEoy?= =?us-ascii?Q?wAKMBRqt+qypKECUcLAEwewSVRl8NEt5PU61paw1VHC31R8ORAn7wRXkpJHj?= =?us-ascii?Q?3s1rs5s3KKBHYwFfJLvdjrKncJ3o4aSFC8qnuxYEs3hphEVPjxBAjTrXrcAX?= =?us-ascii?Q?4sejSTtYtmEFxvl3w/QtB69cUFkX611rOEBfJ6X6SJGXFMr+/02gGw=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25c81cbb-291a-429d-1138-08da07e7794e X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2022 07:26:38.1988 (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: yBxH4jWeYVgelP/zRCyB8dPAgYWExMRMpcIh7tIYixuBAzAc3yfXZ2AZr2jj4+reNDsOAy0AprwAufLNq5N+xg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4332 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10288 signatures=693715 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 suspectscore=0 adultscore=0 spamscore=0 bulkscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203170042 X-Proofpoint-GUID: eCZYzly8CphlDmLHpkvb4pOaUkRz7Wyu X-Proofpoint-ORIG-GUID: eCZYzly8CphlDmLHpkvb4pOaUkRz7Wyu Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Having a single rwsem to synchronize all operations across a kernfs based file system (cgroup, sysfs etc.) does not scale well. The contention around this single rwsem becomes more apparent in large scale systems with few hundred CPUs where most of the CPUs have running tasks that are opening, accessing or closing sysfs files at any point of time. Using hashed rwsems in place of a per-fs rwsem, can significantly reduce contention around per-fs rwsem and hence provide better scalability. Moreover as these hashed rwsems are not part of kernfs_node objects we will not see any singnificant change in memory utilization of kernfs based file systems like sysfs, cgroupfs etc. Modify interface introduced in previous patch to make use of hashed rwsems. Just like earlier change use kernfs_node address as hashing key. Since we are getting rid of per-fs lock, in certain cases we may need to acquire locks corresponding to multiple nodes and in such cases of nested locking, locks are taken in order of their addresses. Introduce helpers to acquire rwsems corresponding to multiple nodes for such cases. For operations that involve finding the node first and then operating on it (for example operations involving find_and_get_ns), acquiring rwsem for the node being searched is not possible. Such operations need to make sure that a concurrent remove does not remove the found node. Introduce a per-fs mutex that can be used to synchronize these operations against parallel removal of involved node. Replacing global mutex and spinlocks with hashed ones (as mentioned in previous changes) and global rwsem with hashed rwsem (as done in this change) reduces contention around kernfs and results in better performance numbers. For example on a system with 384 cores, if I run 200 instances of an application which is mostly executing the following loop: for (int loop =3D 0; loop <100 ; loop++) { for (int port_num =3D 1; port_num < 2; port_num++) { for (int gid_index =3D 0; gid_index < 254; gid_index++ ) { char ret_buf[64], ret_buf_lo[64]; char gid_file_path[1024]; int ret_len; int ret_fd; ssize_t ret_rd; ub4 i, saved_errno; memset(ret_buf, 0, sizeof(ret_buf)); memset(gid_file_path, 0, sizeof(gid_file_path)); ret_len =3D snprintf(gid_file_path, sizeof(gid_file_path), "/sys/class/infiniband/%s/ports/%d/gids/%d", dev_name, port_num, gid_index); ret_fd =3D open(gid_file_path, O_RDONLY | O_CLOEXEC); if (ret_fd < 0) { printf("Failed to open %s\n", gid_file_path); continue; } /* Read the GID */ ret_rd =3D read(ret_fd, ret_buf, 40); if (ret_rd =3D=3D -1) { printf("Failed to read from file %s, errno: %u\n", gid_file_path, saved_errno); continue; } close(ret_fd); } } I can see contention around above mentioned locks as follows: - 54.07% 53.60% showgids [kernel.kallsyms] [k] osq_lock - 53.60% __libc_start_main - 32.29% __GI___libc_open entry_SYSCALL_64_after_hwframe do_syscall_64 sys_open do_sys_open do_filp_open path_openat vfs_open do_dentry_open kernfs_fop_open mutex_lock - __mutex_lock_slowpath - 32.23% __mutex_lock.isra.5 osq_lock - 21.31% __GI___libc_close entry_SYSCALL_64_after_hwframe do_syscall_64 exit_to_usermode_loop task_work_run ____fput __fput kernfs_fop_release kernfs_put_open_node.isra.8 mutex_lock - __mutex_lock_slowpath - 21.28% __mutex_lock.isra.5 osq_lock - 10.49% 10.39% showgids [kernel.kallsyms] [k] down_read 10.39% __libc_start_main __GI___libc_open entry_SYSCALL_64_after_hwframe do_syscall_64 sys_open do_sys_open do_filp_open - path_openat - 9.72% link_path_walk - 5.21% inode_permission - __inode_permission - 5.21% kernfs_iop_permission down_read - 4.08% walk_component lookup_fast - d_revalidate.part.24 - 4.08% kernfs_dop_revalidate - 7.48% 7.41% showgids [kernel.kallsyms] [k] up_read 7.41% __libc_start_main __GI___libc_open entry_SYSCALL_64_after_hwframe do_syscall_64 sys_open do_sys_open do_filp_open - path_openat - 7.01% link_path_walk - 4.12% inode_permission - __inode_permission - 4.12% kernfs_iop_permission up_read - 2.61% walk_component lookup_fast - d_revalidate.part.24 - 2.61% kernfs_dop_revalidate Moreover this run of 200 application isntances takes 32-34 secs. to complete. With the patched kernel and on the same test setup, we no longer see contention around osq_lock (i.e kernfs_open_file_mutex) and also contention around per-fs kernfs_rwsem has reduced significantly as well. This can be seen in the following perf snippet: - 1.66% 1.65% showgids [kernel.kallsyms] [k] down_read 1.65% __libc_start_main __GI___libc_open entry_SYSCALL_64_after_hwframe do_syscall_64 sys_open do_sys_open do_filp_open - path_openat - 1.62% link_path_walk - 0.98% inode_permission - __inode_permission + 0.98% kernfs_iop_permission - 0.52% walk_component lookup_fast - d_revalidate.part.24 - 0.52% kernfs_dop_revalidate - 1.12% 1.11% showgids [kernel.kallsyms] [k] up_read 1.11% __libc_start_main __GI___libc_open entry_SYSCALL_64_after_hwframe do_syscall_64 sys_open do_sys_open do_filp_open - path_openat - 1.11% link_path_walk - 0.69% inode_permission - __inode_permission - 0.69% kernfs_iop_permission up_read Moreover the test execution time has reduced from 32-34 secs to 18-19 secs. Signed-off-by: Imran Khan --- fs/kernfs/Makefile | 2 +- fs/kernfs/dir.c | 133 ++++++++++++++---- fs/kernfs/inode.c | 20 +++ fs/kernfs/kernfs-internal.c | 259 ++++++++++++++++++++++++++++++++++++ fs/kernfs/kernfs-internal.h | 46 ++++++- fs/kernfs/mount.c | 1 + fs/kernfs/symlink.c | 13 +- include/linux/kernfs.h | 3 +- 8 files changed, 444 insertions(+), 33 deletions(-) create mode 100644 fs/kernfs/kernfs-internal.c diff --git a/fs/kernfs/Makefile b/fs/kernfs/Makefile index 4ca54ff54c98..778da6b118e9 100644 --- a/fs/kernfs/Makefile +++ b/fs/kernfs/Makefile @@ -3,4 +3,4 @@ # Makefile for the kernfs pseudo filesystem # =20 -obj-y :=3D mount.o inode.o dir.o file.o symlink.o +obj-y :=3D mount.o inode.o dir.o file.o symlink.o kernfs-internal.o diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c index 5dce041b10c3..1b28d99ff1c3 100644 --- a/fs/kernfs/dir.c +++ b/fs/kernfs/dir.c @@ -25,7 +25,6 @@ static DEFINE_SPINLOCK(kernfs_idr_lock); /* root->ino_idr= */ =20 static bool kernfs_active(struct kernfs_node *kn) { - kernfs_rwsem_assert_held(kn); return atomic_read(&kn->active) >=3D 0; } =20 @@ -450,26 +449,24 @@ void kernfs_put_active(struct kernfs_node *kn) /** * kernfs_drain - drain kernfs_node * @kn: kernfs_node to drain + * @anc: ancestor of kernfs_node to drain * * Drain existing usages and nuke all existing mmaps of @kn. Mutiple * removers may invoke this function concurrently on @kn and all will * return after draining is complete. */ -static void kernfs_drain(struct kernfs_node *kn) - __releases(&kernfs_root(kn)->kernfs_rwsem) - __acquires(&kernfs_root(kn)->kernfs_rwsem) +static void kernfs_drain(struct kernfs_node *kn, struct kernfs_node *anc) + __releases(kernfs_rwsem_ptr(anc)) + __acquires(kernfs_rwsem_ptr(anc)) { struct kernfs_root *root =3D kernfs_root(kn); =20 - /** - * kn has the same root as its ancestor, so it can be used to get - * per-fs rwsem. - */ - struct rw_semaphore *rwsem =3D kernfs_rwsem_ptr(kn); + struct rw_semaphore *rwsem; =20 - kernfs_rwsem_assert_held_write(kn); + kernfs_rwsem_assert_held_write(anc); WARN_ON_ONCE(kernfs_active(kn)); =20 + rwsem =3D kernfs_rwsem_ptr(anc); kernfs_up_write(rwsem); =20 if (kernfs_lockdep(kn)) { @@ -489,7 +486,7 @@ static void kernfs_drain(struct kernfs_node *kn) =20 kernfs_drain_open_files(kn); =20 - kernfs_down_write(kn); + kernfs_down_write(anc); } =20 /** @@ -729,6 +726,11 @@ int kernfs_add_one(struct kernfs_node *kn) bool has_ns; int ret; =20 + /** + * The node being added is not active at this point of time and may + * be activated later depending on CREATE_DEACTIVATED flag. So at + * this point of time just locking the parent is enough. + */ rwsem =3D kernfs_down_write(parent); =20 ret =3D -EINVAL; @@ -867,11 +869,20 @@ struct kernfs_node *kernfs_find_and_get_ns(struct ker= nfs_node *parent, { struct kernfs_node *kn; struct rw_semaphore *rwsem; + struct kernfs_root *root =3D kernfs_root(parent); =20 + /** + * We don't have address of kernfs_node (that is being searched) + * yet. Acquiring root->kernfs_rm_mutex and releasing it after + * pinning the found kernfs_node, ensures that found kernfs_node + * will not disappear due to a parallel remove operation. + */ + mutex_lock(&root->kernfs_rm_mutex); rwsem =3D kernfs_down_read(parent); kn =3D kernfs_find_ns(parent, name, ns); kernfs_get(kn); kernfs_up_read(rwsem); + mutex_unlock(&root->kernfs_rm_mutex); =20 return kn; } @@ -892,11 +903,20 @@ struct kernfs_node *kernfs_walk_and_get_ns(struct ker= nfs_node *parent, { struct kernfs_node *kn; struct rw_semaphore *rwsem; + struct kernfs_root *root =3D kernfs_root(parent); =20 + /** + * We don't have address of kernfs_node (that is being searched) + * yet. Acquiring root->kernfs_rm_mutex and releasing it after + * pinning the found kernfs_node, ensures that found kernfs_node + * will not disappear due to a parallel remove operation. + */ + mutex_lock(&root->kernfs_rm_mutex); rwsem =3D kernfs_down_read(parent); kn =3D kernfs_walk_ns(parent, path, ns); kernfs_get(kn); kernfs_up_read(rwsem); + mutex_unlock(&root->kernfs_rm_mutex); =20 return kn; } @@ -921,9 +941,9 @@ struct kernfs_root *kernfs_create_root(struct kernfs_sy= scall_ops *scops, return ERR_PTR(-ENOMEM); =20 idr_init(&root->ino_idr); - init_rwsem(&root->kernfs_rwsem); INIT_LIST_HEAD(&root->supers); init_rwsem(&root->supers_rwsem); + mutex_init(&root->kernfs_rm_mutex); =20 /* * On 64bit ino setups, id is ino. On 32bit, low 32bits are ino. @@ -1093,6 +1113,11 @@ static int kernfs_dop_revalidate(struct dentry *dent= ry, unsigned int flags) } =20 kn =3D kernfs_dentry_node(dentry); + /** + * For dentry revalidation just acquiring kernfs_node's rwsem for + * reading should be enough. If a competing rename or remove wins + * one of the checks below will fail. + */ rwsem =3D kernfs_down_read(kn); =20 /* The kernfs node has been deactivated */ @@ -1132,24 +1157,35 @@ static struct dentry *kernfs_iop_lookup(struct inod= e *dir, struct inode *inode =3D NULL; const void *ns =3D NULL; struct rw_semaphore *rwsem; + struct kernfs_root *root =3D kernfs_root(parent); =20 + /** + * We don't have address of kernfs_node (that is being searched) + * yet. So take root->kernfs_rm_mutex to avoid parallel removal of + * found kernfs_node. + */ + mutex_lock(&root->kernfs_rm_mutex); rwsem =3D kernfs_down_read(parent); if (kernfs_ns_enabled(parent)) ns =3D kernfs_info(dir->i_sb)->ns; =20 kn =3D kernfs_find_ns(parent, dentry->d_name.name, ns); + kernfs_up_read(rwsem); /* attach dentry and inode */ if (kn) { /* Inactive nodes are invisible to the VFS so don't * create a negative. */ + rwsem =3D kernfs_down_read(kn); if (!kernfs_active(kn)) { kernfs_up_read(rwsem); + mutex_unlock(&root->kernfs_rm_mutex); return NULL; } inode =3D kernfs_get_inode(dir->i_sb, kn); if (!inode) inode =3D ERR_PTR(-ENOMEM); + kernfs_up_read(rwsem); } /* * Needed for negative dentry validation. @@ -1157,9 +1193,11 @@ static struct dentry *kernfs_iop_lookup(struct inode= *dir, * or transforms from positive dentry in dentry_unlink_inode() * called from vfs_rmdir(). */ + rwsem =3D kernfs_down_read(parent); if (!IS_ERR(inode)) kernfs_set_rev(parent, dentry); kernfs_up_read(rwsem); + mutex_unlock(&root->kernfs_rm_mutex); =20 /* instantiate and hash (possibly negative) dentry */ return d_splice_alias(inode, dentry); @@ -1339,27 +1377,40 @@ void kernfs_activate(struct kernfs_node *kn) static void __kernfs_remove(struct kernfs_node *kn) { struct kernfs_node *pos; + struct rw_semaphore *rwsem; + struct kernfs_root *root; =20 - kernfs_rwsem_assert_held_write(kn); + if (!kn) + return; + + root =3D kernfs_root(kn); =20 /* * Short-circuit if non-root @kn has already finished removal. * This is for kernfs_remove_self() which plays with active ref * after removal. */ - if (!kn || (kn->parent && RB_EMPTY_NODE(&kn->rb))) + mutex_lock(&root->kernfs_rm_mutex); + rwsem =3D kernfs_down_write(kn); + if (kn->parent && RB_EMPTY_NODE(&kn->rb)) { + kernfs_up_write(rwsem); + mutex_unlock(&root->kernfs_rm_mutex); return; + } =20 pr_debug("kernfs %s: removing\n", kn->name); =20 /* prevent any new usage under @kn by deactivating all nodes */ pos =3D NULL; + while ((pos =3D kernfs_next_descendant_post(pos, kn))) if (kernfs_active(pos)) atomic_add(KN_DEACTIVATED_BIAS, &pos->active); + kernfs_up_write(rwsem); =20 /* deactivate and unlink the subtree node-by-node */ do { + rwsem =3D kernfs_down_write(kn); pos =3D kernfs_leftmost_descendant(kn); =20 /* @@ -1377,10 +1428,25 @@ static void __kernfs_remove(struct kernfs_node *kn) * error paths without worrying about draining. */ if (kn->flags & KERNFS_ACTIVATED) - kernfs_drain(pos); + kernfs_drain(pos, kn); else WARN_ON_ONCE(atomic_read(&kn->active) !=3D KN_DEACTIVATED_BIAS); =20 + kernfs_up_write(rwsem); + + /** + * By now node and all of its descendants have been deactivated + * Once a descendant has been drained, acquire its parent's lock + * and unlink it from parent's children rb tree. + * We drop kn's lock before acquiring pos->parent's lock to avoid + * deadlock that will happen if pos->parent and kn hash to same lock. + * Dropping kn's lock should be safe because it is in deactived state. + * Further root->kernfs_rm_mutex ensures that we will not have + * concurrent instances of __kernfs_remove + */ + if (pos->parent) + rwsem =3D kernfs_down_write(pos->parent); + /* * kernfs_unlink_sibling() succeeds once per node. Use it * to decide who's responsible for cleanups. @@ -1398,8 +1464,12 @@ static void __kernfs_remove(struct kernfs_node *kn) kernfs_put(pos); } =20 + if (pos->parent) + kernfs_up_write(rwsem); kernfs_put(pos); } while (pos !=3D kn); + + mutex_unlock(&root->kernfs_rm_mutex); } =20 /** @@ -1410,11 +1480,7 @@ static void __kernfs_remove(struct kernfs_node *kn) */ void kernfs_remove(struct kernfs_node *kn) { - struct rw_semaphore *rwsem; - - rwsem =3D kernfs_down_write(kn); __kernfs_remove(kn); - kernfs_up_write(rwsem); } =20 /** @@ -1516,9 +1582,11 @@ bool kernfs_remove_self(struct kernfs_node *kn) */ if (!(kn->flags & KERNFS_SUICIDAL)) { kn->flags |=3D KERNFS_SUICIDAL; + kernfs_up_write(rwsem); __kernfs_remove(kn); kn->flags |=3D KERNFS_SUICIDED; ret =3D true; + rwsem =3D kernfs_down_write(kn); } else { wait_queue_head_t *waitq =3D &kernfs_root(kn)->deactivate_waitq; DEFINE_WAIT(wait); @@ -1572,11 +1640,17 @@ int kernfs_remove_by_name_ns(struct kernfs_node *pa= rent, const char *name, =20 rwsem =3D kernfs_down_write(parent); =20 + /** + * Since the node being searched will be removed eventually, + * we don't need to take root->kernfs_rm_mutex. + * Even if a parallel remove succeeds, the subsequent __kernfs_remove + * will detect it and bail-out early. + */ kn =3D kernfs_find_ns(parent, name, ns); - if (kn) - __kernfs_remove(kn); =20 kernfs_up_write(rwsem); + if (kn) + __kernfs_remove(kn); =20 if (kn) return 0; @@ -1596,14 +1670,24 @@ int kernfs_rename_ns(struct kernfs_node *kn, struct= kernfs_node *new_parent, { struct kernfs_node *old_parent; const char *old_name =3D NULL; - struct rw_semaphore *rwsem; + struct kernfs_rwsem_token token; int error; =20 /* can't move or rename root */ if (!kn->parent) return -EINVAL; =20 - rwsem =3D kernfs_down_write(kn); + old_parent =3D kn->parent; + kernfs_get(old_parent); + kernfs_down_write_triple_nodes(kn, old_parent, new_parent, &token); + while (old_parent !=3D kn->parent) { + kernfs_put(old_parent); + kernfs_up_write_triple_nodes(kn, old_parent, new_parent, &token); + old_parent =3D kn->parent; + kernfs_get(old_parent); + kernfs_down_write_triple_nodes(kn, old_parent, new_parent, &token); + } + kernfs_put(old_parent); =20 error =3D -ENOENT; if (!kernfs_active(kn) || !kernfs_active(new_parent) || @@ -1638,7 +1722,6 @@ int kernfs_rename_ns(struct kernfs_node *kn, struct k= ernfs_node *new_parent, /* rename_lock protects ->parent and ->name accessors */ spin_lock_irq(&kernfs_rename_lock); =20 - old_parent =3D kn->parent; kn->parent =3D new_parent; =20 kn->ns =3D new_ns; @@ -1657,7 +1740,7 @@ int kernfs_rename_ns(struct kernfs_node *kn, struct k= ernfs_node *new_parent, =20 error =3D 0; out: - kernfs_up_write(rwsem); + kernfs_up_write_triple_nodes(kn, new_parent, old_parent, &token); return error; } =20 diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c index efe5ae98abf4..36a40b08b97f 100644 --- a/fs/kernfs/inode.c +++ b/fs/kernfs/inode.c @@ -101,6 +101,12 @@ int kernfs_setattr(struct kernfs_node *kn, const struc= t iattr *iattr) int ret; struct rw_semaphore *rwsem; =20 + /** + * Since we are only modifying the inode attribute, we just need + * to lock involved node. Operations that add or remove a node + * acquire parent's lock before changing the inode attributes, so + * such operations are also in sync with this interface. + */ rwsem =3D kernfs_down_write(kn); ret =3D __kernfs_setattr(kn, iattr); kernfs_up_write(rwsem); @@ -118,6 +124,12 @@ int kernfs_iop_setattr(struct user_namespace *mnt_user= ns, struct dentry *dentry, if (!kn) return -EINVAL; =20 + /** + * Since we are only modifying the inode attribute, we just need + * to lock involved node. Operations that add or remove a node + * acquire parent's lock before changing the inode attributes, so + * such operations are also in sync with .setattr backend. + */ rwsem =3D kernfs_down_write(kn); error =3D setattr_prepare(&init_user_ns, dentry, iattr); if (error) @@ -188,6 +200,10 @@ int kernfs_iop_getattr(struct user_namespace *mnt_user= ns, struct kernfs_node *kn =3D inode->i_private; struct rw_semaphore *rwsem; =20 + /** + * As we are only reading ->iattr, acquiring kn's rwsem for + * reading is enough. + */ rwsem =3D kernfs_down_read(kn); spin_lock(&inode->i_lock); kernfs_refresh_inode(kn, inode); @@ -285,6 +301,10 @@ int kernfs_iop_permission(struct user_namespace *mnt_u= serns, =20 kn =3D inode->i_private; =20 + /** + * As we are only reading ->iattr, acquiring kn's rwsem for + * reading is enough. + */ rwsem =3D kernfs_down_read(kn); spin_lock(&inode->i_lock); kernfs_refresh_inode(kn, inode); diff --git a/fs/kernfs/kernfs-internal.c b/fs/kernfs/kernfs-internal.c new file mode 100644 index 000000000000..80d7d64532fe --- /dev/null +++ b/fs/kernfs/kernfs-internal.c @@ -0,0 +1,259 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * This file provides inernal helpers for kernfs. + */ + +#include "kernfs-internal.h" + +static void kernfs_swap_rwsems(struct rw_semaphore **array, int i, int j) +{ + struct rw_semaphore *tmp; + + tmp =3D array[i]; + array[i] =3D array[j]; + array[j] =3D tmp; +} + +static void kernfs_sort_rwsems(struct kernfs_rwsem_token *token) +{ + struct rw_semaphore **array =3D &token->rwsems[0]; + + if (token->count =3D=3D 2) { + if (array[0] =3D=3D array[1]) + token->count =3D 1; + else if (array[0] > array[1]) + kernfs_swap_rwsems(array, 0, 1); + } else { + if (array[0] =3D=3D array[1] && array[0] =3D=3D array[2]) + token->count =3D 1; + else { + if (array[0] > array[1]) + kernfs_swap_rwsems(array, 0, 1); + + if (array[0] > array[2]) + kernfs_swap_rwsems(array, 0, 2); + + if (array[1] > array[2]) + kernfs_swap_rwsems(array, 1, 2); + + if (array[0] =3D=3D array[1] || array[1] =3D=3D array[2]) + token->count =3D 2; + } + } +} + +/** + * kernfs_down_write_double_nodes() - take hashed rwsem for 2 nodes + * + * @kn1: first kernfs_node of interest + * @kn2: second kernfs_node of interest + * @token: token to pass unlocking information to caller + * + * Acquire hashed rwsem for 2 nodes. Some operation may need to acquire + * hashed rwsems for 2 nodes (for example for a node and its parent). + * This function can be used in such cases. + * + * Return: void + */ +void kernfs_down_write_double_nodes(struct kernfs_node *kn1, + struct kernfs_node *kn2, + struct kernfs_rwsem_token *token) +{ + struct rw_semaphore **array =3D &token->rwsems[0]; + + array[0] =3D kernfs_rwsem_ptr(kn1); + array[1] =3D kernfs_rwsem_ptr(kn2); + token->count =3D 2; + + kernfs_sort_rwsems(token); + + if (token->count =3D=3D 1) { + /* Both nodes hash to same rwsem */ + down_write_nested(array[0], 0); + } else { + /* Both nodes hash to different rwsems */ + down_write_nested(array[0], 0); + down_write_nested(array[1], 1); + } +} + +/** + * kernfs_up_write_double_nodes - release hashed rwsem for 2 nodes + * + * @kn1: first kernfs_node of interest + * @kn2: second kernfs_node of interest + * @token: token to indicate unlocking information + * ->rwsems is a sorted list of rwsem addresses + * ->count contains number of unique locks + * + * Release hashed rwsems for 2 nodes + * + * Return: void + */ +void kernfs_up_write_double_nodes(struct kernfs_node *kn1, + struct kernfs_node *kn2, + struct kernfs_rwsem_token *token) +{ + struct rw_semaphore **array =3D &token->rwsems[0]; + + if (token->count =3D=3D 1) { + /* Both nodes hash to same rwsem */ + up_write(array[0]); + } else { + /* Both nodes hashe to different rwsems */ + up_write(array[0]); + up_write(array[1]); + } +} + +/** + * kernfs_down_read_double_nodes() - take hashed rwsem for 2 nodes + * + * @kn1: first kernfs_node of interest + * @kn2: second kernfs_node of interest + * @token: token to pass unlocking information to caller + * + * Acquire hashed rwsem for 2 nodes. Some operation may need to acquire + * hashed rwsems for 2 nodes (for example for a node and its parent). + * This function can be used in such cases. + * + * Return: void + */ +void kernfs_down_read_double_nodes(struct kernfs_node *kn1, + struct kernfs_node *kn2, + struct kernfs_rwsem_token *token) +{ + struct rw_semaphore **array =3D &token->rwsems[0]; + + array[0] =3D kernfs_rwsem_ptr(kn1); + array[1] =3D kernfs_rwsem_ptr(kn2); + token->count =3D 2; + + kernfs_sort_rwsems(token); + + if (token->count =3D=3D 1) { + /* Both nodes hash to same rwsem */ + down_read_nested(array[0], 0); + } else { + /* Both nodes hash to different rwsems */ + down_read_nested(array[0], 0); + down_read_nested(array[1], 1); + } +} + +/** + * kernfs_up_read_double_nodes - release hashed rwsem for 2 nodes + * + * @kn1: first kernfs_node of interest + * @kn2: second kernfs_node of interest + * @token: token to indicate unlocking information + * ->rwsems is a sorted list of rwsem addresses + * ->count contains number of unique locks + * + * Release hashed rwsems for 2 nodes + * + * Return: void + */ +void kernfs_up_read_double_nodes(struct kernfs_node *kn1, + struct kernfs_node *kn2, + struct kernfs_rwsem_token *token) +{ + struct rw_semaphore **array =3D &token->rwsems[0]; + + if (token->count =3D=3D 1) { + /* Both nodes hash to same rwsem */ + up_read(array[0]); + } else { + /* Both nodes hashe to different rwsems */ + up_read(array[0]); + up_read(array[1]); + } +} + +/** + * kernfs_down_write_triple_nodes() - take hashed rwsem for 3 nodes + * + * @kn1: first kernfs_node of interest + * @kn2: second kernfs_node of interest + * @kn3: third kernfs_node of interest + * @token: token to pass unlocking information to caller + * + * Acquire hashed rwsem for 3 nodes. Some operation may need to acquire + * hashed rwsems for 3 nodes (for example rename operation needs to + * acquire rwsem corresponding to node, its current parent and its future + * parent). This function can be used in such cases. + * + * Return: void + */ +void kernfs_down_write_triple_nodes(struct kernfs_node *kn1, + struct kernfs_node *kn2, + struct kernfs_node *kn3, + struct kernfs_rwsem_token *token) +{ + struct rw_semaphore **array =3D &token->rwsems[0]; + + array[0] =3D kernfs_rwsem_ptr(kn1); + array[1] =3D kernfs_rwsem_ptr(kn2); + array[2] =3D kernfs_rwsem_ptr(kn3); + token->count =3D 3; + + kernfs_sort_rwsems(token); + + if (token->count =3D=3D 1) { + /* All 3 nodes hash to same rwsem */ + down_write_nested(array[0], 0); + } else if (token->count =3D=3D 2) { + /** + * Two nodes hash to same rwsem, and these + * will occupy consecutive places in array after + * sorting. + */ + down_write_nested(array[0], 0); + down_write_nested(array[2], 1); + } else { + /* All 3 nodes hashe to different rwsems */ + down_write_nested(array[0], 0); + down_write_nested(array[1], 1); + down_write_nested(array[2], 2); + } +} + +/** + * kernfs_up_write_triple_nodes - release hashed rwsem for 3 nodes + * + * @kn1: first kernfs_node of interest + * @kn2: second kernfs_node of interest + * @kn3: third kernfs_node of interest + * @token: token to indicate unlocking information + * ->rwsems is a sorted list of rwsem addresses + * ->count contains number of unique locks + * + * Release hashed rwsems for 3 nodes + * + * Return: void + */ +void kernfs_up_write_triple_nodes(struct kernfs_node *kn1, + struct kernfs_node *kn2, + struct kernfs_node *kn3, + struct kernfs_rwsem_token *token) +{ + struct rw_semaphore **array =3D &token->rwsems[0]; + + if (token->count =3D=3D 1) { + /* All 3 nodes hash to same rwsem */ + up_write(array[0]); + } else if (token->count =3D=3D 2) { + /** + * Two nodes hash to same rwsem, and these + * will occupy consecutive places in array after + * sorting. + */ + up_write(array[0]); + up_write(array[2]); + } else { + /* All 3 nodes hashe to different rwsems */ + up_write(array[0]); + up_write(array[1]); + up_write(array[2]); + } +} diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs-internal.h index 8b24bc7e36c2..188e5680066c 100644 --- a/fs/kernfs/kernfs-internal.h +++ b/fs/kernfs/kernfs-internal.h @@ -19,6 +19,20 @@ #include #include =20 +/** + * Token for nested locking interfaces. + * + * rwsems: array of rwsems to acquire + * count: has 2 uses + * As input argument it specifies size of ->rwsems array + * As return argument it specifies number of unique rwsems + * present in ->rwsems array + */ +struct kernfs_rwsem_token { + struct rw_semaphore *rwsems[3]; + int count; +}; + struct kernfs_iattrs { kuid_t ia_uid; kgid_t ia_gid; @@ -46,8 +60,8 @@ struct kernfs_root { struct list_head supers; =20 wait_queue_head_t deactivate_waitq; - struct rw_semaphore kernfs_rwsem; struct rw_semaphore supers_rwsem; + struct mutex kernfs_rm_mutex; }; =20 /* +1 to avoid triggering overflow warning when negating it */ @@ -208,9 +222,9 @@ static inline spinlock_t *kernfs_open_node_spinlock(str= uct kernfs_node *kn) =20 static inline struct rw_semaphore *kernfs_rwsem_ptr(struct kernfs_node *kn) { - struct kernfs_root *root =3D kernfs_root(kn); + int idx =3D hash_ptr(kn, NR_KERNFS_LOCK_BITS); =20 - return &root->kernfs_rwsem; + return &kernfs_locks->kernfs_rwsem[idx]; } =20 static inline void kernfs_rwsem_assert_held(struct kernfs_node *kn) @@ -284,4 +298,30 @@ static inline void kernfs_up_read(struct rw_semaphore = *rwsem) up_read(rwsem); } =20 + +void kernfs_down_write_double_nodes(struct kernfs_node *kn1, + struct kernfs_node *kn2, + struct kernfs_rwsem_token *token); + +void kernfs_up_write_double_nodes(struct kernfs_node *kn1, + struct kernfs_node *kn2, + struct kernfs_rwsem_token *token); + +void kernfs_down_read_double_nodes(struct kernfs_node *kn1, + struct kernfs_node *kn2, + struct kernfs_rwsem_token *token); + +void kernfs_up_read_double_nodes(struct kernfs_node *kn1, + struct kernfs_node *kn2, + struct kernfs_rwsem_token *token); + +void kernfs_down_write_triple_nodes(struct kernfs_node *kn1, + struct kernfs_node *kn2, + struct kernfs_node *kn3, + struct kernfs_rwsem_token *token); + +void kernfs_up_write_triple_nodes(struct kernfs_node *kn1, + struct kernfs_node *kn2, + struct kernfs_node *kn3, + struct kernfs_rwsem_token *token); #endif /* __KERNFS_INTERNAL_H */ diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c index f88dc4e26ffb..f2b3d981b42d 100644 --- a/fs/kernfs/mount.c +++ b/fs/kernfs/mount.c @@ -398,6 +398,7 @@ void __init kernfs_lock_init(void) for (count =3D 0; count < NR_KERNFS_LOCKS; count++) { mutex_init(&kernfs_locks->open_file_mutex[count].lock); spin_lock_init(&kernfs_locks->open_node_locks[count].lock); + init_rwsem(&kernfs_locks->kernfs_rwsem[count]); } } =20 diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c index 9d4103602554..cbdd1be5f0a8 100644 --- a/fs/kernfs/symlink.c +++ b/fs/kernfs/symlink.c @@ -113,12 +113,19 @@ static int kernfs_getlink(struct inode *inode, char *= path) struct kernfs_node *kn =3D inode->i_private; struct kernfs_node *parent =3D kn->parent; struct kernfs_node *target =3D kn->symlink.target_kn; - struct rw_semaphore *rwsem; + struct kernfs_rwsem_token token; int error; =20 - rwsem =3D kernfs_down_read(parent); + /** + * Lock both parent and target, to avoid their movement + * or removal in the middle of path construction. + * If a competing remove or rename for parent or target + * wins, it will be reflected in result returned from + * kernfs_get_target_path. + */ + kernfs_down_read_double_nodes(target, parent, &token); error =3D kernfs_get_target_path(parent, target, path); - kernfs_up_read(rwsem); + kernfs_up_read_double_nodes(target, parent, &token); =20 return error; } diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h index 9f0926f553fc..46e71ae940d9 100644 --- a/include/linux/kernfs.h +++ b/include/linux/kernfs.h @@ -97,6 +97,7 @@ struct kernfs_open_node_lock { struct kernfs_global_locks { struct kernfs_open_file_mutex open_file_mutex[NR_KERNFS_LOCKS]; struct kernfs_open_node_lock open_node_locks[NR_KERNFS_LOCKS]; + struct rw_semaphore kernfs_rwsem[NR_KERNFS_LOCKS]; }; =20 enum kernfs_node_type { @@ -266,8 +267,8 @@ struct kernfs_root { struct list_head supers; =20 wait_queue_head_t deactivate_waitq; - struct rw_semaphore kernfs_rwsem; struct rw_semaphore supers_rwsem; + struct mutex kernfs_rm_mutex; }; #endif =20 --=20 2.30.2 From nobody Mon Jun 22 20:26:31 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8482C433EF for ; Thu, 17 Mar 2022 07:27:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230303AbiCQH2r (ORCPT ); Thu, 17 Mar 2022 03:28:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230234AbiCQH2E (ORCPT ); Thu, 17 Mar 2022 03:28:04 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13D9F1C16DB for ; Thu, 17 Mar 2022 00:26:48 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22H3O7oU030081; Thu, 17 Mar 2022 07:26:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=ixBrXFQUSYstJbK8GgPPTtLT1s0p6RbjKcjoVmYZqvA=; b=WR6cERwF5L4CX3Ea7yR/fSxhkvh1jV6zj4uEjvu/iFmkXROrMxjaVTcySe4Hkccmqc1r Ilnf0RpWBILaJHIUmBgfXCuleqP1a6VPzW8bL29Nq8QfMeMfIGgWCj/pakZdBnsvHqvV 2ffbjEeSJWBHeI2pUBCgycTr032k4jVGnzNc7e9f9OqAH+FP+jq1hvBy+xMEuHL9WNNh SufukkVS8OzMbtfSgN1wWViO7xMYgF/e0mkWfahexbwclYgqjhbE9YaR0b9NmeQyg1O4 QDZ58L94U652JXzqgh/dKDi2HBU8grK76C/9ZnsIumfBBM19S6kvqSgzi93IOIpmRS8D Zg== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3et5fu8hcs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:42 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 22H7C9q2012696; Thu, 17 Mar 2022 07:26:41 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2104.outbound.protection.outlook.com [104.47.58.104]) by aserp3020.oracle.com with ESMTP id 3et64m4wyd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:26:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TmCxRn080IcnqJsVD2Ll8zNpdjbydP9g8M1f8s09GrNsa51YKDbVhGR2x9sBw0/RKSFtoMewBNNSFEjut9BrYgT6M563qNsvnMC+A0WHW533YGCyIg4j8yG1NNKBOKpedg1UH8BbfLPUbDV6gCyNxQoKSMunIzqzWBrOxxnQ/QI7Ex0PCc+4KLfm0G5cKwBaryGiNUFdxgVbna4TCKYtKQWUyzQhxAhI+hPIXlhyK6hZ1Zq20TxnBmVQ8rhRfSvBTwIiQKbCkCz+2CGmBWfXTbgM2D5k5l9RZsOCH421bwtjTNziFKSB6Lb/76eyIYb2vokn13uKORHlArZ9bKeMaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ixBrXFQUSYstJbK8GgPPTtLT1s0p6RbjKcjoVmYZqvA=; b=ByBDCy2yOP/f8Lt63ZQK6qDj+kiZBRSr3YpwQ5F98k3F+1X2sj9GDbFfjf1/nqxPL2NCM+miayKyzd9sQwkQr6eoNoiZKrJ4SRTN9nj3ZxDA2Td+mIVITEXM0okObbuO4/UJ5Fw6fnP48YnduwqBHeOLq9y7BJqX3hgfWUdoBxtz8X7LRRkNBmiQ2vZoVktPjDgwhZ34e7I5d5ay0ruFadF5Cd2YZ4AJ7RF0Lzhgku4uJpdA/oG1GEsHMKaBoPBhbDSgOeFTBzQBY9QR0+ZmdsD2OgroMAEjfS0lHEao954LsGwwiLLMjPLDg5qGK9iPdsg61D5W+OQhUNQbGI1YOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ixBrXFQUSYstJbK8GgPPTtLT1s0p6RbjKcjoVmYZqvA=; b=CJsh3hMmmm5xG8p2mYrxrFTQHsrGcbJonWDiwUel0YZBcN7loSCsFmrycjAOpJyfi5HDYdYzsof+i2v3MsZGkwC3G4HHCdDRK7HcWsobXO7+UOXRjzknGX9r9kj8AVBQ6BD3jYdKGQdwRJaUxx431EqnuWObYs7k4xFZxPUcL6U= Received: from CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) by DM6PR10MB4332.namprd10.prod.outlook.com (2603:10b6:5:220::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.17; Thu, 17 Mar 2022 07:26:40 +0000 Received: from CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa]) by CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::b5ab:1c3e:6540:d2fa%9]) with mapi id 15.20.5081.017; Thu, 17 Mar 2022 07:26:40 +0000 From: Imran Khan To: tj@kernel.org, viro@zeniv.linux.org.uk Cc: gregkh@linuxfoundation.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v7 8/8] kernfs: Add a document to describe hashed locks used in kernfs. Date: Thu, 17 Mar 2022 18:26:12 +1100 Message-Id: <20220317072612.163143-9-imran.f.khan@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220317072612.163143-1-imran.f.khan@oracle.com> References: <20220317072612.163143-1-imran.f.khan@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SY6PR01CA0035.ausprd01.prod.outlook.com (2603:10c6:10:eb::22) To CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ba2a070-a5a2-42b1-e018-08da07e77a76 X-MS-TrafficTypeDiagnostic: DM6PR10MB4332:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yY6XrgF4Er5dSOj0VSUO5ftjBByX5Y9oYqRqddXwup3W+vgyGV+80puyfHB1QSa8I0NkdgP5XIrW9CjVeC0UUfP9LV1hTFH2wQgKUjhsnqbfbqKTfua6fG1XhONjuZCEwHPKFhId0ec2tG2wPzWY0p94NlOV+LeHXaNdiVXRZ9ZfIdXoB1Q8I8NLBM73U+JpK7afUPWW1LnF68Yi7hHutm6IDqFNVtUKi7/5WZSZ1Z6pivsYldXe+7MPTF/2inbc6IJYOsOzqjHgoAGZ9vjfK1OxzdMgttlCBtjIrAPy/3MsdOeHInaEyThLxZoSxGxJSXpJ8LmTdYTX1f9yDKK4fI2o7R6ZRy1ufYBFTiGiEY4DSPXQbcgErjCcl8QxJSazI7fXXeeOix0sxEW4Iq7G6pGkPMlzBWyw9aHYwRzGPhphptWGSftnp903vQ/p48cDZy16gm66VUYyjW4oy7P8SGz4J56kqMqGH+P4a4xWfW+fYNCJk4Vz06MJBEvUU62Sbjm2M0+cywORv9oalWzR5WB20h58b/HIprEbkh4abIgzyoo1qhAzd7QM57LF0olkzPLECO/fF1ifP200igBDME6L6Rqty4oYCZrE5HrLecnyeueZ6WVPs68bFVQsihNrmS9JHQNQKl06SEpQZEKnK6w+EMjnxdb6jflCe48KG7rBMQdr7g8B/nMRu5b/U3zp2hDUna0qCaqUJH1ICvaR7Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR10MB4468.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6512007)(2906002)(8936002)(26005)(52116002)(36756003)(38100700002)(316002)(186003)(38350700002)(103116003)(6506007)(86362001)(6666004)(83380400001)(1076003)(5660300002)(30864003)(4326008)(66946007)(6486002)(8676002)(66556008)(66476007)(508600001)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1cZKvCg48jUM38TBfZpvpIIR3YotNwU2QyiHz7uk/mjT6IF/cG8u15cUd8fK?= =?us-ascii?Q?FTDuyb8ymVpxOD9c4SBuR+hNdOacLpfFah2xsyVz6drt41PXzo2lEr4FKaFV?= =?us-ascii?Q?S/vp/dAMBEwppx8tFRTLWj0ZstZXvsaMGPt+QhpUb4KZCRLZ/mnim1uE84sa?= =?us-ascii?Q?7c919nGhz95zSL0gplvzn5xzhbJyR3cO6UFItcoMdIXdYnN9qno6j0U/zbWX?= =?us-ascii?Q?DKBTivvR3q+T+yYYU+p3QPh41aZJgbEKWuUOhSuNZJIh7LJl/QVXs7A/6k+Y?= =?us-ascii?Q?P0xVdtyH92yJoltGcD3a/Rzr0r/ALBFr1MZ10OOiPfNAG4zBMO6tlAREIQgs?= =?us-ascii?Q?zR7sWw0UDh2B0ZzaqiWCS3YUJC7cGE+VLSoKkdYtUltiWwGQe5nKRsUupVin?= =?us-ascii?Q?rJlWwZAVtOxpMKCST9+M9G8iOyiPgvmxxVbRAdz4C7cL6rtOm8frT7IqwRPl?= =?us-ascii?Q?D3fNORtKwVPvb/RNf/pvIejuutnSyFglqCvaY3qUKoC8VYBwnqDGfegFa/I4?= =?us-ascii?Q?4BsrziJpmGNx4jdodv6KaTncxlqPCrzE6VjPwZmTY8TutFnAsbKwTvlLN6Kf?= =?us-ascii?Q?2uM9MZ9m9PJ7v9sx0NJbMs3FlkgwGUkBCeYHruynsF+oHemLcIkydz2xIqty?= =?us-ascii?Q?WC3CqlJKd8D8fRJz/FMiSO83FvfnwWfi0iHwj1FkANSksg9OL6yGe+Ke+ruE?= =?us-ascii?Q?MseplgeDQuagynYnMdcpxNEwY36WQgrhh7A1XXAcQhxrZRj3w8H/7jtsGypK?= =?us-ascii?Q?fSJOazrBtyTrgndco8HD7qtAbB0L5btaaRm6NGev14oKzZpa8TqPx7bQR6HZ?= =?us-ascii?Q?sr4xulfyuHNVJgjKjl7YeziLeD0RCH9vYWOdhrdKxJHC/0wcCOznL5VKec/d?= =?us-ascii?Q?H6hIgye8CwZ+vEcONBbaIvQqfFC17njTb+4RNF7YTet03m6WJn2NfCu4jnmy?= =?us-ascii?Q?s176uPhhleSagZgYUi7lVEmA6BFdnc/k9DDHhHrV8yjQ85iG2KPWTGzwINjz?= =?us-ascii?Q?Do9oqGlPcsSW8Ez2hezAv3s0KXd+OGnyzauZfGhgJxMlfemu7FpEeYpDAgcl?= =?us-ascii?Q?9pbonJpAa9QlK/zCFq97BMfRVKG89R7eEKSfao0U5M4zRVHSlT2qCKTtQzy5?= =?us-ascii?Q?VZpT7Ogsdv0/kQAIAw3bBjJFqcKPDYGnCpwx/vqOSPCmLBcZ4PzJDiKmWnrT?= =?us-ascii?Q?BDIZcn1TZd04h3UPfLRe6gtr2yNHzHqYWvZPbhxFVO75sBPOMnwUjYWHMd1x?= =?us-ascii?Q?eQ9zfRLVtLrZ1e9M6G1ZKrJln+k13+n79vEfXxjbx5GiXU2xOo2/zf4lAcu1?= =?us-ascii?Q?YEMFfWLoTHq2XSX71CPTuaSAMT6bcr3ZMkshXqpja0FnLyOnzwg7Ehe+ibBC?= =?us-ascii?Q?6O3fQ2/Q7a2Hrh+wxP0A4l92XHcbR3gmjwcaQMT3YaKoz3MukjiC8Pr4Cxda?= =?us-ascii?Q?JHeS4DdneBTy9kWORZNJ/WpewJYhJDR4GL2fquip7sMsP7UVep082A=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ba2a070-a5a2-42b1-e018-08da07e77a76 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2022 07:26:40.1059 (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: DwCtIPG50pahGt1lB+NVfELQr4gRUMFQtK31cMqS2U1MDD2N+ZQRXx0Zci2fgwNC/2gNtv5j2oMMRaOX91LJJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4332 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10288 signatures=693715 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0 malwarescore=0 mlxscore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203170042 X-Proofpoint-GUID: DIwFc6GdqjP8W27Z5HKIGRfYy7q51qgu X-Proofpoint-ORIG-GUID: DIwFc6GdqjP8W27Z5HKIGRfYy7q51qgu Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This document describes usage and proof of various hashed locks introduced in this patch set Signed-off-by: Imran Khan --- .../filesystems/kernfs-hashed-locks.rst | 245 ++++++++++++++++++ 1 file changed, 245 insertions(+) create mode 100644 Documentation/filesystems/kernfs-hashed-locks.rst diff --git a/Documentation/filesystems/kernfs-hashed-locks.rst b/Documentat= ion/filesystems/kernfs-hashed-locks.rst new file mode 100644 index 000000000000..2ffa579ee1e3 --- /dev/null +++ b/Documentation/filesystems/kernfs-hashed-locks.rst @@ -0,0 +1,245 @@ +.. SPDX-License-Identifier: GPL-2.0-only + +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +kernfs hashed locks +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +kernfs uses following hashed locks + +1. Hashed mutexes +2. Hashed spinlock +3. Hashed rwsem + +In certain cases hashed rwsem needs to work in conjunction with a per-fs m= utex +(Described further below).So this document describes this mutex as well. + +A kernfs_global_locks object (defined below) provides hashed mutexes, +hashed spinlocks and hashed rwsems. + + struct kernfs_global_locks { + struct kernfs_open_file_mutex open_file_mutex[NR_KERNFS_LOCKS]; + struct kernfs_open_node_lock open_node_locks[NR_KERNFS_LOCKS]; + struct rw_semaphore kernfs_rwsem[NR_KERNFS_LOCKS]; + }; + +The hashed mutexes and spinlocks are encapsulated in kernfs_open_file_mute= x and +kernfs_open_node_lock respectively as shown below: + +struct kernfs_open_file_mutex { + struct mutex lock; +} ____cacheline_aligned_in_smp; + +struct kernfs_open_node_lock { + spinlock_t lock; +} ____cacheline_aligned_in_smp; + + +For all hashed locks address of a kernfs_node object acts as hashing key. + +For the remainder of this document a node means a kernfs_node object. The +node can refer to a file, directory or symlink of a kernfs based file syst= em. +Also a node's mutex, spinlock or rwsem refers to hashed mutex, hashed spin= lock +or hashed rwsem corresponding to the node. +It does not mean any locking construct embedded in the kernfs_node itself. + +What is protected by hashed locks +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D + +(1) There's one kernfs_open_file for each open file and all kernfs_open_fi= le + instances corresponding to a kernfs_node are maintained in a list. + hashed mutexes or kernfs_global_locks.open_file_mutex[index].lock prot= ects + this list. + +(2) For each kernfs file that has been opened there is one instance of + kernfs_open_node and kernfs_node->attr.open points to it. + hashed spinlocks or kernfs_global_locks.open_node_locks[index].lock pr= otects + ->attr.open. + +(3) Hashed rwsems or kernfs_global_locks.kernfs_rwsem[index] protects node= 's + state and synchronizes operations that change state of a node or depen= d on + the state of a node. + +(4) per-fs mutex (mentioned earlier) provides synchronization between look= up + and remove operations. + While looking for a node we will not have address of corresponding node + so we can't acquire node's rwsem right from the beginning. + On the other hand a parallel remove operation for the same node can ac= quire + corresponding rwsem and go ahead with node removal. So it may happen t= hat + search operation for the node finds and returns it but before it can be + pinned or used, the remove operation, that was going on in parallel, r= emoves + the node and hence makes its any future use wrong. + per-fs mutex ensures that for competing search and remove operations o= nly + one proceeds at a time and since object returned by search is pinned b= efore + releasing the per-fs mutex, it will be available for subsequent usage. + + +Lock usage and proof +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +(1) Hashed mutexes + + Since hashed mutexes protect the list of kernfs_open_file instances + corresponding to a kernfs_node, ->open and ->release backends of + file_operations need to acquire hashed mutex corresponding to kernfs_n= ode. + Also when a kernfs_node is removed, all of its kernfs_open_file instan= ces + are drained after deactivating the node. This drain operation acquires + hashed mutex to traverse list of kernfs_open_file instances. + So addition (via ->open), deletion (via ->release) and traversal + (during kernfs_drain) of kernfs_open_file list occurs in a synchronous + manner. + +(2) Hashed spinlocks + + As hashed spinlocks protect ->attr.open, ->open and ->release backends= of + file operations need to acquire spinlock corresponding the kernfs_node= so + that kernfs_open_node instances can be properly refcounted and freed w= hen + this refcount reaches 0. + + file events notifier uses ->poll backend of kernfs_open_node instance,= so + it also needs node's spinlock before accessing ->attr.open. + +(3) Hashed rwsems + + 3.1. A node's rwsem protects its state and needs to be acquired to: + 3.1.a. Remove the node + 3.1.b. Move the node + 3.1.c. Travers or modify a node's children RB tree (for + directories), i.e to add/remove files/subdirectories + within/from a directory. + 3.1.d. Modify or access node's inode attributes + + 3.2. Hashed rwsems are used in following operations: + + 3.2.a. Addition of a new node + + While adding a new kernfs_node under a kernfs directory + kernfs_add_one acquires directory node's rwsem for + writing. Clause 3.1.a ensures that directory exists + throughout the operation. Clause 3.1.c ensures proper + updation of children rb tree (i.e ->dir.children). + Clause 3.1.d ensures correct modification of inode + attribute to reflect timestamp of this operation. + If the directory gets removed while waiting for semaphore, + the subsequent checks in kernfs_add_one will fail resulting + in early bail out from kernfs_add_one. + + 3.2.b. Removal of a node + + Removal of a node involves recursive removal of all of its + descendants as well. per-fs mutex (i.e kernfs_rm_mutex) avoids + concurrent node removals even if the nodes are different. + + At first node's rwsem is acquired. Clause 3.1.c avoids parallel + modification of descendant tree and while holding this rwsem + each of the descendants are deactivated. + + Once a descendant has been deactivated and drained, its parent's + rwsem is taken. Clause 3.1.c ensures proper unlinking of this + descendant from its siblings. Clause 3.1.d ensures that parent's + inode attributes are correctly updated to record time stamp of + removal. + + 3.2.c. Movement of a node + + Moving or renaming a node (kernfs_rename_ns) acquires rwsem for + node and its old and new parents. Clauses 3.1.b and 3.1.c avoid + concurrent move operations for the same node. + Also if old parent of a node changes while waiting for rwsem, + the acquisition of rwsem for 3 involved nodes is attempted + again. It is always ensured that as far as old parent is + concerned, rwsem corresponding to current parent is acquired. + + 3.2.d. Reading a directory + + For diectory reading kernfs_fop_readdir acquires directory + node's rwsem for reading. Clause 3.1.c ensures a consistent view + of children RB tree. + As far as directroy being read is concerned, if it gets removed + while waiting for semaphore, the for loop that iterates through + children will be ineffective. So for this operation acquiring + directory node's rwsem for reading is enough. + + 3.2.e. Dentry revalidation + + A dentry revalidation (kernfs_dop_revalidate) can happen for a + negative or for a normal dentry. + For negative dentries we just need to check parent change, so in + this case acquiring parent kernfs_node's rwsem for reading is + enough. + For a normal dentry acquiring node's rwsem for reading is enough + (Clause 3.1.a and 3.1.b). + If node gets removed while waiting for the lock subsequent checks + in kernfs_dop_revalidate will fail and kernfs_dop_revalidate will + exit early. + + 3.2.f. kernfs_node lookup + + While searching for a node under a given parent + (kernfs_find_and_get_ns, kernfs_walk_and_get_ns) rwsem of parent + node is acquired for reading. Clause 3.1.c ensures a consistent + view of parent's children RB tree. To avoid parallel removal of + found node before it gets pinned, these operation make use of + per-fs mutex (kernfs_rm_mutex) as explained earlier. + This per-fs mutex is also taken during kernfs_node removal + (__kernfs_remove). + + If the node being searched gets removed while waiting for the + mutex or rwsem, the subsequent kernfs_find_ns or kernfs_walk_ns + will fail. + + 3.2.g. kenfs_node's inode lookup + + Looking up for inode instances via kernfs_iop_lookup involves + node lookup. So locks acquired are same as ones required in 3.2.f. + Also once node lookup is complete parent's rwsem is released and + rwsem of found node is acquired to get corresponding inode. + Since we are operating under per-fs kernfs_rm_mutex the found node + will not disappear in the middle. + + 3.2.h. Updating or reading inode attribute + + Interfaces that change inode attributes(i.e kernfs_setattr and + kernfs_iop_setattr) acquire node's rwsem for writing. + If the kernfs_node gets removed while waiting for the semaphore + the subsequent __kernfs_setattr will fail. + From 3.2.a and 3.2.b we know that updates due to addition or + removal of nodes will not happen in parallel. + So just locking the kernfs_node in these cases is enough to + guarantee correct modification of inode attributes. + Similarly the interfaces that read inode attributes + (i.e kernfs_iop_getattr, kernfs_iop_permission) just need to + acquire involved node's rwsem for reading. + + 3.2.i. kernfs file event generation + + kernfs_notify pins involved node before scheduling + kernfs_notify_work and kernfs_notify_workfn acquires node's + rwsem. Clauses in 3.1 ensure a consistent view of node state + throughout execution of work handler. + + 3.2.j. mount + + kernfs_fill_super, invoked during mount operation, acquires root + node's rwsem. During mount process there can't be other execution + contexts trying to move or delete the node so just locking the + involved node(i.e the root node) is enough. + + 3.2.k. getting symlink for a kernfs file + + kernfs_getlink locks both parent and target nodes. Clauses + 3.1.a and 3.1.b avoid movement/removal of parent and target + nodes. If parent or target gets moved or removed while + kernfs_getlink was waiting for rwsem, the subsequent + kernfs_get_target_path will return error. + + 3.2.l. while activating a node + + For a node that started as deactivated, kernfs_activate + activates the node. In this case acquiring node's rwsem is + enough. Since the node is not active yet any parallel removal + that wins the race for rwsem will skip this node and its + descendents. Also user space can't see a deactivated node so we + don't have any parallel access emanating from their as well. + + 3.3 For operations that involve locking multiple nodes at the same time + locks are acquired in order of their addresses. --=20 2.30.2