From patchwork Thu Jun 22 08:53:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13288655 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 5D623EB64DA for ; Thu, 22 Jun 2023 08:57:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F36378D000D; Thu, 22 Jun 2023 04:57:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EE70F8D0001; Thu, 22 Jun 2023 04:57:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D87C68D000D; Thu, 22 Jun 2023 04:57:10 -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 C8E138D0001 for ; Thu, 22 Jun 2023 04:57:10 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A1109B004D for ; Thu, 22 Jun 2023 08:57:10 +0000 (UTC) X-FDA: 80929779420.23.429CBEF Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by imf11.hostedemail.com (Postfix) with ESMTP id B938640003 for ; Thu, 22 Jun 2023 08:57:08 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=btQFnTi1; spf=pass (imf11.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.172 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687424228; 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=ZsvVWwvjCNbIpzLWR+JMbRdqcPMoA6IncSRNtrMJjtk=; b=w+GMNDQsm04fn2+li3xtX0lx0MexefxrsDwo38b7s9z+m/rogff/ckQhFe26nW/FgliWqm OEiIqrJLX3TNFTEObwJ3m3jN+AHOM5+jSJXQhTAbRSPZU9do1cNwDzbYNWQ5tAvhDd8qK+ tGfcAdmBBJGZ/Nt3wqU5pTl0Ju/OLDc= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=btQFnTi1; spf=pass (imf11.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.172 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687424228; a=rsa-sha256; cv=none; b=Th97LH00+WryebxR33oBjGW4gNDJZ2ymjUxTSLItcsz6eVZ1zE00FKylTDcEI+6sOPTdrj e+9o1cSSLAipCyEpFRWmGqcO8lWGNcB84X7n4MrdElpmBC6KRvf/XbDbmT6PO8OgzgZJgr XjHIgpI3Dj6NeVgLz1Z3ynYt4rhRaXs= Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-543a37c5c03so1091416a12.1 for ; Thu, 22 Jun 2023 01:57:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1687424227; x=1690016227; 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=ZsvVWwvjCNbIpzLWR+JMbRdqcPMoA6IncSRNtrMJjtk=; b=btQFnTi1+Jxgpt9ZEv6SV1CxbtEwEnpYQ1WSSwhfGLNNoz+3LZU80wQIeDEMGJinhi 8+hFjjrmI0Ti2weoui+1nba3fuqZZ6jN3eQN4e+CjSeo0Ggyrqg3j3GGKdGsxTGtEKKB 6n4ntOH8ClqO9PsI9RmJeFYa/h0xYT0vefdwMfx1z83TBiR/mTSXCJDkn82jEtfe964Z +W5pu2WQm5/BmUewzteVLri/ASv79HUROzRO9GvLtgUyAJkwQyVDE/hnKFhVeWh3zZR/ QE/dybVozXXKkm+aMId69JeSrmobjvQPBxgZrNjMENKTPWKUy1hHiQ4+Qa8p1f7rRS3j Hymg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687424227; x=1690016227; 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=ZsvVWwvjCNbIpzLWR+JMbRdqcPMoA6IncSRNtrMJjtk=; b=jZUxB6+LSfYAFnMz7fDGJdg44DMU6bTO4hadMTmJ6nppHD5P15pQfu9awpG+4NHkUK G4NGIzB5lO1klidz02bJeNg9LzAivDftbTPOLHEjdtvqaN2P6Y+xW8lV1k/XjQ334ot7 p7a4QrpmnpBXZEGTWx13U20gsX4vGGX28jmBXCHZTQECKBuu5beGdfUxMBYOpwFAhtnE WSjD6rgIHTXBN5t3j0wimmlfKnpirlDLokL0/4EezydmqIO+FG74UrCFKAz/LluDNpjF XAoyNxhpmS2paHlsjCaPB52Ttpr2nkreii+lSSygsAvCPIvCXNOMAtiIRQq7Vpm3XJW8 qhNA== X-Gm-Message-State: AC+VfDxswiF9sRb01Mblzwu6/DSj1hiVuRW8PVV7ota63yFs5Jl9HR5a fZalDCbrwCSLQiXpUDB/H9p0Yg== X-Google-Smtp-Source: ACHHUZ6IzlQYehvkbwm6qTB7qvbww6jKgEwXRnqs2X+ZAvHSdOqqO5hMcbKXrRtXSYnzqJ1v0JsE2A== X-Received: by 2002:a17:903:1105:b0:1b3:ebda:654e with SMTP id n5-20020a170903110500b001b3ebda654emr20780380plh.5.1687424227653; Thu, 22 Jun 2023 01:57:07 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.254]) by smtp.gmail.com with ESMTPSA id h2-20020a170902f7c200b001b549fce345sm4806971plw.230.2023.06.22.01.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 01:57: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 Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, intel-gfx@lists.freedesktop.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-nfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, Qi Zheng Subject: [PATCH 23/29] mm: shrinker: add refcount and completion_wait fields Date: Thu, 22 Jun 2023 16:53:29 +0800 Message-Id: <20230622085335.77010-24-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230622085335.77010-1-zhengqi.arch@bytedance.com> References: <20230622085335.77010-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: B938640003 X-Rspam-User: X-Stat-Signature: r663i5fgypizx4etzp88ssdxhh5otwge X-Rspamd-Server: rspam01 X-HE-Tag: 1687424228-1929 X-HE-Meta: U2FsdGVkX196jgKCZwfRMSeAmCGXkWbe0exB+q2WDi9hPDLkc3c/U7Xc2NMAcaBNSSH5gWd62lnaRNMczunCdlriMtT2rv76IReICw/wOsIh0lUZG9LGB3zYPqKpaYTol/PYOrYixlCtrinc74Tk9edPyyKHuGfluau3Jl5kryvPVivGN5kjqjpkcaaLkz4Sf15SCi20y17OwoWCB5pc2fcIjX2tEEArRL5z9WGBRlW2daHr3qw6iXxmS24PplsFgVLJKpgy3mE8EfPd+k4d0NjU9NU+6B06pv7I77SjuEskU6sWrTHNjeDqkpw8foL1xErBRbTK4VE80APqzVF4se/aAR9JXIQz2VqdSQoB6afFrWrX8iWVCG9Z+ydrwR9lI225mrMxFmZdU1vEi4Qg1gVEp131pzpQ14IGJJ04BDGOKNSCxwGIVaIQOT3ek/+LS3LfZhJhnUyzAY8TCIpBmw35W67bHMEkVAcbF5bwzwlC+tUxm4CXy/8uF/2nZ30zBwSwFednZWvx3uBVpFXAK8ydKf2rbHHBy5SaWeEcVMpyQ6w7O/Ycnzk9AOUXUkc9ciZFJ6oCt7E6s0LUp3wXVTNdYT7S1LpXeUNfiMxscgaB2fkyyIRLSg2F3HlBwka8a8od9+xwfXybZld1PFuBYApZ6mvk79VveCz1ti2/Lm5H+c3rwl4q4fQ/KqF8/bCZcufbTYTYa1ks1UJ6DisohPUvuBzvSs5YRfnh10s09SO1nlCEVQVLvzVBRUuZSOWLrtuEE8ipG/xwmhGoBU38BKHRyv3eSr1uem3+vvJ4vmtmeXGtAUUfnxF4pQrAfQx9i+jaUVaLz0NNVu1XlS1EOYoh+htv9nVHi+cCg890j5aALFskEBav21rMBwzjK4DgzLwcw2tdPBzemIG06PSAc4cOeGMAGVcUAQ0ODxjsCPlM+Fa/iTYh3uhAcTo54doZm9yx0x7cgXniSvhzaos YwlSvAES 7yfepWfSShdqBv+OdXj1+bMkb3G89hosbnOXJs14aBhPbKIpJIYnn2paBeYgk/NJW7j4pJAmudgVC6rQQg8z/2ToV0zlz4A+Khetr1wCyfn7/v5EpxTgeAM/PSpYkSd52TUlk3QNqxswD6ebQ6/z+llKTdpAs/+RwTGEkEO8e/eQWcI3ovQO2cMFtobs7JqtD+9BgALmIehntz1My9x9BxkXcYtjXSS2L0OBW/wJf6AKcLMpumZ0wnDynpxKgh1Lh4M3FKlFx8Ic6iRvS9IPSuxz7gMG5jH+E8UFSwJKS/4R/8J6HTkAq2EMiBYgwIEeN4Div0zL5Fzd5DGhXu1hn/yhSzQxiH/m1+ogp7bbMX2twmX42hp5jTqIgZSL3Nx4XN4r2cxMsLlqnaLOn1WikCAta8ff26bLln5Ue2EHzCIBd/NqlAUtvcqi91Bk6f/ktV3IGPA/LRxSG40wTJXTOYeLFv+J0vxQWlP1NRrXlW9FvHfogZP5y+vgWug== 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: This commit introduces refcount and completion_wait fields to struct shrinker to manage the life cycle of shrinker instance. Just a preparation work for implementing the lockless slab shrink, no functional changes. Signed-off-by: Qi Zheng --- include/linux/shrinker.h | 11 +++++++++++ mm/vmscan.c | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h index 4094e4c44e80..7bfeb2f25246 100644 --- a/include/linux/shrinker.h +++ b/include/linux/shrinker.h @@ -4,6 +4,8 @@ #include #include +#include +#include /* * This struct is used to pass information from page reclaim to the shrinkers. @@ -70,6 +72,9 @@ struct shrinker { int seeks; /* seeks to recreate an obj */ unsigned flags; + refcount_t refcount; + struct completion completion_wait; + void *private_data; /* These are for internal use */ @@ -118,6 +123,12 @@ struct shrinker *shrinker_alloc_and_init(count_objects_cb count, void shrinker_free(struct shrinker *shrinker); void unregister_and_free_shrinker(struct shrinker *shrinker); +static inline void shrinker_put(struct shrinker *shrinker) +{ + if (refcount_dec_and_test(&shrinker->refcount)) + complete(&shrinker->completion_wait); +} + #ifdef CONFIG_SHRINKER_DEBUG extern int shrinker_debugfs_add(struct shrinker *shrinker); extern struct dentry *shrinker_debugfs_detach(struct shrinker *shrinker, diff --git a/mm/vmscan.c b/mm/vmscan.c index 3a8d50ad6ff6..6f9c4750effa 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -740,6 +740,8 @@ void free_prealloced_shrinker(struct shrinker *shrinker) void register_shrinker_prepared(struct shrinker *shrinker) { down_write(&shrinker_rwsem); + refcount_set(&shrinker->refcount, 1); + init_completion(&shrinker->completion_wait); list_add_tail(&shrinker->list, &shrinker_list); shrinker->flags |= SHRINKER_REGISTERED; shrinker_debugfs_add(shrinker); @@ -794,6 +796,9 @@ void unregister_shrinker(struct shrinker *shrinker) if (!(shrinker->flags & SHRINKER_REGISTERED)) return; + shrinker_put(shrinker); + wait_for_completion(&shrinker->completion_wait); + down_write(&shrinker_rwsem); list_del(&shrinker->list); shrinker->flags &= ~SHRINKER_REGISTERED;