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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 0CCF0C11F68 for ; Wed, 30 Jun 2021 06:56:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8F11F61A1D for ; Wed, 30 Jun 2021 06:56:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F11F61A1D Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id F08BA8D0180; Wed, 30 Jun 2021 02:56:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EB88D8D017A; Wed, 30 Jun 2021 02:56:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D80EC8D0180; Wed, 30 Jun 2021 02:56:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0114.hostedemail.com [216.40.44.114]) by kanga.kvack.org (Postfix) with ESMTP id B75048D017A for ; Wed, 30 Jun 2021 02:56:42 -0400 (EDT) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 89D721CFD9 for ; Wed, 30 Jun 2021 06:56:42 +0000 (UTC) X-FDA: 78309482244.03.84A8081 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf21.hostedemail.com (Postfix) with ESMTP id 25CAFD00146F for ; Wed, 30 Jun 2021 06:56:42 +0000 (UTC) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 2BE9C20456; Wed, 30 Jun 2021 06:56:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1625036201; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=oV014uPU4nv3+T83Wwazi4Y50Lmy7sh68BTDocX3Q1I=; b=UqvYz8pfMANcbqsnefEse7ECNG23Wr5ueVIxCxB71V62AJBkb8v9/vy5SR0D3GdhkO1p8l FzA7CQ7eBx7XdeKX5utCbtJ1YEzni9I3hUCKD0Ltzl0aN00ljHqTsXdZtmoty9DSZg/MAd Bw1PHVzDhEDv03SipEpEOf96Uyaz7Zs= Received: from suse.cz (unknown [10.100.201.86]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id EAD60A3B8A; Wed, 30 Jun 2021 06:56:40 +0000 (UTC) Date: Wed, 30 Jun 2021 08:56:40 +0200 From: Michal Hocko To: "Matthew Wilcox (Oracle)" Cc: linux-mm@kvack.org, cgroups@vger.kernel.org, Johannes Weiner , Vladimir Davydov Subject: Re: [PATCH v3 04/18] mm/memcg: Remove soft_limit_tree_node() Message-ID: References: <20210630040034.1155892-1-willy@infradead.org> <20210630040034.1155892-5-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210630040034.1155892-5-willy@infradead.org> X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 25CAFD00146F X-Stat-Signature: njibc8d7uarp655hydunukz1ebcfsy3o Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=UqvYz8pf; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf21.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.29 as permitted sender) smtp.mailfrom=mhocko@suse.com X-HE-Tag: 1625036202-743902 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: On Wed 30-06-21 05:00:20, Matthew Wilcox wrote: > Opencode this one-line function in its three callers. > > Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Michal Hocko > --- > mm/memcontrol.c | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 29b28a050707..29fdb70dca42 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -446,12 +446,6 @@ ino_t page_cgroup_ino(struct page *page) > return ino; > } > > -static struct mem_cgroup_tree_per_node * > -soft_limit_tree_node(int nid) > -{ > - return soft_limit_tree.rb_tree_per_node[nid]; > -} > - > static void __mem_cgroup_insert_exceeded(struct mem_cgroup_per_node *mz, > struct mem_cgroup_tree_per_node *mctz, > unsigned long new_usage_in_excess) > @@ -528,7 +522,7 @@ static void mem_cgroup_update_tree(struct mem_cgroup *memcg, int nid) > struct mem_cgroup_per_node *mz; > struct mem_cgroup_tree_per_node *mctz; > > - mctz = soft_limit_tree_node(nid); > + mctz = soft_limit_tree.rb_tree_per_node[nid]; > if (!mctz) > return; > /* > @@ -567,7 +561,7 @@ static void mem_cgroup_remove_from_trees(struct mem_cgroup *memcg) > > for_each_node(nid) { > mz = memcg->nodeinfo[nid]; > - mctz = soft_limit_tree_node(nid); > + mctz = soft_limit_tree.rb_tree_per_node[nid]; > if (mctz) > mem_cgroup_remove_exceeded(mz, mctz); > } > @@ -3415,7 +3409,7 @@ unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, > if (order > 0) > return 0; > > - mctz = soft_limit_tree_node(pgdat->node_id); > + mctz = soft_limit_tree.rb_tree_per_node[pgdat->node_id]; > > /* > * Do not even bother to check the largest node if the root > -- > 2.30.2 -- Michal Hocko SUSE Labs From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Hocko Subject: Re: [PATCH v3 04/18] mm/memcg: Remove soft_limit_tree_node() Date: Wed, 30 Jun 2021 08:56:40 +0200 Message-ID: References: <20210630040034.1155892-1-willy@infradead.org> <20210630040034.1155892-5-willy@infradead.org> Mime-Version: 1.0 Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1625036201; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=oV014uPU4nv3+T83Wwazi4Y50Lmy7sh68BTDocX3Q1I=; b=UqvYz8pfMANcbqsnefEse7ECNG23Wr5ueVIxCxB71V62AJBkb8v9/vy5SR0D3GdhkO1p8l FzA7CQ7eBx7XdeKX5utCbtJ1YEzni9I3hUCKD0Ltzl0aN00ljHqTsXdZtmoty9DSZg/MAd Bw1PHVzDhEDv03SipEpEOf96Uyaz7Zs= Content-Disposition: inline In-Reply-To: <20210630040034.1155892-5-willy-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: "Matthew Wilcox (Oracle)" Cc: linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Johannes Weiner , Vladimir Davydov On Wed 30-06-21 05:00:20, Matthew Wilcox wrote: > Opencode this one-line function in its three callers. > > Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Michal Hocko > --- > mm/memcontrol.c | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 29b28a050707..29fdb70dca42 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -446,12 +446,6 @@ ino_t page_cgroup_ino(struct page *page) > return ino; > } > > -static struct mem_cgroup_tree_per_node * > -soft_limit_tree_node(int nid) > -{ > - return soft_limit_tree.rb_tree_per_node[nid]; > -} > - > static void __mem_cgroup_insert_exceeded(struct mem_cgroup_per_node *mz, > struct mem_cgroup_tree_per_node *mctz, > unsigned long new_usage_in_excess) > @@ -528,7 +522,7 @@ static void mem_cgroup_update_tree(struct mem_cgroup *memcg, int nid) > struct mem_cgroup_per_node *mz; > struct mem_cgroup_tree_per_node *mctz; > > - mctz = soft_limit_tree_node(nid); > + mctz = soft_limit_tree.rb_tree_per_node[nid]; > if (!mctz) > return; > /* > @@ -567,7 +561,7 @@ static void mem_cgroup_remove_from_trees(struct mem_cgroup *memcg) > > for_each_node(nid) { > mz = memcg->nodeinfo[nid]; > - mctz = soft_limit_tree_node(nid); > + mctz = soft_limit_tree.rb_tree_per_node[nid]; > if (mctz) > mem_cgroup_remove_exceeded(mz, mctz); > } > @@ -3415,7 +3409,7 @@ unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, > if (order > 0) > return 0; > > - mctz = soft_limit_tree_node(pgdat->node_id); > + mctz = soft_limit_tree.rb_tree_per_node[pgdat->node_id]; > > /* > * Do not even bother to check the largest node if the root > -- > 2.30.2 -- Michal Hocko SUSE Labs