x86/sgx: Rename fallback labels in sgx_init()

PATCH Superseded Jarkko Sakkinen 2 participants 4 messages Nov 2, 2021

Subsystems (3)

x86 Driver core Intel SGX

lore

Share & tools

lore

Jarkko Sakkinen

author maintainer

2021-11-02 16:48 UTC #0 lore raw

PATCH v10 1/2 x86/sgx: Rename fallback labels in sgx_init()

It's hard to add new content to this function because it is time consuming to match fallback and its cause. Rename labels in a way that the name of error label refers to the site where failure happened. This way it is easier to keep on track what is going on.

Signed-off-by Jarkko Sakkinen <[email protected]>

---
v5:
* A new patch.

---
 arch/x86/kernel/cpu/sgx/main.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

arch/x86/kernel/cpu/sgx/main.c +6 -6

index 63d3de02bbcc..a6e313f1a82d 100644
@@ -803,12 +803,12 @@ static int __init sgx_init(void)
 
 	if (!sgx_page_reclaimer_init()) {
 		ret = -ENOMEM;
-		goto err_page_cache;
+		goto err_reclaimer;
 	}
 
 	ret = misc_register(&sgx_dev_provision);
 	if (ret)
-		goto err_kthread;
+		goto err_provision;
 
 	/*
 	 * Always try to initialize the native *and* KVM drivers.

@@ -821,17 +821,17 @@ static int __init sgx_init(void)
 	ret = sgx_drv_init();
 
 	if (sgx_vepc_init() && ret)
-		goto err_provision;
+		goto err_driver;
 
 	return 0;
 
-err_provision:
+err_driver:
 	misc_deregister(&sgx_dev_provision);
 
-err_kthread:
+err_provision:
 	kthread_stop(ksgxd_tsk);
 
-err_page_cache:
+err_reclaimer:
 	for (i = 0; i < sgx_nr_epc_sections; i++) {
 		vfree(sgx_epc_sections[i].pages);
 		memunmap(sgx_epc_sections[i].virt_addr);

Signature · 1 line

2.32.0

Jarkko Sakkinen

author maintainer

2021-11-02 16:48 UTC #1 lore raw

PATCH v10 2/2 x86/sgx: Add an attribute for the amount of SGX memory in a NUMA node

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/size. Calculate these values by summing up EPC section sizes for each node during the driver initalization.

Cc Greg Kroah-Hartman <[email protected]>

Signed-off-by Jarkko Sakkinen <[email protected]>

---
v10:
* Change DEVICE_ATTR_RO() to static (Greg K-H)
* Change the attribute name as sgx_total_bytes, and attribute group name as "x86" (Dave).
* Add a new config flag HAVE_ARCH_NODE_DEV_GROUP to identify, whether an arch exports arch specific attribute group for NUMA nodes.

v9:
* Fix racy initialization of sysfs attributes:
https://lore.kernel.org/linux-sgx/[email protected]/

v8:
* Fix a bug in sgx_numa_init(): node->dev should be only set after sysfe_create_group(). Otherwise, sysfs_remove_group() will issue a warning in sgx_numa_exit(), when sgx_create_group() is unsuccessful, because the group does not exist.

v7:
* Shorten memory_size to size. The prefix makes the name only longer but does not clarify things more than "size" would.
* Use device_attribute instead of kobj_attribute.
* Use named attribute group instead of creating raw kobject just for the "sgx" subdirectory.

v6:
* Initialize node->size to zero in sgx_setup_epc_section(), when the node is first accessed.

v5
* A new patch based on the discussion on
https://lore.kernel.org/linux-sgx/[email protected]/T/#t

---
 Documentation/ABI/stable/sysfs-devices-node |  7 +++++
 arch/Kconfig                                |  4 +++
 arch/x86/Kconfig                            |  1 +
 arch/x86/kernel/cpu/sgx/main.c              | 31 +++++++++++++++++++++
 arch/x86/kernel/cpu/sgx/sgx.h               |  2 ++
 drivers/base/node.c                         | 13 ++++++++-
 include/linux/numa.h                        |  4 +++
 7 files changed, 61 insertions(+), 1 deletion(-)

Documentation/ABI/stable/sysfs-devices-node +7 -0

index 484fc04bcc25..12dc2149e8e0 100644
@@ -176,3 +176,10 @@ Contact:	Keith Busch <[email protected]>
 Description:
 		The cache write policy: 0 for write-back, 1 for write-through,
 		other or unknown.
+
+What:		/sys/devices/system/node/nodeX/sgx/size
+Date:		October 2021
+Contact:	Jarkko Sakkinen <[email protected]>
+Description:
+		Total available physical SGX memory, also known as Enclave Page
+		Cache (EPC), in bytes.

arch/Kconfig +4 -0

index 98db63496bab..ca5d75b5a427 100644
@@ -1285,6 +1285,10 @@ config ARCH_HAS_ELFCORE_COMPAT
 config ARCH_HAS_PARANOID_L1D_FLUSH
 	bool
 
+# Select, if arch has a named attribute group bound to NUMA device nodes.
+config HAVE_ARCH_NODE_DEV_GROUP
+	bool
+
 source "kernel/gcov/Kconfig"
 
 source "scripts/gcc-plugins/Kconfig"

arch/x86/Kconfig +1 -0

index 421fa9e38c60..8503c3bdf63f 100644
@@ -266,6 +266,7 @@ config X86
 	select HAVE_ARCH_KCSAN			if X86_64
 	select X86_FEATURE_NAMES		if PROC_FS
 	select PROC_PID_ARCH_STATUS		if PROC_FS
+	select HAVE_ARCH_NODE_DEV_GROUP		if X86_SGX
 	imply IMA_SECURE_AND_OR_TRUSTED_BOOT    if EFI
 
 config INSTRUCTION_DECODER

arch/x86/kernel/cpu/sgx/main.c +31 -0

index a6e313f1a82d..02ebb233c511 100644
@@ -714,9 +714,12 @@ static bool __init sgx_page_cache_init(void)
 			spin_lock_init(&sgx_numa_nodes[nid].lock);
 			INIT_LIST_HEAD(&sgx_numa_nodes[nid].free_page_list);
 			node_set(nid, sgx_numa_mask);
+			sgx_numa_nodes[nid].size = 0;
 		}
 
 		sgx_epc_sections[i].node =  &sgx_numa_nodes[nid];
+		sgx_numa_nodes[nid].dev = &node_devices[nid]->dev;
+		sgx_numa_nodes[nid].size += size;
 
 		sgx_nr_epc_sections++;
 	}

@@ -790,6 +793,34 @@ int sgx_set_attribute(unsigned long *allowed_attributes,
 }
 EXPORT_SYMBOL_GPL(sgx_set_attribute);
 
+#ifdef CONFIG_NUMA
+static ssize_t sgx_total_bytes_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	unsigned long size = 0;
+	int nid;
+
+	for (nid = 0; nid < num_possible_nodes(); nid++) {
+		if (dev == sgx_numa_nodes[nid].dev) {
+			size = sgx_numa_nodes[nid].size;
+			break;
+		}
+	}
+
+	return sysfs_emit(buf, "%lu\n", size);
+}
+static DEVICE_ATTR_RO(sgx_total_bytes);
+
+static struct attribute *arch_node_dev_attrs[] = {
+	&dev_attr_sgx_total_bytes.attr,
+	NULL,
+};
+
+const struct attribute_group arch_node_dev_group = {
+	.name = "x86",
+	.attrs = arch_node_dev_attrs,
+};
+#endif /* CONFIG_NUMA */
+
 static int __init sgx_init(void)
 {
 	int ret;

arch/x86/kernel/cpu/sgx/sgx.h +2 -0

index 4628acec0009..1de8c627a286 100644
@@ -39,6 +39,8 @@ struct sgx_epc_page {
  */
 struct sgx_numa_node {
 	struct list_head free_page_list;
+	struct device *dev;
+	unsigned long size;
 	spinlock_t lock;
 };

drivers/base/node.c +12 -1

index 4a4ae868ad9f..8da977895b9a 100644
@@ -565,7 +565,18 @@ static struct attribute *node_dev_attrs[] = {
 	&dev_attr_vmstat.attr,
 	NULL
 };
-ATTRIBUTE_GROUPS(node_dev);
+
+static const struct attribute_group node_dev_group = {
+	.attrs = node_dev_attrs,
+};
+
+static const struct attribute_group *node_dev_groups[] = {
+	&node_dev_group,
+#ifdef CONFIG_HAVE_ARCH_NODE_DEV_GROUP
+	&arch_node_dev_group,
+#endif
+	NULL,
+};
 
 #ifdef CONFIG_HUGETLBFS
 /*

include/linux/numa.h +4 -0

index cb44cfe2b725..59df211d051f 100644
@@ -58,4 +58,8 @@ static inline int phys_to_target_node(u64 start)
 }
 #endif
 
+#ifdef CONFIG_HAVE_ARCH_NODE_DEV_GROUP
+extern const struct attribute_group arch_node_dev_group;
+#endif
+
 #endif /* _LINUX_NUMA_H */

Signature · 1 line

2.32.0

Greg Kroah-Hartman

maintainer

2021-11-02 17:04 UTC #2 lore raw

Re: [PATCH v10 2/2] x86/sgx: Add an attribute for the amount of SGX memory in a NUMA node

Quoted 2 lines · Jarkko Sakkinen

* Change the attribute name as sgx_total_bytes, and attribute group name as "x86" (Dave).

<snip>

Documentation/ABI/stable/sysfs-devices-node Contact: Keith Busch <[email protected]> · line 180

Quoted 8 lines

Documentation/ABI/stable/sysfs-devices-node +2 -0

@@ -176,3 +176,10 @@ Contact:	Keith Busch <[email protected]>
 Description:
 		The cache write policy: 0 for write-back, 1 for write-through,
 		other or unknown.
+
+What:		/sys/devices/system/node/nodeX/sgx/size

Looks like the attribute group name is still "sgx" :(

Jarkko Sakkinen

author maintainer

2021-11-02 20:12 UTC #3 lore raw

Re: [PATCH v10 2/2] x86/sgx: Add an attribute for the amount of SGX memory in a NUMA node

Quoted 6 lines · Greg Kroah-Hartman

Quoted 2 lines · Jarkko Sakkinen
* Change the attribute name as sgx_total_bytes, and attribute group name as "x86" (Dave).
<snip>

Quoted 10 lines

Documentation/ABI/stable/sysfs-devices-node Contact: Keith Busch <[email protected]> · line 180
Quoted 8 lines
Documentation/ABI/stable/sysfs-devices-node +0 -0
@@ -176,3 +176,10 @@ Contact:   Keith Busch <[email protected]>
Description:
The cache write policy: 0 for write-back, 1 for write-through, other or unknown.
Documentation/ABI/stable/sysfs-devices-node +2 -0
+
+What:          /sys/devices/system/node/nodeX/sgx/size
Looks like the attribute group name is still "sgx" :(

Ugh, also commit message needs an update. Thanks, I'll do fix this, apologies.

/Jarkko