Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb1eae38 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ANDROID: gki_config: disable per-cgroup pressure tracking"

parents c67017ec 824379ca

Documentation/admin-guide/kernel-parameters.txt

+7 −2
Original line number Diff line number Diff line
@@ -488,16 +488,21 @@ 
	ccw_timeout_log	[S390]

			See Documentation/s390/common_io.rst for details.



	cgroup_disable=	[KNL] Disable a particular controller

			Format: {name of the controller(s) to disable}

	cgroup_disable=	[KNL] Disable a particular controller or optional feature

			Format: {name of the controller(s) or feature(s) to disable}

			The effects of cgroup_disable=foo are:

			- foo isn't auto-mounted if you mount all cgroups in

			  a single hierarchy

			- foo isn't visible as an individually mountable

			  subsystem

			- if foo is an optional feature then the feature is

			  disabled and corresponding cgroup files are not

			  created

			{Currently only "memory" controller deal with this and

			cut the overhead, others just disable the usage. So

			only cgroup_disable=memory is actually worthy}

			Specifying "pressure" disables per-cgroup pressure

			stall information accounting feature



	cgroup_no_v1=	[KNL] Disable cgroup controllers and named hierarchies in v1

			Format: { { controller | "all" | "named" }

arch/arm64/configs/gki_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ CONFIG_SWP_EMULATION=y 
CONFIG_CP15_BARRIER_EMULATION=y

CONFIG_SETEND_EMULATION=y

CONFIG_RANDOMIZE_BASE=y

CONFIG_CMDLINE="cgroup_disable=pressure"

CONFIG_CMDLINE_EXTEND=y

# CONFIG_DMI is not set

CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

arch/x86/configs/gki_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ CONFIG_HYPERVISOR_GUEST=y 
CONFIG_PARAVIRT=y

CONFIG_NR_CPUS=32

CONFIG_EFI=y

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="cgroup_disable=pressure"

CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set

include/linux/cgroup-defs.h

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ enum { 
	CFTYPE_NO_PREFIX	= (1 << 3),	/* (DON'T USE FOR NEW FILES) no subsys prefix */

	CFTYPE_WORLD_WRITABLE	= (1 << 4),	/* (DON'T USE FOR NEW FILES) S_IWUGO */

	CFTYPE_DEBUG		= (1 << 5),	/* create when cgroup_debug */

	CFTYPE_PRESSURE		= (1 << 6),	/* only if pressure feature is enabled */



	/* internal flags, do not use outside cgroup core proper */

	__CFTYPE_ONLY_ON_DFL	= (1 << 16),	/* only on default hierarchy */

include/linux/cgroup.h

+7 −0
Original line number Diff line number Diff line
@@ -670,6 +670,8 @@ static inline struct psi_group *cgroup_psi(struct cgroup *cgrp) 
	return &cgrp->psi;

}



bool cgroup_psi_enabled(void);



static inline void cgroup_init_kthreadd(void)

{

	/*
@@ -735,6 +737,11 @@ static inline struct psi_group *cgroup_psi(struct cgroup *cgrp) 
	return NULL;

}



static inline bool cgroup_psi_enabled(void)

{

	return false;

}



static inline bool task_under_cgroup_hierarchy(struct task_struct *task,

					       struct cgroup *ancestor)

{