From patchwork Thu Jan 19 21:14:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Chanudet X-Patchwork-Id: 45975 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp555097wrn; Thu, 19 Jan 2023 13:33:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXvZBbzol6ckmmYdcXlPZpViMFWm0ugQDf8QsByu+NA0t0+XdavrUlLTa2oR3KR5t7Ehw8dM X-Received: by 2002:a05:6a21:33aa:b0:b9:6208:44e9 with SMTP id yy42-20020a056a2133aa00b000b9620844e9mr750456pzb.7.1674163995759; Thu, 19 Jan 2023 13:33:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674163995; cv=none; d=google.com; s=arc-20160816; b=NDA6nZlQfjgQEIooSdOY48NSMIBgBo2h1MOgyn7yEJsd1ttvRaVKXN/qGDNs3iMvLp X11Uj1JkYMto0+s5Nc3QN9kyFIOyP1hAjgTPilvPaMG0ywhQeF5fpxatgYe/c6/057P5 5PYvD3Sjp1T2dVNog4U+EjtuuCeRZ0VXmPCkhMVspVx9xPN5C5sktoI0MjCrBn5N14OF Coe/DAiQJIyupTdfrgT1ZXYNnDLGCUq+Nw+Ga9iaWTVk8WJwBkfP5Sd1YYrgE8lowjEB 3+TOme6G45BYZRwX0CxdkTysVgdoCqsBfuHjLIIZzg0ij2VKr/YWtKlY6OPcS6ydEef/ wyKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kMg8gNQDfp59Z8c/Laiz+GjWJb2Q7J01BdsOGckaZ2o=; b=L2vCOKddmooyUSQ9CeT4KGcsJsqzRlDojxjeo+42QHsc3McPNM6mwV8xenl/RDU7ay GRZSwb80yv9GEqrgkKRvcHnrm2ZjOuCNUs07sxCUVlF+M3XgwAemFi4RCNoEQuYUpNFh M9G3dzuXT1WfzdmFb36K0SW14DXbra43Xvex8tbHd9D+XtVFzYO1YiuxjbeumlWU8wX6 3u5NR23sR+aHu9SKPtq0SEDKVhu/27OCgpcDXSxqPW0HgEui4QhPaCQz68kR9Wn804vS vo7+Pftx7RXOHgLfC4c8mkCvoS1CDrt6FKogCpBV5pBHziLrk7VOzuaOWfSZGotpiTbe svcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="UpC/KpUD"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q8-20020a63cc48000000b0046b1dabcb34si40095313pgi.765.2023.01.19.13.33.03; Thu, 19 Jan 2023 13:33:15 -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; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="UpC/KpUD"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230342AbjASVY5 (ORCPT + 99 others); Thu, 19 Jan 2023 16:24:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229654AbjASVWl (ORCPT ); Thu, 19 Jan 2023 16:22:41 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63A8C9F3AE for ; Thu, 19 Jan 2023 13:15:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674162931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kMg8gNQDfp59Z8c/Laiz+GjWJb2Q7J01BdsOGckaZ2o=; b=UpC/KpUDpEMYCS5+V9Fr8jl0r/Xo7A/XnUk+plLkz8t+bk1JRgj6RuI42vM5E0zdTw3ATt 3Qjw3/vNjdCukcjHR0mf7gnoDgAq6wsXOcgzGK++8Fda0ZNm/FGW6FMbfO/2bLInAAsnHw OuEmCshJZvfDpyCD1FWhLhx6ueQX4ZQ= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-508-kv9d8IbAOKS5z4NiyJvJDQ-1; Thu, 19 Jan 2023 16:15:30 -0500 X-MC-Unique: kv9d8IbAOKS5z4NiyJvJDQ-1 Received: by mail-qt1-f198.google.com with SMTP id o16-20020ac841d0000000b003b689580725so1525796qtm.22 for ; Thu, 19 Jan 2023 13:15:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kMg8gNQDfp59Z8c/Laiz+GjWJb2Q7J01BdsOGckaZ2o=; b=G0qBtmJI/ixVVsQmV2sv9dj1Ag3x0VY72XQKvaFgMx8hqXrnqifSSb1b30eQc41LPs N2VTj18Gcgq6MkA6NS3kiEMVGYX/KMrBeXPRfxDromPuvS0Ojg2JW2/pXFlDjJX6pFV4 kQgNmnkYZdM/6OWGKzkT+d3DZ0n2CvHqXkqNO50BcZ/n494Z65Y4ob7uoPtZnIXZJLuO 0u4nPfHkesGbtLPPKwZDzq4WtRWB9uJwkGL4uhsD41beSZsWK1GeFkhcLTmGUIDPectE 1D5IkozLgorZg+d8TlTHY69pDS8PIP5IG8l3O+/zTuwHSHMvC2fbLbDNM1/DcJ4E17Zz 5F4Q== X-Gm-Message-State: AFqh2krCHjiGjn+r22eoLmhNGhRnVw2R+8DljUPY6HopHc6R9MipjFAv rpA9TSJiVOMOMPk39VjzX2WHRSQDzKyEJSonUYoo3RGT91yctP5IrEUH5fSPrBGH4U2UZCmMMkT pDMvLFzUsEpJ3F47Jhfpgvl9u X-Received: by 2002:ac8:45ce:0:b0:3b6:2e75:c9bd with SMTP id e14-20020ac845ce000000b003b62e75c9bdmr14633632qto.1.1674162929638; Thu, 19 Jan 2023 13:15:29 -0800 (PST) X-Received: by 2002:ac8:45ce:0:b0:3b6:2e75:c9bd with SMTP id e14-20020ac845ce000000b003b62e75c9bdmr14633616qto.1.1674162929441; Thu, 19 Jan 2023 13:15:29 -0800 (PST) Received: from localhost (pool-71-184-142-128.bstnma.fios.verizon.net. [71.184.142.128]) by smtp.gmail.com with ESMTPSA id b24-20020ac86798000000b0039cc944ebdasm19443699qtp.54.2023.01.19.13.15.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 13:15:29 -0800 (PST) From: Eric Chanudet To: Alexander Viro Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org, Alexander Larsson , Andrew Halaney , Eric Chanudet Subject: [RFC PATCH RESEND 1/1] fs/namespace: defer free_mount from namespace_unlock Date: Thu, 19 Jan 2023 16:14:55 -0500 Message-Id: <20230119211455.498968-2-echanude@redhat.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230119211455.498968-1-echanude@redhat.com> References: <20230119211455.498968-1-echanude@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1755486370383353604?= X-GMAIL-MSGID: =?utf-8?q?1755488186165265005?= From: Alexander Larsson Use call_rcu to defer releasing the umount'ed or detached filesystem when calling namepsace_unlock(). Calling synchronize_rcu_expedited() has a significant cost on RT kernel that default to rcupdate.rcu_normal_after_boot=1. For example, on a 6.2-rt1 kernel: perf stat -r 10 --null --pre 'mount -t tmpfs tmpfs mnt' -- umount mnt 0.07464 +- 0.00396 seconds time elapsed ( +- 5.31% ) With this change applied: perf stat -r 10 --null --pre 'mount -t tmpfs tmpfs mnt' -- umount mnt 0.00162604 +- 0.00000637 seconds time elapsed ( +- 0.39% ) Waiting for the grace period before completing the syscall does not seem mandatory. The struct mount umount'ed are queued up for release in a separate list and no longer accessible to following syscalls. Signed-off-by: Alexander Larsson Signed-off-by: Eric Chanudet --- fs/namespace.c | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index ab467ee58341..11d219a6e83c 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -44,6 +44,11 @@ static unsigned int m_hash_shift __read_mostly; static unsigned int mp_hash_mask __read_mostly; static unsigned int mp_hash_shift __read_mostly; +struct mount_delayed_release { + struct rcu_head rcu; + struct hlist_head release_list; +}; + static __initdata unsigned long mhash_entries; static int __init set_mhash_entries(char *str) { @@ -1582,11 +1587,31 @@ int may_umount(struct vfsmount *mnt) EXPORT_SYMBOL(may_umount); -static void namespace_unlock(void) +static void free_mounts(struct hlist_head *mount_list) { - struct hlist_head head; struct hlist_node *p; struct mount *m; + + hlist_for_each_entry_safe(m, p, mount_list, mnt_umount) { + hlist_del(&m->mnt_umount); + mntput(&m->mnt); + } +} + +static void delayed_mount_release(struct rcu_head *head) +{ + struct mount_delayed_release *drelease = + container_of(head, struct mount_delayed_release, rcu); + + free_mounts(&drelease->release_list); + kfree(drelease); +} + +static void namespace_unlock(void) +{ + struct hlist_head head; + struct mount_delayed_release *drelease; + LIST_HEAD(list); hlist_move_list(&unmounted, &head); @@ -1599,12 +1624,15 @@ static void namespace_unlock(void) if (likely(hlist_empty(&head))) return; - synchronize_rcu_expedited(); - - hlist_for_each_entry_safe(m, p, &head, mnt_umount) { - hlist_del(&m->mnt_umount); - mntput(&m->mnt); + drelease = kmalloc(sizeof(*drelease), GFP_KERNEL); + if (unlikely(!drelease)) { + synchronize_rcu_expedited(); + free_mounts(&head); + return; } + + hlist_move_list(&head, &drelease->release_list); + call_rcu(&drelease->rcu, delayed_mount_release); } static inline void namespace_lock(void)