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 13859C77B7A for ; Sat, 27 May 2023 02:45:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 856A16B0071; Fri, 26 May 2023 22:45:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 806EB6B0072; Fri, 26 May 2023 22:45:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6F58F900002; Fri, 26 May 2023 22:45:19 -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 5FD296B0071 for ; Fri, 26 May 2023 22:45:19 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3166E1C7EE8 for ; Sat, 27 May 2023 02:45:19 +0000 (UTC) X-FDA: 80834493558.05.B166F07 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf22.hostedemail.com (Postfix) with ESMTP id 05367C0006 for ; Sat, 27 May 2023 02:45:15 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf22.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685155517; a=rsa-sha256; cv=none; b=hQNJYTKQ8g/AKle0rb1Yz8dctF0J4SCz2S6cx7jsSoGBQ5Nkoyxq6PgyAiNJa4M+/yFdvr MJfbcjib7/yXfKbh0hqr8tnIYN8Ih/FwqKc+bdZtRS1XFXGIe/MtQdoi6CNp2PERbm2/JE MQ+reCFfDEd9nKaopfVFS/QdeJv+0W8= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf22.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685155517; 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-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=9wYbgQqJ9PMyfu/YyM/zhnpAUEaukpLO/SmBNOHu/PE=; b=skdUMz8nhInEBaK9UpRp4rzMx4mIcrPH8t+RAoMvuGNpAVqK2awTf4j5rdMeQdeFGaWLPj SIS9Wa7JySG7SbtmW7eGxOxOBf+tqKQmkIUrgE3IX2IMfpJwziT0QFVVots7zDMb39PFI3 amrJrbnleCfn3WnsTskF1/Mrn56y6NA= Received: from canpemm500002.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4QSm9f52TQzqSHN; Sat, 27 May 2023 10:35:34 +0800 (CST) Received: from huawei.com (10.175.104.170) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Sat, 27 May 2023 10:40:07 +0800 From: Miaohe Lin To: , , , , CC: , , , , Subject: [PATCH] memcg: remove unused mem_cgroup_from_obj() Date: Sat, 27 May 2023 18:31:26 +0800 Message-ID: <20230527103126.398267-1-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.175.104.170] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 05367C0006 X-Stat-Signature: kwj34jk6e3367nn6c77kt648prncb7xr X-Rspam-User: X-HE-Tag: 1685155515-115424 X-HE-Meta: U2FsdGVkX18TUGBS+op0S2KCKHuwAYXUlTgHLESkYR7brSENgTBsEH21dvKzTjsLuzl1MGuvRWyzKIxIq4ojmsLs4Kymz1LMBIztk4F9T+63z0ygm29VGEVxw9Bbq1AzRa6lZD0w2zu+Zl1eOhMWA0hZGQrdKYgNrlRbdTGd1Jz0dVfdzDHS/9XpLZ4T52+ND4TLt7Ioiu42LGpZ3BLELOiIxCnC1jwBdHawMEVm91FnY5nQFtrSoXAHYN9qmahUxjgDyGe0zdhHfN+8Su1C3gFot5o1TzilH6x+5kjY+lVBOwf8ZTkWR/7KfMnaam4xFw0SesI56upbQvpzANGT+Lk/HXaeTOZGvPU+26oTMTK6A2S6dErXNZdv8oxNtRBNIdlEbl/XPF9rJs3jWHSsCoB9fYfoe4c6m++th2jZSAAOn6LQ8pydJKZXJWUoKqNQKqShmA+TQ3Uq5oFtMFHOoJYiWIKjQESnrU+50L9Zqs5S0J+v8dkIcir6Oqe0sxVGMS88u9Gq82tAGpTxlr5l5vRshZnDGZuS5+Yy62fpoi+VupPU/fRVWXZb3Q/byN85kvKIKHnFr5VCZa/8/FaST3TF9NOwOUBOq5MrUL2H1yVNXZnPOt1SilVBZJUFFydcbGlhq1/a3uir10RLNK4h0ngiZBVF4NORBz/zEq3xKT1dqvOMin0LiLrAfpuDe5ZjdBHYCGo5KLWVLh7UfJpHjVj5fHgwy24XDh9hKBAkU2utgp21hU52KnjvhXQnuQJT5295QIH1LJRN2lGWWlShpkB6CpfBdsOMhUFvDlrbiqoSpreyNr4PIWGu1po9Ev2G7xYk3lb6LpgJjHQcgP6tIuATaNkloM04V3Z6X3x/Q4pxWBIhKloRLNnFde4JYR2xaHe2Qp5FGb8d3O9nkyRk7T5nm/ekZvSlMTq5NsCTCfZJlZEFTtcrqCrGXDbf8TgzDFJtp/uwQh1ehOc15gH Ye70RoSW 0Z9OHS6ZjsJVGu9oNf0XYpFxGjAGpeNKexcU/+c+Y7tKUH0ncTAXngJkeEJqxdMTq63kTJOMGLp9yn/70MeNSdYWXhm83FpLnolGcp16HsGqFsr5nkS8kgKA9fR5Fxk5Tkh1ekUekO/HZKfEQrxC2cECtnEKVLIAeeK3/uCPcIh1o6OkmcUZgcTwk46XDFQhlIrrRPbjTHk7LvazagmwVDLcWjHzQGgV0peEK1eouRsKSYB4= 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 function mem_cgroup_from_obj() is not used anymore. Remove it and clean up relevant comments. Signed-off-by: Miaohe Lin --- include/linux/memcontrol.h | 6 ------ mm/memcontrol.c | 31 ------------------------------- 2 files changed, 37 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 00a88cf947e1..ce8c2355ed9f 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1813,7 +1813,6 @@ static inline int memcg_kmem_id(struct mem_cgroup *memcg) return memcg ? memcg->kmemcg_id : -1; } -struct mem_cgroup *mem_cgroup_from_obj(void *p); struct mem_cgroup *mem_cgroup_from_slab_obj(void *p); static inline void count_objcg_event(struct obj_cgroup *objcg, @@ -1876,11 +1875,6 @@ static inline int memcg_kmem_id(struct mem_cgroup *memcg) return -1; } -static inline struct mem_cgroup *mem_cgroup_from_obj(void *p) -{ - return NULL; -} - static inline struct mem_cgroup *mem_cgroup_from_slab_obj(void *p) { return NULL; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 6a3d4ce87b8a..532b29c9a0fe 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2972,37 +2972,6 @@ struct mem_cgroup *mem_cgroup_from_obj_folio(struct folio *folio, void *p) /* * Returns a pointer to the memory cgroup to which the kernel object is charged. * - * A passed kernel object can be a slab object, vmalloc object or a generic - * kernel page, so different mechanisms for getting the memory cgroup pointer - * should be used. - * - * In certain cases (e.g. kernel stacks or large kmallocs with SLUB) the caller - * can not know for sure how the kernel object is implemented. - * mem_cgroup_from_obj() can be safely used in such cases. - * - * The caller must ensure the memcg lifetime, e.g. by taking rcu_read_lock(), - * cgroup_mutex, etc. - */ -struct mem_cgroup *mem_cgroup_from_obj(void *p) -{ - struct folio *folio; - - if (mem_cgroup_disabled()) - return NULL; - - if (unlikely(is_vmalloc_addr(p))) - folio = page_folio(vmalloc_to_page(p)); - else - folio = virt_to_folio(p); - - return mem_cgroup_from_obj_folio(folio, p); -} - -/* - * Returns a pointer to the memory cgroup to which the kernel object is charged. - * Similar to mem_cgroup_from_obj(), but faster and not suitable for objects, - * allocated using vmalloc(). - * * A passed kernel object must be a slab object or a generic kernel page. * * The caller must ensure the memcg lifetime, e.g. by taking rcu_read_lock(), -- 2.27.0