* [PATCH] Fix memory leak on PPC44x/kernel 2.6.5-rc2-bk
@ 2004-03-26 9:34 Toru UCHIYAMA
2004-03-26 19:24 ` Matt Porter
0 siblings, 1 reply; 4+ messages in thread
From: Toru UCHIYAMA @ 2004-03-26 9:34 UTC (permalink / raw)
To: linuxppc-dev
Hi,
I found a memory leak problem in pgd_free().
The following patch against 2.6.5-rc2 fix the problem.
Best regards,
Toru Uchiyama
2004-03-25 Toru Uchiyama <uchi@cs.fujitsu.co.jp>,
Takeharu KATO <tkato@cs.fujitsu.co.jp>
* arch/ppc/kernel/misc.S : Add clear_pages().
* arch/ppc/mm/pgtable.c : Use clear_pages
* include/asm-ppc/page.h : Add prototype definition for clear_pages()
diff -Nru linux-ppc/arch/ppc/kernel/misc.S linux-ppc-debug/arch/ppc/kernel/misc.S
--- linux-ppc/arch/ppc/kernel/misc.S 2004-03-24 16:28:22.000000000 +0900
+++ linux-ppc-debug/arch/ppc/kernel/misc.S 2004-03-25 17:04:37.000000000 +0900
@@ -757,6 +757,26 @@
addi r3,r3,L1_CACHE_LINE_SIZE
bdnz 1b
blr
+/*
+ * Clear pages
+ * void clear_pages(void *page,int order) ;
+ */
+_GLOBAL(clear_pages)
+ li r0,4096/L1_CACHE_LINE_SIZE
+ slw r0,r0,r4
+ mtctr r0
+#ifdef CONFIG_8xx
+ li r4, 0
+1: stw r4, 0(r3)
+ stw r4, 4(r3)
+ stw r4, 8(r3)
+ stw r4, 12(r3)
+#else
+1: dcbz 0,r3
+#endif
+ addi r3,r3,L1_CACHE_LINE_SIZE
+ bdnz 1b
+ blr
/*
* Copy a whole page. We use the dcbz instruction on the destination
diff -Nru linux-ppc/arch/ppc/mm/pgtable.c linux-ppc-debug/arch/ppc/mm/pgtable.c
--- linux-ppc/arch/ppc/mm/pgtable.c 2004-03-24 16:25:39.000000000 +0900
+++ linux-ppc-debug/arch/ppc/mm/pgtable.c 2004-03-25 17:04:57.000000000 +0900
@@ -69,15 +69,22 @@
pgd_t *pgd_alloc(struct mm_struct *mm)
{
pgd_t *ret;
-
if ((ret = (pgd_t *)__get_free_pages(GFP_KERNEL, PGDIR_ORDER)) != NULL)
+#if 0 /* Relaced by Uchi and KATO 2004.3.25 - begin - */
clear_page(ret);
+#else
+ clear_pages(ret,PGDIR_ORDER);
+#endif /* Relaced by Uchi and KATO 2004.3.25 - end - */
return ret;
}
void pgd_free(pgd_t *pgd)
{
+#if 0 /* Relaced by Uchi and KATO 2004.3.25 - begin - */
free_page((unsigned long)pgd);
+#else
+ free_pages((unsigned long)pgd,PGDIR_ORDER);
+#endif /* Relaced by Uchi and KATO 2004.3.25 - end - */
}
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
diff -Nru linux-ppc/include/asm-ppc/page.h linux-ppc-debug/include/asm-ppc/page.h
--- linux-ppc/include/asm-ppc/page.h 2004-03-24 16:25:55.000000000 +0900
+++ linux-ppc-debug/include/asm-ppc/page.h 2004-03-25 17:03:42.000000000 +0900
@@ -85,6 +85,10 @@
struct page;
extern void clear_page(void *page);
+#if 1 /* Relaced by Uchi and KATO 2004.3.25 - begin - */
+/* See arch/ppc/kernel/misc.S in detail. */
+extern void clear_pages(void *page,int order);
+#endif /* Relaced by Uchi and KATO 2004.3.25 - end - */
extern void copy_page(void *to, void *from);
extern void clear_user_page(void *page, unsigned long vaddr, struct page *pg);
extern void copy_user_page(void *to, void *from, unsigned long vaddr,
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Fix memory leak on PPC44x/kernel 2.6.5-rc2-bk
2004-03-26 9:34 [PATCH] Fix memory leak on PPC44x/kernel 2.6.5-rc2-bk Toru UCHIYAMA
@ 2004-03-26 19:24 ` Matt Porter
2004-03-26 21:03 ` Eugene Surovegin
0 siblings, 1 reply; 4+ messages in thread
From: Matt Porter @ 2004-03-26 19:24 UTC (permalink / raw)
To: Toru UCHIYAMA; +Cc: linuxppc-dev, paulus
On Fri, Mar 26, 2004 at 06:34:31PM +0900, Toru UCHIYAMA wrote:
> Hi,
>
> I found a memory leak problem in pgd_free().
> The following patch against 2.6.5-rc2 fix the problem.
Good catch. I did some minor cleanup to submit it upstream.
Paul: Ok to send to akpm?
-Matt
===== arch/ppc/kernel/misc.S 1.54 vs edited =====
--- 1.54/arch/ppc/kernel/misc.S Tue Mar 23 15:46:40 2004
+++ edited/arch/ppc/kernel/misc.S Fri Mar 26 11:56:23 2004
@@ -759,6 +759,27 @@
blr
/*
+ * Clear pages
+ * void clear_pages(void *page, int order) ;
+ */
+_GLOBAL(clear_pages)
+ li r0,4096/L1_CACHE_LINE_SIZE
+ slw r0,r0,r4
+ mtctr r0
+#ifdef CONFIG_8xx
+ li r4, 0
+1: stw r4, 0(r3)
+ stw r4, 4(r3)
+ stw r4, 8(r3)
+ stw r4, 12(r3)
+#else
+1: dcbz 0,r3
+#endif
+ addi r3,r3,L1_CACHE_LINE_SIZE
+ bdnz 1b
+ blr
+
+/*
* Copy a whole page. We use the dcbz instruction on the destination
* to reduce memory traffic (it eliminates the unnecessary reads of
* the destination into cache). This requires that the destination
===== arch/ppc/mm/pgtable.c 1.16 vs edited =====
--- 1.16/arch/ppc/mm/pgtable.c Wed Feb 4 21:58:08 2004
+++ edited/arch/ppc/mm/pgtable.c Fri Mar 26 11:54:37 2004
@@ -71,13 +71,13 @@
pgd_t *ret;
if ((ret = (pgd_t *)__get_free_pages(GFP_KERNEL, PGDIR_ORDER)) != NULL)
- clear_page(ret);
+ clear_pages(ret, PGDIR_ORDER);
return ret;
}
void pgd_free(pgd_t *pgd)
{
- free_page((unsigned long)pgd);
+ free_pages((unsigned long)pgd, PGDIR_ORDER);
}
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
===== include/asm-ppc/page.h 1.15 vs edited =====
--- 1.15/include/asm-ppc/page.h Fri Sep 12 09:26:56 2003
+++ edited/include/asm-ppc/page.h Fri Mar 26 11:53:04 2004
@@ -85,6 +85,7 @@
struct page;
extern void clear_page(void *page);
+extern void clear_pages(void *page, int order);
extern void copy_page(void *to, void *from);
extern void clear_user_page(void *page, unsigned long vaddr, struct page *pg);
extern void copy_user_page(void *to, void *from, unsigned long vaddr,
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Fix memory leak on PPC44x/kernel 2.6.5-rc2-bk
2004-03-26 19:24 ` Matt Porter
@ 2004-03-26 21:03 ` Eugene Surovegin
2004-03-26 21:32 ` Matt Porter
0 siblings, 1 reply; 4+ messages in thread
From: Eugene Surovegin @ 2004-03-26 21:03 UTC (permalink / raw)
To: Matt Porter; +Cc: Toru UCHIYAMA, linuxppc-dev, paulus
On Fri, Mar 26, 2004 at 12:24:25PM -0700, Matt Porter wrote:
>
> Paul: Ok to send to akpm?
>
Maybe we should get rid of clear_page in misc.S and make it an inline:
static inline void clear_page(void* page) { clear_pages(page, 0); }
Eugene.
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Fix memory leak on PPC44x/kernel 2.6.5-rc2-bk
2004-03-26 21:03 ` Eugene Surovegin
@ 2004-03-26 21:32 ` Matt Porter
0 siblings, 0 replies; 4+ messages in thread
From: Matt Porter @ 2004-03-26 21:32 UTC (permalink / raw)
To: Toru UCHIYAMA, linuxppc-dev, paulus
On Fri, Mar 26, 2004 at 01:03:04PM -0800, Eugene Surovegin wrote:
> On Fri, Mar 26, 2004 at 12:24:25PM -0700, Matt Porter wrote:
> >
> > Paul: Ok to send to akpm?
> >
>
> Maybe we should get rid of clear_page in misc.S and make it an inline:
>
> static inline void clear_page(void* page) { clear_pages(page, 0); }
Yep, much better. Here's the improved version.
-Matt
===== arch/ppc/kernel/misc.S 1.54 vs edited =====
--- 1.54/arch/ppc/kernel/misc.S Tue Mar 23 15:46:40 2004
+++ edited/arch/ppc/kernel/misc.S Fri Mar 26 14:25:25 2004
@@ -738,12 +738,15 @@
blr
/*
- * Clear a page using the dcbz instruction, which doesn't cause any
+ * Clear pages using the dcbz instruction, which doesn't cause any
* memory traffic (except to write out any cache lines which get
* displaced). This only works on cacheable memory.
+ *
+ * void clear_pages(void *page, int order) ;
*/
-_GLOBAL(clear_page)
+_GLOBAL(clear_pages)
li r0,4096/L1_CACHE_LINE_SIZE
+ slw r0,r0,r4
mtctr r0
#ifdef CONFIG_8xx
li r4, 0
===== arch/ppc/mm/pgtable.c 1.16 vs edited =====
--- 1.16/arch/ppc/mm/pgtable.c Wed Feb 4 21:58:08 2004
+++ edited/arch/ppc/mm/pgtable.c Fri Mar 26 11:54:37 2004
@@ -71,13 +71,13 @@
pgd_t *ret;
if ((ret = (pgd_t *)__get_free_pages(GFP_KERNEL, PGDIR_ORDER)) != NULL)
- clear_page(ret);
+ clear_pages(ret, PGDIR_ORDER);
return ret;
}
void pgd_free(pgd_t *pgd)
{
- free_page((unsigned long)pgd);
+ free_pages((unsigned long)pgd, PGDIR_ORDER);
}
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
===== include/asm-ppc/page.h 1.15 vs edited =====
--- 1.15/include/asm-ppc/page.h Fri Sep 12 09:26:56 2003
+++ edited/include/asm-ppc/page.h Fri Mar 26 14:22:30 2004
@@ -84,7 +84,8 @@
#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
struct page;
-extern void clear_page(void *page);
+extern void clear_pages(void *page, int order);
+static inline clear_page(void *page) { clear_pages(page, 0); }
extern void copy_page(void *to, void *from);
extern void clear_user_page(void *page, unsigned long vaddr, struct page *pg);
extern void copy_user_page(void *to, void *from, unsigned long vaddr,
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2004-03-26 21:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-03-26 9:34 [PATCH] Fix memory leak on PPC44x/kernel 2.6.5-rc2-bk Toru UCHIYAMA
2004-03-26 19:24 ` Matt Porter
2004-03-26 21:03 ` Eugene Surovegin
2004-03-26 21:32 ` Matt Porter
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).