Merge branch 'acpi-numa' (e4174ff7) · Commits · 戴 / test

Documentation/admin-guide/mm/numaperf.rst

+8 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,11 @@ nodes' access characteristics share the same performance relative to other
		linked initiator nodes. Each target within an initiator's access class,
		though, do not necessarily perform the same as each other.

		The access class "1" is used to allow differentiation between initiators
		that are CPUs and hence suitable for generic task scheduling, and
		IO initiators such as GPUs and NICs. Unlike access class 0, only
		nodes containing CPUs are considered.

		================
		NUMA Performance
		================
		@@ -88,6 +93,9 @@ The latency attributes are provided in nanoseconds.
		The values reported here correspond to the rated latency and bandwidth
		for the platform.

		Access class 1 takes the same form but only includes values for CPU to
		memory activity.

		==========
		NUMA Cache
		==========

+2 −0

Original line number	Diff line number	Diff line
		@@ -62,12 +62,14 @@ extern void numa_clear_node(int cpu);
		extern void __init init_cpu_to_node(void);
		extern void numa_add_cpu(int cpu);
		extern void numa_remove_cpu(int cpu);
		extern void init_gi_nodes(void);
		#else /* CONFIG_NUMA */
		static inline void numa_set_node(int cpu, int node) { }
		static inline void numa_clear_node(int cpu) { }
		static inline void init_cpu_to_node(void) { }
		static inline void numa_add_cpu(int cpu) { }
		static inline void numa_remove_cpu(int cpu) { }
		static inline void init_gi_nodes(void) { }
		#endif /* CONFIG_NUMA */

		#ifdef CONFIG_DEBUG_PER_CPU_MAPS

+1 −0

Original line number	Diff line number	Diff line
		@@ -1218,6 +1218,7 @@ void __init setup_arch(char **cmdline_p)
		prefill_possible_map();

		init_cpu_to_node();
		init_gi_nodes();

		io_apic_init_mappings();

+21 −0

Original line number	Diff line number	Diff line
		@@ -747,6 +747,27 @@ static void __init init_memory_less_node(int nid)
		*/
		}

		/*
		* A node may exist which has one or more Generic Initiators but no CPUs and no
		* memory.
		*
		* This function must be called after init_cpu_to_node(), to ensure that any
		* memoryless CPU nodes have already been brought online, and before the
		* node_data[nid] is needed for zone list setup in build_all_zonelists().
		*
		* When this function is called, any nodes containing either memory and/or CPUs
		* will already be online and there is no need to do anything extra, even if
		* they also contain one or more Generic Initiators.
		*/
		void __init init_gi_nodes(void)
		{
		int nid;

		for_each_node_state(nid, N_GENERIC_INITIATOR)
		if (!node_online(nid))
		init_memory_less_node(nid);
		}

		/*
		* Setup early cpu_to_node.
		*

+1 −1

Original line number	Diff line number	Diff line
		@@ -1335,7 +1335,7 @@ static int __init arm_smmu_v3_set_proximity(struct device *dev,

		smmu = (struct acpi_iort_smmu_v3 *)node->node_data;
		if (smmu->flags & ACPI_IORT_SMMU_V3_PXM_VALID) {
		int dev_node = acpi_map_pxm_to_node(smmu->pxm);
		int dev_node = pxm_to_node(smmu->pxm);

		if (dev_node != NUMA_NO_NODE && !node_online(dev_node))
		return -EINVAL;