not adding modules range to kcore if it's equal to vmcore range
Subsystems (2)
PATCH 1/1 not adding modules range to kcore if it's equal to vmcore range
On some ARCHs modules range is eauql to vmalloc range. E.g on i686
This will cause 2 duplicate program segments in /proc/kcore, makes user confused. In this patch a judgment added to check if modules range is equal to vmalloc range. If yes, just skip adding the modules range.
--- fs/proc/kcore.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/proc/kcore.c +4 -2
@@ -610,8 +610,10 @@ static void __init proc_kcore_text_init(void)struct kcore_list kcore_modules;static void __init add_modules_range (void ) { -kclist_add (&kcore_modules, (void *)MODULES_VADDR , -MODULES_END -MODULES_VADDR ,KCORE_VMALLOC ); +if (MODULES_VADDR !=VMALLOC_START ) { +kclist_add (&kcore_modules, (void *)MODULES_VADDR , +MODULES_END -MODULES_VADDR ,KCORE_VMALLOC ); + } }#else static void __init add_modules_range (void )
Signature · 1 line
1.9.3
On some ARCHs modules range is eauql to vmalloc range. E.g on i686
"#define MODULES_VADDR VMALLOC_START"
"#define MODULES_END VMALLOC_END"
This will cause 2 duplicate program segments in /proc/kcore, makes user confused. In this patch a judgment added to check if modules range is equal to vmalloc range. If yes, just skip adding the modules range.
--- fs/proc/kcore.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/proc/kcore.c +4 -2
@@ -610,8 +610,10 @@ static void __init proc_kcore_text_init(void)struct kcore_list kcore_modules;static void __init add_modules_range (void ) { -kclist_add (&kcore_modules, (void *)MODULES_VADDR , -MODULES_END -MODULES_VADDR ,KCORE_VMALLOC ); +if (MODULES_VADDR !=VMALLOC_START ) { +kclist_add (&kcore_modules, (void *)MODULES_VADDR , +MODULES_END -MODULES_VADDR ,KCORE_VMALLOC ); + } }#else static void __init add_modules_range (void )
Signature · 1 line
1.9.3
Quoted 15 lines · On Sun, 13 Jul 2014 09:05:46 +0800 Baoquan He <[email protected]> wrote:
On some ARCHs modules range is eauql to vmalloc range. E.g on i686
"#defineMODULES_VADDRVMALLOC_START"
"#defineMODULES_ENDVMALLOC_END"
This will cause 2 duplicate program segments in/proc/kcore, makes user confused. In this patch a judgment added to check if modules range is equal to vmalloc range. If yes, just skip adding the modules range....
fs/proc/kcore.c +0
-0@@ -610,8 +610,10 @@ static void __init proc_kcore_text_init(void)struct kcore_list kcore_modules;static void __init add_modules_range (void )
fs/proc/kcore.c static void __init proc_kcore_text_init(void) · line 619
Quoted 10 lines
fs/proc/kcore.c +4
-2{ -kclist_add (&kcore_modules, (void *)MODULES_VADDR , -MODULES_END -MODULES_VADDR ,KCORE_VMALLOC ); +if (MODULES_VADDR !=VMALLOC_START ) { +kclist_add (&kcore_modules, (void *)MODULES_VADDR , +MODULES_END -MODULES_VADDR ,KCORE_VMALLOC ); + } }#else static void __init add_modules_range (void )
But if some application or script is using the modules range, won't this patch cause breakage on some architectures?
Quoted 22 lines · Andrew Morton
Quoted 20 lines · On Sun, 13 Jul 2014 09:05:46 +0800 Baoquan He <[email protected]> wrote:
On some ARCHs modules range is eauql to vmalloc range. E.g on i686
"#defineMODULES_VADDRVMALLOC_START"
"#defineMODULES_ENDVMALLOC_END"
This will cause 2 duplicate program segments in/proc/kcore, makes user confused. In this patch a judgment added to check if modules range is equal to vmalloc range. If yes, just skip adding the modules range....
fs/proc/kcore.c +2
-2@@ -610,8 +610,10 @@ static void __init proc_kcore_text_init(void)struct kcore_list kcore_modules;static void __init add_modules_range (void ) { -kclist_add (&kcore_modules, (void *)MODULES_VADDR , -MODULES_END -MODULES_VADDR ,KCORE_VMALLOC ); +if (MODULES_VADDR !=VMALLOC_START ) { + kclist_add(&kcore_modules, (void *)MODULES_VADDR,
Quoted 8 lines
fs/proc/kcore.c static void __init proc_kcore_text_init(void) · line 619
Quoted 5 lines
fs/proc/kcore.c +2
-0+ MODULES_END - MODULES_VADDR, KCORE_VMALLOC); + } }#else static void __init add_modules_range (void )But if some application or script is using the modules range, won't this patch cause breakage on some architectures?
Hi Andrew,
Thanks for your review and comments.
Since in this situation the modules range and the vmalloc range are the same, and from the print of /proc/kcore you can't differentiate them, I guess people may not care it.
Unless people assume the range after vmalloc is modules range in script. But if someone did this, his/her program is not carefully considered. Entries of kcore are not fixed, E.g in x86-64 kcore_vsyscall exists while it doesn't exist in i686. AFAIK, usually people use address range to judge what area it is, E.g in makedumpfile, one user space utility of kdump, below function is used to check the type of virtual address in x86-64.
intis_vmalloc_addr(ulong vaddr)
{
/*
* vmalloc, virtual memmap, and module space as VMALLOC space.
*/
return ((vaddr >= VMALLOC_START && vaddr <= VMALLOC_END)
|| (vaddr >= VMEMMAP_START && vaddr <= VMEMMAP_END)
|| (vaddr >= MODULES_VADDR && vaddr <= MODULES_END));
}In i686, the code is
intis_vmalloc_addr_x86(unsigned long vaddr)
{
return (info->vmalloc_start && vaddr >= info->vmalloc_start);
}So I think people should check entries of kcore by range it spans, not which line the entry could be in. When I tried to read /proc/kcore, I was confused why the same line comes up twice. It could be better to remove the confusion, from my personal opinion.
Thanks
Baoquan
Quoted 1 line
Quoted 22 lines · Andrew Morton
Quoted 20 lines · On Sun, 13 Jul 2014 09:05:46 +0800 Baoquan He <[email protected]> wrote:
On some ARCHs modules range is eauql to vmalloc range. E.g on i686
"#defineMODULES_VADDRVMALLOC_START"
"#defineMODULES_ENDVMALLOC_END"
This will cause 2 duplicate program segments in/proc/kcore, makes user confused. In this patch a judgment added to check if modules range is equal to vmalloc range. If yes, just skip adding the modules range....
fs/proc/kcore.c +2
-2@@ -610,8 +610,10 @@ static void __init proc_kcore_text_init(void)struct kcore_list kcore_modules;static void __init add_modules_range (void ) { -kclist_add (&kcore_modules, (void *)MODULES_VADDR , -MODULES_END -MODULES_VADDR ,KCORE_VMALLOC ); +if (MODULES_VADDR !=VMALLOC_START ) { + kclist_add(&kcore_modules, (void *)MODULES_VADDR,
Quoted 8 lines
fs/proc/kcore.c static void __init proc_kcore_text_init(void) · line 619
Quoted 5 lines
fs/proc/kcore.c +2
-0+ MODULES_END - MODULES_VADDR, KCORE_VMALLOC); + } }#else static void __init add_modules_range (void )But if some application or script is using the modules range, won't this patch cause breakage on some architectures?
Hi Andrew,
As I replied in previous mail, people usually check memory range but not which entry is available, so this should not cause breakage on the relevant architectures.
Surely if you don't like it, I am fine too.
Baoquan
Thanks