From: Kristen Carlson Accardi <kris...@linux.intel.com>

Add SGX EPC memory, MISC_CG_RES_SGX_EPC, to be a valid resource type
for the misc controller.

Signed-off-by: Kristen Carlson Accardi <kris...@linux.intel.com>
Co-developed-by: Haitao Huang <haitao.hu...@linux.intel.com>
Signed-off-by: Haitao Huang <haitao.hu...@linux.intel.com>
Reviewed-by: Jarkko Sakkinen <jar...@kernel.org>
Reviewed-by: Kai Huang <kai.hu...@intel.com>
Tested-by: Jarkko Sakkinen <jar...@kernel.org>
---
V12:
- Remove CONFIG_CGROUP_SGX_EPC (Jarkko)

V6:
- Split the original patch into this and the preceding one (Kai)
---
 include/linux/misc_cgroup.h | 4 ++++
 kernel/cgroup/misc.c        | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/include/linux/misc_cgroup.h b/include/linux/misc_cgroup.h
index 75c711333ad4..b4119869b0d1 100644
--- a/include/linux/misc_cgroup.h
+++ b/include/linux/misc_cgroup.h
@@ -17,6 +17,10 @@ enum misc_res_type {
        MISC_CG_RES_SEV,
        /** @MISC_CG_RES_SEV_ES: AMD SEV-ES ASIDs resource */
        MISC_CG_RES_SEV_ES,
+#endif
+#ifdef CONFIG_X86_SGX
+       /** @MISC_CG_RES_SGX_EPC: SGX EPC memory resource */
+       MISC_CG_RES_SGX_EPC,
 #endif
        /** @MISC_CG_RES_TYPES: count of enum misc_res_type constants */
        MISC_CG_RES_TYPES
diff --git a/kernel/cgroup/misc.c b/kernel/cgroup/misc.c
index 6cf1f0899f4e..300af1ee20fc 100644
--- a/kernel/cgroup/misc.c
+++ b/kernel/cgroup/misc.c
@@ -24,6 +24,10 @@ static const char *const misc_res_name[] = {
        /* AMD SEV-ES ASIDs resource */
        "sev_es",
 #endif
+#ifdef CONFIG_X86_SGX
+       /* Intel SGX EPC memory bytes */
+       "sgx_epc",
+#endif
 };
 
 /* Root misc cgroup */
-- 
2.43.0


Reply via email to