From nobody Mon Apr 27 09:14:02 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 5D7AEC433EF for ; Wed, 15 Jun 2022 02:11:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240907AbiFOCLZ (ORCPT ); Tue, 14 Jun 2022 22:11:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233589AbiFOCLX (ORCPT ); Tue, 14 Jun 2022 22:11:23 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 995FC240BC for ; Tue, 14 Jun 2022 19:11:21 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25F0SwLt013333; Wed, 15 Jun 2022 02:11:17 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=PDITXdINvrrnnw3RduAKjRK9Ukj2JJpTbDng2hhfGQs=; b=uaOYKEijkg0apHA47KRoNHK2sI70NOd+bTZls/bo1pzdX7nsrYEeiaw9Xjlu3XXKVF0F 986CZ6hpOwQEtHxUte54eN5mmiyUyzWMRxoJXvBtf8osPo2QKoX/h2yrbY7A4ciM7skv /N5xIdgv9HlEiXi6y4xZi78ryL9KPVzWIyRHqQRBV+S/F5d06Ru0DhaUwUP20tP+jAJB Q++xH7wP65cE2I53dSv7skmkGghtLgkSzzyGSo1yYnNRWkXAHTjC7z5GUEIBY+vqjHFV cVF7TRUyUpsBCi4gJ9B/nwJiQdXhlGczgZJFYwf1OB8usdpb9OfC3cHUVS8wL7/Pt7Mb Ew== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gmkktfacw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Jun 2022 02:11:17 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25F29wlT003789; Wed, 15 Jun 2022 02:11:16 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3gpr25a1ff-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Jun 2022 02:11:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MVEMOkYm9Unb8NrywnoNIqaCrDrI1Jlj1ylLqw3ASJCCdb9HaLz36b0HYNht2uDOvIxQlXgHle8Ios6PKPcIXQIPv7QADqDAfI0539C6hmotdSbaiFtzmCZhz1LuoYYVgle0W3j29vJXQPevlQitmHTjVAv7G7eUep+gS74Az7DzpREPl9t4z9Q5LRa9FqndYaS5aNaX+DcNmHs0N7fcLU16Z7TgT9zG649PFyyYJRo++pNw+CfTVwzBqdBRa89wJ0yn1WUs9UeDg52V0Sg01EMS8S4PFswYlQ72js+umT33wI1+1dve3iZFJ3WjjRngxZqMyDS4ps+5XFdaMOZNSw== 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=PDITXdINvrrnnw3RduAKjRK9Ukj2JJpTbDng2hhfGQs=; b=Hf2bgeKmq9AQ5gRq+nQhg81r8yMXys3+V9xHspnVBTetZdymZAhy82QsUTJ/SHMbim1f5GdvOI369VeSggNAgCanuCnOslxN1AiZGFRgIOtdDo5/dgpyrzT7XstsMA4t9R+p7eqfnRiqI7YOMxnNjpkstIU4jyTF0lT+pFUmGi1PfSt1d9vOZUQugr+W2jEsiBUfHF/OTIYzgROpBHnIKroQ8Klu1tMX6ofAyuriGFNpAl2IDBVbRa1m7RhuYPlkZ6YvMlZaiEcV4AuEn9PCncG6n/3L2xF0Dq82cfiT0au3cu99DKFx5AWWJGf54rB1PPyiXOy106arBsd/OdmvGA== 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=PDITXdINvrrnnw3RduAKjRK9Ukj2JJpTbDng2hhfGQs=; b=toz3jHwOe3SQi/AagdfMYMWvKkGU2m+fEUq4+k8QF5x25cm1NFvGkiTCyFwYYu4PCHdbSBy3pgE8QJ9Wm1Lw25tNa+07+rt8RPwNNkxg1d+tpzyC+Dacsox71O+VhK+V6iEw0okc3jKkE4eiu2SxSHti8NxvoF5xFNvy7/22bBQ= Received: from CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) by BN7PR10MB2513.namprd10.prod.outlook.com (2603:10b6:406:c8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.14; Wed, 15 Jun 2022 02:11:14 +0000 Received: from CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::e9bd:ba52:c1c2:11e0]) by CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::e9bd:ba52:c1c2:11e0%9]) with mapi id 15.20.5332.022; Wed, 15 Jun 2022 02:11:14 +0000 From: Imran Khan To: tj@kernel.org, gregkh@linuxfoundation.org, viro@zeniv.linux.org.uk Cc: linux-kernel@vger.kernel.org Subject: [PATCH v7 1/4] kernfs: make ->attr.open RCU protected. Date: Wed, 15 Jun 2022 12:10:56 +1000 Message-Id: <20220615021059.862643-2-imran.f.khan@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220615021059.862643-1-imran.f.khan@oracle.com> References: <20220615021059.862643-1-imran.f.khan@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SY4P282CA0003.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:a0::13) 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: 6b9ebce8-cc5b-4f75-2772-08da4e74530e X-MS-TrafficTypeDiagnostic: BN7PR10MB2513: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: 5P26jB67ydFX3qigEICF9OkeNPw12Ot5KsNQmR2NWLftQE32dp6L0/gV//hh+V0TKMyD5Uf/tiuKel3LcQb+W8xdQejcefPZF5yC2WuTHkzN7rTgwPBjrhhtuPzRk4pHlzXGgbgZVltaiAM3xBDy4UOS2hwObyFXqPG3Kw+Ephb93lHc3L0xPTZZMAAV2lhMs+o6tJz57vbUsyN+CRKtOZ8oW7/Nt3u4mz35Am9yqdWPGZcEZcLMuQcezFeLzMiVLdab2NYm56Urj01n+8cSgTUaf9tKYXTr1dZ+dzryk1d8pfx2gp1Fi1WxOKL0+jaM1cJpgdY1OrUC2ZXf71oB+LEaG4eEOfJJpfe5VD7ZnbIwqdW8dqHQY+pwFlRmUZ0fdBtAhMObh3JPb7+x2G/rUZh4cNSTfTWceQn+6nGAUYL1vnWHqNjSpQpo4rMEbrWoyz8sWifrI5sPjIYhpd0Was/KbDDsi/AaTW/rjeWvAaBTqjGW9sH/1ZQzUri+amifcsccQnBzwmQgzJzg1iMI55hCREfqpdGKdsPtMUpqAEAgpg7mWxGslXAi9idUYIZ2q7cU+1CDp0EyQrKD4YHgoC9dInnafLQqJ+piVe4m8r9vL5faaNcBB2NKrvXMGuNzF3557GRR0IkRjPI1nh6UfKkcaQPhdIIemP/QKfttvjEBbnta6UoLwlJdaxN/l4XjOTSu/lPL+8Bj0lfNzGFwzA== 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:(13230016)(366004)(38350700002)(4326008)(66946007)(6512007)(8676002)(2616005)(66556008)(26005)(66476007)(186003)(86362001)(38100700002)(103116003)(8936002)(6506007)(508600001)(6486002)(83380400001)(5660300002)(36756003)(6666004)(1076003)(316002)(2906002)(52116002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?B6cbevBVr3h5xs8AS2Q1MEIqaUCa+/vwysjlZ5ibqoXkd+dXHwpFS/orF10O?= =?us-ascii?Q?QndkFObjXAiA0JAPUryk3KnNeLtbnb6XeJJpArDIhfNAVOEEMN8Mh5E4FgKD?= =?us-ascii?Q?4lbgEofjCTmI6hhJXJz/gYfSwPyXNvaBmeq5SZQ6ddKAQOZBc6aqOKZH9Dwm?= =?us-ascii?Q?6VmLJHjLAQjxx/W/K4BpFTX89Z91Z549+9zhMl/A/UQOwjhgjPL7A1spIh1g?= =?us-ascii?Q?sVkhheMCfjep6Nd0I9gW8SOz5PH9CxC50JD76G898YO/jDXMHudxlIQBUSP6?= =?us-ascii?Q?3fbML/JaUEC0XVDTQUBbpwRi5jyJKe3pO2u6SKhPyACY3/6luAvLJoEMfUWo?= =?us-ascii?Q?o0+u8LjwnFmtKD2CuVD6m9w/1xZiJ9yj6Tb+g18XJK33r8mauuA0TaeNLsXP?= =?us-ascii?Q?EuLaL2I26Ve7reN3y8IFPOQvBnjiRcw6GpOpRys8VHwQI09Rz/HTZlFsQ7XQ?= =?us-ascii?Q?t0w2MjGBj6TQ1rwz4dmlajS37HviJvWM8xjrXhnNl1sY5oxAxloewQV7sA8c?= =?us-ascii?Q?b2RP6Dy9g09x2ewI9CSgKQpxxMSZaEN2HL76F2zQ5R3hf5Ggl8PplvCEqDW5?= =?us-ascii?Q?2P9wpnLwj5FC9Zp+ulekQr2a7maFA1dUQBSRpmLuaZf31qN7AwxZzy7MpoRf?= =?us-ascii?Q?sVeR4wvwuYEKRWj/B1GOJ8rO/kJja+ss6P1iWJWD5/dSOrdMztHrIgk0eF0I?= =?us-ascii?Q?feh8fPaNAxbJAxwNys5S3Msq8scxJsOrlG1JgX5BtMv7155hq13uyT0xzbzv?= =?us-ascii?Q?M99SWFzN3NgBoP+Gmq0M860cRKEwy5p14T5VvKIXrPNwaXLzJLf5W/jNxUEa?= =?us-ascii?Q?y21TGP3P9KmRTfZ61fF//OHbfV8fqwKgiMna/dw7GW0Lasg4t0EV+keLJHKF?= =?us-ascii?Q?k1Z8eTUV1uOOv+OPoqtyQ7FW161mJA/h3uEkPP6Edn68grq/1KI8UUkbTwCj?= =?us-ascii?Q?iemn4yzyx+RlmhtR0JPyuvOQyXdz6ni2aCsu8vbjbaX/KBcUDR6h/nnEI9Px?= =?us-ascii?Q?srVNyS0n/cuAwiTnBHoXy/YJ93d0G5xXe5s9MosI1UddPpQz+RYCzsJc4cUJ?= =?us-ascii?Q?di3r5tHD/TfTwxF8P2RX+yi6LA5vQ6t8ypfpCivBgE0J78SUYTclPnm88WFk?= =?us-ascii?Q?sqck0QYd7jGXehKAEWOjuvLsPefp4uYZ7rTIPc0eJMbXawycytzx0uvXqVG3?= =?us-ascii?Q?iksyWVj/LHOQ5ywVj0CDer7vK22DNIYYo0OUiaXUkzH61qhVdy0t+kRgkWXe?= =?us-ascii?Q?qqJztOBA5Z+0kr5j+xAvEfqnMg4p9hnjUW/+gDxrQFK6hXxj/C9AUaSJVic8?= =?us-ascii?Q?XBQD6iOgTbq2n4f5E+0oU4GYbtu0oabLwYTuqpUSBh4EctJBbhrjihZCw/UL?= =?us-ascii?Q?1AWulhcwcwziOwplYCbrymm5T3eHdojDOIiNASrpidqpvOerBydhuCpSOZ85?= =?us-ascii?Q?zodzYyCjNGxBuVz5960NjfkPPqM4Q+pszTf1SVeq+n0u5xGS4WqCW1oaVe54?= =?us-ascii?Q?UgzJhpVfXw8kvReAL7kybeWVS43g2UVI7Z7MMN9pyGC7iVe+Mp/RaDAl2Iol?= =?us-ascii?Q?CsiZH8gBhEjMqTGiYYEVjkOAEJIBjYrUEqMaayrrbFIqrGin2s9JGrqckw/b?= =?us-ascii?Q?s1H74mr1lVXi7DNgXlVdsIzPJHNC5nXXbcOMOR8G5j7+qU3zMKGqhUlVMKJi?= =?us-ascii?Q?J7YBmaXRJRF2Dr+uRWhdYH1go9j91+6CrYr3k+rNVoKO23SI/cVSWieLiuJI?= =?us-ascii?Q?p/qdWhhLb5qarT+/RJ064i0oWNGOKmM=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b9ebce8-cc5b-4f75-2772-08da4e74530e X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2022 02:11:14.5902 (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: YGoau7N3IKI3Re2te5rqfdo9MZlQUrgfsJiOzh1TwmA/JBCearEAFlthH3q9IlcLlIgGxkjqkso6MU3jZOqNaA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR10MB2513 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874 definitions=2022-06-15_01:2022-06-13,2022-06-14 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 suspectscore=0 spamscore=0 mlxscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206150004 X-Proofpoint-GUID: aNqGSM6TrGcnElp1425NG2BrjeS6tN_n X-Proofpoint-ORIG-GUID: aNqGSM6TrGcnElp1425NG2BrjeS6tN_n Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" After removal of kernfs_open_node->refcnt in the previous patch, kernfs_open_node_lock can be removed as well by making ->attr.open RCU protected. kernfs_put_open_node can delegate freeing to ->attr.open to RCU and other readers of ->attr.open can do so under rcu_read_(un)lock. Suggested by: Al Viro Signed-off-by: Imran Khan Acked-by: Tejun Heo --- fs/kernfs/file.c | 147 ++++++++++++++++++++++++++++------------- include/linux/kernfs.h | 2 +- 2 files changed, 102 insertions(+), 47 deletions(-) diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index e3abfa843879c..706aebcfb8f69 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -23,16 +23,16 @@ * 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. + * RCU protected. * * 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. */ -static DEFINE_SPINLOCK(kernfs_open_node_lock); static DEFINE_MUTEX(kernfs_open_file_mutex); =20 struct kernfs_open_node { + struct rcu_head rcu_head; atomic_t event; wait_queue_head_t poll; struct list_head files; /* goes through kernfs_open_file.list */ @@ -51,6 +51,52 @@ struct kernfs_open_node { static DEFINE_SPINLOCK(kernfs_notify_lock); static struct kernfs_node *kernfs_notify_list =3D KERNFS_NOTIFY_EOL; =20 +/** + * kernfs_deref_open_node - Get kernfs_open_node corresponding to @kn. + * + * @of: associated kernfs_open_file instance. + * @kn: target kernfs_node. + * + * Fetch and return ->attr.open of @kn if @of->list is non empty. + * If @of->list is not empty we can safely assume that @of is on + * @kn->attr.open->files list and this guarantees that @kn->attr.open + * will not vanish i.e. dereferencing outside RCU read-side critical + * section is safe here. + * + * The caller needs to make sure that @of->list is not empty. + */ +static struct kernfs_open_node * +kernfs_deref_open_node(struct kernfs_open_file *of, struct kernfs_node *kn) +{ + struct kernfs_open_node *on; + + on =3D rcu_dereference_check(kn->attr.open, !list_empty(&of->list)); + + return on; +} + +/** + * kernfs_deref_open_node_protected - Get kernfs_open_node corresponding t= o @kn + * + * @kn: target kernfs_node. + * + * Fetch and return ->attr.open of @kn when caller holds the + * kernfs_open_file_mutex. + * + * Update of ->attr.open happens under kernfs_open_file_mutex. So when + * the caller guarantees that this mutex is being held, other updaters can= 't + * change ->attr.open and this means that we can safely deref ->attr.open + * outside RCU read-side critical section. + * + * The caller needs to make sure that kernfs_open_file_mutex is held. + */ +static struct kernfs_open_node * +kernfs_deref_open_node_protected(struct kernfs_node *kn) +{ + return rcu_dereference_protected(kn->attr.open, + lockdep_is_held(&kernfs_open_file_mutex)); +} + static struct kernfs_open_file *kernfs_of(struct file *file) { return ((struct seq_file *)file->private_data)->private; @@ -156,8 +202,12 @@ static void kernfs_seq_stop(struct seq_file *sf, void = *v) static int kernfs_seq_show(struct seq_file *sf, void *v) { struct kernfs_open_file *of =3D sf->private; + struct kernfs_open_node *on =3D kernfs_deref_open_node(of, of->kn); =20 - of->event =3D atomic_read(&of->kn->attr.open->event); + if (!on) + return -EINVAL; + + of->event =3D atomic_read(&on->event); =20 return of->kn->attr.ops->seq_show(sf, v); } @@ -180,6 +230,7 @@ static ssize_t kernfs_file_read_iter(struct kiocb *iocb= , struct iov_iter *iter) struct kernfs_open_file *of =3D kernfs_of(iocb->ki_filp); ssize_t len =3D min_t(size_t, iov_iter_count(iter), PAGE_SIZE); const struct kernfs_ops *ops; + struct kernfs_open_node *on; char *buf; =20 buf =3D of->prealloc_buf; @@ -201,7 +252,15 @@ static ssize_t kernfs_file_read_iter(struct kiocb *ioc= b, struct iov_iter *iter) goto out_free; } =20 - of->event =3D atomic_read(&of->kn->attr.open->event); + on =3D kernfs_deref_open_node(of, of->kn); + if (!on) { + len =3D -EINVAL; + mutex_unlock(&of->mutex); + goto out_free; + } + + of->event =3D atomic_read(&on->event); + ops =3D kernfs_ops(of->kn); if (ops->read) len =3D ops->read(of, buf, len, iocb->ki_pos); @@ -519,36 +578,29 @@ static int kernfs_get_open_node(struct kernfs_node *k= n, { struct kernfs_open_node *on, *new_on =3D NULL; =20 - retry: mutex_lock(&kernfs_open_file_mutex); - spin_lock_irq(&kernfs_open_node_lock); - - if (!kn->attr.open && new_on) { - kn->attr.open =3D new_on; - new_on =3D NULL; - } - - on =3D kn->attr.open; - if (on) - list_add_tail(&of->list, &on->files); - - spin_unlock_irq(&kernfs_open_node_lock); - mutex_unlock(&kernfs_open_file_mutex); + on =3D kernfs_deref_open_node_protected(kn); =20 if (on) { - kfree(new_on); + list_add_tail(&of->list, &on->files); + mutex_unlock(&kernfs_open_file_mutex); return 0; + } else { + /* not there, initialize a new one */ + new_on =3D kmalloc(sizeof(*new_on), GFP_KERNEL); + if (!new_on) { + mutex_unlock(&kernfs_open_file_mutex); + return -ENOMEM; + } + atomic_set(&new_on->event, 1); + init_waitqueue_head(&new_on->poll); + INIT_LIST_HEAD(&new_on->files); + list_add_tail(&of->list, &new_on->files); + rcu_assign_pointer(kn->attr.open, new_on); } + mutex_unlock(&kernfs_open_file_mutex); =20 - /* not there, initialize a new one and retry */ - new_on =3D kmalloc(sizeof(*new_on), GFP_KERNEL); - if (!new_on) - return -ENOMEM; - - atomic_set(&new_on->event, 1); - init_waitqueue_head(&new_on->poll); - INIT_LIST_HEAD(&new_on->files); - goto retry; + return 0; } =20 /** @@ -567,24 +619,25 @@ static int kernfs_get_open_node(struct kernfs_node *k= n, static void kernfs_unlink_open_file(struct kernfs_node *kn, struct kernfs_open_file *of) { - struct kernfs_open_node *on =3D kn->attr.open; - unsigned long flags; + struct kernfs_open_node *on; =20 mutex_lock(&kernfs_open_file_mutex); - spin_lock_irqsave(&kernfs_open_node_lock, flags); + + on =3D kernfs_deref_open_node_protected(kn); + if (!on) { + mutex_unlock(&kernfs_open_file_mutex); + return; + } =20 if (of) list_del(&of->list); =20 - if (list_empty(&on->files)) - kn->attr.open =3D NULL; - else - on =3D NULL; + if (list_empty(&on->files)) { + rcu_assign_pointer(kn->attr.open, NULL); + kfree_rcu(on, rcu_head); + } =20 - spin_unlock_irqrestore(&kernfs_open_node_lock, flags); mutex_unlock(&kernfs_open_file_mutex); - - kfree(on); } =20 static int kernfs_fop_open(struct inode *inode, struct file *file) @@ -774,17 +827,16 @@ void kernfs_drain_open_files(struct kernfs_node *kn) * check under kernfs_open_file_mutex will ensure bailing out if * ->attr.open became NULL while waiting for the mutex. */ - if (!kn->attr.open) + if (!rcu_access_pointer(kn->attr.open)) return; =20 mutex_lock(&kernfs_open_file_mutex); - if (!kn->attr.open) { + on =3D kernfs_deref_open_node_protected(kn); + if (!on) { mutex_unlock(&kernfs_open_file_mutex); return; } =20 - on =3D kn->attr.open; - list_for_each_entry(of, &on->files, list) { struct inode *inode =3D file_inode(of->file); =20 @@ -815,7 +867,10 @@ void kernfs_drain_open_files(struct kernfs_node *kn) __poll_t kernfs_generic_poll(struct kernfs_open_file *of, poll_table *wait) { struct kernfs_node *kn =3D kernfs_dentry_node(of->file->f_path.dentry); - struct kernfs_open_node *on =3D kn->attr.open; + struct kernfs_open_node *on =3D kernfs_deref_open_node(of, kn); + + if (!on) + return EPOLLERR; =20 poll_wait(of->file, &on->poll, wait); =20 @@ -922,13 +977,13 @@ void kernfs_notify(struct kernfs_node *kn) return; =20 /* kick poll immediately */ - spin_lock_irqsave(&kernfs_open_node_lock, flags); - on =3D kn->attr.open; + rcu_read_lock(); + on =3D rcu_dereference(kn->attr.open); if (on) { atomic_inc(&on->event); wake_up_interruptible(&on->poll); } - spin_unlock_irqrestore(&kernfs_open_node_lock, flags); + rcu_read_unlock(); =20 /* schedule work to kick fsnotify */ spin_lock_irqsave(&kernfs_notify_lock, flags); diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h index e2ae15a6225e8..13f54f078a52a 100644 --- a/include/linux/kernfs.h +++ b/include/linux/kernfs.h @@ -114,7 +114,7 @@ struct kernfs_elem_symlink { =20 struct kernfs_elem_attr { const struct kernfs_ops *ops; - struct kernfs_open_node *open; + struct kernfs_open_node __rcu *open; loff_t size; struct kernfs_node *notify_next; /* for kernfs_notify() */ }; --=20 2.30.2 From nobody Mon Apr 27 09:14:02 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 C6A05C43334 for ; Wed, 15 Jun 2022 02:11:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345272AbiFOCL1 (ORCPT ); Tue, 14 Jun 2022 22:11:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238635AbiFOCLY (ORCPT ); Tue, 14 Jun 2022 22:11:24 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6C14248D1 for ; Tue, 14 Jun 2022 19:11:23 -0700 (PDT) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25F0Sxlh000892; Wed, 15 Jun 2022 02:11:20 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=VB5KC9zdxhxBEeHDl81mzpiGxVscSardrsEkgHsrhz0=; b=r++PG2cvKn5kaUjm5Z1AWQ5DZXEmpXvn3eczi/zjcKzLM+sqnVSYeiBq9++5co6We126 rAqgY+XcsE8oSCgDLZ/NsfhhRXbh+Bk1ZkU8lFRtApsQrK2zs2hxYo03ewYEuCQxgYIF YfSllGGtZtsvXk5bqom1tq/jimjbIFrcvVbFTcKhd8aH+Cr+MZNx2+V2Me+j0kJv1fVF wgxh4clC3mq4vD6MWOLMDYwX+S135GgnCK4xr6axFVsDBs57x2DzifbNrtnih3gnoVWm mN05FA6zArbQL6YQ5sHkFn+ilKnRR57U3L923I+gBaYNJ0blj6S/IrHlFRwo7kCxs3uP Sw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gmjx9f5y5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Jun 2022 02:11:20 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25F2ACLF005230; Wed, 15 Jun 2022 02:11:18 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2168.outbound.protection.outlook.com [104.47.56.168]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3gpr29rgmy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Jun 2022 02:11:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X6P40c7XbvSjoCj+c6/mZEc45FjDO60LtfEo4Vs5tv6AjOQyEOG7iRuNYZnw1/4zeaiYGofWEOuV6/rmvykDlYSkFaZUNKmZh0/6+W+3vWrsdSxxXWhh9GxDOb4v2Py2f6ejJ7WGfwObVz40gI/3QYYalBr4g87iUx2Na0hAv5N9ErFVonMLH6dZRFmHQlUab1brgJwThFz6JqpcY9ukgygYGU6V2r9UhbWu6R5PxtaE5SDwNy6Yn8F571PVGhisQhTaaoAqLLIBEX3AERA2Ifgoq3ydAxrUinnZiipR+lneHHdzal47oRaflluscl/uRoPYvM/CkNQubX7dDjarRg== 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=VB5KC9zdxhxBEeHDl81mzpiGxVscSardrsEkgHsrhz0=; b=X72SYUnv5qFvJImR3vb4qs8d4lgyUEmcP2XOpqHNjE9YLq44G6Z5/fyc661USAcUUB5AO8KLbMn229NTJpwL/VO5BnMPRY6No10AjDcL4aGOARlnxMF5OBDd6JICQLlwjqgVnNevlTlljicwgsZ6cNMwN3n32FAdd9zJ7l09clZfIqB0hIO9Qd35w4ZJZ22MBqhYHphlWFwYP3kuzTmugjWKiPBV55Fru+gZn6IGdGBzxsxbPpzuL9m4pNylBjwYRDXYGYqT59EVoX4dWQ1FDK1ValtrX2cuewrnVUlLHyaJ4qPKd52IvM/Beeo+LGMJ4zVTmtQGLFPMc06C375uzA== 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=VB5KC9zdxhxBEeHDl81mzpiGxVscSardrsEkgHsrhz0=; b=olq8EL7BnURDso+yp8xj+4on+bj0mOP3OS5E+mHmA5Nnyk4SVC1UV7/EjZ1fSuOcmWUNoVR+UYFQvT7gU9hJNHPSqqD6lGMkq3J/ZQGDpmBDsDnBBn+x6qGiDfQJIc7wdoybMFwF5NCsy1Dwc4oYMj3R9zLGTpkBBpaTsuDm/fI= Received: from CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) by BN7PR10MB2513.namprd10.prod.outlook.com (2603:10b6:406:c8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.14; Wed, 15 Jun 2022 02:11:16 +0000 Received: from CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::e9bd:ba52:c1c2:11e0]) by CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::e9bd:ba52:c1c2:11e0%9]) with mapi id 15.20.5332.022; Wed, 15 Jun 2022 02:11:16 +0000 From: Imran Khan To: tj@kernel.org, gregkh@linuxfoundation.org, viro@zeniv.linux.org.uk Cc: linux-kernel@vger.kernel.org Subject: [PATCH v7 2/4] kernfs: Change kernfs_notify_list to llist. Date: Wed, 15 Jun 2022 12:10:57 +1000 Message-Id: <20220615021059.862643-3-imran.f.khan@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220615021059.862643-1-imran.f.khan@oracle.com> References: <20220615021059.862643-1-imran.f.khan@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SY4P282CA0003.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:a0::13) 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: 0f42a077-8f87-481d-febb-08da4e745437 X-MS-TrafficTypeDiagnostic: BN7PR10MB2513: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: b3I2QkabaJOyvgKA6Jyag7PEhjJp5+FCQPJXfPje4r8n3wCfrX2sXeQUZncYoX82w9tBleDqrHPDsG4K0LpOVgABjv0V1jpCgJS79d627eCgkv6OoA9deDNYcRHqEpuD6xPGp4ZPU19ncrmHOyH4bTV2u0R8I+iMHWnD6kLMxcNILosHBUqua5WdWQ2PvVN1PiR2Koae+SkfQvzji96/h3/plei/6Psdv8RGpwiv4CyCKSjWXZwxmrUWnkopHHrHUfBkwlONGMkNNBiRvDU/55Kdf6giTSs7Rm417pN2kRiS73DAAlvQdK1kQ8JPOFBqvslaEGyHQQV+V7+IVzf3fVI03O1BidsI7bj/bCqVN7y5eBsI4ZL0sIv8JrpR9cEGBwrWUSi2PwMNhjEC0s0DoHt22Np3jAy/vSel2Pai0URLObiv6PxaF8NvACrGSq2HgYsidgSpeKkUw03R3tlccZsLsLhiTrNrpeNPvr9YePMmwSrnunqmMvqi/ed37neO8E3gSCgTaT4JIrjcW+Mj3QwKrIElz+CirNM9oj2T6/XKf9Odk2batza3WMjwSwRpHbAVqIL0s0wMd09+C/rHCQvcGgQuMlOlkADyLdFXXpGh2c7vFgOQfi/z8xMAWJ3iDq0EzW0vU4ZzdFD1IKOKIhtRptqf4H6rXP5nt6UuJXprcbn6fZmrJwr+Rt538a8e+oAsc5LTmDzYQTxdAaYa8A== 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:(13230016)(366004)(38350700002)(4326008)(66946007)(6512007)(8676002)(2616005)(66556008)(26005)(66476007)(186003)(86362001)(38100700002)(103116003)(8936002)(6506007)(508600001)(6486002)(83380400001)(5660300002)(36756003)(6666004)(1076003)(316002)(2906002)(52116002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WVrjjPCRCb/HE+0TWhsYunMU57WRO1JiqlxrWqMQBMqmbSsin4mDFF9UwEac?= =?us-ascii?Q?HOqAFEBw+uTo7WQ8rXFXJh3YTtCmgFLjIJWQIpY4HqjcAi6xJ9EmJbMEvde+?= =?us-ascii?Q?YM52K6FWBD6hsZZB8q53LIOpHbwDKsTYevO0ejM7pC96nwvFr5rlLcFfPfeC?= =?us-ascii?Q?6vE8BUoA07MwT1pZrRYsMA5TOmfLb/EV/aXATh0Kqtwx3Ht3L7rH/eo3UhXM?= =?us-ascii?Q?9sAz/ME+KpTKkkvhh/FfmLZ5WeUPJ6v3ThyTVj+DJPNRANEapVSgc5++vstI?= =?us-ascii?Q?1yDt/ctNXfZK1G8PKEgtX/zg+AyJIntAHvPJY++UlGmyXN/Htle+oPocecp+?= =?us-ascii?Q?6lMejoda7FtlxZs/t9sAsNE9RcZ58i2fS7F4Spg9HnzeZ7jstm+EBcg/m/ql?= =?us-ascii?Q?B6lSyrP27Y+9F5d5doIdoKmXTGjzQxUVjqLarpwfWtyRWN9lRzdhErccfCzK?= =?us-ascii?Q?dfk/WXOMCRhP+hNTbPJ4nejbGLguNaYJdup3qgA3QWK1IoNN5Q3KTUEjmq8n?= =?us-ascii?Q?orxBF1or8qgzY3d5o3wgyRNB5ZeAyvo1e78cloBDBJ3RFwY8wUtfMqjHAEMt?= =?us-ascii?Q?9/BdAuGt4h+TgBLR35H7aB2/UmLDfbN4ghidEtXxbqyyYxFTqP4n0QFz6Ior?= =?us-ascii?Q?D8UhTPrE4YcswAVVPUhW4JiNE4YgcbudedHnKhGnyvYic9lCtw1TfIZQ9yF7?= =?us-ascii?Q?va0t0uLIi6EXTRy38vvDEGUPmmsJ0b5PzZe+RWDw8dpf8KsmHbw1lk9on5A1?= =?us-ascii?Q?2bvKUD7xBXJdQzJRZNe2xz6SIuf2EupiHqx7J2p8FnSI6uPft5hfpGiMNoJd?= =?us-ascii?Q?/IUPI/VZAYTPVNBQiqKKQCpgLiTOoZO+iczY0GnmvB6T2v/qzgTcS16IjUX+?= =?us-ascii?Q?iO/ZSVhPYlhusS6FS6uD6T+QF/xVZoEcnep4pb33Eba3NVQZJwmMusfyy/zT?= =?us-ascii?Q?mLSpA+98LpnbodIZ36srefH35U9DI+9LkePJbzhwrR3FguYdao6Gzd2xDkwl?= =?us-ascii?Q?mY7mAu31VsHzwEhy4ujLYfE8Q2Ul6qyhy8Ix1QasRutWoT+1ma+CVrZB+Ctw?= =?us-ascii?Q?Qr61511sHnUU2mygeWCpwOx+d5woEl0jkSHQe2bsn/pGXsS95fX383FbMZzR?= =?us-ascii?Q?iOuBqOTqID99GvHK4kPELr2luHbsGG7zBGKA/dLuhO/U4KR6l2+Beo3Fjkt9?= =?us-ascii?Q?HaNzls5AXaz6JonwXYOURE3ZCcGDhZPPfT3DVGWGW4Bh+BH5bgMxSM0KJtOD?= =?us-ascii?Q?golj+Gkun2IaF/8iDXyEFd5M1epRxbvOw2V+0xXAmS5UrDHButwAyZ/glwPc?= =?us-ascii?Q?tAqS+0wymJp+jEOf7Rn/A7usM4cNMD3BxYSMcPL+32Jfy1yH8xiVjAovI9hF?= =?us-ascii?Q?qKQLMVsjOY0bInSVTMvFLZkdxXHEuu2rR9/tt79PeiT39SY99jbLSQBOvs0C?= =?us-ascii?Q?RByMCzCzcCu5MZBPvLu/kKrqBot21i3bFaGUOM6UaRsr7aAbEWj0nQt8APAW?= =?us-ascii?Q?GQXTqSi4HegckJGx409VeyFAU3oTgr6jN71lFb6b//ld++momuYnMoEs3aIv?= =?us-ascii?Q?vMOCFEEbRG0XajgCtwiHFdtNy0cnaAOvt/teHCEQpfAoSTCU/qQVi2YnTsMs?= =?us-ascii?Q?DrdS8NGrVXgpH8U+Y1zXQYzZ/WYFvsVzEN6FWa2rlIy1gSGTLpg+BrtJsJge?= =?us-ascii?Q?NCM7Mbv/cOpZAZOXt1hY/9jpUdxfiR7JBEdjcpDDKM5X0fW07CNMB3wsM6CQ?= =?us-ascii?Q?09qqj8Z/7aDMY7TJah5+1MeDAZ0X/ug=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f42a077-8f87-481d-febb-08da4e745437 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2022 02:11:16.3724 (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: MTDJXoceoCoS+UAKKIpehbX3xgISeWnvAHUR9ujIEoHrQ/CwICMPW5sZYI9UJzmUa0DdWoioGIr+ibMUXSzVjg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR10MB2513 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874 definitions=2022-06-15_01:2022-06-13,2022-06-14 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 spamscore=0 adultscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206150004 X-Proofpoint-ORIG-GUID: o49r0AZZRjirLWGt_8yW7vP3WzMid6XO X-Proofpoint-GUID: o49r0AZZRjirLWGt_8yW7vP3WzMid6XO Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" At present kernfs_notify_list is implemented as a singly linked list of kernfs_node(s), where last element points to itself and value of ->attr.next tells if node is present on the list or not. Both addition and deletion to list happen under kernfs_notify_lock. Change kernfs_notify_list to llist so that addition to list can heppen locklessly. Suggested by: Al Viro Signed-off-by: Imran Khan Acked-by: Tejun Heo Reported-by: Marek Szyprowski Tested-by: Marek Szyprowski --- fs/kernfs/file.c | 47 ++++++++++++++++++------------------------ include/linux/kernfs.h | 2 +- 2 files changed, 21 insertions(+), 28 deletions(-) diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index 706aebcfb8f69..dce654ad2cea9 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -38,18 +38,16 @@ struct kernfs_open_node { struct list_head files; /* goes through kernfs_open_file.list */ }; =20 -/* - * kernfs_notify() may be called from any context and bounces notifications - * through a work item. To minimize space overhead in kernfs_node, the - * pending queue is implemented as a singly linked list of kernfs_nodes. - * The list is terminated with the self pointer so that whether a - * kernfs_node is on the list or not can be determined by testing the next - * pointer for NULL. +/** + * attribute_to_node - get kernfs_node object corresponding to a kernfs at= tribute + * @ptr: &struct kernfs_elem_attr + * @type: struct kernfs_node + * @member: name of member (i.e attr) */ -#define KERNFS_NOTIFY_EOL ((void *)&kernfs_notify_list) +#define attribute_to_node(ptr, type, member) \ + container_of(ptr, type, member) =20 -static DEFINE_SPINLOCK(kernfs_notify_lock); -static struct kernfs_node *kernfs_notify_list =3D KERNFS_NOTIFY_EOL; +static LLIST_HEAD(kernfs_notify_list); =20 /** * kernfs_deref_open_node - Get kernfs_open_node corresponding to @kn. @@ -903,18 +901,16 @@ static void kernfs_notify_workfn(struct work_struct *= work) struct kernfs_node *kn; struct kernfs_super_info *info; struct kernfs_root *root; + struct llist_node *free; + struct kernfs_elem_attr *attr; repeat: /* pop one off the notify_list */ - spin_lock_irq(&kernfs_notify_lock); - kn =3D kernfs_notify_list; - if (kn =3D=3D KERNFS_NOTIFY_EOL) { - spin_unlock_irq(&kernfs_notify_lock); + free =3D llist_del_first(&kernfs_notify_list); + if (free =3D=3D NULL) return; - } - kernfs_notify_list =3D kn->attr.notify_next; - kn->attr.notify_next =3D NULL; - spin_unlock_irq(&kernfs_notify_lock); =20 + attr =3D llist_entry(free, struct kernfs_elem_attr, notify_next); + kn =3D attribute_to_node(attr, struct kernfs_node, attr); root =3D kernfs_root(kn); /* kick fsnotify */ down_write(&root->kernfs_rwsem); @@ -970,12 +966,14 @@ static void kernfs_notify_workfn(struct work_struct *= work) void kernfs_notify(struct kernfs_node *kn) { static DECLARE_WORK(kernfs_notify_work, kernfs_notify_workfn); - unsigned long flags; struct kernfs_open_node *on; =20 if (WARN_ON(kernfs_type(kn) !=3D KERNFS_FILE)) return; =20 + /* Because we are using llist for kernfs_notify_list */ + WARN_ON_ONCE(in_nmi()); + /* kick poll immediately */ rcu_read_lock(); on =3D rcu_dereference(kn->attr.open); @@ -986,14 +984,9 @@ void kernfs_notify(struct kernfs_node *kn) rcu_read_unlock(); =20 /* schedule work to kick fsnotify */ - spin_lock_irqsave(&kernfs_notify_lock, flags); - if (!kn->attr.notify_next) { - kernfs_get(kn); - kn->attr.notify_next =3D kernfs_notify_list; - kernfs_notify_list =3D kn; - schedule_work(&kernfs_notify_work); - } - spin_unlock_irqrestore(&kernfs_notify_lock, flags); + kernfs_get(kn); + llist_add(&kn->attr.notify_next, &kernfs_notify_list); + schedule_work(&kernfs_notify_work); } EXPORT_SYMBOL_GPL(kernfs_notify); =20 diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h index 13f54f078a52a..2dd9c8df0f4f6 100644 --- a/include/linux/kernfs.h +++ b/include/linux/kernfs.h @@ -116,7 +116,7 @@ struct kernfs_elem_attr { const struct kernfs_ops *ops; struct kernfs_open_node __rcu *open; loff_t size; - struct kernfs_node *notify_next; /* for kernfs_notify() */ + struct llist_node notify_next; /* for kernfs_notify() */ }; =20 /* --=20 2.30.2 From nobody Mon Apr 27 09:14:02 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 18C12C433EF for ; Wed, 15 Jun 2022 02:11:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345693AbiFOCLs (ORCPT ); Tue, 14 Jun 2022 22:11:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345669AbiFOCLj (ORCPT ); Tue, 14 Jun 2022 22:11:39 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB6E340909 for ; Tue, 14 Jun 2022 19:11:30 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25F0SpYs002108; Wed, 15 Jun 2022 02:11:21 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=ZUOcE7tzIMGoYsaIMuYmLq7cWaWMhxugw+Ja3iy52Ds=; b=s2Yc72BzPZXlCB/6Dp5yH9G7fitE1G21NT+kTZvb0IyPpYFd5mtlTIFTdmb/+LPqSN+P R/9kwq/RfNysYAPo2q6ZKnF9KJswNLRsWY/rLc4I45weWEL01owlJdRqSAMCrmdbX9zz wu1IQhS6IfZA39D1UaWSwFshg1jZhHKZ/Jc3t6zDIspIStQk69G81WdTwWgM6g6vKGqy HiJfCoYTvuscAyCgT4qFj5dRSDajcgoEgoohNsBwvcwuQ+iKre241vDdeqSEjNfGsOWw xj/pk2oDGzDsFR8L8mQjDoq+jRtxhJM1pRWURYvJpgvqL+JVzjKzKoKDv8fblFWaKwJU 8g== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gmhfcqahr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Jun 2022 02:11:21 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25F29wWq003813; Wed, 15 Jun 2022 02:11:20 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2041.outbound.protection.outlook.com [104.47.51.41]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3gpr25a1g7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Jun 2022 02:11:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OSeNcYfD118y6U8ar/MF+KvevZtk5zdet5+hhruCWPbPhzWtPyCciYSM0dw4vZs7pM5BbBuTF5eM6VfFkKtWMZrYAeNdr2N8hN0ojP3fZhMxuBEUjWLPwj6Ufv5s7XzsEaCi+WtGllvbl81QVFhhDaEgnuB3drOTmXwcEt+fr7ZLzXYD+3OdkhuO75qx9x5KiUjLQo/zlJPQicHZPQFo1FJjoNICPtEf3ZjuFaNYS+3SBxWZWiQMjmCsG81K2REEmNzr1EeaXfW9m4szv4RLkqIUi7R6AgKCX3dgM/JgLU9HWK/3i5QDfL/Mr8YTahi3iwjbGEuL8MdiVZ84VvScng== 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=ZUOcE7tzIMGoYsaIMuYmLq7cWaWMhxugw+Ja3iy52Ds=; b=h2O6HyiS+vfHxBxLvmWVIh4XhZQTP0Pu4jMYhcMGqPPy+W1vBqATyqdTX+qGI7RDlBpnJMJAgLHoC5rSCo/Zb3e7cggQdAM8r8CZVRY050ME4mHTPJ2HscCcDb7nzyQfsmC1WHDL6Io2WLwogXWYrfq8e/Iu6y8qAGWQM2/iv+7CZcx2UHKIR5VRN8BVVy3By4XZ9DE7a8eI52tvSLcvSf63RIiKURPKN9K9mubPeQkQE555NhWrHQcPKYH6gSJJGRAUCpjB4XZ3IAHoyYTYfHgSpI8YoJTelONnrGKBN6+VLiQqxtoLiSgqvm9vhbARMKz0HPp1JCdOGyRLtI1n1g== 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=ZUOcE7tzIMGoYsaIMuYmLq7cWaWMhxugw+Ja3iy52Ds=; b=Z0eZ6KSY7CEQ1qa3zhhNpSCjIHUK32lgchpNeJmatD2TEwyL/6XEG26BB0dpFyQHr+ydbex6H0/e9tkC8iWZR47m2Lq3Ww5qW1s26rttHyhW30brgW4YMWcbdeACOTQEcYWVw/24nRXadk0Zk0+81zx7bC6uZfuTB/LX3L4wNso= Received: from CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) by CH2PR10MB3800.namprd10.prod.outlook.com (2603:10b6:610:9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.14; Wed, 15 Jun 2022 02:11:18 +0000 Received: from CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::e9bd:ba52:c1c2:11e0]) by CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::e9bd:ba52:c1c2:11e0%9]) with mapi id 15.20.5332.022; Wed, 15 Jun 2022 02:11:18 +0000 From: Imran Khan To: tj@kernel.org, gregkh@linuxfoundation.org, viro@zeniv.linux.org.uk Cc: linux-kernel@vger.kernel.org Subject: [PATCH v7 3/4] kernfs: Introduce interface to access global kernfs_open_file_mutex. Date: Wed, 15 Jun 2022 12:10:58 +1000 Message-Id: <20220615021059.862643-4-imran.f.khan@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220615021059.862643-1-imran.f.khan@oracle.com> References: <20220615021059.862643-1-imran.f.khan@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SY4P282CA0003.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:a0::13) 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: fe8445cf-ed40-449f-49b3-08da4e745532 X-MS-TrafficTypeDiagnostic: CH2PR10MB3800: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: EUe0QUa4G4yeIf3qNAxr98LBYw3yPeUOUYg5Zn7eb1URRRcZ832B30R6ITNSwv6Y654JxQPQXIaBvOITqHoLkXfOgAyPFS+93HPrU3uG7vsfYT3S94mYQTIZKObCUbopmnYlBr1ctBQORhtxnkpRctH+FhzvFIcv3iLaLigIO6WEReksSrlgFBvK+ft7wUjVAZuyAuvh+Qnwy/92sCX+4JNCjqwdbzh5jna+7KBx1lGLRulZeRftKoH05GTQ3vIdd/unIGDnpCIlylEgc/CiJK+f6WmDl4N3Lqm3aiv17a5SLrtCH0lIGxMFEoXL2gslOWnMrrjPbeDKEqsihBtnBzxFqkuu21Zx71QaaLGf9GmluKvGAE4QP4pAq+b1Ww6WDt2Ihla17kh1eFz9QmOjSMMEOmz01bK/iC/fhCNXjkIqFtuAzu/6u7HWQTx6JvL/qHefQ6M7/eU51g1cm4BewuH99YoBAznKny1drJTDKwMLdPGq2fsNy1Rz3wAr+MNB002rtrPPhEQPpD1h0BNsA6BwJ+0aVkDFWJw75nDN5If/Ids/Evm9W1PXiNXc20Wp32cNOvtP5I8AGgFvOL+NG2SJp29Zz2VALbaah/mJMDY36PZgoTKnTYoJXU7BZ7SB52xTpBS2ToEzO36vELypC77D3hSdLH0sVkW8Q0ZINUh8aK/wsuri3RhEKbF8v44PIVUY2WU1jYM1e2gRqRTvog== 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:(13230016)(366004)(6666004)(86362001)(38100700002)(5660300002)(1076003)(508600001)(2616005)(38350700002)(8936002)(6486002)(4326008)(8676002)(66946007)(66476007)(316002)(66556008)(83380400001)(26005)(36756003)(2906002)(52116002)(103116003)(186003)(6506007)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uQGCB7cXFPYv1FdLaD/017nMkOyfWcX4PbWcVQF22xmOwDfmb/0gjCAQw7pv?= =?us-ascii?Q?GzWUZi+0FIr4XQ753Bi0WANtkq3bP6C7fVFrk7TEcySLEI2E26mp9c7xZI6A?= =?us-ascii?Q?ArfiitM9QjhtjXSwJRPOQws03tpkQaqTMH2S1oI+bjUG3YqRdwuttebDqHo0?= =?us-ascii?Q?i3W1OQfZQP3oY9geOLC87j5zf07UEOrrwXUXUR7OKBV11drgt0Iz/A8HpOyU?= =?us-ascii?Q?6/H+9t/y5RhGf4eSZEnOR1eIQjGsJN2upnZl1UfnYpuVjVeSDbNLDba2dSRO?= =?us-ascii?Q?uOZ824OIkGb7mVJ+EeSddpHH3CZAobrYIHLddhW6YslR9+yTtwBFTwrs+mPX?= =?us-ascii?Q?aTMaLQesAOi7A3Nu90xDjuJVA7JYYK+Ls9JGqvr/x1hEny+KNkvVM5mNUHya?= =?us-ascii?Q?5XbnIxcQPnCg4S/Xa3QdDkyJFJx4448opZBXPkzQTLljTdgyAFXwp9upwqKG?= =?us-ascii?Q?2CBYfN8HmQFEaAMCtqw9qV1S0tHREUCE8EK+0PEE655nBHnMptSt3olxmVT0?= =?us-ascii?Q?SY7l/3quPFcY3bkZMIik00Ac4ByhB96VC9hC4Obx6gvClo3wadso7VSDbE83?= =?us-ascii?Q?Ml+cW6/Jm04/Z/zAVTR2RLiYVjYusXLfRYftGhBjPCXczW5v4cheaKQpZNlF?= =?us-ascii?Q?H+TqN6uf8zveY5z9QQu8jr5MAK2CwGTbYX2rU1vEaM3GOy25YqVV61gorATX?= =?us-ascii?Q?zvhQgxLt4XMqYjHJqh623LXRCiNjMzeP8xtv+0wJBFScJuEwoZkdbnNPrlB4?= =?us-ascii?Q?OYfhHesWEIN4C8myzGMvqRCjZ01I9JlNHGdcHifNHWQDpjjMpUuXg9Q94QVC?= =?us-ascii?Q?lFfPi/1sD5JNVJFpq2EGfBRuNvD7fUtbOQfLduMbnomZ3wKf6dcGpkxW9VZW?= =?us-ascii?Q?sMSFpvbGYyHXlccvVMGL8u4ZNaE3AZ4qnxsBlbBmHCOAy8Q9gZ2nLRe2KrGN?= =?us-ascii?Q?o+xYuqnXdbK3I2MQ4Di55BcuD28pIzNwbjyj9NrFh5oFjfQthkaf8PAE5d+P?= =?us-ascii?Q?VI2NcmKB+Yq1IjAy963IzVxIGwMLNl6fPH4C150xlNsb3jaxsET98CDPpdlC?= =?us-ascii?Q?n00zldRNxgkZ3BoEtmHEDDuZhPxYTjBMMi5mA1aTnLLK80zA9eI6P7Sw9PoV?= =?us-ascii?Q?srVlBAAY2wmnSBKZLr7+v5Wr6NucTIhwZs2lCJOiWyOUmMTSzQIOvd1cVrnF?= =?us-ascii?Q?vlokLV2KjlZOzMI5QcR9cEDgSlYkgrI8Vu0/wvKpkyreP4D49WWZYczthAUi?= =?us-ascii?Q?85xkJ/FbKA5vnTUq7GGL6oeYjL6RnrtLw9zHaNFALDIneWLTCoPIZKouOLJ0?= =?us-ascii?Q?/nb5tUTfZpOW2bRS6TC4UCjcTNKoRJFarknbSzzRZqKTDyirzZQvenRa+/cx?= =?us-ascii?Q?IO4uhcH7UWis4sFGX8xhWjL7Wh97+nF/rrm0eMBK+0gu/++1sIit5WE9JBIH?= =?us-ascii?Q?eTprl9CPvwspVUQQg2Sf9clXEIZaqf8JH3g/J8JKcBSus/X2l3mUVcA36WmF?= =?us-ascii?Q?h9J6ymRA5DDENzY8RgbioRRZISt4aEJca9fNco2b9EQo6K8qAPczZWtvJJcs?= =?us-ascii?Q?1Sm/aNHBd1MOB1V7N3rf4Lag07zXRilrYYlcSyLgRk95swjG1a/rhW76TVlg?= =?us-ascii?Q?Yk0zECBHx8bsAQ7Bj8+BetpygY3LYThS6PAV9nreQSSPptGWR3szGEZpQ3xs?= =?us-ascii?Q?huhdTSaXczysChbl7jpDiHAYzdBQAn8tmyA2xpo7g0dTAKGlnHkMyRYgbeg3?= =?us-ascii?Q?i+Woy49nM47p+5SRZkhIoJF0w68yIy0=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: fe8445cf-ed40-449f-49b3-08da4e745532 X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2022 02:11:17.9971 (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: q+R5r+DfVKQV4KfosC5c1Xlmh3B46ZxRLtFHHJiH6UUtgAw6Qk07fPEQoSqRUJazjKGSVKPQ7IXgMSbXPEKYng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB3800 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874 definitions=2022-06-15_01:2022-06-13,2022-06-14 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 suspectscore=0 spamscore=0 mlxscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206150004 X-Proofpoint-ORIG-GUID: bpy3uf-a5qdRiNfPIpj_YHRMHsgZmvIO X-Proofpoint-GUID: bpy3uf-a5qdRiNfPIpj_YHRMHsgZmvIO 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 Acked-by: Tejun Heo --- fs/kernfs/file.c | 56 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index dce654ad2cea9..fa0154211076d 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -49,6 +49,22 @@ struct kernfs_open_node { =20 static LLIST_HEAD(kernfs_notify_list); =20 +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; +} + /** * kernfs_deref_open_node - Get kernfs_open_node corresponding to @kn. * @@ -79,9 +95,9 @@ kernfs_deref_open_node(struct kernfs_open_file *of, struc= t kernfs_node *kn) * @kn: target kernfs_node. * * Fetch and return ->attr.open of @kn when caller holds the - * kernfs_open_file_mutex. + * kernfs_open_file_mutex_ptr(kn). * - * Update of ->attr.open happens under kernfs_open_file_mutex. So when + * Update of ->attr.open happens under kernfs_open_file_mutex_ptr(kn). So = when * the caller guarantees that this mutex is being held, other updaters can= 't * change ->attr.open and this means that we can safely deref ->attr.open * outside RCU read-side critical section. @@ -92,7 +108,7 @@ static struct kernfs_open_node * kernfs_deref_open_node_protected(struct kernfs_node *kn) { return rcu_dereference_protected(kn->attr.open, - lockdep_is_held(&kernfs_open_file_mutex)); + lockdep_is_held(kernfs_open_file_mutex_ptr(kn))); } =20 static struct kernfs_open_file *kernfs_of(struct file *file) @@ -575,19 +591,20 @@ static int kernfs_get_open_node(struct kernfs_node *k= n, struct kernfs_open_file *of) { struct kernfs_open_node *on, *new_on =3D NULL; + struct mutex *mutex =3D NULL; =20 - mutex_lock(&kernfs_open_file_mutex); + mutex =3D kernfs_open_file_mutex_lock(kn); on =3D kernfs_deref_open_node_protected(kn); =20 if (on) { list_add_tail(&of->list, &on->files); - mutex_unlock(&kernfs_open_file_mutex); + mutex_unlock(mutex); return 0; } else { /* not there, initialize a new one */ new_on =3D kmalloc(sizeof(*new_on), GFP_KERNEL); if (!new_on) { - mutex_unlock(&kernfs_open_file_mutex); + mutex_unlock(mutex); return -ENOMEM; } atomic_set(&new_on->event, 1); @@ -596,7 +613,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn, list_add_tail(&of->list, &new_on->files); rcu_assign_pointer(kn->attr.open, new_on); } - mutex_unlock(&kernfs_open_file_mutex); + mutex_unlock(mutex); =20 return 0; } @@ -618,12 +635,13 @@ static void kernfs_unlink_open_file(struct kernfs_nod= e *kn, struct kernfs_open_file *of) { struct kernfs_open_node *on; + struct mutex *mutex =3D NULL; =20 - mutex_lock(&kernfs_open_file_mutex); + mutex =3D kernfs_open_file_mutex_lock(kn); =20 on =3D kernfs_deref_open_node_protected(kn); if (!on) { - mutex_unlock(&kernfs_open_file_mutex); + mutex_unlock(mutex); return; } =20 @@ -635,7 +653,7 @@ static void kernfs_unlink_open_file(struct kernfs_node = *kn, kfree_rcu(on, rcu_head); } =20 - mutex_unlock(&kernfs_open_file_mutex); + mutex_unlock(mutex); } =20 static int kernfs_fop_open(struct inode *inode, struct file *file) @@ -773,11 +791,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 + * @kernfs_open_file_mutex_ptr(kn) 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) { /* @@ -794,11 +812,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 *mutex =3D NULL; =20 if (kn->flags & KERNFS_HAS_RELEASE) { - mutex_lock(&kernfs_open_file_mutex); + mutex =3D kernfs_open_file_mutex_lock(kn); kernfs_release_file(kn, of); - mutex_unlock(&kernfs_open_file_mutex); + mutex_unlock(mutex); } =20 kernfs_unlink_open_file(kn, of); @@ -813,6 +832,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; @@ -822,16 +842,16 @@ void kernfs_drain_open_files(struct kernfs_node *kn) * ->attr.open at this point of time. This check allows early bail out * if ->attr.open is already NULL. kernfs_unlink_open_file makes * ->attr.open NULL only while holding kernfs_open_file_mutex so below - * check under kernfs_open_file_mutex will ensure bailing out if + * check under kernfs_open_file_mutex_ptr(kn) will ensure bailing out if * ->attr.open became NULL while waiting for the mutex. */ if (!rcu_access_pointer(kn->attr.open)) return; =20 - mutex_lock(&kernfs_open_file_mutex); + mutex =3D kernfs_open_file_mutex_lock(kn); on =3D kernfs_deref_open_node_protected(kn); if (!on) { - mutex_unlock(&kernfs_open_file_mutex); + mutex_unlock(mutex); return; } =20 @@ -845,7 +865,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 /* --=20 2.30.2 From nobody Mon Apr 27 09:14:02 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 9DE36C433EF for ; Wed, 15 Jun 2022 02:11:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345634AbiFOCLp (ORCPT ); Tue, 14 Jun 2022 22:11:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345611AbiFOCL2 (ORCPT ); Tue, 14 Jun 2022 22:11:28 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 095CB27FF0 for ; Tue, 14 Jun 2022 19:11:26 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25F0Sq37002206; Wed, 15 Jun 2022 02:11:23 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=uqvZvLh0G989ufZqmc/N/K4i51RKlYfNv8J8TR6Gjps=; b=ngpuLnjHBMU48pEJ6lmq3wv0qQ+5uwMuQb8P46fi5yQIJ6WP54auHZo8Flp7bAC2sNrW VrgpxG39TuP/5RLzHv3yeJ0oY5u58MxQGe/I3SZ0s/uZ4WGrlJqzs0VXaChajSYrkhx1 QGXCrd6nGHvHgEoK77F4zhfBzOB8q36oPQWf6WyRMJfZHyDwWNVnVCKqIvuwsN/tH8lW Q6Vn8iImdHtIO6xvMqhnjUPFdbqerCNX44L8IYkstRhoYPhDyhKrALY29lMP9LENJNqs LiY8bKj8I+gcLTTO9JJqchHfqgEo2skP7/IHRABLxDkVoMiUKxaOpok6aomSsO5xUGra eA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gmhfcqahs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Jun 2022 02:11:23 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25F25lLE028721; Wed, 15 Jun 2022 02:11:22 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2048.outbound.protection.outlook.com [104.47.51.48]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3gpr7nh9wx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Jun 2022 02:11:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nWasY6j8yK6pL9IabC6I9H/9TFVM60lBcipTAsSISZHztxsk7EVL403ca2K+lt7bp1MCVPfPI52O5yJGqZAlHrOElEOjgMInWf0sdg9ZWB3WX+1DatrWFc++juf47CQOphk/24JVbciIO1+GM9Sz/LZS/mA13ESMY+qi/IRM2pqrSMzYuNcM77rGHEfI6hekTxxMqtEnwYBJTAh0qVjofiJlGQbCR63c6RuxZdgHEtlXbLUfzYV+JwHh/a1z90YTWOCGBjlSqh0HOgejOki4Al9PyGDTxDiP9e0GLI2hJF4iDL3sQoXc81bterRLB7ERgmls/qhPQunrytpZD22+Hw== 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=uqvZvLh0G989ufZqmc/N/K4i51RKlYfNv8J8TR6Gjps=; b=OaojZQ5FDDMz2HRgqQUvlFCx4XSifNEvc44062rrjflaDo8nC5OPiKiPwGuoI/SflFE6GwwrEf3kbU9e62fNMuWzyOuV+/t819txPZCP5DuF5xXJP1jl58Vmov2625uB1XZ7RZgm1dT3/lRuu+8rCIIiVpLIBttNqIuNyOiod5p28zaLYvBv0yZL1i/qm9an4dZQHNQM6JfaB9bts5g2XjvTSkqTABcvKL3x6zLdNyO9O/vLAenpxYrl61yZAxhw8HQ/8r/BAOrgLXVJwyfx8Ak4mhXNy1gPt+7AE6imWns7xBG5mFKJM3TXYL6zUbxEpExpwMKYUVkrNqRSA9CgZw== 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=uqvZvLh0G989ufZqmc/N/K4i51RKlYfNv8J8TR6Gjps=; b=HxwpL2wm1WaN2rZ1s230gRuF3ZOqkjaEc2f/J+FqnIB71TQAYFYrFdoKLiaObCNFmTHa6dtzdCYReh6KX0dDjq9Xeh27++ROdg8m/bDfFsqYi6amrLuh4Gihhd2r5XdyhWiJkAZF4QMc5RTvx9trMy+k88wVEyNg5iiT4H7BcAE= Received: from CO1PR10MB4468.namprd10.prod.outlook.com (2603:10b6:303:6c::24) by CH2PR10MB3800.namprd10.prod.outlook.com (2603:10b6:610:9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.14; Wed, 15 Jun 2022 02:11:20 +0000 Received: from CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::e9bd:ba52:c1c2:11e0]) by CO1PR10MB4468.namprd10.prod.outlook.com ([fe80::e9bd:ba52:c1c2:11e0%9]) with mapi id 15.20.5332.022; Wed, 15 Jun 2022 02:11:19 +0000 From: Imran Khan To: tj@kernel.org, gregkh@linuxfoundation.org, viro@zeniv.linux.org.uk Cc: linux-kernel@vger.kernel.org Subject: [PATCH v7 4/4] kernfs: Replace global kernfs_open_file_mutex with hashed mutexes. Date: Wed, 15 Jun 2022 12:10:59 +1000 Message-Id: <20220615021059.862643-5-imran.f.khan@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220615021059.862643-1-imran.f.khan@oracle.com> References: <20220615021059.862643-1-imran.f.khan@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SY4P282CA0003.AUSP282.PROD.OUTLOOK.COM (2603:10c6:10:a0::13) 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: 342caa52-f8aa-4889-7841-08da4e74562c X-MS-TrafficTypeDiagnostic: CH2PR10MB3800: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: OYUzNX06DLfJKbgVYHVThjY1tnU18ny+tgfYb4RiLWIMI/ME6Y1OzXt8A+TVfhseVTzKqAICTEnX8upLBSevPNbMgHjEF2HfO+dWnGBZcafi55IDlz3QaRS6M9Pmb47w9+yGbHqy21CtF2OObAkPGfZH2pCuE4u6mUOfzOIIaiONYDFvrhJ3JGf7zRxGZbq3rnbzju9kLOBZxQy0ntgWxcK2bX9Sn8ksNigAHaaU2gGFxTK/PHw2DPG2vLHzFrnUR32bnG3qWDmqIIFgQLGcGyTWz6hocZwUT2/9HzMtAEP/HiHEh3dtBnVBSyR8i5TFWoAbsKCu9iuGcKyfc36wSuWrnK9qzFlsC1K/yajPRpK1cAxauY2rO+R0aG61n3pl8hRI0fui+zIGNMuIyttuuqtKOupUZPGvDKBN7qx+kacmet2mLfz1cfhB1YW4te/C1PK1YA9+25AEkPMAAtOSuncwtQMobGogmDcvJGlpm2wjqGRfSlWRokzY3b/Qpx13J4v6kqzF6Y5wjex7PwDo7YBBsHW+pFsJ0qdLIDCx/DlEuhUVJ+VrDO5IWoXxC1yO4qPb7hcTx798TLYxcBvOR0y2Z2nmdxF+wAw++XeeGjt5dxB41eRfQkn/6ovafm+5P1qNx2OkoxstVNFnpdUnycPEZchnzS61v37bacwA9bfqFbv13yod6BV+IVgCgHxGnJvb6uMrwLCTIYNU67qd9w== 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:(13230016)(366004)(6666004)(86362001)(38100700002)(5660300002)(1076003)(508600001)(2616005)(38350700002)(8936002)(6486002)(4326008)(8676002)(66946007)(66476007)(316002)(66556008)(83380400001)(26005)(36756003)(2906002)(52116002)(103116003)(186003)(6506007)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?adNCBOt+75BDU0vjGmVL16zw2BvkSssldav73j6Cn5zXtg8P/G1kco2lFe8L?= =?us-ascii?Q?lBvmQS2uoP4j0Gp5fbyAY6vzDy71alBNsqL0NxKdDzAF9DikqWfQBKgW6Ucf?= =?us-ascii?Q?Rd9llZZ1a3yfu/Ma4WuJmBUWVWc7+cjmsZy9Tf505vl4n/1/atXXRhEIYn6s?= =?us-ascii?Q?DYI1TbgewHB++1s53yoYxS1cbKLWS33cNv+HZo7ngiJe+JtYOq2VNW5U/O37?= =?us-ascii?Q?G9nYyrVX/c7wjYc7Asv15YhhRa9U5sEqH6jHuKGaO9kdTpLC6AHdQmBNIfvV?= =?us-ascii?Q?r0VxuUmrOmh2PIX46JKtdpmEf86gU/iKOSNCgz/ya2sSmys6t7NJWvHHS5x5?= =?us-ascii?Q?QCz1VEaourFVD844TVjwUwKq8a/Ewn9CnpaN6XBKiuHjPVjteBxD3PwNe+YH?= =?us-ascii?Q?FbsHcn5J2NZp9qnN8H2GJrAa/SyqxxFByfh1BcuB9/2XYQH0TFC38P3Gr+xP?= =?us-ascii?Q?cvkcg8fj01CzJtYywZxqZKn6/yW4lFCV/A6zebnvEaP19TjHlPoJ7/e3A3UW?= =?us-ascii?Q?+JgEy2h8tkEYWoakwCWMCpNyPF5VTzcSg4HuZva1NRsgmiq5p5HbWWlxZpUf?= =?us-ascii?Q?IA5qy11GFla2df7JhLG44agwHxSUK0lhoX13jJq1O19tY4AiPXdwUwrTOhLO?= =?us-ascii?Q?vAD51/8VX/fFWTYiP98XUdT/QZv6tnsf9C8+aVngFsWvcNBFpZTE2NMsWlRJ?= =?us-ascii?Q?oO47Unx84kmEPszNfm32b/8Dtm3XY1GGODfsYOEixgI/NjVg6jbHT09Vm7yW?= =?us-ascii?Q?Mqe7ZkYb+QVVJYtFm0nqli8snLQXBeXM9VXHArAzQMHhliM3Wtzm+qWWo38W?= =?us-ascii?Q?Vk7870w7wB+RNAEnhTjsBT3Ajnw+COJURvczn0ZuC9YCilE4161z88J6WUwj?= =?us-ascii?Q?OvuNRMyiuEtjbn0gByHGjI20LKjELksrHRTNl1lzne65MqIqcjxXgg5KZA01?= =?us-ascii?Q?wfsZ5x9XG4kxVX6FX/MEYvBitlES4bTtwA2m8aMG3u+bgRUGalGNixFPQKTe?= =?us-ascii?Q?dkrSH+NJXjLyYc3PTxU0FchtjEI5gDzYurSKS4c/p+ksofXCX/5vTMLnLFfY?= =?us-ascii?Q?uxdUbCy7sVj8XHa5ixFPU/XAAvUdatgXEtANTlbf8ZdkRZRmIvJJn8z5dBha?= =?us-ascii?Q?gI+P3le57jjDmf2v8Yxsqj80PzvenZHaD4t8L8bbY/WdnOSiFoBYUJndUalm?= =?us-ascii?Q?vOUlSiwrhmbHkszC6UlzsRZr1dqbAR/7LIl6wlsb4Jt0btu3bQj0JkVW5XHl?= =?us-ascii?Q?P7Glt4Eg0B9szTfrePwlvYLTnWyQYvlKKTXN9vBsEHigVZgDl2u1eUWHq4L1?= =?us-ascii?Q?IEwgrzWNHyBuP9Sgd49Y61kO0eS/woMlQoT+6V3jSFp/C2OXU2gv8t/OKan4?= =?us-ascii?Q?xktWCWhzg/qfLMRYcZKXWiBpOXFiShtE1r8oA+azXmDFMm7eX4dyMWUYPmdU?= =?us-ascii?Q?grVt9Zby9X6OH0gAyM9vnLwrt734KhUZdSMOxHN5/4Z6fzFVNb17bkB3HfCo?= =?us-ascii?Q?5EeL3zhHEUvUUYlR3XcpUDvhXFGlmFi6DhIKLuv1JNjwagYNJ3m5vzC2cVwN?= =?us-ascii?Q?ghI4HCC1XI7SXIk3n1dd4VOyCUyo8OPlmRxDMxTNSgBJM8asiAmuavkrnGW/?= =?us-ascii?Q?9gEOiKqk5kKDSsRNvOVGlvlilgvfeZNy7/BOh6DHMCrvXuuIknrJyIiRcgf9?= =?us-ascii?Q?8AOYqqM3jJLJ4iv6dxkwHc6605FGk73u3puPH4KtPs/ZwYGxMTeruUP8Tpde?= =?us-ascii?Q?rDgnMLTkPqJifXTWJ5dZ1b7+EsqRpz4=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 342caa52-f8aa-4889-7841-08da4e74562c X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4468.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2022 02:11:19.8867 (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: 45sN6afeX0lsPViUrDiWp4gONbz/OwllCsoCvm3/tDO5lm/KhTrLBS0d+du3Xg0kM+bw5+FEKLI9bX1C88j7vg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB3800 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.874 definitions=2022-06-14_10:2022-06-13,2022-06-14 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 mlxscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206150003 X-Proofpoint-ORIG-GUID: M68MBpczfxOXJfByzWIFVPDX1wxG-dp7 X-Proofpoint-GUID: M68MBpczfxOXJfByzWIFVPDX1wxG-dp7 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 Acked-by: Tejun Heo --- fs/kernfs/file.c | 17 ++--------- fs/kernfs/kernfs-internal.h | 4 +++ fs/kernfs/mount.c | 19 +++++++++++++ include/linux/kernfs.h | 57 +++++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 14 deletions(-) diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index fa0154211076d..06fc4be4032b2 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -18,19 +18,6 @@ =20 #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 - * RCU protected. - * - * 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. - */ -static DEFINE_MUTEX(kernfs_open_file_mutex); - struct kernfs_open_node { struct rcu_head rcu_head; atomic_t event; @@ -51,7 +38,9 @@ static LLIST_HEAD(kernfs_notify_list); =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]; } =20 static inline struct mutex *kernfs_open_file_mutex_lock(struct kernfs_node= *kn) diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs-internal.h index eeaa779b929c7..3ae214d02d441 100644 --- a/fs/kernfs/kernfs-internal.h +++ b/fs/kernfs/kernfs-internal.h @@ -164,4 +164,8 @@ void kernfs_drain_open_files(struct kernfs_node *kn); */ extern const struct inode_operations kernfs_symlink_iops; =20 +/* + * kernfs locks + */ +extern struct kernfs_global_locks *kernfs_locks; #endif /* __KERNFS_INTERNAL_H */ diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c index cfa79715fc1a7..d0859f72d2d64 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,22 @@ void kernfs_kill_sb(struct super_block *sb) kfree(info); } =20 +static void __init kernfs_mutex_init(void) +{ + int count; + + for (count =3D 0; count < NR_KERNFS_LOCKS; count++) + mutex_init(&kernfs_locks->open_file_mutex[count]); +} + +static void __init kernfs_lock_init(void) +{ + kernfs_locks =3D kmalloc(sizeof(struct kernfs_global_locks), GFP_KERNEL); + WARN_ON(!kernfs_locks); + + kernfs_mutex_init(); +} + void __init kernfs_init(void) { kernfs_node_cache =3D kmem_cache_create("kernfs_node_cache", @@ -397,4 +414,6 @@ 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 2dd9c8df0f4f6..13e703f615f79 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_global_locks.open_file_mutex[i]. + * + * To reduce possible contention in sysfs access, arising due to single + * locks, use an array of locks (e.g. open_file_mutex) and use kernfs_node + * object address as hash keys to get the index of these locks. + * + * Hashed mutexes are safe to use here because operations using these don't + * rely on global exclusion. + * + * In future we intend to replace other global locks with hashed ones as w= ell. + * kernfs_global_locks acts as a holder for all such hash tables. + */ +struct kernfs_global_locks { + struct mutex open_file_mutex[NR_KERNFS_LOCKS]; +}; + enum kernfs_node_type { KERNFS_DIR =3D 0x0001, KERNFS_FILE =3D 0x0002, --=20 2.30.2