From patchwork Fri Jan 27 01:15:35 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: 49011 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp584626wrn; Thu, 26 Jan 2023 17:27:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXtRBJGuuljM9qdIKkrh2MXUt1830deWCl4pwkZGPRwi/VASEGxVmkMTFOLdXj+Ac9NwI8eR X-Received: by 2002:a17:907:75e7:b0:871:3919:cbea with SMTP id jz7-20020a17090775e700b008713919cbeamr38799114ejc.54.1674782864544; Thu, 26 Jan 2023 17:27:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674782864; cv=none; d=google.com; s=arc-20160816; b=DyeGoRi+d96HYjbOqmT/8j+X4lFl81TSqX7pLyJPvMyj9Me9xZaC/25FIUE2OdGxsX rcB8ubkhOinqgJL95UwWCMpdGkDEjoHH1/FJw3uzoQa3VUj6b579kOJpj8/0dp5AO3XY JeZLakZCNz4r4USq4Str+EveQW1MntRkuCpvyiVgeF1SNOAqJCdIWtQilWV5AWZiRqV7 +ujU5q6mUHlxKibkX3ZdN+uyxrRQREZdGP1d+Q8gSoQuTzVJthjuqi8cj4kxgtuY/tbN eVO5bicexvcIxSjwpucmOj7p8q6Je2Lu5mJQQak4Z4liHgoGyAbKcBYtx2ZyXRbKpKSR uE9A== 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:date:subject:cc:to:from; bh=uD54bMAjiPzpxW2HL1R0H23WWShRtgJCKHko4iP+Bis=; b=O/DAV72MJwbVy6+X0gRwDF9/f0ES6j0epsVhJH5In8eiqHpRMK6IWw9q3OLyyzAfw0 MsAXOW95rn5IkpNwFVztXvnH7/70rFsPZGpDNSKtG3oLmxogOrklAGoTm6/vc3Rzh6Qo +zH67kOxIpMBtVg6o1ep8gHjsRrDq6tALmvaZrkqRlm/6GHVcD6PT1LYMBnocuojShNr nHxONAv1noRAfkNHUXzpDQoVgA7IMTfZdj/xWu57FzIbdF2JedFVHy4An3Z7+1vA90jX izYGqMEHbc8pFOAj2akzjbcJPkW+dmwFyAMFnySpuwh22kFDM4oer6VfVIuM3uOgtjuR tEZA== 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 gj31-20020a170907741f00b0087139670f21si2515613ejc.913.2023.01.26.17.27.20; Thu, 26 Jan 2023 17:27:44 -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 S232894AbjA0BPx (ORCPT + 99 others); Thu, 26 Jan 2023 20:15:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229844AbjA0BPu (ORCPT ); Thu, 26 Jan 2023 20:15:50 -0500 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB7836F223; Thu, 26 Jan 2023 17:15:49 -0800 (PST) Received: from imladris.home.surriel.com ([10.0.13.28] 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 1pLDLC-00038z-2y; Thu, 26 Jan 2023 20:15:42 -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: Rik van Riel , Chris Mason Subject: [PATCH 2/2] ipc,namespace: batch free ipc_namespace structures Date: Thu, 26 Jan 2023 20:15:35 -0500 Message-Id: <20230127011535.1265297-3-riel@surriel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230127011535.1265297-1-riel@surriel.com> References: <20230127011535.1265297-1-riel@surriel.com> 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?1756137117061748156?= 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 | 10 ++++++++++ include/linux/mount.h | 1 + ipc/namespace.c | 13 ++++++++++--- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index ab467ee58341..296432ba3716 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1397,6 +1397,16 @@ 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) +{ + real_mount(mnt)->mnt_ns = NULL; +} + /** * path_is_mountpoint() - Check if path is a mount in the current namespace. * @path: path to check 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); }