[PATCH] perf/x86/uncore: fix missing end markers for SNB/IVB/HSW IMC PMU

[PATCH] perf/x86/uncore: fix missing end markers for SNB/IVB/HSW IMC PMU

[Stephane Eranian]

This patch fixes a bug with the SNB/IVB/HSW uncore
mmeory controller support.

The PCI Ids tables for the memory controller were missing end markers.
That could cause random crashes on boot during or after PCI device
registration.

Signed-off-by: Stephane Erainan <eranian@google.com>
--
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index f509ab1..bd2253d 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -1989,6 +1989,7 @@ static DEFINE_PCI_DEVICE_TABLE(snb_uncore_pci_ids) = {
 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SNB_IMC),
 		.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
 	},
+	{ /* end: all zeroes */ },
 };
 
 static DEFINE_PCI_DEVICE_TABLE(ivb_uncore_pci_ids) = {
@@ -1996,6 +1997,7 @@ static DEFINE_PCI_DEVICE_TABLE(ivb_uncore_pci_ids) = {
 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IVB_IMC),
 		.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
 	},
+	{ /* end: all zeroes */ },
 };
 
 static DEFINE_PCI_DEVICE_TABLE(hsw_uncore_pci_ids) = {
@@ -2003,6 +2005,7 @@ static DEFINE_PCI_DEVICE_TABLE(hsw_uncore_pci_ids) = {
 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HSW_IMC),
 		.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
 	},
+	{ /* end: all zeroes */ },
 };
 
 static struct pci_driver snb_uncore_pci_driver = {

Re: [PATCH] perf/x86/uncore: fix missing end markers for SNB/IVB/HSW IMC PMU

[Andi Kleen]

Stephane Eranian <eranian@google.com> writes:

> This patch fixes a bug with the SNB/IVB/HSW uncore
> mmeory controller support.
>
> The PCI Ids tables for the memory controller were missing end markers.
> That could cause random crashes on boot during or after PCI device
> registration.

I wonder if there's a way to check this in checkpatch.pl ?

Or maybe a sparse check could be added, with a new type attribute 
that says "needs to be 0 terminate"

-Andi

-- 
ak@linux.intel.com -- Speaking for myself only

Re: [PATCH] perf/x86/uncore: fix missing end markers for SNB/IVB/HSW IMC PMU

[Stephane Eranian]

On Thu, Mar 13, 2014 at 6:17 PM, Andi Kleen <andi@firstfloor.org> wrote:
> Stephane Eranian <eranian@google.com> writes:
>
>> This patch fixes a bug with the SNB/IVB/HSW uncore
>> mmeory controller support.
>>
>> The PCI Ids tables for the memory controller were missing end markers.
>> That could cause random crashes on boot during or after PCI device
>> registration.
>
> I wonder if there's a way to check this in checkpatch.pl ?
>
> Or maybe a sparse check could be added, with a new type attribute
> that says "needs to be 0 terminate"
>
Not that easy , because in some cases, the size may be passed as a parameter
to the call or maybe embedded into a struct passed to the call.
But if you target this specific macro, you should be able to find the issues.

> -Andi
>
> --
> ak@linux.intel.com -- Speaking for myself only

[tip:perf/core] perf/x86/uncore: Fix missing end markers for SNB/ IVB/HSW IMC PMU

[tip-bot for Stephane Eranian]

Commit-ID:  81827ed8d85e892311965dc9ec4120b2b2e745bd
Gitweb:     http://git.kernel.org/tip/81827ed8d85e892311965dc9ec4120b2b2e745bd
Author:     Stephane Eranian <eranian@google.com>
AuthorDate: Thu, 13 Mar 2014 13:04:36 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 14 Mar 2014 09:25:25 +0100

perf/x86/uncore: Fix missing end markers for SNB/IVB/HSW IMC PMU

This patch fixes a bug with the SNB/IVB/HSW uncore
mmeory controller support.

The PCI Ids tables for the memory controller were missing end
markers. That could cause random crashes on boot during or after
PCI device registration.

Signed-off-by: Stephane Erainan <eranian@google.com>
Cc: peterz@infradead.org
Cc: zheng.z.yan@intel.com
Cc: bp@alien8.de
Cc: ak@linux.intel.com
Link: http://lkml.kernel.org/r/20140313120436.GA14236@quad
Signed-off-by: Ingo Molnar <mingo@kernel.org>
--
---
 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index dfd50ea..618d502 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -1989,6 +1989,7 @@ static DEFINE_PCI_DEVICE_TABLE(snb_uncore_pci_ids) = {
 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SNB_IMC),
 		.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
 	},
+	{ /* end: all zeroes */ },
 };
 
 static DEFINE_PCI_DEVICE_TABLE(ivb_uncore_pci_ids) = {
@@ -1996,6 +1997,7 @@ static DEFINE_PCI_DEVICE_TABLE(ivb_uncore_pci_ids) = {
 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IVB_IMC),
 		.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
 	},
+	{ /* end: all zeroes */ },
 };
 
 static DEFINE_PCI_DEVICE_TABLE(hsw_uncore_pci_ids) = {
@@ -2003,6 +2005,7 @@ static DEFINE_PCI_DEVICE_TABLE(hsw_uncore_pci_ids) = {
 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HSW_IMC),
 		.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
 	},
+	{ /* end: all zeroes */ },
 };
 
 static struct pci_driver snb_uncore_pci_driver = {