From nobody Wed Dec 17 01:11:20 2025 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D38803399B for ; Thu, 18 Jul 2024 09:19:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721294378; cv=none; b=Fw6IuO4GJ2QIidpI7zwDv1RBvY7jmAr9y/qmng9B2/8ULUYMZIZxa9yOKftuZWj68NxItCJwxuMF9+skv8IqgcByp3x2ARYAIfgMaoz8KS80MrWS7nXBG/C3+/4OTfixaIMEqZp0dMpYRISdcgtuu9hNT7XAzbvV1U8PS2E5Qng= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721294378; c=relaxed/simple; bh=cRBLaAKsjg60Bgx2QXSb7J4tMBoVTvtjecD2r8glEB8=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=TmQZiifPslQz9VvRRMyW0PAlgxMLfrRIXpX8o4gAskeAEkXqXdwMbNUQc9v9JA0+sRG1H3PaN6W8ySl09ol0cL701Mu1rGzPhfxAR5039u6SpiyUkTge5cekCWFcPx/pBrgyK6JqWUUQBewiA7FsI210fmSjBnegte5KxgxcBio= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=hW5P9sA5; arc=none smtp.client-ip=209.85.210.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="hW5P9sA5" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-70cec4aa1e4so372056b3a.1 for ; Thu, 18 Jul 2024 02:19:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1721294376; x=1721899176; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=nU8sLB6vIuteXJgQPw++2LFGLgdg5qqMxhtbiU9nCuo=; b=hW5P9sA5J79fn1lfpVhbqXUrzS6hrFO1fV51TCepZLMi/JIMkCRMUoTL/RJoyBV2JA yog2/pVXAx7zXNt/fYij/fmByjIy6coyPX+V0o7SCqMIgCTd/JY7UzdPIeq10VYZcwiN 5qS9lc4BCD920m48APKn2yQuUk6TjDzzQ7zgUD1gzkAwfTDhZRj36g5HaRH9XDH1uO6g q4d7VwTBZC1MrhpyRExkJtOVqaE8muZs6elO/tM0Ejf/CqCpdHpPU+/QBBc9ywm30sMz K+affVksDU4ew6bjzfm8Ksev/aBW762kDtA45u9zXhAUv0Cqd6e8BzGB8HuWEt+5oUY1 gacA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721294376; x=1721899176; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nU8sLB6vIuteXJgQPw++2LFGLgdg5qqMxhtbiU9nCuo=; b=XNfLJmmGe0aDHmkGQBtqSTOGfEHUv6WC83MgaEmZ+rLzsI/QrpxS2x2L3oI8MF5suO B5zPLyyvXLm++XyOee9etGLTcj4H+isnPi9Qkvp2zZp2o9jbXcwctG6itzrYu36eP1b6 ZtinNk75/wGwTCWAJuKvQUtOWoveax9W6vU5NgbFjib59FQNDquHEU7L0qH276ZT36cE tfY7z//c4uwDpEiQvoAXw+iz6SoZE83ZSzWVgYDKcEXSkYzvy0qsMZAX/voLhV2lJk6e eSGrE0uhfHyZImLV+xjY1f6YM/YksmflKhfNoQA6yKw245Leo8lqWnYZutz9iB/m241J YMxA== X-Forwarded-Encrypted: i=1; AJvYcCXHiZZUlPMyxXsDF+sH1k3wTpP+FccOUbzq9uNkl+S/Zl1RLdfUelXecjunonatTLcAS4fzh1CnxBH06rO0WepYfwvw907ty4mgA5va X-Gm-Message-State: AOJu0YzWkXwGEO2nL6VmarU/UoQPQo9Uu9PDR6ujjmPynHnuDaPjBFI0 niP1Vgmuz1BWNzTOM8FBoOnCMO5RzXRMT7oFv/5awgMvrCxepgjd7NOLLQSl3ow= X-Google-Smtp-Source: AGHT+IGOaTVMJyS7kT7lM0bn1HJi6pUMyC1NCcBFyE3paLzEIwtWXl/YIIWAEle3euPKuYGHJElEaQ== X-Received: by 2002:a05:6a00:3d0a:b0:705:6a0a:de14 with SMTP id d2e1a72fcca58-70ce4f47fd3mr4979886b3a.1.1721294376045; Thu, 18 Jul 2024 02:19:36 -0700 (PDT) Received: from PXLDJ45XCM.bytedance.net ([61.213.176.12]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b7eca8c01sm9830421b3a.172.2024.07.18.02.19.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 18 Jul 2024 02:19:35 -0700 (PDT) From: Muchun Song To: hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, akpm@linux-foundation.org Cc: cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song Subject: [PATCH] mm: kmem: remove mem_cgroup_from_obj() Date: Thu, 18 Jul 2024 17:18:21 +0800 Message-Id: <20240718091821.44740-1-songmuchun@bytedance.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There is no user of mem_cgroup_from_obj(), remove it. Signed-off-by: Muchun Song Acked-by: Roman Gushchin Acked-by: Shakeel Butt --- include/linux/memcontrol.h | 6 ------ mm/memcontrol.c | 32 +------------------------------- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 394fd0a887ae7..461313307ec23 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1862,7 +1862,6 @@ static inline int memcg_kmem_id(struct mem_cgroup *me= mcg) return memcg ? memcg->kmemcg_id : -1; } =20 -struct mem_cgroup *mem_cgroup_from_obj(void *p); struct mem_cgroup *mem_cgroup_from_slab_obj(void *p); =20 static inline void count_objcg_event(struct obj_cgroup *objcg, @@ -1925,11 +1924,6 @@ static inline int memcg_kmem_id(struct mem_cgroup *m= emcg) return -1; } =20 -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 fabce2b50c695..d04fb1ae870e9 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3076,37 +3076,7 @@ struct mem_cgroup *mem_cgroup_from_obj_folio(struct = folio *folio, void *p) =20 /* * Returns a pointer to the memory cgroup to which the kernel object is ch= arged. - * - * A passed kernel object can be a slab object, vmalloc object or a generic - * kernel page, so different mechanisms for getting the memory cgroup poin= ter - * should be used. - * - * In certain cases (e.g. kernel stacks or large kmallocs with SLUB) the c= aller - * 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 =3D page_folio(vmalloc_to_page(p)); - else - folio =3D 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 ch= arged. - * Similar to mem_cgroup_from_obj(), but faster and not suitable for objec= ts, - * allocated using vmalloc(). + * It is not suitable for objects allocated using vmalloc(). * * A passed kernel object must be a slab object or a generic kernel page. * --=20 2.20.1