From patchwork Tue Jan 30 02:09:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haitao Huang X-Patchwork-Id: 193869 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1055487dyb; Mon, 29 Jan 2024 23:38:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IHHcyCtlgyU5GgW+ikvS+SXJf9wNpu+Iirjr9xzFwHRZSmjiTJstyLB9g5rBA+XO+g6QPnd X-Received: by 2002:a81:83c8:0:b0:602:d17a:7f7b with SMTP id t191-20020a8183c8000000b00602d17a7f7bmr5301626ywf.39.1706600300228; Mon, 29 Jan 2024 23:38:20 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706600300; cv=pass; d=google.com; s=arc-20160816; b=fu6cPBqC0VHhQY5KZFbPwSHvOnxLrx2bkSwQDrH1T2xh2HaL3qImtii3n8U55+a+sk lzqoEXkNP4TG5m/jf4BhVMfmTtAnsWsvxt2RkPpfUrqPLRYx/EpvWWrYNqRnAO9kCz0J KyeQ9JUgDC29RwldPLSMY/Md3OktV59NxTCkYXJDfe/Rd4qew6WE4un9a5k5CJIyvJ+M KL2z/bemWAevktoBBuyqaCrC7vlSsZcjTL7jS71ImIZseFw+E+nLbRwjVLRMiEPOF8Fy f7H6tYob1igJYz+fy5AfM3uJnrlMQldKP/6A1j406EWi4lC0W9vczLS4ET9FaLwkQNca ND2A== 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=AjYx2RXmZ12ZTZ4QMQH6AM9PJymYWkZubaRveF/V0jU=; fh=dtGru4wMzkfh5N4HjO7hjgtPmzQheD7FyA8qGNiECvw=; b=FC9s8xOU+ZNwl6KkqosNiuUnvasM6KdWGO3+24BCvBRzRMG0oFXXavmfZ26jxG2hYt ye7wlu8qcu7zIPGI8m2kK7Cal15hUS4GxcZnELM5XyX8gPKWwtfHw6gA1ct85JfDlgLw vTAcbyTf9GopfvyIyppPvb/McbMeYKXFQ8xFW+BHXYsK19otX0nDnl74RrXnMx2uz/Yq vq74l3lTI7iODsLwJFIK7OCmGL0Q/2L411Pg7FO0WLMcOfld3Irp9qIwP1iqw8CVTdbO JULlJtA7zlYq5w8o1KwIkA9GT9svVz/mXMqkUelqv7bylb/qTIFRwyXusOd7EmCGNSA3 vAlA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LjRQLRzg; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-43784-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-43784-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id y62-20020a636441000000b005d5c9f0d40csi7163458pgb.302.2024.01.29.23.38.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 23:38:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-43784-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LjRQLRzg; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-43784-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-43784-ouuuleilei=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 sv.mirrors.kernel.org (Postfix) with ESMTPS id BD77A2870B1 for ; Tue, 30 Jan 2024 02:11:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 11ED038380; Tue, 30 Jan 2024 02:09:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="LjRQLRzg" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 D726A364B3; Tue, 30 Jan 2024 02:09:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706580583; cv=none; b=utqRpjbly6LOJBY1hrDe5LlgHqOT2Y+ajtRVtMALEUKUHMnYtrPSI4KADiEpDAPtdl26H/PM1XKq1TPAl0372ESU8vG4hHvrBTjZ8tzuhap3c7RVpj8QCnkAk3xvX0yVG8EnrE3l8YGt3fWUxDzkDoen7g+nkKx/XwnhZWeuSJ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706580583; c=relaxed/simple; bh=ZEGZe8zv9/pCYQdMqDtrlmy0wtyZRRV26E+V+mhOBxI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PWXSaLGV2kluod/QoKz331H0mKaDQrJV+ml0awDXbtsX+fxSAWN5wGbKhA/wb8OsOhc7aB0KVvz7YXR6XzvXvhrFF+zHYMdbICesGAJVCW3tmw/v2c784HkzNVN0szczNM4Wa3ATLfPL+NPTqWbOh40NzZA0LfLbjfmJEGAbMXE= 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=LjRQLRzg; arc=none smtp.client-ip=198.175.65.10 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=1706580582; x=1738116582; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZEGZe8zv9/pCYQdMqDtrlmy0wtyZRRV26E+V+mhOBxI=; b=LjRQLRzgTVq89O5agUR/+S47RDGS5IwqGSXB/+ed6wjkij9KpOCvaZGS EUd6br5gVRCiObk1ryiuW4LjiX0iIF26CKfbCPJsqafo3gER281qq7THF rTC8QOVw/VXA/yI2aO6G6le9+xT8o5vgek6gK2MFStYTZ1eu7UVlgvOYF olIBhrToBrQqizu1BJspyyS7yehPucDjBvZCjNCTVVvv1BB589KIHeNhs JVv9mocCmLdCwc9pkvVPX9ZO5y0EfzttA5cpQteBx+h2uwJAE0vGic5aj y92C9HKT9c81VHSJNNweg3yuY1h5pRHVgyZ0aXTan2HZGDHntIbh+IE2Z A==; X-IronPort-AV: E=McAfee;i="6600,9927,10968"; a="16530923" X-IronPort-AV: E=Sophos;i="6.05,707,1701158400"; d="scan'208";a="16530923" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2024 18:09:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10968"; a="822042321" X-IronPort-AV: E=Sophos;i="6.05,707,1701158400"; d="scan'208";a="822042321" Received: from b4969161e530.jf.intel.com ([10.165.56.46]) by orsmga001.jf.intel.com with ESMTP; 29 Jan 2024 18:09:38 -0800 From: Haitao Huang To: jarkko@kernel.org, dave.hansen@linux.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 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 v8 02/15] cgroup/misc: Export APIs for SGX driver Date: Mon, 29 Jan 2024 18:09:25 -0800 Message-Id: <20240130020938.10025-3-haitao.huang@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240130020938.10025-1-haitao.huang@linux.intel.com> References: <20240130020938.10025-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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789500116328311993 X-GMAIL-MSGID: 1789500116328311993 From: Kristen Carlson Accardi The SGX EPC cgroup will reclaim EPC pages when a 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 may also need 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 --- 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 14ab13ef3bc7..1f0d8e05b36c 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);