LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* x86: potential ioremap() issues
@ 2008-02-28 12:59 Jan Beulich
  2008-02-28 13:24 ` Ingo Molnar
  0 siblings, 1 reply; 6+ messages in thread
From: Jan Beulich @ 2008-02-28 12:59 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: linux-kernel

Ingo,

with the new ioremap() implementation I see a couple of (potential)
issues:
- When ioremap_page_range() fails, remove_vm_area() is used rather
  than vunmap() - I think this will cause a 'struct vm_struct' leak.
- While ioremap() continues to happily map RAM pages (with a bogus
  [see below] WARN_ON_ONCE()), cacheability of the memory is not
  being restored in iounmap().
- The check for RAM pages (except for the WARN_ON_ONCE())
  continues to be applied only to lowmem pages.
- The WARN_ON_ONCE() itself is applied to the pfn after the
  preceding loop finished, i.e. to a pfn that doesn't actually participate
  in the operation. Shouldn't it be moved inside the loop?

Thanks for any clarification,
Jan


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: x86: potential ioremap() issues
  2008-02-28 12:59 x86: potential ioremap() issues Jan Beulich
@ 2008-02-28 13:24 ` Ingo Molnar
  2008-02-28 14:30   ` Jan Beulich
  2008-02-29 22:04   ` Oliver Pinter
  0 siblings, 2 replies; 6+ messages in thread
From: Ingo Molnar @ 2008-02-28 13:24 UTC (permalink / raw)
  To: Jan Beulich
  Cc: linux-kernel, Thomas Gleixner, H. Peter Anvin, Arjan van de Ven


* Jan Beulich <jbeulich@novell.com> wrote:

> Ingo,
> 
> with the new ioremap() implementation I see a couple of (potential)
> issues:
> - When ioremap_page_range() fails, remove_vm_area() is used rather
>   than vunmap() - I think this will cause a 'struct vm_struct' leak.

indeed, good catch - could you check whether the patch below fixes this? 
I also pushed this out into x86.git#testing, which you can pick up via:

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

> - While ioremap() continues to happily map RAM pages (with a bogus
>   [see below] WARN_ON_ONCE()), cacheability of the memory is not
>   being restored in iounmap().

correct - these are never supposed to be 'true', generally allocated RAM 
pages - or like we do with AGP where the pages are exclusively owned we 
restore their cacheability explicitly.

> - The check for RAM pages (except for the WARN_ON_ONCE())
>   continues to be applied only to lowmem pages.

yes, the biggest constraint from ioremap comes when it applies to pages 
that are mapped by the kernel. But i guess we could extend this to all 
things RAM ... the second patch below does this. What do you think? I've 
queued this up in x86.git#testing as well.

> - The WARN_ON_ONCE() itself is applied to the pfn after the
>   preceding loop finished, i.e. to a pfn that doesn't actually participate
>   in the operation. Shouldn't it be moved inside the loop?

i removed the WARN_ON_ONCE() from x86.git a few days ago, it's lined up 
for the next push.

	Ingo

--------------------->
Subject: x86: fix leak un ioremap_page_range() failure
From: Ingo Molnar <mingo@elte.hu>
Date: Thu Feb 28 14:02:08 CET 2008

Jan Beulich noticed that if a driver's ioremap() fails (say due to -ENOMEM)
then we might leak the struct vm_area - free it properly.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86/mm/ioremap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-x86.q/arch/x86/mm/ioremap.c
===================================================================
--- linux-x86.q.orig/arch/x86/mm/ioremap.c
+++ linux-x86.q/arch/x86/mm/ioremap.c
@@ -179,7 +179,7 @@ static void __iomem *__ioremap(unsigned 
 	area->phys_addr = phys_addr;
 	vaddr = (unsigned long) area->addr;
 	if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot)) {
-		remove_vm_area((void *)(vaddr & PAGE_MASK));
+		free_vm_area(area);
 		return NULL;
 	}

-------------------> 
Subject: x86: ioremap(), extend check to all RAM pages
From: Ingo Molnar <mingo@elte.hu>
Date: Thu Feb 28 14:10:49 CET 2008

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86/mm/ioremap.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: linux-x86.q/arch/x86/mm/ioremap.c
===================================================================
--- linux-x86.q.orig/arch/x86/mm/ioremap.c
+++ linux-x86.q/arch/x86/mm/ioremap.c
@@ -146,8 +146,9 @@ static void __iomem *__ioremap(unsigned 
 	/*
 	 * Don't allow anybody to remap normal RAM that we're using..
 	 */
-	for (pfn = phys_addr >> PAGE_SHIFT; pfn < max_pfn_mapped &&
-	     (pfn << PAGE_SHIFT) < last_addr; pfn++) {
+	for (pfn = phys_addr >> PAGE_SHIFT;
+				(pfn << PAGE_SHIFT) < last_addr; pfn++) {
+
 		if (page_is_ram(pfn) && pfn_valid(pfn) &&
 		    !PageReserved(pfn_to_page(pfn)))
 			return NULL;

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: x86: potential ioremap() issues
  2008-02-28 13:24 ` Ingo Molnar
@ 2008-02-28 14:30   ` Jan Beulich
  2008-02-29 22:04   ` Oliver Pinter
  1 sibling, 0 replies; 6+ messages in thread
From: Jan Beulich @ 2008-02-28 14:30 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Arjan van de Ven, Thomas Gleixner, linux-kernel, H. Peter Anvin

>> - When ioremap_page_range() fails, remove_vm_area() is used rather
>>   than vunmap() - I think this will cause a 'struct vm_struct' leak.
>
>indeed, good catch - could you check whether the patch below fixes this? 

Yes, it certainly does. You using it rather than vunmap() makes me notice
other inconsistencies (but harmless in nature): The ioremap_change_attr()
failure case should use the same function, and iounmap() could be
simplified using it, too.

Acked-by: Jan Beulich <jbeulich@novell.com>

>> - While ioremap() continues to happily map RAM pages (with a bogus
>>   [see below] WARN_ON_ONCE()), cacheability of the memory is not
>>   being restored in iounmap().
>
>correct - these are never supposed to be 'true', generally allocated RAM 
>pages - or like we do with AGP where the pages are exclusively owned we 
>restore their cacheability explicitly.

Never supposed to be doesn't mean they really aren't. I think as long as
one permits it, the other should undo its effects. Further more, it would
seem to me that you could easily ioremap() a hot-pluggable (but
unpopulated) memory range, and get into inconsistencies once that
range gets actually populated. Or am I not seeing a safeguard
preventing this?

>> - The check for RAM pages (except for the WARN_ON_ONCE())
>>   continues to be applied only to lowmem pages.
>
>yes, the biggest constraint from ioremap comes when it applies to pages 
>that are mapped by the kernel. But i guess we could extend this to all 
>things RAM ... the second patch below does this. What do you think? I've 
>queued this up in x86.git#testing as well.

Yes, that's exactly what I would have thought it should look like.

Acked-by: Jan Beulich <jbeulich@novell.com>

>> - The WARN_ON_ONCE() itself is applied to the pfn after the
>>   preceding loop finished, i.e. to a pfn that doesn't actually participate
>>   in the operation. Shouldn't it be moved inside the loop?
>
>i removed the WARN_ON_ONCE() from x86.git a few days ago, it's lined up 
>for the next push.

Great, thanks!

Jan


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: x86: potential ioremap() issues
  2008-02-28 13:24 ` Ingo Molnar
  2008-02-28 14:30   ` Jan Beulich
@ 2008-02-29 22:04   ` Oliver Pinter
  2008-03-03 10:44     ` Ingo Molnar
  1 sibling, 1 reply; 6+ messages in thread
From: Oliver Pinter @ 2008-02-29 22:04 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Jan Beulich, linux-kernel, Thomas Gleixner, H. Peter Anvin,
	Arjan van de Ven

Hi Ingo!
this patch is needed for 2.6.22 kernel? I see, this code inarch/x86_64/mm/ioremap.c
/* a kérdés az, hogy ezt a patchet backportoljam 2.6.22 alá vagy ne?x86_64 alatt megtaláltam a cserélendő kódrészt... * köszönöm a választ */On 2/28/08, Ingo Molnar <mingo@elte.hu> wrote:>> * Jan Beulich <jbeulich@novell.com> wrote:>> > Ingo,> >> > with the new ioremap() implementation I see a couple of (potential)> > issues:> > - When ioremap_page_range() fails, remove_vm_area() is used rather> > than vunmap() - I think this will cause a 'struct vm_struct' leak.>> indeed, good catch - could you check whether the patch below fixes this?> I also pushed this out into x86.git#testing, which you can pick up via:>> http://people.redhat.com/mingo/x86.git/README>> > - While ioremap() continues to happily map RAM pages (with a bogus> > [see below] WARN_ON_ONCE()), cacheability of the memory is not> > being restored in iounmap().>> correct - these are never supposed to be 'true', generally allocated RAM> pages - or like we do with AGP where the pages are exclusively owned we> restore their cacheability explicitly.>> > - The check for RAM pages (except for the WARN_ON_ONCE())> > continues to be applied only to lowmem pages.>> yes, the biggest constraint from ioremap comes when it applies to pages> that are mapped by the kernel. But i guess we could extend this to all> things RAM ... the second patch below does this. What do you think? I've> queued this up in x86.git#testing as well.>> > - The WARN_ON_ONCE() itself is applied to the pfn after the> > preceding loop finished, i.e. to a pfn that doesn't actually participate> > in the operation. Shouldn't it be moved inside the loop?>> i removed the WARN_ON_ONCE() from x86.git a few days ago, it's lined up> for the next push.>> Ingo>> --------------------->> Subject: x86: fix leak un ioremap_page_range() failure> From: Ingo Molnar <mingo@elte.hu>> Date: Thu Feb 28 14:02:08 CET 2008>> Jan Beulich noticed that if a driver's ioremap() fails (say due to -ENOMEM)> then we might leak the struct vm_area - free it properly.>> Signed-off-by: Ingo Molnar <mingo@elte.hu>> ---> arch/x86/mm/ioremap.c | 2 +-> 1 file changed, 1 insertion(+), 1 deletion(-)>> Index: linux-x86.q/arch/x86/mm/ioremap.c> ===================================================================> --- linux-x86.q.orig/arch/x86/mm/ioremap.c> +++ linux-x86.q/arch/x86/mm/ioremap.c> @@ -179,7 +179,7 @@ static void __iomem *__ioremap(unsigned> area->phys_addr = phys_addr;> vaddr = (unsigned long) area->addr;> if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot)) {> -	remove_vm_area((void *)(vaddr & PAGE_MASK));> +	free_vm_area(area);> return NULL;> }>> ------------------->> Subject: x86: ioremap(), extend check to all RAM pages> From: Ingo Molnar <mingo@elte.hu>> Date: Thu Feb 28 14:10:49 CET 2008>> Signed-off-by: Ingo Molnar <mingo@elte.hu>> ---> arch/x86/mm/ioremap.c | 5 +++--> 1 file changed, 3 insertions(+), 2 deletions(-)>> Index: linux-x86.q/arch/x86/mm/ioremap.c> ===================================================================> --- linux-x86.q.orig/arch/x86/mm/ioremap.c> +++ linux-x86.q/arch/x86/mm/ioremap.c> @@ -146,8 +146,9 @@ static void __iomem *__ioremap(unsigned> /*> * Don't allow anybody to remap normal RAM that we're using..> */> -	for (pfn = phys_addr >> PAGE_SHIFT; pfn < max_pfn_mapped &&> -	(pfn << PAGE_SHIFT) < last_addr; pfn++) {> +	for (pfn = phys_addr >> PAGE_SHIFT;> +	(pfn << PAGE_SHIFT) < last_addr; pfn++) {> +> if (page_is_ram(pfn) && pfn_valid(pfn) &&> !PageReserved(pfn_to_page(pfn)))> return NULL;> --> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in> the body of a message to majordomo@vger.kernel.org> More majordomo info at http://vger.kernel.org/majordomo-info.html> Please read the FAQ at http://www.tux.org/lkml/>--Thanks,Oliver˙ôčş{.nÇ+‰ˇŸŽ‰­†+%ŠË˙ąéÝś\x17ĽŠw˙ş{.nÇ+‰ˇĽŠ{ąţGŤé˙Š{ayş\x1dʇڙë,j\a­˘fŁ˘ˇhšďę˙‘ęçz_čŽ\x03(­éšŽŠÝ˘j"ú\x1aś^[m§˙˙ž\aŤţGŤé˙˘¸?™¨č­Ú&Łř§~áśiO•ćŹzˇšvŘ^\x14\x04\x1aś^[m§˙˙Ă\f˙śě˙˘¸?–IĽ

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: x86: potential ioremap() issues
  2008-02-29 22:04   ` Oliver Pinter
@ 2008-03-03 10:44     ` Ingo Molnar
  2008-03-03 15:19       ` Oliver Pinter
  0 siblings, 1 reply; 6+ messages in thread
From: Ingo Molnar @ 2008-03-03 10:44 UTC (permalink / raw)
  To: Oliver Pinter
  Cc: Jan Beulich, linux-kernel, Thomas Gleixner, H. Peter Anvin,
	Arjan van de Ven


* Oliver Pinter <oliver.pntr@gmail.com> wrote:

> Hi Ingo!
> 
> this patch is needed for 2.6.22 kernel? I see, this code in 
> arch/x86_64/mm/ioremap.c

no, should not be needed - these are extra warnings in .25.

	Ingo

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: x86: potential ioremap() issues
  2008-03-03 10:44     ` Ingo Molnar
@ 2008-03-03 15:19       ` Oliver Pinter
  0 siblings, 0 replies; 6+ messages in thread
From: Oliver Pinter @ 2008-03-03 15:19 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Jan Beulich, linux-kernel, Thomas Gleixner, H. Peter Anvin,
	Arjan van de Ven

thanks

On 3/3/08, Ingo Molnar <mingo@elte.hu> wrote:
>
> * Oliver Pinter <oliver.pntr@gmail.com> wrote:
>
> > Hi Ingo!
> >
> > this patch is needed for 2.6.22 kernel? I see, this code in
> > arch/x86_64/mm/ioremap.c
>
> no, should not be needed - these are extra warnings in .25.
>
> 	Ingo
>


-- 
Thanks,
Oliver

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2008-03-03 15:20 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-28 12:59 x86: potential ioremap() issues Jan Beulich
2008-02-28 13:24 ` Ingo Molnar
2008-02-28 14:30   ` Jan Beulich
2008-02-29 22:04   ` Oliver Pinter
2008-03-03 10:44     ` Ingo Molnar
2008-03-03 15:19       ` Oliver Pinter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).