linux-kernel - Re: [PATCH 01/01] x86: L3 cache index disable for 2.6.26

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20080728144913.GA16147@elte.hu>
Date:	Mon, 28 Jul 2008 16:49:13 +0200
From:	Ingo Molnar <mingo@...e.hu>
To:	Mark Langsdorf <mark.langsdorf@....com>
Cc:	tglx@...utronix.de, mingo@...hat.com, hpa@...or.com,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH 01/01] x86: L3 cache index disable for 2.6.26


* Ingo Molnar <mingo@...e.hu> wrote:

> > > please send a delta fix patch against the tip/x86/cpu branch:
> > > 
> > >   http://people.redhat.com/mingo/tip.git/README
> > > 
> > > which has your patch plus the cleanup applied.
> > 
> > delta fix patch follows.  It removes the dependency on k8_northbridges.
> 
> applied, thanks. I fixed up some whitespace damage, see below. That 
> file could use a thorough cleanup ...

it still doesnt work, on !PCI:

arch/x86/kernel/cpu/intel_cacheinfo.c: In function 'get_k8_northbridge':
arch/x86/kernel/cpu/intel_cacheinfo.c:675: error: implicit declaration of function 'pci_match_id'
make[2]: *** [arch/x86/kernel/cpu/intel_cacheinfo.o] Error 1

config and fix attached.

	Ingo

-------------->
>From 7571a249c8d8e577c1811ab12a06bc106ab466b7 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@...e.hu>
Date: Mon, 28 Jul 2008 16:45:49 +0200
Subject: [PATCH] x86: L3 cache index disable for 2.6.26, fix #2

fix !PCI build failure:

 arch/x86/kernel/cpu/intel_cacheinfo.c: In function 'get_k8_northbridge':
 arch/x86/kernel/cpu/intel_cacheinfo.c:675: error: implicit declaration of function 'pci_match_id'

Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
 arch/x86/kernel/cpu/intel_cacheinfo.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 0ea539f..3f46afb 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -135,11 +135,13 @@ struct _cpuid4_info {
 	cpumask_t shared_cpu_map;	/* future?: only cpus/node is needed */
 };
 
+#ifdef CONFIG_PCI
 static struct pci_device_id k8_nb_id[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1103) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1203) },
 	{}
 };
+#endif
 
 unsigned short			num_cache_leaves;
 
@@ -662,6 +664,7 @@ static ssize_t show_type(struct _cpuid4_info *this_leaf, char *buf) {
 #define to_object(k)	container_of(k, struct _index_kobject, kobj)
 #define to_attr(a)	container_of(a, struct _cache_attr, attr)
 
+#ifdef CONFIG_PCI
 static struct pci_dev *get_k8_northbridge(int node)
 {
 	struct pci_dev *dev = NULL;
@@ -678,6 +681,12 @@ static struct pci_dev *get_k8_northbridge(int node)
 	}
 	return dev;
 }
+#else
+static struct pci_dev *get_k8_northbridge(int node)
+{
+	return NULL;
+}
+#endif
 
 static ssize_t show_cache_disable(struct _cpuid4_info *this_leaf, char *buf)
 {

View attachment "config" of type "text/plain" (42798 bytes)