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=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 4883BC2BC11 for ; Mon, 14 Sep 2020 14:21:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 139A921D80 for ; Mon, 14 Sep 2020 14:21:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="UzPDPcVO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726781AbgINOVU (ORCPT ); Mon, 14 Sep 2020 10:21:20 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:31605 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726671AbgINOU0 (ORCPT ); Mon, 14 Sep 2020 10:20:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600093223; 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=HtBSdfoUR8h4s3JfPJeC6QxKphf9QsZWctKie4ScbZc=; b=UzPDPcVOjSdDqGtUIanjQUmjVq7q2VZt13t5mDDtAr+u9HX9cGFZGeloUCY7VLkbkcb4rY x1xwHI4XIU9CH8nEwwktAHlOKVuNirs6SGh6AsCuzHkZ+5uefxu6q9uau1gJkVneQlgIPt LSSdlXelNJp5s/VOnYN3a1840sTvcjk= 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-249-7AJo8FsCMz-PblnLrDL7sw-1; Mon, 14 Sep 2020 10:20:20 -0400 X-MC-Unique: 7AJo8FsCMz-PblnLrDL7sw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7DDA6884E47; Mon, 14 Sep 2020 14:20:18 +0000 (UTC) Received: from llong.com (ovpn-118-85.rdu2.redhat.com [10.10.118.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F9A727BCB; Mon, 14 Sep 2020 14:20:14 +0000 (UTC) From: Waiman Long To: Johannes Weiner , Michal Hocko , Vladimir Davydov , Andrew Morton , Tejun Heo Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, Shakeel Butt , Chris Down , Roman Gushchin , Yafang Shao , Waiman Long Subject: [PATCH v3 2/3] mm/memcg: Simplify mem_cgroup_get_max() Date: Mon, 14 Sep 2020 10:19:55 -0400 Message-Id: <20200914141955.2145-1-longman@redhat.com> In-Reply-To: <20200914024452.19167-1-longman@redhat.com> References: <20200914024452.19167-1-longman@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The mem_cgroup_get_max() function used to get memory+swap max from both the v1 memsw and v2 memory+swap page counters & return the maximum of these 2 values. This is redundant and it is more efficient to just get either the v1 or the v2 values depending on which one is currently in use. Signed-off-by: Waiman Long --- mm/memcontrol.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 8c74f1200261..2331d4bc7c4d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1633,17 +1633,19 @@ void mem_cgroup_print_oom_meminfo(struct mem_cgroup *memcg) */ unsigned long mem_cgroup_get_max(struct mem_cgroup *memcg) { - unsigned long max; - - max = READ_ONCE(memcg->memory.max); - if (mem_cgroup_swappiness(memcg)) { - unsigned long memsw_max; - unsigned long swap_max; - - memsw_max = memcg->memsw.max; - swap_max = READ_ONCE(memcg->swap.max); - swap_max = min(swap_max, (unsigned long)total_swap_pages); - max = min(max + swap_max, memsw_max); + unsigned long max = READ_ONCE(memcg->memory.max); + + if (cgroup_subsys_on_dfl(memory_cgrp_subsys)) { + if (mem_cgroup_swappiness(memcg)) + max += min(READ_ONCE(memcg->swap.max), + (unsigned long)total_swap_pages); + } else { /* v1 */ + if (mem_cgroup_swappiness(memcg)) { + unsigned long memsw = READ_ONCE(memcg->memsw.max); + + if (memsw > max) + max += min(memsw - max, (unsigned long)total_swap_pages); + } } return max; } -- 2.18.1