Received: by 2002:ab2:60d1:0:b0:1f7:5705:b850 with SMTP id i17csp140305lqm; Tue, 30 Apr 2024 15:56:59 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWO8FSoHvTBPvvmCzrAG8goLOeIQCCaBWQ+8VEC0ddKKwPbMU17yBfTlkXhFFWeITohozOTC6TXen9zlcnKXgYG1GYWFgTKlYnb84ltqw== X-Google-Smtp-Source: AGHT+IG344hqzJywqg6x7Q7HZ741lfHw9WzGAMp74A52Hct1OXYhxlXcVQqVn/QZ9uBUC+LvUgXj X-Received: by 2002:a50:8756:0:b0:572:7b2b:d990 with SMTP id 22-20020a508756000000b005727b2bd990mr834501edv.30.1714517818997; Tue, 30 Apr 2024 15:56:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714517818; cv=pass; d=google.com; s=arc-20160816; b=ACD5d8ct2Phsi27q2cgqBi4O9M5H/JEW+XNtKyBPsPa/N8UAkgOFv+L+IlCe7bObd4 MhDkd1ZO0oVDs+96TUqzLzYquCrUSmGHsoChKKPu7PqsB8czn2KNHeW/jSA3KMn9vvGj um16H34oQMWDUEFgYOdVfdoPFZWfQ/wgE5OsKnBSkMcFI61KwBvVAlCpkFDRuvpSSHrG MVdtljOOzXTegu9gvx7za3XhVn5dRqpx+JVu4TYhEsMUJycUsEXylN8GOjR9Liid1nR8 8x+ViguwCCciPXwFKcoQxmF7W97BUenEZEGr4pXq3gLLzCkpBM+GeEvDhqmRtzmyh1b2 7dmA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=t/SSQ/rT5ABhTkTj2IunJUmDdU8BP8dDIkZclhXHqCs=; fh=G1r0sJ0F/0v82zumykPUwC7a5Du5vVkWNEWao5ifD3o=; b=Mx6xtEbkpHrdVeTpFwf5tzwlE07e3v6qWfzWwYiRmgR961tvjAkDQM8xVhFzFqG2xF Lwic+oqWDUc1O+tBcXpW5srZFc7Eyg1OPc8PGXZ6dVUaPhNNI3epMb+RykA9H8iv2E3p NFXZ/A9Gkx1t+tdtmotvNi6Ftdo0VpILiS7e3DnzjyeCBN+4PxYNT+d4wIKwjJ/HiuRC 0gq8tPMpbcPLibjNQvnm/q429ACb4Fr7xGDqcNas+i43U0zSRA7r8phPR6ixzER52YrI E/PZ55mcHbrzcCsapV8SVoDeo6j8HvJhw+6N/Hct+Tts9PoGIC5wHo8leGt4UW87SLbk B9Nw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="m/eoPvNf"; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-164659-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-164659-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id k3-20020a056402340300b00572658b7ee4si4732731edc.388.2024.04.30.15.56.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 15:56:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-164659-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="m/eoPvNf"; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-164659-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-164659-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 656771F22CAC for ; Tue, 30 Apr 2024 19:51:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 644AD1A38EF; Tue, 30 Apr 2024 19:51:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="m/eoPvNf" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B355119DF72; Tue, 30 Apr 2024 19:51:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714506674; cv=none; b=ERr3CxpOeBADiVvhypu9M1VZfmxmUzwvGZTs4n+TbAVuQwTkeFsNsZK2K//Zo5ypbYETL17la2/CePe7xFm9Bt6UI8Y9P9NnaK29NmmJ+Aa8wAZc0EzBmRl4dBE0riZP4ig8BExDT44mp/wq9GmY/+RJGdnHK6VhJe59gfs5FiI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714506674; c=relaxed/simple; bh=eqN2yKPP04cTarojAaLprGk14sHMHhoIfgiMAqyE0Ac=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Mc77QYMup00MuqjtlFJ+U21gfCqi0k9G9kPwGlEjNnUv6KFeQL3drq6Wznc/RODvmuPAtcKkRGIVDdCwkOIYhSLRSvvfnb5kCniCwgdU317virDUWqa6fgmJFXcEIToWraZ9Gks59B4m8QSOsffyahxlIqKs3gA8bMVshfCW8Bk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=m/eoPvNf; arc=none smtp.client-ip=198.175.65.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714506673; x=1746042673; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eqN2yKPP04cTarojAaLprGk14sHMHhoIfgiMAqyE0Ac=; b=m/eoPvNfWCUtRiR3fgXzmHzZUhcRj8RYNkGGezGnQZGY5bu0FFrHtRID JTF1GCpHPXl7GaXdpcZcK4Zx1L0fUpkY3+0XCrtwaxBoVkXEE4iP4nsP4 M2au59Jhc37DTPE4YKrEvOkWv19pwIEUGWfqz/MaNNfnXrXS7lOIZ2icb 9HkUTKgkSD0sgb0HM6a0uKWf9uiiGU9b+r6pZKy/Z9RR5iVa/PnaV/Mll gwuHkXxS+7+PESsqhhlPWt5SXWuqBdbUeZiY1Q35vL7gXWoW7h8JWywnI DslBq4jxKTFqfr7hrccFLELRsO26lW+I+wQ8rmuqdqmkWfXbwZkNflNIb g==; X-CSE-ConnectionGUID: hs2gBOaqSGODLV+FzQyo9Q== X-CSE-MsgGUID: dEAXykIlSwO1v5WgF/ZyMw== X-IronPort-AV: E=McAfee;i="6600,9927,11060"; a="10355578" X-IronPort-AV: E=Sophos;i="6.07,243,1708416000"; d="scan'208";a="10355578" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Apr 2024 12:51:10 -0700 X-CSE-ConnectionGUID: HuK9eSsuQG6pF2yJOFyjPQ== X-CSE-MsgGUID: 3mi3TR56SUOIIyJPKyXLMQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,243,1708416000"; d="scan'208";a="31280303" Received: from b4969161e530.jf.intel.com ([10.165.56.46]) by orviesa003.jf.intel.com with ESMTP; 30 Apr 2024 12:51:09 -0700 From: Haitao Huang To: jarkko@kernel.org, dave.hansen@linux.intel.com, kai.huang@intel.com, tj@kernel.org, mkoutny@suse.com, linux-kernel@vger.kernel.org, linux-sgx@vger.kernel.org, x86@kernel.org, cgroups@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, sohil.mehta@intel.com, tim.c.chen@linux.intel.com Cc: zhiquan1.li@intel.com, kristen@linux.intel.com, seanjc@google.com, zhanb@microsoft.com, anakrish@microsoft.com, mikko.ylinen@linux.intel.com, yangjie@microsoft.com, chrisyan@microsoft.com Subject: [PATCH v13 03/14] cgroup/misc: Export APIs for SGX driver Date: Tue, 30 Apr 2024 12:50:57 -0700 Message-Id: <20240430195108.5676-4-haitao.huang@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240430195108.5676-1-haitao.huang@linux.intel.com> References: <20240430195108.5676-1-haitao.huang@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Kristen Carlson Accardi The SGX EPC cgroup will reclaim EPC pages when usage in a cgroup reaches its or ancestor's limit. This requires a walk from the current cgroup up to the root similar to misc_cg_try_charge(). Export misc_cg_parent() to enable this walk. The SGX driver also needs start a global level reclamation from the root. Export misc_cg_root() for the SGX driver to access. Signed-off-by: Kristen Carlson Accardi Co-developed-by: Haitao Huang Signed-off-by: Haitao Huang Reviewed-by: Jarkko Sakkinen Reviewed-by: Tejun Heo Reviewed-by: Kai Huang Tested-by: Jarkko Sakkinen --- V6: - Make commit messages more concise and split the original patch into two(Kai) --- include/linux/misc_cgroup.h | 24 ++++++++++++++++++++++++ kernel/cgroup/misc.c | 21 ++++++++------------- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/include/linux/misc_cgroup.h b/include/linux/misc_cgroup.h index 0806d4436208..541a5611c597 100644 --- a/include/linux/misc_cgroup.h +++ b/include/linux/misc_cgroup.h @@ -64,6 +64,7 @@ struct misc_cg { struct misc_res res[MISC_CG_RES_TYPES]; }; +struct misc_cg *misc_cg_root(void); u64 misc_cg_res_total_usage(enum misc_res_type type); int misc_cg_set_capacity(enum misc_res_type type, u64 capacity); int misc_cg_set_ops(enum misc_res_type type, const struct misc_res_ops *ops); @@ -84,6 +85,20 @@ static inline struct misc_cg *css_misc(struct cgroup_subsys_state *css) return css ? container_of(css, struct misc_cg, css) : NULL; } +/** + * misc_cg_parent() - Get the parent of the passed misc cgroup. + * @cgroup: cgroup whose parent needs to be fetched. + * + * Context: Any context. + * Return: + * * struct misc_cg* - Parent of the @cgroup. + * * %NULL - If @cgroup is null or the passed cgroup does not have a parent. + */ +static inline struct misc_cg *misc_cg_parent(struct misc_cg *cgroup) +{ + return cgroup ? css_misc(cgroup->css.parent) : NULL; +} + /* * get_current_misc_cg() - Find and get the misc cgroup of the current task. * @@ -108,6 +123,15 @@ static inline void put_misc_cg(struct misc_cg *cg) } #else /* !CONFIG_CGROUP_MISC */ +static inline struct misc_cg *misc_cg_root(void) +{ + return NULL; +} + +static inline struct misc_cg *misc_cg_parent(struct misc_cg *cg) +{ + return NULL; +} static inline u64 misc_cg_res_total_usage(enum misc_res_type type) { diff --git a/kernel/cgroup/misc.c b/kernel/cgroup/misc.c index 4a602d68cf7d..7d852139121a 100644 --- a/kernel/cgroup/misc.c +++ b/kernel/cgroup/misc.c @@ -43,18 +43,13 @@ static u64 misc_res_capacity[MISC_CG_RES_TYPES]; static const struct misc_res_ops *misc_res_ops[MISC_CG_RES_TYPES]; /** - * parent_misc() - Get the parent of the passed misc cgroup. - * @cgroup: cgroup whose parent needs to be fetched. - * - * Context: Any context. - * Return: - * * struct misc_cg* - Parent of the @cgroup. - * * %NULL - If @cgroup is null or the passed cgroup does not have a parent. + * misc_cg_root() - Return the root misc cgroup. */ -static struct misc_cg *parent_misc(struct misc_cg *cgroup) +struct misc_cg *misc_cg_root(void) { - return cgroup ? css_misc(cgroup->css.parent) : NULL; + return &root_cg; } +EXPORT_SYMBOL_GPL(misc_cg_root); /** * valid_type() - Check if @type is valid or not. @@ -183,7 +178,7 @@ int misc_cg_try_charge(enum misc_res_type type, struct misc_cg *cg, u64 amount) if (!amount) return 0; - for (i = cg; i; i = parent_misc(i)) { + for (i = cg; i; i = misc_cg_parent(i)) { res = &i->res[type]; new_usage = atomic64_add_return(amount, &res->usage); @@ -196,12 +191,12 @@ int misc_cg_try_charge(enum misc_res_type type, struct misc_cg *cg, u64 amount) return 0; err_charge: - for (j = i; j; j = parent_misc(j)) { + for (j = i; j; j = misc_cg_parent(j)) { atomic64_inc(&j->res[type].events); cgroup_file_notify(&j->events_file); } - for (j = cg; j != i; j = parent_misc(j)) + for (j = cg; j != i; j = misc_cg_parent(j)) misc_cg_cancel_charge(type, j, amount); misc_cg_cancel_charge(type, i, amount); return ret; @@ -223,7 +218,7 @@ void misc_cg_uncharge(enum misc_res_type type, struct misc_cg *cg, u64 amount) if (!(amount && valid_type(type) && cg)) return; - for (i = cg; i; i = parent_misc(i)) + for (i = cg; i; i = misc_cg_parent(i)) misc_cg_cancel_charge(type, i, amount); } EXPORT_SYMBOL_GPL(misc_cg_uncharge); -- 2.25.1