[PATCH] x86/pci: fix dmar_tbl early_ioremap leak v2

[PATCH] x86/pci: fix dmar_tbl early_ioremap leak v2

[Yinghai Lu]

use early_acpi_os_unmap_memory

v2: move unmap_memory early...

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>

---
 drivers/pci/dmar.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Index: linux-2.6/drivers/pci/dmar.c
===================================================================
--- linux-2.6.orig/drivers/pci/dmar.c
+++ linux-2.6/drivers/pci/dmar.c
@@ -42,6 +42,7 @@
 LIST_HEAD(dmar_drhd_units);
 
 static struct acpi_table_header * __initdata dmar_tbl;
+static acpi_size __initdata dmar_tbl_size;
 
 static void __init dmar_register_drhd_unit(struct dmar_drhd_unit *drhd)
 {
@@ -297,8 +298,9 @@ static int __init dmar_table_detect(void
 	acpi_status status = AE_OK;
 
 	/* if we could find DMAR table, then there are DMAR devices */
-	status = acpi_get_table(ACPI_SIG_DMAR, 0,
-				(struct acpi_table_header **)&dmar_tbl);
+	status = acpi_get_table_with_size(ACPI_SIG_DMAR, 0,
+				(struct acpi_table_header **)&dmar_tbl,
+				&dmar_tbl_size);
 
 	if (ACPI_SUCCESS(status) && !dmar_tbl) {
 		printk (KERN_WARNING PREFIX "Unable to map DMAR\n");
@@ -493,6 +495,9 @@ void __init detect_intel_iommu(void)
 	}
 end:
 #endif
+	if (dmar_tbl)
+		early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
+
 	dmar_tbl = NULL;
 }
 

Re: [PATCH] x86/pci: fix dmar_tbl early_ioremap leak v2

[Ingo Molnar]

* Yinghai Lu <yhlu.kernel@gmail.com> wrote:

> use early_acpi_os_unmap_memory
> 
> v2: move unmap_memory early...
> 
> Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
> 
> ---
>  drivers/pci/dmar.c |    9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)

since this depends on other x2apic/sparseirq changes in -tip i've 
applied it to tip/irq/sparseirq.

Jesse, any objections?

	Ingo

Re: [PATCH] x86/pci: fix dmar_tbl early_ioremap leak v2

[Jesse Barnes]

On Thursday, September 25, 2008 1:11 am Ingo Molnar wrote:
> * Yinghai Lu <yhlu.kernel@gmail.com> wrote:
> > use early_acpi_os_unmap_memory
> >
> > v2: move unmap_memory early...
> >
> > Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
> >
> > ---
> >  drivers/pci/dmar.c |    9 +++++++--
> >  1 file changed, 7 insertions(+), 2 deletions(-)
>
> since this depends on other x2apic/sparseirq changes in -tip i've
> applied it to tip/irq/sparseirq.
>
> Jesse, any objections?

Nope, but it would be good to get Dave or Mark's ack (Dave owns this code 
now).

Jesse

Re: [PATCH] x86/pci: fix dmar_tbl early_ioremap leak v2

[David Woodhouse]

On Thu, 2008-09-25 at 07:43 -0700, Jesse Barnes wrote:
> On Thursday, September 25, 2008 1:11 am Ingo Molnar wrote:
> > * Yinghai Lu <yhlu.kernel@gmail.com> wrote:
> > > use early_acpi_os_unmap_memory
> > >
> > > v2: move unmap_memory early...
> > >
> > > Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
> > >
> > > ---
> > >  drivers/pci/dmar.c |    9 +++++++--
> > >  1 file changed, 7 insertions(+), 2 deletions(-)
> >
> > since this depends on other x2apic/sparseirq changes in -tip i've
> > applied it to tip/irq/sparseirq.
> >
> > Jesse, any objections?
> 
> Nope, but it would be good to get Dave or Mark's ack (Dave owns this code 
> now).

I own the code in theory, but am not yet sufficiently competent.

My VT-d hardware arrived just before I left the country for KS+LPC, so
is gathering dust in my absence. I get home this weekend.

_Next_ week, if you see me thinking about _anything_ other than the
IOMMU, please slap me.

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation

Re: [PATCH] x86/pci: fix dmar_tbl early_ioremap leak v2

[mark gross]

On Thu, Sep 25, 2008 at 07:43:34AM -0700, Jesse Barnes wrote:
> On Thursday, September 25, 2008 1:11 am Ingo Molnar wrote:
> > * Yinghai Lu <yhlu.kernel@gmail.com> wrote:
> > > use early_acpi_os_unmap_memory
> > >
> > > v2: move unmap_memory early...
> > >
> > > Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
> > >
> > > ---
> > >  drivers/pci/dmar.c |    9 +++++++--
> > >  1 file changed, 7 insertions(+), 2 deletions(-)
> >
> > since this depends on other x2apic/sparseirq changes in -tip i've
> > applied it to tip/irq/sparseirq.
> >
> > Jesse, any objections?
> 
> Nope, but it would be good to get Dave or Mark's ack (Dave owns this code 
> now).
>
Sorry for the dumb question but where is acpi_get_table_with_size
defined?  Its not in linus's git. /me goes and gets linux-next...

--mgross
 

Re: [PATCH] x86/pci: fix dmar_tbl early_ioremap leak v2

[Yinghai Lu]

On Thu, Sep 25, 2008 at 9:24 AM, mark gross <mgross@linux.intel.com> wrote:
> On Thu, Sep 25, 2008 at 07:43:34AM -0700, Jesse Barnes wrote:
>> On Thursday, September 25, 2008 1:11 am Ingo Molnar wrote:
>> > * Yinghai Lu <yhlu.kernel@gmail.com> wrote:
>> > > use early_acpi_os_unmap_memory
>> > >
>> > > v2: move unmap_memory early...
>> > >
>> > > Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
>> > >
>> > > ---
>> > >  drivers/pci/dmar.c |    9 +++++++--
>> > >  1 file changed, 7 insertions(+), 2 deletions(-)
>> >
>> > since this depends on other x2apic/sparseirq changes in -tip i've
>> > applied it to tip/irq/sparseirq.
>> >
>> > Jesse, any objections?
>>
>> Nope, but it would be good to get Dave or Mark's ack (Dave owns this code
>> now).
>>
> Sorry for the dumb question but where is acpi_get_table_with_size
> defined?  Its not in linus's git. /me goes and gets linux-next...
>

in tip/master

YH

Re: [PATCH] x86/pci: fix dmar_tbl early_ioremap leak v2

[Ingo Molnar]

* Yinghai Lu <yinghai@kernel.org> wrote:

> On Thu, Sep 25, 2008 at 9:24 AM, mark gross <mgross@linux.intel.com> wrote:
> > On Thu, Sep 25, 2008 at 07:43:34AM -0700, Jesse Barnes wrote:
> >> On Thursday, September 25, 2008 1:11 am Ingo Molnar wrote:
> >> > * Yinghai Lu <yhlu.kernel@gmail.com> wrote:
> >> > > use early_acpi_os_unmap_memory
> >> > >
> >> > > v2: move unmap_memory early...
> >> > >
> >> > > Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
> >> > >
> >> > > ---
> >> > >  drivers/pci/dmar.c |    9 +++++++--
> >> > >  1 file changed, 7 insertions(+), 2 deletions(-)
> >> >
> >> > since this depends on other x2apic/sparseirq changes in -tip i've
> >> > applied it to tip/irq/sparseirq.
> >> >
> >> > Jesse, any objections?
> >>
> >> Nope, but it would be good to get Dave or Mark's ack (Dave owns this code
> >> now).
> >>
> > Sorry for the dumb question but where is acpi_get_table_with_size
> > defined?  Its not in linus's git. /me goes and gets linux-next...
> >
> 
> in tip/master

access coordinates:

  http://people.redhat.com/mingo/tip.git/README

	Ingo

Re: [PATCH] x86/pci: fix dmar_tbl early_ioremap leak v2

[Suresh Siddha]

On Thu, Sep 25, 2008 at 12:28:25AM -0700, Yinghai Lu wrote:
> use early_acpi_os_unmap_memory
> 
> v2: move unmap_memory early...
> 
> Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>

Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>