[PATCH 2/2] makedumpfile: Clean up unused KERNEL_IMAGE_SIZE

[Dave Anderson]

----- Original Message -----
> The old MODULES_VADDR need be decided by KERNEL_IMAGE_SIZE when kaslr
> enabled. Now MODULES_VADDR is not needed any more since Pratyush makes
> all VA to PA converting done by page table lookup. So remove its related
> code.

Hi Bao,

I'm not clear on this.  The crash utility still reads/needs KERNEL_IMAGE_SIZE
from the dumpfile's vmcoreinfo data.  Is it being written to the vmcoreinfo
section somewhere else in the code?

Dave



> 
> Signed-off-by: Baoquan He <bhe at redhat.com>
> ---
>  makedumpfile.c | 11 +----------
>  makedumpfile.h |  3 ---
>  2 files changed, 1 insertion(+), 13 deletions(-)
> 
> diff --git a/makedumpfile.c b/makedumpfile.c
> index a3f711e..1c95306 100644
> --- a/makedumpfile.c
> +++ b/makedumpfile.c
> @@ -1994,14 +1994,7 @@ get_value_for_old_linux(void)
>  			NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE) =
>  			PAGE_BUDDY_MAPCOUNT_VALUE_v2_6_39_to_latest_version;
>  	}
> -#ifdef __x86_64__
> -	if (NUMBER(KERNEL_IMAGE_SIZE) == NOT_FOUND_NUMBER) {
> -		if (info->kernel_version < KERNEL_VERSION(2, 6, 26))
> -			NUMBER(KERNEL_IMAGE_SIZE) = KERNEL_IMAGE_SIZE_ORIG;
> -		else
> -			NUMBER(KERNEL_IMAGE_SIZE) = KERNEL_IMAGE_SIZE_2_6_26;
> -	}
> -#endif
> +
>  	if (SIZE(pageflags) == NOT_FOUND_STRUCTURE) {
>  		if (info->kernel_version >= KERNEL_VERSION(2, 6, 27))
>  			SIZE(pageflags) =
> @@ -2258,7 +2251,6 @@ write_vmcoreinfo_data(void)
>  	WRITE_NUMBER("PG_hwpoison", PG_hwpoison);
>  
>  	WRITE_NUMBER("PAGE_BUDDY_MAPCOUNT_VALUE", PAGE_BUDDY_MAPCOUNT_VALUE);
> -	WRITE_NUMBER("KERNEL_IMAGE_SIZE", KERNEL_IMAGE_SIZE);
>  	WRITE_NUMBER("phys_base", phys_base);
>  
>  	WRITE_NUMBER("HUGETLB_PAGE_DTOR", HUGETLB_PAGE_DTOR);
> @@ -2606,7 +2598,6 @@ read_vmcoreinfo(void)
>  	READ_SRCFILE("pud_t", pud_t);
>  
>  	READ_NUMBER("PAGE_BUDDY_MAPCOUNT_VALUE", PAGE_BUDDY_MAPCOUNT_VALUE);
> -	READ_NUMBER("KERNEL_IMAGE_SIZE", KERNEL_IMAGE_SIZE);
>  	READ_NUMBER("phys_base", phys_base);
>  
>  	READ_NUMBER("HUGETLB_PAGE_DTOR", HUGETLB_PAGE_DTOR);
> diff --git a/makedumpfile.h b/makedumpfile.h
> index 422b6be..b627e32 100644
> --- a/makedumpfile.h
> +++ b/makedumpfile.h
> @@ -573,8 +573,6 @@ int get_va_bits_arm64(void);
>  #define VMEMMAP_END_2_6_31	(0xffffeaffffffffff) /* 2.6.31, or later  */
>  
>  #define __START_KERNEL_map	(0xffffffff80000000)
> -#define KERNEL_IMAGE_SIZE_ORIG		(0x0000000008000000) /* 2.6.25, or former */
> -#define KERNEL_IMAGE_SIZE_2_6_26	(0x0000000020000000) /* 2.6.26, or later
> */
>  #define KVBASE			PAGE_OFFSET
>  #define _SECTION_SIZE_BITS	(27)
>  #define _MAX_PHYSMEM_BITS_ORIG		(40)
> @@ -1713,7 +1711,6 @@ struct number_table {
>  	long    PG_hwpoison;
>  
>  	long	PAGE_BUDDY_MAPCOUNT_VALUE;
> -	long	KERNEL_IMAGE_SIZE;
>  	long	SECTION_SIZE_BITS;
>  	long	MAX_PHYSMEM_BITS;
>  	long    HUGETLB_PAGE_DTOR;
> --
> 2.5.5
> 
>