From patchwork Mon Sep 11 09:44:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13379113 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 0E96BEE7FF4 for ; Mon, 11 Sep 2023 09:50:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A268D6B025C; Mon, 11 Sep 2023 05:50:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D6606B025E; Mon, 11 Sep 2023 05:50:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 876A86B025F; Mon, 11 Sep 2023 05:50:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 74EE46B025C for ; Mon, 11 Sep 2023 05:50:51 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 46E50C02D9 for ; Mon, 11 Sep 2023 09:50:51 +0000 (UTC) X-FDA: 81223847502.14.106282D Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf26.hostedemail.com (Postfix) with ESMTP id 79660140009 for ; Mon, 11 Sep 2023 09:50:49 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=gejDJHzs; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf26.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.172 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=1694425849; 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=VTNYXL/R7M/nPTx6n9hiKgpOq1ZzCxN84K5zlnPRsiM=; b=BophKWZvQGfiDj9cCithyxz5/Nm/fvNUtaApwhXCZqD9MrtbNfRBIlzUHBS4cufGFDsIT+ J/ZZiZpOAqWFw3S0L/elHy319Qedh12yE+vaRauMtkub7bnt4cmjDVFhK8i7OFcxUtvrxA yEwfSK43oCI2amyRmv5iuVg7KgePTiQ= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=gejDJHzs; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf26.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694425849; a=rsa-sha256; cv=none; b=kg0ZS2UeFtQDE3DYppYeLW3jhBd1xbtVc5ikWm3nsLboz6t6EhGQ5YrqYh/1caL1AO0arb 7b3F45EmljzGqY2/l/kZ7fzuSetqENRfUmrlWairKwK/5mFwgJV/szG3uPjYDwbVxk+mUa N8ucWgK8UGM9WrzLzCZUkJJiSwqiozY= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1c39500767aso6237495ad.0 for ; Mon, 11 Sep 2023 02:50:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1694425848; x=1695030648; darn=kvack.org; 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=VTNYXL/R7M/nPTx6n9hiKgpOq1ZzCxN84K5zlnPRsiM=; b=gejDJHzsNiZjhRwMuFS+vibiZfCsPWiOqkajeDhn7Wwbi65S+Q7CynmFuuc7j/bd7m 24FwPLfa1zy+/liXwhTe7A397Btn/m8unxnLSAauZR0akV4b/ko2OUp2pRB5cONfVdNg v2o033GpR5k1Z/8xyrMBYVeMxDLzmepBwZSweboS8HhXfvl/6IsA/VRQotihDdFEhl+n AmCCQRp7oQwfElf4nJTU5pJK3uUeKjoKxaiA07blbDRXuqXFEbfk5/zYFPWsAczO3p7r JYnP13C7cuvk75yewQNhsJvxkl+CoEw/YtP2oaYM8KW0JhtXLnvBgjSuMi9E8JtXT4BN XZLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694425848; x=1695030648; 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=VTNYXL/R7M/nPTx6n9hiKgpOq1ZzCxN84K5zlnPRsiM=; b=aSxJfyMAt0qLrf1opIO7wGMiCfbZNADGXduAqV3GL51AA922WX7HTP+ZE+L9yOqFoC 6ooqq9j9tT230AQn1sKF9vlYF8r9MPkCpECsHgHTTjI3CoY72oDvmViYGkQoVrHv5896 MoNdrIxF18/v7/DsjHFCUjbPCcMZfzzw3eSQjpfwtlgqAV/9kwdPF10l+1fJ9J+taQVC avb10NmyAdXxLtrmcH5DiYmajEtNzS+71FO+QtWeCJMTA3W9cpM+cF9zA0gXrq+jTOMl f9yvXnbt85G7bs+MuSi20uwnYas5jmv3ZYT9ySlXf3vhQkUuz9ktMfOAmVzqm8R8tZHd UMyg== X-Gm-Message-State: AOJu0Yxp5qrDyV81fLYF9ejUiQ7eLaUhyInhOdSFer75t93cPrQCdCrQ XWX6TUzxYx5oKV78Ciau4NBklw== X-Google-Smtp-Source: AGHT+IEacDPb0mHmf21GNbuP05fWsDcTy2ksO8DVITs4JFo4XsRI7vg8H5BM+TEndmXxdohti+42Ig== X-Received: by 2002:a17:902:e5c7:b0:1c1:fc5c:b34a with SMTP id u7-20020a170902e5c700b001c1fc5cb34amr10662458plf.3.1694425848453; Mon, 11 Sep 2023 02:50:48 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id az7-20020a170902a58700b001bdc2fdcf7esm5988188plb.129.2023.09.11.02.50.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 02:50:48 -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, linux-fsdevel@vger.kernel.org, Qi Zheng , Muchun Song , Minchan Kim Subject: [PATCH v6 37/45] zsmalloc: dynamically allocate the mm-zspool shrinker Date: Mon, 11 Sep 2023 17:44:36 +0800 Message-Id: <20230911094444.68966-38-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230911094444.68966-1-zhengqi.arch@bytedance.com> References: <20230911094444.68966-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 79660140009 X-Stat-Signature: 7dxqnmu5hgt4ojuehwdhrx6yni6o14yx X-HE-Tag: 1694425849-725486 X-HE-Meta: U2FsdGVkX1/ecULnUWRWkymN/Oply/icacHttZeV5mtG2UVUHRAvlff/m0iIPCdUGquicXNJ7XejjEA3DwQR+9s2AEyYSkom0HEaZnJJ9AwlGaofWAKQ56jGUohkqX0OVe97VG95FGq31f5AlQMC7p7vToO9jhg+cQVEoeWThZ5Xg/UosEOjm1Yr0quTkx9NstTPCNMOi9yaavfLPcNRI4lMATpP6VH1ocDEyvw55wDzdnGl9NOkPQgNWNq00rjGUhWx8XcKxq2F5ljrq2jCJOkwKAdwBIeuru7XScHq49uCDgcJ1ap5Sk5cXTgdTMPC1E1KRySL5dJd/YNXyiADrUi2mLeY/DfriafpAY3gG8gxxvinihhy4BtbjfmJzYXoUjN8gUHLz6ownkniHT86Gq/tOOiZifPiuLInahAiJ4kZMrLAkEw9l4xQSM1zFtVAy1Wego5on/1U/+LbFttnpsgMBpVWfWv0rO7lRDpLewYBru/ZoQAQazdvxBquYfq7ageLMbyQyIcEJW8Y0M1xcGfCIlCNEjSaYVdjIvUAILle/FXoiPYWVVxod0F8jNBNjsoH1r+aKmmgNR5Y0O1Z5a3LNaUHxXNe/dCpawAT3z+xBwrKbxJLaeml5MA6ZZii2ulBxTCVgF3iACbWthL6m3ofaZYNIxhU6+NNff3mYgA+tqX+CheD4par4sN5botrxz/sz2L6s4XZoHPN41lI2N2eo1jg62sY1nhBwoMkU46OJlX/703APGF3uMahPfQDTLo0fk3xLEAV31ZLirRonF7s2tnjMIqt6WhTJWw91N+NILsF0sf2xf8BKot4OwivjJmN6Xius9gprR4T/giusMZZfTXjBUrlHeIrcHeVUt8JIUqtHGXosZPRVA67ahBPjWMXd2+72hZ3dre3mLbp2pFI/x0leKNPrai9wuDZaJfJqFqJNYNrhWZT8w6ivqsQ+gRwBR+z+sDsiQW5ova ONfTXzMa zbVYI4bvrwqPpWyeZABEZzjUQHL9PxUOKJgYQchUycBZFrC8ZxIJlB64dcfNXG91CXIy6vgFTQWcwndcMPI4pU+iErgKdAEiU7LF1K3ofr55my7hHIeuwNfnKL8/7ufBuBqi5YVs3bMCke5C8DdEACRyzNn28uaHEhr/2Ds6zTiWxcNpu4TGcs1nG03Q1ioHyImtohA+FUGVXGnf8WiVg0flUacR/WU6Mm54wJXlb7H+yRIEuhADR26mhuN9VT3NVb8MsOG1TeOL8UvKvrsbK2XVxyBSmXAFpbMnqWvd6N4M9W7sncaDC7Wc7bl4pZo5pz17kUchj2unQJ7rfbcdLO6QSsSQ2wkgE+JTENsRdPjTpFyqWB/Lifk9gD7wQj47NTMKSC4HeodUxFBVGOpAcwIIqa5hipa0gVyZ07qMIBpgzUCju2XuHhxtx9JdU12C23K2RerzP13bus7mVD+ogNRcHza7twzxjcYc6l7JFf+bOyulEmRu70sJLzyt9RSM2BP2FkP0DCepa0s4KEb/M8cZD1u4DV+z+se3z2qSPviUMvXmZ0k/fhdpv+iSHpUp+wvxukWRjDMvVtxY= 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 via 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 Reviewed-by: Sergey Senozhatsky CC: Minchan Kim --- mm/zsmalloc.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index b58f957429f0..c743ce7a5f49 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,23 @@ 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->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)