From patchwork Thu Jul 27 08:04:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13329372 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8859C00528 for ; Thu, 27 Jul 2023 08:13:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8837F8D0002; Thu, 27 Jul 2023 04:13:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 833E78D0001; Thu, 27 Jul 2023 04:13:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 723208D0002; Thu, 27 Jul 2023 04:13:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 64EF48D0001 for ; Thu, 27 Jul 2023 04:13:11 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 425A9B2AC4 for ; Thu, 27 Jul 2023 08:13:11 +0000 (UTC) X-FDA: 81056676582.04.C78BBF3 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by imf03.hostedemail.com (Postfix) with ESMTP id 64A5A20002 for ; Thu, 27 Jul 2023 08:13:09 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=kd6rt5g6; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf03.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.169 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690445589; a=rsa-sha256; cv=none; b=oio0HSUzGNE7uuGDNSKr0FP9NMkCzIg0uK16TUg1r5/ZlU9m2O1MdPAJiAyR9lo+H3BoJW ZYoJR03ucdg1LFHZwA5ljdKnO/M4NNkV8hZYULhVO5HNHGMn6wayZjH4yiDo6xdK4DNGob MrFx+wMwPhbEGLTr1iieZ9lYCF28xfE= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=kd6rt5g6; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf03.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.169 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690445589; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=SQyM2U1mZ/Gwc1nAOvYev1L9XLZmdJlRT0RgZ5HuwGo=; b=v9jt6qOUudPztB2fmc2esAm4Ox4HrstQBV5HGlAcCpq2kAmKQJca/usPaZFq5IhSmGPlST 3bpu+eZIEH6rsJSYBYFezh5rp+EIwrjRVbQsrQ1OfAHajzjcltzbrSQfaAyUdvijpkoBPa cBRUCktgdx5ICMywT75zaFEvdMLgtMI= Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-66d6a9851f3so168615b3a.0 for ; Thu, 27 Jul 2023 01:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690445588; x=1691050388; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SQyM2U1mZ/Gwc1nAOvYev1L9XLZmdJlRT0RgZ5HuwGo=; b=kd6rt5g6FvxszAExAWwDvnGLZ3nlFI6+LjpyYA2SwsBpfxyntyz5JxeLs4IsuFoqam BPrbW0IZbPo4bp5jr8CP6dW+kXsV2/xzlGqHNQMPkgHqzMSniXcziiHnCVK42nJM1noq S50aGwia7MX8euX+8hfeRRERjX2qwSrJrcd+yJ4VULel6DaWSf6W0hZ/qFtzG1N+JN0n uQB95m4CN8ZeNY7Xsu+pZiPFb9O3G4aVUw6FAsCxKpZx+yuB9vunfivBBZ8XUQHuWQvc AX+QkUyO8AP8Aa2+4wftvFDhdV62VUn8gnj7NjCNsCf/vREHbdt8IjenIeReKEgqNeKN BvoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690445588; x=1691050388; 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=SQyM2U1mZ/Gwc1nAOvYev1L9XLZmdJlRT0RgZ5HuwGo=; b=XX6MmwsQB7638B/EcHVme+sdmvUji9gO9P+05SNb1067Njyh9t7OjUvIUG2/MX+DLJ lO1jlLtqi+ajk2LJ+RO1lsB8wj7q3ST0ezfm3kI9EmKP3QtReJi1lVx4E1st+DDyhEx1 E2B7AkzLQYSFILQHsTZNGPzinbUcNnOGpWxWBi1vvqWb42pCtZiaScLrqx+op5s66QjC R6ytN0qiuL76RdRSkeLgs59OQbFLS1oeuwH1kXEw+1F+SVOYqydaTUlpME9d550jAY2D E0af8uMThzY5GOdBs22qtHVQNj5efcFI7wkMnPK6tUb/RCZZ8KXjHKePnV1a1R5PkH4i T1Ow== X-Gm-Message-State: ABy/qLbdx/17BHbCbrPB4l2lSncbIVMQlClmE59vZyDvov/6qhIHB5Kf P2Kxu+xbnbz+Sm2Jiokjj2W09A== X-Google-Smtp-Source: APBJJlGx3t3etMepgJMVu+n+Us77oI88lCmbMpzaxwGd8c6y1MJ13X5vnrHVztpBTHVV1RS/gpzzOQ== X-Received: by 2002:a05:6a21:3281:b0:137:514a:982d with SMTP id yt1-20020a056a21328100b00137514a982dmr6062167pzb.6.1690445588272; Thu, 27 Jul 2023 01:13:08 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id j8-20020aa78d08000000b006828e49c04csm885872pfe.75.2023.07.27.01.12.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 01:13:07 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, david@fromorbit.com, tkhai@ya.ru, vbabka@suse.cz, roman.gushchin@linux.dev, djwong@kernel.org, brauner@kernel.org, paulmck@kernel.org, tytso@mit.edu, steven.price@arm.com, cel@kernel.org, senozhatsky@chromium.org, yujie.liu@intel.com, gregkh@linuxfoundation.org, muchun.song@linux.dev Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, linux-erofs@lists.ozlabs.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-nfs@vger.kernel.org, linux-mtd@lists.infradead.org, rcu@vger.kernel.org, netdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-bcache@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, Qi Zheng , Chuck Lever , Jeff Layton Subject: [PATCH v3 36/49] nfsd: dynamically allocate the nfsd-client shrinker Date: Thu, 27 Jul 2023 16:04:49 +0800 Message-Id: <20230727080502.77895-37-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230727080502.77895-1-zhengqi.arch@bytedance.com> References: <20230727080502.77895-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 64A5A20002 X-Stat-Signature: 9hkdxjcanj99tfbh4niu1gxk8sbedwgd X-HE-Tag: 1690445589-715201 X-HE-Meta: U2FsdGVkX1/71GNf45qHUIdfBp/+rNBYUW0klAdUhQXyxJt7zj0NQAG1C9wdqdcHxWy5A1kr/JcEM2FFLrcApmI9+9ytLBb80DP6UhsFqBqY0IMlVK4V/KPOTjeZps83RY4ws/JyyO6ISr8FXZGGDgNOoRWI0PW+OKmyzA3yizDN/hcQ2j9IWDHhcMpEOqzcFtIojFgDyzR2qChmK3fzzfhFK2pQbr8oWkf/EWFX9TBRVMQfr5CE3LcKTCwyVAm+BvUzI88K8LqEzBwSHbvYAUAcCFqDgAYFX2mOt8v6mvs8Eo8HigjdZ+eW8izpQE1WpMHL/XN17nYpi6m7HZdD7ofwgph+u0QRlBShPO+DdS2I4j0Sn9zJ4J5789JTnP/XBGrXzlouvXcJPP1PF9QQ3oPSLQGrn/pxjpbu1bYNuAzc5nlm4tqp1mKEYqg6Mp3sgi+fmZ0UCNxj4a6Ntvt+AJcSKYo6pkqz9yomD89GUx9uROaZ57a3plw/003Pxr+zFSoMEUBZH2y62kIYXsBFfJcrXu8sVOuHxV09Ohj/pzMRFmEmEjq/pKJQ9sPr6LQYMei00f+cYD96TeN9LAyMHmeE8r6hR+LaWV60z/rQ7MoyUR7bF7vbZCxjP4lcfZ0OrjMtkjvUNFj65pwW9FjyOVOx27jdh/J0DP+EmdeBpbtCzWRCkMYwSx5fson0XBharegNjwc3jmFR64UG0Da7EeLg0scEe0XhT1gMvOxF6PjqNPVeJWBIQ4RVGE4+7+vETNc1DPqcpE2t4YTYTIJzqFtQ8nu2IZV9N+G3igs4EqEG6yFVwOXczNWq/Ul3ZnKICeV90dPYWZlm1THnGsSRLcR3/vlW3r+ME5XBmxATNVEo0TWlLa14F8IwuJNqS0Lm88gkKpph4z3w5K3sTigPS6Klc9ORwh1ODdAjLizxjuFpDkIdSx+g6rBieVPe3CUdNC+48yCdxAT3uRpNlQ5 jY1jyGt9 2IJ+uaVjE+cOxukgX5DeNGHN8ho1Z2YLXHe3LeW56SbX+8ANrt9R8vPUwo1cuII2gRSL72D/erDkEVBhI51WkZ+DvCrF6m/J5srtzIgPXOrZoFo30iW5qeC2ufpVdY21bIwDpHeo9fSZ108i6YAp+eq/4Et3vRwbVruJFyOhPtZWjgq2YPc9WZlhbowplevGz7vhFPkpWhpH/Tbn8o7OriI4dTZ3mwt93dzmetpQanxUGjlVvfjqc9r9wCtip5pMAIu03B6dP7dqvkegZWuIHrQ7m5w41yQSB5yx6R/QJYqZq//Wk4j0ije7l+6mddOw92hOqsJ4AtYoUPrd4RdF3WU2mXX2rV2bHPuIe6+FfmVojaBidS+D5nktQRKaqkLUquT7zS0nRapuR5FEzUhuZCqVpAPNSPHHIozkd+OmZ9GsETuVo96gdfGiFjdzQjjH0YSSER5NVOeOYZ0+7DnNwJFkljXSu0eMh2gQ4zEYeNZLUBB87VbhS2f8+3w== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: In preparation for implementing lockless slab shrink, use new APIs to dynamically allocate the nfsd-client shrinker, so that it can be freed asynchronously using kfree_rcu(). Then it doesn't need to wait for RCU read-side critical section when releasing the struct nfsd_net. Signed-off-by: Qi Zheng Acked-by: Chuck Lever Acked-by: Jeff Layton --- fs/nfsd/netns.h | 2 +- fs/nfsd/nfs4state.c | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h index ec49b200b797..f669444d5336 100644 --- a/fs/nfsd/netns.h +++ b/fs/nfsd/netns.h @@ -195,7 +195,7 @@ struct nfsd_net { int nfs4_max_clients; atomic_t nfsd_courtesy_clients; - struct shrinker nfsd_client_shrinker; + struct shrinker *nfsd_client_shrinker; struct work_struct nfsd_shrinker_work; }; diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index ef7118ebee00..75334a43ded4 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4388,8 +4388,7 @@ static unsigned long nfsd4_state_shrinker_count(struct shrinker *shrink, struct shrink_control *sc) { int count; - struct nfsd_net *nn = container_of(shrink, - struct nfsd_net, nfsd_client_shrinker); + struct nfsd_net *nn = shrink->private_data; count = atomic_read(&nn->nfsd_courtesy_clients); if (!count) @@ -8123,12 +8122,17 @@ static int nfs4_state_create_net(struct net *net) INIT_WORK(&nn->nfsd_shrinker_work, nfsd4_state_shrinker_worker); get_net(net); - nn->nfsd_client_shrinker.scan_objects = nfsd4_state_shrinker_scan; - nn->nfsd_client_shrinker.count_objects = nfsd4_state_shrinker_count; - nn->nfsd_client_shrinker.seeks = DEFAULT_SEEKS; - - if (register_shrinker(&nn->nfsd_client_shrinker, "nfsd-client")) + nn->nfsd_client_shrinker = shrinker_alloc(0, "nfsd-client"); + if (!nn->nfsd_client_shrinker) goto err_shrinker; + + nn->nfsd_client_shrinker->scan_objects = nfsd4_state_shrinker_scan; + nn->nfsd_client_shrinker->count_objects = nfsd4_state_shrinker_count; + nn->nfsd_client_shrinker->seeks = DEFAULT_SEEKS; + nn->nfsd_client_shrinker->private_data = nn; + + shrinker_register(nn->nfsd_client_shrinker); + return 0; err_shrinker: @@ -8226,7 +8230,7 @@ nfs4_state_shutdown_net(struct net *net) struct list_head *pos, *next, reaplist; struct nfsd_net *nn = net_generic(net, nfsd_net_id); - unregister_shrinker(&nn->nfsd_client_shrinker); + shrinker_free(nn->nfsd_client_shrinker); cancel_work(&nn->nfsd_shrinker_work); cancel_delayed_work_sync(&nn->laundromat_work); locks_end_grace(&nn->nfsd4_manager);