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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27440C43217 for ; Fri, 25 Mar 2022 01:30:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357350AbiCYBcH (ORCPT ); Thu, 24 Mar 2022 21:32:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357356AbiCYBbu (ORCPT ); Thu, 24 Mar 2022 21:31:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D25939175 for ; Thu, 24 Mar 2022 18:30:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EE9C16191D for ; Fri, 25 Mar 2022 01:30:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50C52C340ED; Fri, 25 Mar 2022 01:30:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1648171814; bh=U10NiskVLmgXs7QgfjLh298eu9yM7yTKde//Ot3jAqI=; h=Date:To:From:Subject:From; b=w8H9pfxUOw8pKHmmCZ/N7/j9PlGqZX4rip5yU90IECdrRXF5SGO4c5X5VBt2+MZbr PwCpSYNexwkm4CuBq+ATIhMMpWd/BhqPqp4qPne38uGyA538HMYMfHic7wwG5xulf6 cYnFRGSxTFacCYPm5rk1alP/wkf0FaohxJJ6jaBg= Date: Thu, 24 Mar 2022 18:30:13 -0700 To: mm-commits@vger.kernel.org, vdavydov.dev@gmail.com, vbabka@suse.cz, surenb@google.com, songmuchun@bytedance.com, shy828301@gmail.com, shakeelb@google.com, rppt@linux.ibm.com, roman.gushchin@linux.dev, mhocko@suse.com, hannes@cmpxchg.org, guro@fb.com, richard.weiyang@gmail.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged] mm-memcg-retrieve-parent-memcg-from-cssparent.patch removed from -mm tree Message-Id: <20220325013014.50C52C340ED@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm/memcg: retrieve parent memcg from css.parent has been removed from the -mm tree. Its filename was mm-memcg-retrieve-parent-memcg-from-cssparent.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Wei Yang Subject: mm/memcg: retrieve parent memcg from css.parent The parent we get from page_counter is correct, while this is two different hierarchy. Let's retrieve the parent memcg from css.parent just like parent_cs(), blkcg_parent(), etc. Link: https://lkml.kernel.org/r/20220201004643.8391-2-richard.weiyang@gmail.com Signed-off-by: Wei Yang Reviewed-by: Muchun Song Acked-by: Michal Hocko Reviewed-by: Roman Gushchin Reviewed-by: Shakeel Butt Cc: Roman Gushchin Cc: Johannes Weiner Cc: Vladimir Davydov Cc: Yang Shi Cc: Suren Baghdasaryan Cc: Vlastimil Babka Cc: Mike Rapoport Signed-off-by: Andrew Morton --- include/linux/memcontrol.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/include/linux/memcontrol.h~mm-memcg-retrieve-parent-memcg-from-cssparent +++ a/include/linux/memcontrol.h @@ -842,9 +842,7 @@ static inline struct mem_cgroup *lruvec_ */ static inline struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg) { - if (!memcg->memory.parent) - return NULL; - return mem_cgroup_from_counter(memcg->memory.parent, memory); + return mem_cgroup_from_css(memcg->css.parent); } static inline bool mem_cgroup_is_descendant(struct mem_cgroup *memcg, _ Patches currently in -mm which might be from richard.weiyang@gmail.com are mm-page_alloc-add-same-penalty-is-enough-to-get-round-robin-order.patch mm-page_alloc-add-penalty-to-local_node.patch