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=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 E8D63C43381 for ; Fri, 15 Feb 2019 18:14:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0AC6222A1 for ; Fri, 15 Feb 2019 18:14:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cmpxchg-org.20150623.gappssmtp.com header.i=@cmpxchg-org.20150623.gappssmtp.com header.b="UdfnkLw0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388606AbfBOSOm (ORCPT ); Fri, 15 Feb 2019 13:14:42 -0500 Received: from mail-yb1-f195.google.com ([209.85.219.195]:36388 "EHLO mail-yb1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731904AbfBOSOg (ORCPT ); Fri, 15 Feb 2019 13:14:36 -0500 Received: by mail-yb1-f195.google.com with SMTP id o129so2381416yba.3 for ; Fri, 15 Feb 2019 10:14:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m8WChnDGiJjl3dG7Qy7BcuERcz0zJgVAywmHmi4mw/w=; b=UdfnkLw0LmmTMvDdh9ElM17TqIoS3oWEjsSyoG4o6RGsaPK+fs4daWXmy0W/V7D+78 Ob2Pc5U21jjOaaMkxoMxu9tYDRhLSY2CL/sI5SGMTfBDcQdRvqtWJ1c9dngW43CxCbTv 9p4H2xQVSXhBxNYvad1mhG4sR3iDigfmHjGeDfRaTU+7XjGsyeFxL22FLqvWeI/UsRbR PTdCQwKwdVXH+yJAh1ngZAjeqZ2nUBqtDoA+jtJ5gStQMocaU9AuCbQLZYLint5d9dxj S9J7e7kCePwD2WfXXOsu+GBqZ9GNU0PIVhs0jDdsSLfjoGX15iGR18dpmrWWhqj3O5UO DL0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m8WChnDGiJjl3dG7Qy7BcuERcz0zJgVAywmHmi4mw/w=; b=uiAv1D4Qj6kAgIUowTSuQqSgALDnF8V7RadEBzLEyaaEPBtyouWqsjhiV5LPqPPvjf Kp+xcvkYNB+DYv+YNN7/QfDm4ZTLGEDRpaobdD7twplxlR1pH1t/azoQoaA7Ym7VVTyG NMJ4bhC6XsFJHuM8TjAq89DqGqv5qIw4djh+qVcdDsUrBJoornfNQ8v0beoOKTqF6qTP yNkc1xPhCBvQ6QlBUG7b8yAyUcrA8fTOhSb72IPC8m+jDPGFueA8mhTTD1pVE56MHHF6 JWnNVoYPfg2IIBYbZisfxlSw27Bg7jaIOxQvOG4oo6cxA8N1xG1pu8ax6DUapEgKJQ6i MesA== X-Gm-Message-State: AHQUAub3Lo8Lvw/JoRRd7Wbnfq7Tyl2z/KdwlDpOJPQ42Rj25FwO9HTV 3/ZV3yFUeCeOeK30Ki9UCbzb3Q== X-Google-Smtp-Source: AHgI3IZ8yDwTc7PxyKzJo3tl350n3p72QNy9yMJQXMoHx1G4LbQACYtj2tYCy+gNRFU1vjZ6WO77cw== X-Received: by 2002:a25:b287:: with SMTP id k7mr2048404ybj.9.1550254474721; Fri, 15 Feb 2019 10:14:34 -0800 (PST) Received: from localhost ([2620:10d:c091:200::4:33c1]) by smtp.gmail.com with ESMTPSA id m127sm2369379ywf.68.2019.02.15.10.14.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Feb 2019 10:14:34 -0800 (PST) From: Johannes Weiner To: Andrew Morton Cc: Tejun Heo , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 3/6] mm: memcontrol: replace node summing with memcg_page_state() Date: Fri, 15 Feb 2019 13:14:22 -0500 Message-Id: <20190215181425.32624-4-hannes@cmpxchg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215181425.32624-1-hannes@cmpxchg.org> References: <20190215181425.32624-1-hannes@cmpxchg.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of adding up the node counters, use memcg_page_state() to get the memcg state directly. This is a bit cheaper and more stream-lined. Signed-off-by: Johannes Weiner --- mm/memcontrol.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index a04177f25758..4d573f4e1759 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -739,10 +739,13 @@ static unsigned long mem_cgroup_nr_lru_pages(struct mem_cgroup *memcg, unsigned int lru_mask) { unsigned long nr = 0; - int nid; + enum lru_list lru; - for_each_node_state(nid, N_MEMORY) - nr += mem_cgroup_node_nr_lru_pages(memcg, nid, lru_mask); + for_each_lru(lru) { + if (!(BIT(lru) & lru_mask)) + continue; + nr += memcg_page_state(memcg, NR_LRU_BASE + lru); + } return nr; } -- 2.20.1