From patchwork Fri Jan 27 01:31:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rik van Riel X-Patchwork-Id: 49013 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp591673wrn; Thu, 26 Jan 2023 17:48:36 -0800 (PST) X-Google-Smtp-Source: AK7set+9REnqYLq130e4nZpeNion4nxMH7Q3cvEvyFDOPbbQlSfU38MPoxAt/yLdSF62LkbQSYu+ X-Received: by 2002:a62:e418:0:b0:581:a55:d213 with SMTP id r24-20020a62e418000000b005810a55d213mr3894421pfh.29.1674784115997; Thu, 26 Jan 2023 17:48:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674784115; cv=none; d=google.com; s=arc-20160816; b=Al17/LV68Xtx8CXHkBNjN3WYRCjIlP2icaHDBWW+A3TC1FeLztkzl06i39niJYFFuE csLXrlpndYFnN4kwVLcRUcF83nb9Bnyz1jpd2027B13Dhh0ad6p55yPrRNp3egdnc7ua FKOzvvVgIW8r8WoLw8wnUKIYuZniU0iUSe5NndMCUmpueVWXd5Qw1rXFEXeoQZHttd0g 2BB/wb8zp3QpdCeF8ZjM58E0BgbKOlijT49SuilDB2s57mpo5wiMRMoo3+UU+2qmr+KI gQVb9FMcIv5MK7bZZ0iHsiGAp2SVwvY8aerqJ5lmUnBigsfyrdZIhiXt9FYBk1fyHy/8 Ks1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date; bh=SJFYROGatXvZ8tED7TWCXqUlef22cm+ind2pFbb8A0M=; b=NnBcy8caV/u7p00Nze1T6+kosjs+gUuOdGWxLTrWLYMwUnxHsjbxald9jVLKq3q66p 3X6HVDnTdQtFwYtmV97Jx2i8y1ZBRWlPG4HnB2id4Wff/kkSrmMx3sS0qwTnlHH9eVDs RYnK45SSFMp2XF9CXssNZ6vsLkQF5EZDDyIAEl2T68+RblXCt5i+jWr2+hURp6VW6q/Q nz9dhjcbuQo7Ukm7xFAIQ97HXNUirQ3iglHdgbSOXDNzXDfCf3yQcv0z09BePpm/EoZ9 SxrBWL48Kn7H+zxsfdtmwE1bf+9zmqTLA/D0WAInJuhMw6A5T6xLqF/II1F4seFEn8J8 2Z9g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j22-20020aa78dd6000000b00575428b9ea7si2758155pfr.204.2023.01.26.17.48.23; Thu, 26 Jan 2023 17:48:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232766AbjA0BcJ convert rfc822-to-8bit (ORCPT + 99 others); Thu, 26 Jan 2023 20:32:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229446AbjA0BcE (ORCPT ); Thu, 26 Jan 2023 20:32:04 -0500 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AD6068120; Thu, 26 Jan 2023 17:32:03 -0800 (PST) Received: from [2603:3005:d05:2b00:6e0b:84ff:fee2:98bb] (helo=imladris.surriel.com) by shelob.surriel.com with esmtpsa (TLS1.2) tls TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1pLDaz-0008Ij-0Y; Thu, 26 Jan 2023 20:32:01 -0500 Date: Thu, 26 Jan 2023 20:31:59 -0500 From: Rik van Riel To: viro@zeniv.linux.org.uk, linux-kernel@vger.kernel.org, kernel-team@meta.com, linux-fsdevel@vger.kernel.org, gscrivan@redhat.com Cc: Chris Mason Subject: [PATCH v2 2/2] ipc,namespace: batch free ipc_namespace structures Message-ID: <20230126203159.3af959c8@imladris.surriel.com> In-Reply-To: <20230127011535.1265297-3-riel@surriel.com> References: <20230127011535.1265297-1-riel@surriel.com> <20230127011535.1265297-3-riel@surriel.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.34; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Sender: riel@shelob.surriel.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756137117061748156?= X-GMAIL-MSGID: =?utf-8?q?1756138429272998321?= On Thu, 26 Jan 2023 20:15:35 -0500 Rik van Riel wrote: > Instead of waiting for an RCU grace period between each ipc_namespace > structure that is being freed, wait an RCU grace period for every batch > of ipc_namespace structures. > > Thanks to Al Viro for the suggestion of the helper function. ... and of course I forgot the "git add" before the "git commit --amend". Sorry about that. The real v2 of this patch, with Al's suggestions included is below. ---8<--- From 479378a794c5312acdb555b3deedc403134b2a70 Mon Sep 17 00:00:00 2001 From: Rik van Riel Date: Thu, 26 Jan 2023 15:45:06 -0500 Subject: [PATCH] ipc,namespace: batch free ipc_namespace structures Instead of waiting for an RCU grace period between each ipc_namespace structure that is being freed, wait an RCU grace period for every batch of ipc_namespace structures. Thanks to Al Viro for the suggestion of the helper function. This speeds up the run time of the test case that allocates ipc_namespaces in a loop from 6 minutes, to a little over 1 second: real 0m1.192s user 0m0.038s sys 0m1.152s Signed-off-by: Rik van Riel Reported-by: Chris Mason Suggested-by: Al Viro --- fs/namespace.c | 18 ++++++++++++++---- include/linux/mount.h | 1 + ipc/namespace.c | 13 ++++++++++--- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index ab467ee58341..1ad4e5acef06 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1397,6 +1397,17 @@ struct vfsmount *mntget(struct vfsmount *mnt) } EXPORT_SYMBOL(mntget); +/* + * Make a mount point inaccessible to new lookups. + * Because there may still be current users, the caller MUST WAIT + * for an RCU grace period before destroying the mount point. + */ +void mnt_make_shortterm(struct vfsmount *mnt) +{ + if (mnt) + real_mount(mnt)->mnt_ns = NULL; +} + /** * path_is_mountpoint() - Check if path is a mount in the current namespace. * @path: path to check @@ -4573,8 +4584,8 @@ EXPORT_SYMBOL_GPL(kern_mount); void kern_unmount(struct vfsmount *mnt) { /* release long term mount so mount point can be released */ - if (!IS_ERR_OR_NULL(mnt)) { - real_mount(mnt)->mnt_ns = NULL; + if (!IS_ERR(mnt)) { + mnt_make_shortterm(mnt); synchronize_rcu(); /* yecchhh... */ mntput(mnt); } @@ -4586,8 +4597,7 @@ void kern_unmount_array(struct vfsmount *mnt[], unsigned int num) unsigned int i; for (i = 0; i < num; i++) - if (mnt[i]) - real_mount(mnt[i])->mnt_ns = NULL; + mnt_make_shortterm(mnt[i]); synchronize_rcu_expedited(); for (i = 0; i < num; i++) mntput(mnt[i]); diff --git a/include/linux/mount.h b/include/linux/mount.h index 62475996fac6..ec55a031aa8c 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h @@ -88,6 +88,7 @@ extern void mnt_drop_write(struct vfsmount *mnt); extern void mnt_drop_write_file(struct file *file); extern void mntput(struct vfsmount *mnt); extern struct vfsmount *mntget(struct vfsmount *mnt); +extern void mnt_make_shortterm(struct vfsmount *mnt); extern struct vfsmount *mnt_clone_internal(const struct path *path); extern bool __mnt_is_readonly(struct vfsmount *mnt); extern bool mnt_may_suid(struct vfsmount *mnt); diff --git a/ipc/namespace.c b/ipc/namespace.c index a26860a41dac..6ecc30effd3e 100644 --- a/ipc/namespace.c +++ b/ipc/namespace.c @@ -145,10 +145,11 @@ void free_ipcs(struct ipc_namespace *ns, struct ipc_ids *ids, static void free_ipc_ns(struct ipc_namespace *ns) { - /* mq_put_mnt() waits for a grace period as kern_unmount() - * uses synchronize_rcu(). + /* + * Caller needs to wait for an RCU grace period to have passed + * after making the mount point inaccessible to new accesses. */ - mq_put_mnt(ns); + mntput(ns->mq_mnt); sem_exit_ns(ns); msg_exit_ns(ns); shm_exit_ns(ns); @@ -168,6 +169,12 @@ static void free_ipc(struct work_struct *unused) struct llist_node *node = llist_del_all(&free_ipc_list); struct ipc_namespace *n, *t; + llist_for_each_entry_safe(n, t, node, mnt_llist) + mnt_make_shortterm(n->mq_mnt); + + /* Wait for any last users to have gone away. */ + synchronize_rcu(); + llist_for_each_entry_safe(n, t, node, mnt_llist) free_ipc_ns(n); }