From patchwork Fri Oct 1 19:09:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 12531631 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FBD2C433EF for ; Fri, 1 Oct 2021 19:10:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C4AB66137A for ; Fri, 1 Oct 2021 19:10:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C4AB66137A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 576CD940140; Fri, 1 Oct 2021 15:10:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 527A5940121; Fri, 1 Oct 2021 15:10:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C5D2940140; Fri, 1 Oct 2021 15:10:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0157.hostedemail.com [216.40.44.157]) by kanga.kvack.org (Postfix) with ESMTP id 2E372940121 for ; Fri, 1 Oct 2021 15:10:22 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id EA1CD3A2BE for ; Fri, 1 Oct 2021 19:10:21 +0000 (UTC) X-FDA: 78648809442.21.5B385FC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 74FD53001DA2 for ; Fri, 1 Oct 2021 19:10:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633115421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=4NNmOdozgW34250h3i+XZDY/eQfLDbJdb5QbTC9VPyU=; b=OWCUKVzgJjApLLcSlSARA0N48z6Vx1xtqEFqQQSi8uiFBumD0zvRu8RV4qXay/4Ro1P6a3 Zk5iAgoZBqP5ZLPS6K8O9yvsS99pakcbD8U0CeM+k6tT5uZoD0hwjwmWWMh0rqkMz33e0X gWI2DWltxizz9z1/wyBMYMyNZaeRRWA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-576-QPseJOL4PxykHrj_plzBZg-1; Fri, 01 Oct 2021 15:10:17 -0400 X-MC-Unique: QPseJOL4PxykHrj_plzBZg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3082B107B0F3; Fri, 1 Oct 2021 19:10:16 +0000 (UTC) Received: from llong.com (unknown [10.22.33.73]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA75C60BD8; Fri, 1 Oct 2021 19:10:14 +0000 (UTC) From: Waiman Long To: Johannes Weiner , Michal Hocko , Vladimir Davydov , Andrew Morton , Vlastimil Babka , Roman Gushchin Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, Shakeel Butt , Muchun Song , Waiman Long Subject: [PATCH 2/3] mm, memcg: Remove obsolete memcg_free_kmem() Date: Fri, 1 Oct 2021 15:09:37 -0400 Message-Id: <20211001190938.14050-3-longman@redhat.com> In-Reply-To: <20211001190938.14050-1-longman@redhat.com> References: <20211001190938.14050-1-longman@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 74FD53001DA2 X-Stat-Signature: w9z3qohcfzieiyjphps46dibcc6ouww3 Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=OWCUKVzg; spf=none (imf09.hostedemail.com: domain of longman@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=longman@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-HE-Tag: 1633115421-606981 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: Since commit d648bcc7fe65 ("mm: kmem: make memcg_kmem_enabled() irreversible"), the only thing memcg_free_kmem() does is to call memcg_offline_kmem() when the memcg is still online. However, memcg_offline_kmem() is only called from mem_cgroup_css_free() which cannot be reached if the memcg hasn't been offlined first. As this function now serves no purpose, we should just remove it. Signed-off-by: Waiman Long --- mm/memcontrol.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 4568363062c1..8177f253a127 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3673,13 +3673,6 @@ static void memcg_offline_kmem(struct mem_cgroup *memcg) memcg_free_cache_id(kmemcg_id); } - -static void memcg_free_kmem(struct mem_cgroup *memcg) -{ - /* css_alloc() failed, offlining didn't happen */ - if (unlikely(memcg->kmem_state == KMEM_ONLINE)) - memcg_offline_kmem(memcg); -} #else static int memcg_online_kmem(struct mem_cgroup *memcg) { @@ -3688,9 +3681,6 @@ static int memcg_online_kmem(struct mem_cgroup *memcg) static void memcg_offline_kmem(struct mem_cgroup *memcg) { } -static void memcg_free_kmem(struct mem_cgroup *memcg) -{ -} #endif /* CONFIG_MEMCG_KMEM */ static int memcg_update_kmem_max(struct mem_cgroup *memcg, @@ -5325,7 +5315,6 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css) cancel_work_sync(&memcg->high_work); mem_cgroup_remove_from_trees(memcg); free_shrinker_info(memcg); - memcg_free_kmem(memcg); mem_cgroup_free(memcg); }