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 6020BC71145 for ; Thu, 24 Aug 2023 03:36:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D950B280062; Wed, 23 Aug 2023 23:36:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D1D6C8E0011; Wed, 23 Aug 2023 23:36:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B9859280062; Wed, 23 Aug 2023 23:36:26 -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 A36A98E0011 for ; Wed, 23 Aug 2023 23:36:26 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 755D4B19BF for ; Thu, 24 Aug 2023 03:36:26 +0000 (UTC) X-FDA: 81157585572.28.2369135 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by imf16.hostedemail.com (Postfix) with ESMTP id B1E4418000D for ; Thu, 24 Aug 2023 03:36:24 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=bi91mAkW; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf16.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.171 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=1692848184; 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=GrI/X5Yh7LcU5jmS4qIzMzIMVvFD9p+WXlgnh63DuQo=; b=j8TJ/yhRPiJBr22x7Ob0to5hW3LN5P/PIIkY/M4Zd+aC3Yf44ArUWa8/6bA0F1QbZPjd1M XRHs0AIuHL6vuM/EDRqGwYj5mT4cH6ps51ahrN/XjQzawfFGbEwmRaAinLHcMWzVlI9a0q AxJ/h/6qRYGBUT3C27Jby0uRRF2FqV8= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=bi91mAkW; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf16.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.171 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692848184; a=rsa-sha256; cv=none; b=n6CqPq04k0uolOCBWDELCH3WDfxQ37QTzAALS2eOFvsJPBOkI8U3n39693Ixkw26GHN3uJ ziUIFVm9ruLm61DYLXlWCX74/sZzV1yMArux+dEXN1rLEOE3cVOqBiwj1QzogBDOL4eS+G LTDVxUY0w3+U1AyD9iDrydx78eqAuIU= Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-68a56ed12c0so754618b3a.0 for ; Wed, 23 Aug 2023 20:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1692848183; x=1693452983; 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=GrI/X5Yh7LcU5jmS4qIzMzIMVvFD9p+WXlgnh63DuQo=; b=bi91mAkWfHF+ZGYrAGi8fSfP1rZgaQ9UJQma4R2GISMfzIMSepcMEEtmQfvpPwQ6sZ 52K3xo34HKG6b4Tb0EhiNBVsZ9PyIACSu80NiXODexlSiTfsepdidiPEL6ktcGMDBKkH CWpSVA/inH6bwziARO2vWCSnFe3pz89phQgHiYKVDAZf74s4T/6V3tF34JyKaqboDMmH SESxt5Qwuo7Pdz2vKABn2yS97A32aC1lsl9BQ3K0Wakrgi/UtYf3bF0wCw1wYDKP5wJG GOFGVNp3DQTv8FP9lay3DWqR5HarnFkL1KQcm6aePLHP9ZUkzjnAXDUEXu0QaA+19pee Q3Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692848183; x=1693452983; 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=GrI/X5Yh7LcU5jmS4qIzMzIMVvFD9p+WXlgnh63DuQo=; b=RjmaHyIexI9SuudmIBk2UEiCD3Eeq8c7i4srvPzPtDTKzzokHXxbKU8WWotL/2eJ9i 0QksRD2qI6CZ1im+i7vqrA3XKVLeUQqQIgS+z+JW7VePdqchTBx7oDEqPNh5Po0Mp5gt e8UJNUGCJ2ffhclUS/ysy7u3UiD+e/A0uI9fUoNdRmYFIFcqR4exTqp1O4VrlEXmT/9N AVOtQqK1+Ysu2ffIe1QpB4A7xYqMZyM/vuK5HIUTnNdgkzYj/u/F7Ah+zSsjZ6y73ysI guCNkwSGv/P66krQLJC2L5B+BibKPmCs+LRmyS8xMR4lvaa4b4P1UW7Aut4S0o6FKpJ9 saoA== X-Gm-Message-State: AOJu0YyA7KcVvaUqjZ5Y8ePRKPKi2cvD4/y1hWKZjP83AFQMhF6eypME ZaxZJmCCKyc316wYjW8Q6P7bdw== X-Google-Smtp-Source: AGHT+IHygFMFVjr3jXqgDVchpFeZd7tEZ1ZJUV56jgY+zNR9KGBBKA6XO9KnSRG3Wm4xupEdPrToWQ== X-Received: by 2002:a05:6a20:938d:b0:13c:bda3:79c3 with SMTP id x13-20020a056a20938d00b0013cbda379c3mr17537865pzh.4.1692848183684; Wed, 23 Aug 2023 20:36:23 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id p16-20020a62ab10000000b0068b6137d144sm2996570pff.30.2023.08.23.20.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 20:36:23 -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, joel@joelfernandes.org, christian.koenig@amd.com, daniel@ffwll.ch Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, dri-devel@lists.freedesktop.org, linux-fsdevel@vger.kernel.org, Qi Zheng , Muchun Song Subject: [PATCH v3 1/4] mm: move some shrinker-related function declarations to mm/internal.h Date: Thu, 24 Aug 2023 11:35:36 +0800 Message-Id: <20230824033539.34570-2-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230824033539.34570-1-zhengqi.arch@bytedance.com> References: <20230824033539.34570-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: nhbq1jxikgcr5qt47aceihwrrqi99xxf X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: B1E4418000D X-HE-Tag: 1692848184-386827 X-HE-Meta: U2FsdGVkX19rpnwiux1LnDSrNmt8rMwi/sjacEuZ6UTHyela+ekG2qwJZzbofDVvqHb3bZZKypOb5/ZrFNcpxzf2KHdGnytnlRZjgEbkXcSfe9o2oQG8cnVOWZEg+KFqubeArAu+prU57/E8+Di+9wQRUgWK/8TbCCHPQYOx34jw54RGtreVh++G+g3ezbOfRm9sa+vJyOLKM2P3HBTMU9At2AZFo542vr5iy2LvZK/7eY8b9AQ0eTHR0FoPIUaDxMlFTauP+1MJRG/rsu9UeGzPFPxT//9RSgZl6c1PYoZLuJ7BmlJv7WYeYh7yCVJNXrpjSJtGB9XYIb5qOVMbMPqiwqn6EeDgTWEAATuAkct5xMtxxuRqOADjKu2ArvvqKX29JkXBByJQtbEgW1eflMEbspkZNWFIAV8sWwf8ebAUbSiF0w3tMG/6rcy8LBOtP86/00A5vWFXIhyeEDJ/QO4zosAEe3AqzPcAhXbDp4tpVr7CtzgY3X+aWe6ANeLzAbwdgkwo2MxJ9vhvKhioFuh+AFMT9ut2vzc1+oyZvAdYcH7JgNN7ruzwta4oiT3GTVDCy0Iwz8mc/UiRO74t5vWcDPGD9EPB9IfN1Iojt6vQeQDU2Vhh/vuEK8ZWtvi71yF+AsumRLG2VrFvWQLoezCa/uo7rXwbLduHVhXaF98W1x1OzTWMeELBhCqJmi7dyRxSkqguNDcDcubgLU3U4QV2T7j2Hv8PU2p/bNn9Qj88Cq/cyOXVIgo+0bw2TsLV3QXREc3y+cz7skUvpr/7ezMU7ai9EZMSoXpzRh3BmaTVQkpW63a86YGbcXDf0490k4nV0qXDCuxGkv6PXlgRuHbgCqSMrhqXjBABOBb3a/8diqOHkUCL00R0Ek7zhG35J+ZlrkhqYbM0VoAP43aGxb7UsC/mnIm4/RJaWsVaD2S5D2b0XDL/6n6LW044hvfDWXAR1Xqs3yuLVsnPpLK khT921Im i+XaiKMFCcyQaHXssDi/q4l9+9kfxmuWi8Ec1bzjTMbzEWfD6Nq+QjXwMS6SDW4mZkfFj84eOQ26/Bo4R5WPylUQaJT02kZBhptHvi/4XGhqxKtBd9u0p0g9emdUU1+k6CaJaUgSMaYucdXox79NGKkuawJSOeWT3xGEG0PaDljshqBKf25Mf7cPyt4TIQelPRWBjtYJpjVeAEbUKW8MYtsV7AsJVt1m0jkKREaXm9wlBNWAOga/82bTKhsKmEbyxOSOBftwKt6UOLFewBrKOGPCyA07w7bwZFAiUJYvz/uRlsJWLb9QD4F1idmb5inyKt0XBmhWThCbJ8tKvZFgmxYJN+6PWz4qBawqbwdWnYWy5nMCu5EEBtNoCouANe7v/KacjIvaB3aLlmqgy0mEpCFTtQZxow8z5vACQKzYbMYb2Pa5WJ0+DHRWUkjkmmqMIe0nxlF/uLv78iGs= 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: The following functions are only used inside the mm subsystem, so it's better to move their declarations to the mm/internal.h file. 1. shrinker_debugfs_add() 2. shrinker_debugfs_detach() 3. shrinker_debugfs_remove() Signed-off-by: Qi Zheng Reviewed-by: Muchun Song --- include/linux/shrinker.h | 19 ------------------- mm/internal.h | 26 ++++++++++++++++++++++++++ mm/shrinker_debug.c | 2 ++ 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h index 224293b2dd06..8dc15aa37410 100644 --- a/include/linux/shrinker.h +++ b/include/linux/shrinker.h @@ -106,28 +106,9 @@ extern void free_prealloced_shrinker(struct shrinker *shrinker); extern void synchronize_shrinkers(void); #ifdef CONFIG_SHRINKER_DEBUG -extern int shrinker_debugfs_add(struct shrinker *shrinker); -extern struct dentry *shrinker_debugfs_detach(struct shrinker *shrinker, - int *debugfs_id); -extern void shrinker_debugfs_remove(struct dentry *debugfs_entry, - int debugfs_id); extern int __printf(2, 3) shrinker_debugfs_rename(struct shrinker *shrinker, const char *fmt, ...); #else /* CONFIG_SHRINKER_DEBUG */ -static inline int shrinker_debugfs_add(struct shrinker *shrinker) -{ - return 0; -} -static inline struct dentry *shrinker_debugfs_detach(struct shrinker *shrinker, - int *debugfs_id) -{ - *debugfs_id = -1; - return NULL; -} -static inline void shrinker_debugfs_remove(struct dentry *debugfs_entry, - int debugfs_id) -{ -} static inline __printf(2, 3) int shrinker_debugfs_rename(struct shrinker *shrinker, const char *fmt, ...) { diff --git a/mm/internal.h b/mm/internal.h index 7499b5ea1cf6..f30bb60e7790 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1155,4 +1155,30 @@ struct vma_prepare { struct vm_area_struct *remove; struct vm_area_struct *remove2; }; + +/* shrinker related functions */ + +#ifdef CONFIG_SHRINKER_DEBUG +extern int shrinker_debugfs_add(struct shrinker *shrinker); +extern struct dentry *shrinker_debugfs_detach(struct shrinker *shrinker, + int *debugfs_id); +extern void shrinker_debugfs_remove(struct dentry *debugfs_entry, + int debugfs_id); +#else /* CONFIG_SHRINKER_DEBUG */ +static inline int shrinker_debugfs_add(struct shrinker *shrinker) +{ + return 0; +} +static inline struct dentry *shrinker_debugfs_detach(struct shrinker *shrinker, + int *debugfs_id) +{ + *debugfs_id = -1; + return NULL; +} +static inline void shrinker_debugfs_remove(struct dentry *debugfs_entry, + int debugfs_id) +{ +} +#endif /* CONFIG_SHRINKER_DEBUG */ + #endif /* __MM_INTERNAL_H */ diff --git a/mm/shrinker_debug.c b/mm/shrinker_debug.c index 3ab53fad8876..ee0cddb4530f 100644 --- a/mm/shrinker_debug.c +++ b/mm/shrinker_debug.c @@ -6,6 +6,8 @@ #include #include +#include "internal.h" + /* defined in vmscan.c */ extern struct rw_semaphore shrinker_rwsem; extern struct list_head shrinker_list; -- 2.30.2