Skip to contentSkip to conversation

x86: cache_info: Bugfix and cleanups AMD_NB related

PATCH In review Thomas Gleixner 3 participants 9 messages Jul 24, 2011 – Sep 20, 2011 x86

lore
Share & tools
lore
#0 lore raw

cover x86: cache_info: Bugfix and cleanups AMD_NB related

The following series fixes a kfree() problem in the cache_info code and cleans up the shadow struct mess and gets rid of the atomic allocation in the smp function call.

Thanks,

tglx

---
 include/asm/amd_nb.h         |    6 ++
 kernel/cpu/intel_cacheinfo.c |  121 ++++++++++++++-----------------------------
 2 files changed, 47 insertions(+), 80 deletions(-)
#1 lore raw

PATCH 1/3 x86: cache_info: Remove bogus free of amd_l3_cache data

free_cache_attributes() kfree's:

per_cpu(ici_cpuid4_info, cpu)->l3

which is a pointer to memory which was allocated as a block in amd_init_l3_cache(). l3 of a particular cpu points to a part of this memory blob. The part and the rest of the blob are still referenced by other cpus.

As far as I can tell from the git history this is a leftover from the conversion from per cpu to node data with commit ba06edb63(x86,
cacheinfo: Make L3 cache info per node) and the following commit f658bcfb2(x86, cacheinfo: Cleanup L3 cache index disable support)

---
 arch/x86/kernel/cpu/intel_cacheinfo.c |    1 -
 1 file changed, 1 deletion(-)
arch/x86/kernel/cpu/intel_cacheinfo.c +0 -1
Index: linux-2.6/arch/x86/kernel/cpu/intel_cacheinfo.c
===================================================================
@@ -820,7 +820,6 @@ static void __cpuinit free_cache_attribu
 	for (i = 0; i < num_cache_leaves; i++)
 		cache_remove_shared_cpu_map(cpu, i);
 
-	kfree(per_cpu(ici_cpuid4_info, cpu)->l3);
 	kfree(per_cpu(ici_cpuid4_info, cpu));
 	per_cpu(ici_cpuid4_info, cpu) = NULL;
 }
#2 lore raw

PATCH 2/3 x86: cache_info: Kill the moronic shadow struct

In reply to Thomas Gleixner

commit f9b90566c (x86: reduce stack usage in init_intel_cacheinfo) introduced a shadow structure to reduce the stack usage on large machines instead of making the smaller structure embedded into the large one. That's definitely a candidate for the bad taste award.

Move the small struct into the large one and get rid of the ugly type casts.

---
 arch/x86/kernel/cpu/intel_cacheinfo.c |   60 ++++++++++++----------------------
 1 file changed, 22 insertions(+), 38 deletions(-)
arch/x86/kernel/cpu/intel_cacheinfo.c +22 -38
Index: linux-2.6/arch/x86/kernel/cpu/intel_cacheinfo.c
===================================================================
@@ -157,22 +157,17 @@ struct amd_l3_cache {
 	u8	 subcaches[4];
 };
 
-struct _cpuid4_info {
+struct _cpuid4_info_regs {
 	union _cpuid4_leaf_eax eax;
 	union _cpuid4_leaf_ebx ebx;
 	union _cpuid4_leaf_ecx ecx;
 	unsigned long size;
 	struct amd_l3_cache *l3;
-	DECLARE_BITMAP(shared_cpu_map, NR_CPUS);
 };
 
-/* subset of above _cpuid4_info w/o shared_cpu_map */
-struct _cpuid4_info_regs {
-	union _cpuid4_leaf_eax eax;
-	union _cpuid4_leaf_ebx ebx;
-	union _cpuid4_leaf_ecx ecx;
-	unsigned long size;
-	struct amd_l3_cache *l3;
+struct _cpuid4_info {
+	struct _cpuid4_info_regs base;
+	DECLARE_BITMAP(shared_cpu_map, NR_CPUS);
 };
 
 unsigned short			num_cache_leaves;
@@ -387,11 +382,10 @@ static ssize_t show_cache_disable(struct
 {
 	int index;
 
-	if (!this_leaf->l3 ||
-	    !amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
+	if (!this_leaf->base.l3 || !amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
 		return -EINVAL;
 
-	index = amd_get_l3_disable_slot(this_leaf->l3, slot);
+	index = amd_get_l3_disable_slot(this_leaf->base.l3, slot);
 	if (index >= 0)
 		return sprintf(buf, "%d\n", index);
 
@@ -480,8 +474,7 @@ static ssize_t store_cache_disable(struc
 	if (!capable(CAP_SYS_ADMIN))
 		return -EPERM;
 
-	if (!this_leaf->l3 ||
-	    !amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
+	if (!this_leaf->base.l3 || !amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
 		return -EINVAL;
 
 	cpu = cpumask_first(to_cpumask(this_leaf->shared_cpu_map));
@@ -489,7 +482,7 @@ static ssize_t store_cache_disable(struc
 	if (strict_strtoul(buf, 10, &val) < 0)
 		return -EINVAL;
 
-	err = amd_set_l3_disable_slot(this_leaf->l3, cpu, slot, val);
+	err = amd_set_l3_disable_slot(this_leaf->base.l3, cpu, slot, val);
 	if (err) {
 		if (err == -EEXIST)
 			printk(KERN_WARNING "L3 disable slot %d in use!\n",
@@ -518,7 +511,7 @@ static struct _cache_attr cache_disable_
 static ssize_t
 show_subcaches(struct _cpuid4_info *this_leaf, char *buf, unsigned int cpu)
 {
-	if (!this_leaf->l3 || !amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
+	if (!this_leaf->base.l3 || !amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
 		return -EINVAL;
 
 	return sprintf(buf, "%x\n", amd_get_subcaches(cpu));
@@ -533,7 +526,7 @@ store_subcaches(struct _cpuid4_info *thi
 	if (!capable(CAP_SYS_ADMIN))
 		return -EPERM;
 
-	if (!this_leaf->l3 || !amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
+	if (!this_leaf->base.l3 || !amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
 		return -EINVAL;
 
 	if (strict_strtoul(buf, 16, &val) < 0)
@@ -769,7 +762,7 @@ static void __cpuinit cache_shared_cpu_m
 		return;
 	}
 	this_leaf = CPUID4_INFO_IDX(cpu, index);
-	num_threads_sharing = 1 + this_leaf->eax.split.num_threads_sharing;
+	num_threads_sharing = 1 + this_leaf->base.eax.split.num_threads_sharing;
 
 	if (num_threads_sharing == 1)
 		cpumask_set_cpu(cpu, to_cpumask(this_leaf->shared_cpu_map));
@@ -824,24 +817,15 @@ static void __cpuinit free_cache_attribu
 	per_cpu(ici_cpuid4_info, cpu) = NULL;
 }
 
-static int
-__cpuinit cpuid4_cache_lookup(int index, struct _cpuid4_info *this_leaf)
-{
-	struct _cpuid4_info_regs *leaf_regs =
-		(struct _cpuid4_info_regs *)this_leaf;
-
-	return cpuid4_cache_lookup_regs(index, leaf_regs);
-}
-
 static void __cpuinit get_cpu_leaves(void *_retval)
 {
 	int j, *retval = _retval, cpu = smp_processor_id();
 
 	/* Do cpuid and store the results */
 	for (j = 0; j < num_cache_leaves; j++) {
-		struct _cpuid4_info *this_leaf;
-		this_leaf = CPUID4_INFO_IDX(cpu, j);
-		*retval = cpuid4_cache_lookup(j, this_leaf);
+		struct _cpuid4_info *this_leaf = CPUID4_INFO_IDX(cpu, j);
+
+		*retval = cpuid4_cache_lookup_regs(j, &this_leaf->base);
 		if (unlikely(*retval < 0)) {
 			int i;
 
@@ -899,16 +883,16 @@ static ssize_t show_##file_name(struct _
 	return sprintf(buf, "%lu\n", (unsigned long)this_leaf->object + val); \
 }
 
-show_one_plus(level, eax.split.level, 0);
-show_one_plus(coherency_line_size, ebx.split.coherency_line_size, 1);
-show_one_plus(physical_line_partition, ebx.split.physical_line_partition, 1);
-show_one_plus(ways_of_associativity, ebx.split.ways_of_associativity, 1);
-show_one_plus(number_of_sets, ecx.split.number_of_sets, 1);
+show_one_plus(level, base.eax.split.level, 0);
+show_one_plus(coherency_line_size, base.ebx.split.coherency_line_size, 1);
+show_one_plus(physical_line_partition, base.ebx.split.physical_line_partition, 1);
+show_one_plus(ways_of_associativity, base.ebx.split.ways_of_associativity, 1);
+show_one_plus(number_of_sets, base.ecx.split.number_of_sets, 1);
 
 static ssize_t show_size(struct _cpuid4_info *this_leaf, char *buf,
 			 unsigned int cpu)
 {
-	return sprintf(buf, "%luK\n", this_leaf->size / 1024);
+	return sprintf(buf, "%luK\n", this_leaf->base.size / 1024);
 }
 
 static ssize_t show_shared_cpu_map_func(struct _cpuid4_info *this_leaf,
@@ -945,7 +929,7 @@ static inline ssize_t show_shared_cpu_li
 static ssize_t show_type(struct _cpuid4_info *this_leaf, char *buf,
 			 unsigned int cpu)
 {
-	switch (this_leaf->eax.split.type) {
+	switch (this_leaf->base.eax.split.type) {
 	case CACHE_TYPE_DATA:
 		return sprintf(buf, "Data\n");
 	case CACHE_TYPE_INST:
@@ -1134,7 +1118,7 @@ static int __cpuinit cache_add_dev(struc
 
 		ktype_cache.default_attrs = default_attrs;
 #ifdef CONFIG_AMD_NB
-		if (this_leaf->l3)
+		if (this_leaf->base.l3)
 			ktype_cache.default_attrs = amd_l3_attrs();
 #endif
 		retval = kobject_init_and_add(&(this_object->kobj),
#3 lore raw

PATCH 3/3 x86: cache_info: Kill the atomic allocation in amd_init_l3_cache()

In reply to Thomas Gleixner

It's not a good reason to allocate memory in the smp function call just because someone thought it's the most conveniant place.

The AMD L3 data is coupled to the northbridge info by a pointer to the corresponding north bridge data. So allocating it with the northbridge data and referencing the northbridge in the cache_info code instead uses less memory and gets rid of that atomic allocation hack in the smp function call.

---
 arch/x86/include/asm/amd_nb.h         |    6 ++
 arch/x86/kernel/cpu/intel_cacheinfo.c |   74 +++++++++++-----------------------
 2 files changed, 32 insertions(+), 48 deletions(-)
arch/x86/include/asm/amd_nb.h +6 -0
Index: linux-2.6/arch/x86/include/asm/amd_nb.h
===================================================================
@@ -19,9 +19,15 @@ extern int amd_numa_init(void);
 extern int amd_get_subcaches(int);
 extern int amd_set_subcaches(int, int);
 
+struct amd_l3_cache {
+	unsigned indices;
+	u8	 subcaches[4];
+};
+
 struct amd_northbridge {
 	struct pci_dev *misc;
 	struct pci_dev *link;
+	struct amd_l3_cache l3_cache;
 };
 
 struct amd_northbridge_info {
arch/x86/kernel/cpu/intel_cacheinfo.c +26 -48

193 lines not on this page · raw message

maintainer
#4 lore raw

Re: [patch 3/3] x86: cache_info: Kill the atomic allocation in amd_init_l3_cache()

Quoted 8 lines · Thomas Gleixner

It's not a good reason to allocate memory in the smp function call just because someone thought it's the most conveniant place.

The AMD L3 data is coupled to the northbridge info by a pointer to the corresponding north bridge data. So allocating it with the northbridge data and referencing the northbridge in the cache_info code instead uses less memory and gets rid of that atomic allocation hack in the smp function call.

Nice, much better.

See for a minor nitpick below.

Quoted 68 lines
---
 arch/x86/include/asm/amd_nb.h         |    6 ++
 arch/x86/kernel/cpu/intel_cacheinfo.c |   74 +++++++++++-----------------------
 2 files changed, 32 insertions(+), 48 deletions(-)

Index: linux-2.6/arch/x86/include/asm/amd_nb.h
===================================================================

arch/x86/include/asm/amd_nb.h +6 -0
@@ -19,9 +19,15 @@ extern int amd_numa_init(void);
 extern int amd_get_subcaches(int);
 extern int amd_set_subcaches(int, int);
 
+struct amd_l3_cache {
+	unsigned indices;
+	u8	 subcaches[4];
+};
+
 struct amd_northbridge {
 	struct pci_dev *misc;
 	struct pci_dev *link;
+	struct amd_l3_cache l3_cache;
 };
 
 struct amd_northbridge_info {

Index: linux-2.6/arch/x86/kernel/cpu/intel_cacheinfo.c
===================================================================

arch/x86/kernel/cpu/intel_cacheinfo.c +4 -9
@@ -151,18 +151,12 @@ union _cpuid4_leaf_ecx {
 	u32 full;
 };
 
-struct amd_l3_cache {
-	struct	 amd_northbridge *nb;
-	unsigned indices;
-	u8	 subcaches[4];
-};
-
 struct _cpuid4_info_regs {
 	union _cpuid4_leaf_eax eax;
 	union _cpuid4_leaf_ebx ebx;
 	union _cpuid4_leaf_ecx ecx;
 	unsigned long size;
-	struct amd_l3_cache *l3;
+	struct amd_northbridge *nb;
 };
 
 struct _cpuid4_info {
@@ -309,12 +303,13 @@ struct _cache_attr {
 /*
  * L3 cache descriptors
  */
-static void __cpuinit amd_calc_l3_indices(struct amd_l3_cache *l3)
+static void __cpuinit amd_calc_l3_indices(struct amd_northbridge *nb)
 {
+	struct amd_l3_cache *l3 = &nb->l3_cache;
 	unsigned int sc0, sc1, sc2, sc3;
 	u32 val = 0;
 
-	pci_read_config_dword(l3->nb->misc, 0x1C4, &val);
+	pci_read_config_dword(nb->misc, 0x1C4, &val);
 
 	/* calculate subcache sizes */
 	l3->subcaches[0] = sc0 = !(val & BIT(0));

arch/x86/kernel/cpu/intel_cacheinfo.c static void __cpuinit amd_calc_l3_indice · line 330

Quoted 10 lines
arch/x86/kernel/cpu/intel_cacheinfo.c +1 -2
@@ -328,33 +323,16 @@ static void __cpuinit amd_calc_l3_indice
 static void __cpuinit amd_init_l3_cache(struct _cpuid4_info_regs *this_leaf,
 					int index)
 {
-	static struct amd_l3_cache *__cpuinitdata l3_caches;
 	int node;
 
 	/* only for L3, and not in virtualized environments */
-	if (index < 3 || amd_nb_num() == 0)
+	if (index < 3)
 		return;

AFAICT, we still need the "amd_nb_num() == 0" check for xen because it doesn't export NB PCI devices to the guest, see f2b20e41...

Quoted 12 lines
arch/x86/kernel/cpu/intel_cacheinfo.c +0 -11
-	/*
-	 * Strictly speaking, the amount in @size below is leaked since it is
-	 * never freed but this is done only on shutdown so it doesn't matter.
-	 */
-	if (!l3_caches) {
-		int size = amd_nb_num() * sizeof(struct amd_l3_cache);
-
-		l3_caches = kzalloc(size, GFP_ATOMIC);
-		if (!l3_caches)
-			return;
-	}

arch/x86/kernel/cpu/intel_cacheinfo.c static void __cpuinit amd_calc_l3_indice · line 333

Quoted 10 lines
arch/x86/kernel/cpu/intel_cacheinfo.c +1 -8
-
 	node = amd_get_nb_id(smp_processor_id());
-
-	if (!l3_caches[node].nb) {
-		l3_caches[node].nb = node_to_amd_nb(node);
-		amd_calc_l3_indices(&l3_caches[node]);
-	}
-
-	this_leaf->l3 = &l3_caches[node];
+	this_leaf->nb = node_to_amd_nb(node);

although, on a second thought, node_to_amd_nb(node) should return NULL since the AMD NB caching code shouldnt've enumerated any NB devices and

arch/x86/kernel/cpu/intel_cacheinfo.c static void __cpuinit amd_calc_l3_indice · line 335

Quoted 2 lines
arch/x86/kernel/cpu/intel_cacheinfo.c +2 -0
+	if (this_leaf->nb && !this_leaf->nb->l3_cache.indices)
+		amd_calc_l3_indices(this_leaf->nb);

this check should fail. Hm.

Let me test the patchset on Monday to verify there are no other subtle interactions I haven't thought of right now.

Thanks.

Signature · 2 lines
Regards/Gruss,
    Boris.
#5 lore raw

Re: [patch 3/3] x86: cache_info: Kill the atomic allocation in amd_init_l3_cache()

Quoted 36 lines · Borislav Petkov

arch/x86/kernel/cpu/intel_cacheinfo.c static void __cpuinit amd_calc_l3_indice · line 330

Quoted 5 lines · Thomas Gleixner
arch/x86/kernel/cpu/intel_cacheinfo.c +1 -1
 	/* only for L3, and not in virtualized environments */
-	if (index < 3 || amd_nb_num() == 0)
+	if (index < 3)
 		return;

AFAICT, we still need the "amd_nb_num() == 0" check for xen because it doesn't export NB PCI devices to the guest, see f2b20e41...

Quoted 12 lines
arch/x86/kernel/cpu/intel_cacheinfo.c +0 -11
-	/*
-	 * Strictly speaking, the amount in @size below is leaked since it is
-	 * never freed but this is done only on shutdown so it doesn't matter.
-	 */
-	if (!l3_caches) {
-		int size = amd_nb_num() * sizeof(struct amd_l3_cache);
-
-		l3_caches = kzalloc(size, GFP_ATOMIC);
-		if (!l3_caches)
-			return;
-	}

arch/x86/kernel/cpu/intel_cacheinfo.c static void __cpuinit amd_calc_l3_indice · line 333

Quoted 10 lines
arch/x86/kernel/cpu/intel_cacheinfo.c +1 -8
-
 	node = amd_get_nb_id(smp_processor_id());
-
-	if (!l3_caches[node].nb) {
-		l3_caches[node].nb = node_to_amd_nb(node);
-		amd_calc_l3_indices(&l3_caches[node]);
-	}
-
-	this_leaf->l3 = &l3_caches[node];
+	this_leaf->nb = node_to_amd_nb(node);

although, on a second thought, node_to_amd_nb(node) should return NULL since the AMD NB caching code shouldnt've enumerated any NB devices and

Quoted 4 lines

arch/x86/kernel/cpu/intel_cacheinfo.c static void __cpuinit amd_calc_l3_indice · line 335

Quoted 2 lines
arch/x86/kernel/cpu/intel_cacheinfo.c +2 -0
+	if (this_leaf->nb && !this_leaf->nb->l3_cache.indices)
+		amd_calc_l3_indices(this_leaf->nb);

this check should fail. Hm.

Right, that was my thought.

Quoted 2 lines

Let me test the patchset on Monday to verify there are no other subtle interactions I haven't thought of right now.

Thanks,

tglx

#6 lore raw

Re: [patch 3/3] x86: cache_info: Kill the atomic allocation in amd_init_l3_cache()

Quoted 2 lines · Thomas Gleixner
Quoted 2 lines

Let me test the patchset on Monday to verify there are no other subtle interactions I haven't thought of right now.

Yep, patches look good and boot as a xen guest too.

While you're at it, can you please also apply the following one which updates L3 size calculation on F15h?

Thanks.

--
From: Frank Arnold <[email protected]>
Date: Wed, 18 May 2011 11:32:10 +0200
Subject: [PATCH] x86, AMD, cacheinfo: Update calculation of L3 cache indices

L3 subcaches 0 and 1 of AMD Family 15h CPUs can have a size of 2MB. Update the calculation routine for the number of L3 indices to reflect that.

---
 arch/x86/kernel/cpu/intel_cacheinfo.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
arch/x86/kernel/cpu/intel_cacheinfo.c +6 -0
index 951820f..a3b0811 100644
@@ -314,6 +314,12 @@ static void __cpuinit amd_calc_l3_indices(struct amd_northbridge *nb)
 	/* calculate subcache sizes */
 	l3->subcaches[0] = sc0 = !(val & BIT(0));
 	l3->subcaches[1] = sc1 = !(val & BIT(4));
+
+	if (boot_cpu_data.x86 == 0x15) {
+		l3->subcaches[0] = sc0 += !(val & BIT(1));
+		l3->subcaches[1] = sc1 += !(val & BIT(5));
+	}
+
 	l3->subcaches[2] = sc2 = !(val & BIT(8))  + !(val & BIT(9));
 	l3->subcaches[3] = sc3 = !(val & BIT(12)) + !(val & BIT(13));
 
Signature · 12 lines
1.7.6.134.gcf13f6


-- 
Regards/Gruss,
Boris.

Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551
#7 lore raw
In reply to Thomas Gleixner
Quoted 11 lines · Thomas Gleixner

The following series fixes a kfree() problem in the cache_info code and cleans up the shadow struct mess and gets rid of the atomic allocation in the smp function call.

Thanks,

tglx

---
 include/asm/amd_nb.h         |    6 ++
 kernel/cpu/intel_cacheinfo.c |  121 ++++++++++++++-----------------------------
 2 files changed, 47 insertions(+), 80 deletions(-)

/me wonders whatever happened to those?

Signature · 8 lines
Regards/Gruss,
Boris.

Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551
#8 lore raw
Quoted 7 lines · Borislav Petkov
Quoted 6 lines · Thomas Gleixner

The following series fixes a kfree() problem in the cache_info code and cleans up the shadow struct mess and gets rid of the atomic allocation in the smp function call.

Thanks,

Quoted 7 lines
Quoted 5 lines

tglx

---
 include/asm/amd_nb.h         |    6 ++
 kernel/cpu/intel_cacheinfo.c |  121 ++++++++++++++-----------------------------
 2 files changed, 47 insertions(+), 80 deletions(-)

/me wonders whatever happened to those?

queued in tip and they should be in next as well.