Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751936AbcDKHbW (ORCPT ); Mon, 11 Apr 2016 03:31:22 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36519 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751026AbcDKHbU (ORCPT ); Mon, 11 Apr 2016 03:31:20 -0400 Date: Mon, 11 Apr 2016 09:31:18 +0200 From: Michal Hocko To: Johannes Weiner Cc: Andrew Morton , Vladimir Davydov , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: Re: [PATCH] mm: memcontrol: let v2 cgroups follow changes in system swappiness Message-ID: <20160411073117.GC23157@dhcp22.suse.cz> References: <1460155744-15942-1-git-send-email-hannes@cmpxchg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1460155744-15942-1-git-send-email-hannes@cmpxchg.org> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1187 Lines: 37 On Fri 08-04-16 18:49:04, Johannes Weiner wrote: > Cgroup2 currently doesn't have a per-cgroup swappiness setting. We > might want to add one later - that's a different discussion - but > until we do, the cgroups should always follow the system setting. > Otherwise it will be unchangeably set to whatever the ancestor > inherited from the system setting at the time of cgroup creation. > > Signed-off-by: Johannes Weiner > Cc: stable@vger.kernel.org # 4.5 Acked-by: Michal Hocko > --- > include/linux/swap.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/include/linux/swap.h b/include/linux/swap.h > index e58dba3..15d17c8 100644 > --- a/include/linux/swap.h > +++ b/include/linux/swap.h > @@ -534,6 +534,10 @@ static inline swp_entry_t get_swap_page(void) > #ifdef CONFIG_MEMCG > static inline int mem_cgroup_swappiness(struct mem_cgroup *memcg) > { > + /* Cgroup2 doesn't have per-cgroup swappiness */ > + if (cgroup_subsys_on_dfl(memory_cgrp_subsys)) > + return vm_swappiness; > + > /* root ? */ > if (mem_cgroup_disabled() || !memcg->css.parent) > return vm_swappiness; > -- > 2.8.0 -- Michal Hocko SUSE Labs