Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp305610pxb; Mon, 13 Sep 2021 20:06:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwt5pMPq4vSf4EO6MkOVvZsJ/EpAq+EQSxst0nF3Z9xW+h4IJqSJKzou9dHgfdqaRpGgpde X-Received: by 2002:a17:907:2d9f:: with SMTP id gt31mr16492226ejc.489.1631588792612; Mon, 13 Sep 2021 20:06:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631588792; cv=none; d=google.com; s=arc-20160816; b=cckigZr+/DN7/z7mUbdzRYc3ekflByqplBpAAx2cW9/VFb60wz4Gq3xfVB7xXJJGTX PR78H4r8ybc3ErWfoRA57CuyXoaNmMkdcLmErvCq9IdVUkSVoWqkHFzkd0G/MomIdUkI kTtnwvDfIZvRU6KvrS7uKMn4L7K7clx6+31BqlkoYsoO3vm/5O5N/8fZolxGsE/qdbKz o+uSDxfb3WCwRVkcGhj6x000MdR+4/0iiWP0NcL49cAp9mRzUxaYiFCldWVg9DtGg7Bl NlZJBlsE5JcAkCfF18lYcjaMfkVmjmWMHFR76LabBlODPsKg9NZOFF8z09MTOiZYJZtt S2kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BOs4UkKUJCjsU7gs3kT6py+b84oTRZ14XfyWfAX+wDI=; b=nsItCw/W/giwSUo91vHawsIT9JMCOpVukjgHotvjc5GoPbAYb+nVQ1Sd6lCXS2lQDj nzeEuoyAr8tOL+W+GKsWlBait6yW5eKUuPev54os+AKs7T3lDaNxTE4EYO9IXLeneiRP mgoLQCzmUKk89UR5QmfKtohPzXp/xTaD9tSyHDkQel/N7oACvMAmCPlSGixpSTzCVCTq jlZX6aNYJxIdpDw7WRhUzI/+bQlB4uYaugyJShTUdvHDp0VByiu3YlmOxN8HlLyj4v/s tqOJiTUv3GUC9WECzEpcvUKcwMipq8UD38P6Eei0CKQ4z785b7sUkZcsL6FQuALJ2/0V tUGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ru5otmVH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p23si11314328edw.186.2021.09.13.20.06.06; Mon, 13 Sep 2021 20:06:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ru5otmVH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238376AbhINDFq (ORCPT + 99 others); Mon, 13 Sep 2021 23:05:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:34924 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237777AbhINDFp (ORCPT ); Mon, 13 Sep 2021 23:05:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 589576112E; Tue, 14 Sep 2021 03:04:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631588668; bh=0F5jSnD62cR5VFmZSZmBT7r8grfZA8jifIrD3awKk/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ru5otmVH8ogKC4M+hKS6NIiLdDgchqUlLtD6Vwp1xKPrtmM15MYFMajLGlQggFwbm JaCGNnVNDe3DOjE6XeDtKMdU4LlNPGumuJUmVEgC63svYHswYY4cCBJngcs8e8pES2 HEUWqjsuG/k0M4gAo2hQz+BHojU5isKOBD/1bgf64+l/89is3Uj/S6eaWAlQczM3Gz zof7S9fOq6SAp26VH8Twz7kKaWgPx3fFJDJjck3MM1cAESB+POFwvKKd5UKltzzoXk U4h4bbRLhyeABHm7FMb3VE5976lxKgehA1eHREM7vq8/sMVTORVWP2IMxKMRGD+lS8 BNRteIeLovq4Q== From: Jarkko Sakkinen To: Jarkko Sakkinen , Dave Hansen , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Jonathan Corbet Cc: linux-sgx@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH v5 2/2] x86/sgx: Add an attribute for the amount of SGX memory in a NUMA node Date: Tue, 14 Sep 2021 06:04:22 +0300 Message-Id: <20210914030422.377601-2-jarkko@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210914030422.377601-1-jarkko@kernel.org> References: <20210914030422.377601-1-jarkko@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The amount of SGX memory on the system is determined by the BIOS and it varies wildly between systems. It can be from dozens of MB's on desktops or VM's, up to many GB's on servers. Just like for regular memory, it is sometimes useful to know the amount of usable SGX memory in the system. Add an attribute for the amount of SGX memory in bytes to each NUMA node. The path is /sys/devices/system/node/node[0-9]*/sgx/memory_size. Signed-off-by: Jarkko Sakkinen --- v5: A new patch based on the discussion at https://lore.kernel.org/linux-sgx/3a7cab4115b4f902f3509ad8652e616b91703e1d.camel@kernel.org/T/#t --- Documentation/x86/sgx.rst | 14 ++++++ arch/x86/kernel/cpu/sgx/main.c | 90 ++++++++++++++++++++++++++++++++++ arch/x86/kernel/cpu/sgx/sgx.h | 2 + 3 files changed, 106 insertions(+) diff --git a/Documentation/x86/sgx.rst b/Documentation/x86/sgx.rst index dd0ac96ff9ef..f9d9cfa6dbf9 100644 --- a/Documentation/x86/sgx.rst +++ b/Documentation/x86/sgx.rst @@ -250,3 +250,17 @@ user wants to deploy SGX applications both on the host and in guests on the same machine, the user should reserve enough EPC (by taking out total virtual EPC size of all SGX VMs from the physical EPC size) for host SGX applications so they can run with acceptable performance. + +Per NUMA node SGX attributes +============================ + +NUMA nodes devices expose SGX specific attributes in the following path: + + /sys/devices/system/node/node[0-9]*/sgx/ + +Attributes +---------- + +memory_size + Total available physical SGX memory, also known as Enclave + Page Cache (EPC), in bytes. diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index a6e313f1a82d..c43b5a0120c1 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -717,6 +717,7 @@ static bool __init sgx_page_cache_init(void) } sgx_epc_sections[i].node = &sgx_numa_nodes[nid]; + sgx_numa_nodes[nid].size += size; sgx_nr_epc_sections++; } @@ -790,6 +791,87 @@ int sgx_set_attribute(unsigned long *allowed_attributes, } EXPORT_SYMBOL_GPL(sgx_set_attribute); +#ifdef CONFIG_NUMA +static void sgx_numa_exit(void) +{ + int nid; + + for (nid = 0; nid < num_possible_nodes(); nid++) { + if (!sgx_numa_nodes[nid].kobj) + continue; + + kobject_put(sgx_numa_nodes[nid].kobj); + } +} + +#define SGX_NODE_ATTR_RO(_name) \ + static struct kobj_attribute _name##_attr = __ATTR_RO(_name) + +static ssize_t memory_size_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) +{ + unsigned long size = 0; + int nid; + + for (nid = 0; nid < num_possible_nodes(); nid++) { + if (kobj == sgx_numa_nodes[nid].kobj) { + size = sgx_numa_nodes[nid].size; + break; + } + } + + return sysfs_emit(buf, "%lu\n", size); +} +SGX_NODE_ATTR_RO(memory_size); + +static struct attribute *sgx_node_attrs[] = { + &memory_size_attr.attr, + NULL, +}; + +static const struct attribute_group sgx_node_attr_group = { + .attrs = sgx_node_attrs, +}; + +static bool sgx_numa_init(void) +{ + struct sgx_numa_node *node; + struct device *dev; + int nid; + int ret; + + for (nid = 0; nid < num_possible_nodes(); nid++) { + if (!sgx_numa_nodes[nid].size) + continue; + + node = &sgx_numa_nodes[nid]; + dev = &node_devices[nid]->dev; + + node->kobj = kobject_create_and_add("sgx", &dev->kobj); + if (!node->kobj) { + sgx_numa_exit(); + return false; + } + + ret = sysfs_create_group(node->kobj, &sgx_node_attr_group); + if (ret) { + sgx_numa_exit(); + return false; + } + } + + return true; +} +#else +static inline void sgx_numa_exit(void) +{ +} + +static inline bool sgx_numa_init(void) +{ + return true; +} +#endif /* CONFIG_NUMA */ + static int __init sgx_init(void) { int ret; @@ -806,6 +888,11 @@ static int __init sgx_init(void) goto err_reclaimer; } + if (!sgx_numa_init()) { + ret = -ENOMEM; + goto err_numa_nodes; + } + ret = misc_register(&sgx_dev_provision); if (ret) goto err_provision; @@ -829,6 +916,9 @@ static int __init sgx_init(void) misc_deregister(&sgx_dev_provision); err_provision: + sgx_numa_exit(); + +err_numa_nodes: kthread_stop(ksgxd_tsk); err_reclaimer: diff --git a/arch/x86/kernel/cpu/sgx/sgx.h b/arch/x86/kernel/cpu/sgx/sgx.h index 4628acec0009..c2c5e7c66d21 100644 --- a/arch/x86/kernel/cpu/sgx/sgx.h +++ b/arch/x86/kernel/cpu/sgx/sgx.h @@ -39,6 +39,8 @@ struct sgx_epc_page { */ struct sgx_numa_node { struct list_head free_page_list; + struct kobject *kobj; + unsigned long size; spinlock_t lock; }; -- 2.25.1