From mboxrd@z Thu Jan 1 00:00:00 1970 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 B7FFFC001DB for ; Mon, 7 Aug 2023 11:18:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5931D6B0074; Mon, 7 Aug 2023 07:18:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 542B18D0005; Mon, 7 Aug 2023 07:18:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E36B8D0003; Mon, 7 Aug 2023 07:18:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 2EC446B0074 for ; Mon, 7 Aug 2023 07:18:33 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 013BCB2123 for ; Mon, 7 Aug 2023 11:18:32 +0000 (UTC) X-FDA: 81097060506.25.96ABE96 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by imf28.hostedemail.com (Postfix) with ESMTP id 0B97CC0025 for ; Mon, 7 Aug 2023 11:18:30 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Zyx6A0ES; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf28.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.216.46 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=1691407111; 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=WPvD0YF4yF0E/V3NMttF7YVdRMfLZcl9Qmy2whUD9jE=; b=fvch8iD3UoHqmKGZodOu01SJeYco9K8oRZt8drxfpLOgXeaW03oV1c5jJ90tdZhpWkhAn4 SSoZ+O92rBc9xbPOIfjmO+eO8MK0urPAV9j6dOCOX0QHJ2srCZK+YdURdjqnOAI01hvS0O UkRLfYQ7x/QPxok94lDLdZPPL9i+Rr8= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=Zyx6A0ES; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf28.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.216.46 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691407111; a=rsa-sha256; cv=none; b=WfP6m7DpScSnu22dohq21jdDGnL9uACAk10Ta7N0A1Rxe7jb9IjVsDWCYeJLq4+tL4WLIv LBNnxW8LR4ubWDk0BXzTFVdDC80mPOh4GwwIhSb0KNwa/4l379HeiUyHImJ/pB/aqEscXn /0qFBs791eLkKLgwud8hAJK+j2KT3Dk= Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-268f6ba57b5so625451a91.1 for ; Mon, 07 Aug 2023 04:18:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1691407110; x=1692011910; 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=WPvD0YF4yF0E/V3NMttF7YVdRMfLZcl9Qmy2whUD9jE=; b=Zyx6A0EStcsVwcUtmlmHBj8SZuYfnooxelT8QMOYXSAyp4FCbwtu0BbNt7l+P/wBJj 3uKMQnjNsG7kojYgy7WxPCZCDaFjHA3Lkyvej9QWnqL7VojGrNrN9hCPJG63fZ7FoTcQ O0E54wIoRR4I2PoVCGsys6mtB59u+SgFkM0Y7fE6r6JpnE869MmShYbt1p4JfBRV0wIx 7GkvLsY4v9shjjU3+1o+arkgzF82WBo8NnslYR1Cfid19C5zIsiC0KJHBzW/oF+sMC5M xApENfMLb6T9Hu0suHBowRs4nuIaRY0OBNI6a9JHKGzdE5XR+fVrCSwS1eOLCHlN+w0k LsQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691407110; x=1692011910; 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=WPvD0YF4yF0E/V3NMttF7YVdRMfLZcl9Qmy2whUD9jE=; b=SvqMVZ2JLT7UblSksD3s7qA6tY1P+PNvOEmVgilIBUV6pwxLMy30DsHpyodaFPrTKL AV1Jl2T6g73gfsnXYofs+KCK8gk0tKz1iUXoLeKNIjS2LaG00G7Vei/Q2dPDRxAdnHED b7m06Gzoflzm35z5TqycOQJq98BXaTC024GAx5tAwCU7aJtkF2ri6xfPXWrHbcmp919D ds/nXrPZxkJOyceEAwOErWBfOn6mla6uIvlZUz52FR1Nab9LbhbdtYYvcBzM9JY1JF5e pSPbcCIpcyDgNNQv5ouBn115/1ibeEK8/eKSlgcuZM6jp7CG5NRj8UpMK2iEv5Ajw9zI DWnw== X-Gm-Message-State: ABy/qLaOu2sAtwSRQMTyytvktQhSGEEMiHJcbT93XoY3MqKq9vLU/BL5 hFGGvA/5oRqDD0gOhr6tU0mHmQ== X-Google-Smtp-Source: APBJJlFnoOazdp9TvNa1Sdutczsv0h+KjLn+q+TQByEK163E+9f/k1cC7rmChP+7R75WsTDRsF4HxQ== X-Received: by 2002:a17:90a:901:b0:268:3a31:3e4d with SMTP id n1-20020a17090a090100b002683a313e4dmr23078917pjn.2.1691407109946; Mon, 07 Aug 2023 04:18:29 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id y13-20020a17090aca8d00b0025be7b69d73sm5861191pjt.12.2023.08.07.04.18.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 04:18:29 -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, simon.horman@corigine.com, dlemoal@kernel.org 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 , Muchun Song Subject: [PATCH v4 40/48] zsmalloc: dynamically allocate the mm-zspool shrinker Date: Mon, 7 Aug 2023 19:09:28 +0800 Message-Id: <20230807110936.21819-41-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230807110936.21819-1-zhengqi.arch@bytedance.com> References: <20230807110936.21819-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 0B97CC0025 X-Stat-Signature: mkiq8jdmgfc3szehf5n3gan1k9nez8xt X-HE-Tag: 1691407110-934988 X-HE-Meta: U2FsdGVkX19m0dPmb3j44FHn4T+UonFDri5Us8/QI8cPQ0sCzmvWOEqGdyl55naU8ppTaFbQoH1AVP5Zuj8tN68HZFxTwFnvvD61LbutF9V1v8xaLIXEPC8ZYayXptpKES+OWNag0lWKNu1eEi1i0RVP5Dfk/KCkxLGOyJyAF5w93BBU/Smf3Tt8LKDyQC72bzXicX0IJTTi0lQuGcoW4yBOPH2keAHEJOg82wGx5k3onL0Kizou0v0qTby+pW7OwdBhHp+WBGiR7QqipI0+a1NOsJpCefssJQsTNhewyVCCazAQFrPjoG+14Ze4yYQokM7BkjcpuqztRJRbKRu+BfilTa3E2pYp4TUUloMwIpvIbMFnzxJ4MvMxZvg7t+iCYmcPnkvzuB7FTt5XDP/WwwkCUg7AMNrs3aCL/jWvIVRz2jvjODKuYugrS9kyydr6T00OxfgBKYbbw6dz395iBwq47FQ0a/VzHswfsJhWZhsUJ3rfrsunzzPt+z9HdnVkwtXT47izzTOp+H8GA16E8CzTwNXnVbcNNYXAR3u23B9Arh8qZ8nwIbZSu/0Ylu/HXpHv72C0TtBoarvNG68pVLQGIsf5DIDpWuZ19JpanMwEVlR9hZsmkcBGOShiiEtLUkqbXamzA+o0iru5yWiFpNglUZBgNZl/tHFDWZbCzMl00nHFVI9XoXibSH1dyE4+xK5yYItM4vD8dUq5zHcNYDhj0BWv4OySg6/SSqirYmhJ/maQLiehTz8QA0NkZWemDiPQ7O8SOfNqsdY4nl/9leLfw2H4MZu9cQSryK+5RkBoLfnofk5Gt4oSDzHme3VlE7TlZ+TWvze47q1ShntKkkjsWqZeP4r8LPT+PwSkp6P4TGQHMoR+RtpKb7QY0/zrgH+bo4yVUAMmK5VK+ViWmKLA7FsPQtWgdcNCLywowLDFqxuCNIcNyTy6zM70+S15CNXuCq88D9mb5eCP7ux sK1qFEq5 9QkRV7NWxN8Lr8627fAJRdzQQBbiuZSMNR8HT9ZKRouKi8F5DK+DuLDpAPj70v9Y7diudpSiR20E+NGi8zEnk4QLl1kwwe8vHG1W8CEsp9Z0Z8H6oCSOMB6uu9S3Mo5oaRZ9eFXpgfAg3eqHWk7r6fSKYiNwebgkYs5HU+aorykpG5Dack1M24TO+iztzCjdfBFdWVNeb77fb6MeyVqof7etawcCIlNzK4rd4xkt2EUXYebLon49+DUK4SADTRqmLIFniwff2ozgNaxtnhyrub8YBichPwjLqz2CaM8u5ozmOJbaAd4DeAI2V13R4xcAPN4GsJvQahHDncOLihJoB+kNCGSyYq7/fFuN4TDKcEiVrEmyjwl0krCiHajODOWcb3kH6nDQ7aPlO7K40gdBwsTTXQkgfdkTFpOryUHP9+rhk1QA7qgvO6bGGWZNJ4RMMZJ3tJjOfOzjIqQA= 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 mm-zspool 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 zs_pool. Signed-off-by: Qi Zheng Reviewed-by: Muchun Song --- mm/zsmalloc.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index b58f957429f0..1909234bb345 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -229,7 +229,7 @@ struct zs_pool { struct zs_pool_stats stats; /* Compact classes */ - struct shrinker shrinker; + struct shrinker *shrinker; #ifdef CONFIG_ZSMALLOC_STAT struct dentry *stat_dentry; @@ -2086,8 +2086,7 @@ static unsigned long zs_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) { unsigned long pages_freed; - struct zs_pool *pool = container_of(shrinker, struct zs_pool, - shrinker); + struct zs_pool *pool = shrinker->private_data; /* * Compact classes and calculate compaction delta. @@ -2105,8 +2104,7 @@ static unsigned long zs_shrinker_count(struct shrinker *shrinker, int i; struct size_class *class; unsigned long pages_to_free = 0; - struct zs_pool *pool = container_of(shrinker, struct zs_pool, - shrinker); + struct zs_pool *pool = shrinker->private_data; for (i = ZS_SIZE_CLASSES - 1; i >= 0; i--) { class = pool->size_class[i]; @@ -2121,18 +2119,24 @@ static unsigned long zs_shrinker_count(struct shrinker *shrinker, static void zs_unregister_shrinker(struct zs_pool *pool) { - unregister_shrinker(&pool->shrinker); + shrinker_free(pool->shrinker); } static int zs_register_shrinker(struct zs_pool *pool) { - pool->shrinker.scan_objects = zs_shrinker_scan; - pool->shrinker.count_objects = zs_shrinker_count; - pool->shrinker.batch = 0; - pool->shrinker.seeks = DEFAULT_SEEKS; + pool->shrinker = shrinker_alloc(0, "mm-zspool:%s", pool->name); + if (!pool->shrinker) + return -ENOMEM; + + pool->shrinker->scan_objects = zs_shrinker_scan; + pool->shrinker->count_objects = zs_shrinker_count; + pool->shrinker->batch = 0; + pool->shrinker->seeks = DEFAULT_SEEKS; + pool->shrinker->private_data = pool; - return register_shrinker(&pool->shrinker, "mm-zspool:%s", - pool->name); + shrinker_register(pool->shrinker); + + return 0; } static int calculate_zspage_chain_size(int class_size) -- 2.30.2