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 X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39BA3C43460 for ; Mon, 19 Apr 2021 17:26:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1945C61279 for ; Mon, 19 Apr 2021 17:26:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239777AbhDSR1F (ORCPT ); Mon, 19 Apr 2021 13:27:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:26583 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234084AbhDSR1E (ORCPT ); Mon, 19 Apr 2021 13:27:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618853193; h=from:from: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:in-reply-to:references:references; bh=bP0dgJylGUHZI2K8PCqLGYvIKzzqMKEmXpSiyAKkpRw=; b=CVjqQJ+vaxc17PoM3xoItSAX/nnU4ATvdY7CRDTK+jQXOrLep/gUNDTPpXEZjIg4LH4et/ yTIBZOAKYLtgzyJXGxZjq0cQ5eLwJh2ewXYIXvpn6SiEBRRyxPzcJJACZ/SCTfbbYQ+yeT uSSTKF5Nd4NO1pQ+nS1smDJT0LlntVQ= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-420-n-PRhxkZMFyrn2BbBMXNfQ-1; Mon, 19 Apr 2021 13:26:32 -0400 X-MC-Unique: n-PRhxkZMFyrn2BbBMXNfQ-1 Received: by mail-qt1-f200.google.com with SMTP id o21-20020a05622a0095b02901b1324f9fceso9427463qtw.8 for ; Mon, 19 Apr 2021 10:26:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=bP0dgJylGUHZI2K8PCqLGYvIKzzqMKEmXpSiyAKkpRw=; b=L0P72AI4R5Hm61RkRk3AACsZAmllwe5yTp6Yvvevjp0GBrwY5d83pnlnebFSm/zBNe l4Fj67LKkOzYNmvWbXng8Ce53s/HPJ2bKmUFguSwc7mYzSkNM6ox6BbOFeQIWOvIOnPG UnI2U+Q2rxYUESu9WqtxFf/FMrZACvzO1ldeCO6+IM0FDKCvyJ7KHN/0gqe7xLxXQgzE bTgTHsprFT5QM6AmyP4sp8YE2fVQvwBNDORO5P1OOjYmvTGy1Z7QJUEjaKoP1PvxnLYY +3P4/v+y1uMZTMJ746m14LgY9AQqkNHZhs/Q9aA81J89+CmFmdyXyWN+hkt+kmOAa8bd knJQ== X-Gm-Message-State: AOAM530hax1mWrULX1xBCd0An6lfxA05QYePetFuvh2YysyzWWUcsw/7 nalXqR1AddPWtzVSLWzVCYuwSnlgDvTxE37sfQvSBKuSbr3h+F2re3dx0e/sDfhhKaL28VmanSG 9IfcxxwhAILCIz8nxeQqRSZfN X-Received: by 2002:ac8:b45:: with SMTP id m5mr12675865qti.56.1618853191881; Mon, 19 Apr 2021 10:26:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIZTibzrz4kicze63i+d0ejCOInPjvw1tyWYei7C0LpWKnxlmJLHYVjQAc/5TcNHS8aZuk7Q== X-Received: by 2002:ac8:b45:: with SMTP id m5mr12675845qti.56.1618853191705; Mon, 19 Apr 2021 10:26:31 -0700 (PDT) Received: from llong.remote.csb ([2601:191:8500:76c0::cdbc]) by smtp.gmail.com with ESMTPSA id a187sm10080819qkd.69.2021.04.19.10.26.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 Apr 2021 10:26:31 -0700 (PDT) From: Waiman Long X-Google-Original-From: Waiman Long Subject: Re: [PATCH v4 1/5] mm/memcg: Move mod_objcg_state() to memcontrol.c To: Waiman Long , Johannes Weiner Cc: Michal Hocko , Vladimir Davydov , Andrew Morton , Tejun Heo , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Vlastimil Babka , Roman Gushchin , linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, Shakeel Butt , Muchun Song , Alex Shi , Chris Down , Yafang Shao , Wei Yang , Masayoshi Mizuma , Xing Zhengjun , Matthew Wilcox References: <20210419000032.5432-1-longman@redhat.com> <20210419000032.5432-2-longman@redhat.com> <140444ea-14e7-b305-910f-f23fafe45488@redhat.com> Message-ID: Date: Mon, 19 Apr 2021 13:26:29 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 4/19/21 1:19 PM, Waiman Long wrote: > On 4/19/21 1:13 PM, Johannes Weiner wrote: >> On Mon, Apr 19, 2021 at 12:18:29PM -0400, Waiman Long wrote: >>> On 4/19/21 11:21 AM, Waiman Long wrote: >>>> On 4/19/21 11:14 AM, Johannes Weiner wrote: >>>>> On Sun, Apr 18, 2021 at 08:00:28PM -0400, Waiman Long wrote: >>>>>> The mod_objcg_state() function is moved from mm/slab.h to >>>>>> mm/memcontrol.c >>>>>> so that further optimization can be done to it in later patches >>>>>> without >>>>>> exposing unnecessary details to other mm components. >>>>>> >>>>>> Signed-off-by: Waiman Long >>>>>> --- >>>>>>    mm/memcontrol.c | 13 +++++++++++++ >>>>>>    mm/slab.h       | 16 ++-------------- >>>>>>    2 files changed, 15 insertions(+), 14 deletions(-) >>>>>> >>>>>> diff --git a/mm/memcontrol.c b/mm/memcontrol.c >>>>>> index e064ac0d850a..dc9032f28f2e 100644 >>>>>> --- a/mm/memcontrol.c >>>>>> +++ b/mm/memcontrol.c >>>>>> @@ -3150,6 +3150,19 @@ void __memcg_kmem_uncharge_page(struct >>>>>> page *page, int order) >>>>>>        css_put(&memcg->css); >>>>>>    } >>>>>>    +void mod_objcg_state(struct obj_cgroup *objcg, struct >>>>>> pglist_data *pgdat, >>>>>> +             enum node_stat_item idx, int nr) >>>>>> +{ >>>>>> +    struct mem_cgroup *memcg; >>>>>> +    struct lruvec *lruvec = NULL; >>>>>> + >>>>>> +    rcu_read_lock(); >>>>>> +    memcg = obj_cgroup_memcg(objcg); >>>>>> +    lruvec = mem_cgroup_lruvec(memcg, pgdat); >>>>>> +    mod_memcg_lruvec_state(lruvec, idx, nr); >>>>>> +    rcu_read_unlock(); >>>>>> +} >>>>> It would be more naturally placed next to the others, e.g. below >>>>> __mod_lruvec_kmem_state(). >>>>> >>>>> But no deal breaker if there isn't another revision. >>>>> >>>>> Acked-by: Johannes Weiner >>>>> >>>> Yes, there will be another revision by rebasing patch series on the >>>> linux-next. I will move the function then. >>> OK, it turns out that mod_objcg_state() is only defined if >>> CONFIG_MEMCG_KMEM. That was why I put it in the CONFIG_MEMCG_KMEM >>> block with >>> the other obj_stock functions. I think I will keep it there. >> The CONFIG_MEMCG_KMEM has become sort of useless now. It used to be >> configurable, but now it just means CONFIG_MEMCG && !CONFIG_SLOB. And >> even that doesn't make sense because while slob doesn't support slab >> object tracking, we can still do all the other stuff we do under >> KMEM. I have a patch in the works to remove the symbol and ifdefs. >> >> With that in mind, it's better to group the functions based on what >> they do rather than based on CONFIG_MEMCG_KMEM. It's easier to just >> remove another ifdef later than it is to reorder the functions. >> > OK, I will make the move then. Thanks for the explanation. BTW, have you ever thought of moving the cgroup-v1 specific functions out into a separate memcontrol-v1.c file just like kernel/cgroup/cgroup-v1.c? I thought of that before, but memcontrol.c is a frequently changed file and so a bit hard to do. Cheers, Longman