Hello Kazu, I've refreshed my patch on top of 'origin/add-get_kaslr_offset_general'. Please find it attached below. Hope there is still a chance to include it into the release. Thanks, Mikhail Zaslonko On 06.01.2020 22:42, HAGIO KAZUHITO(萩尾 一仁) wrote: > >> -----Original Message----- >> Hi Kazu, >> >> Sorry, I did't have a chance to try your patch yet. >> I will update mine next week. > > OK. > FYI, I'm planning to relase the next version of makedumpfile by the end > of next week. It needs some regression testing with old vmcores, etc., so > I can include patches merged by the beginning of next week in the release. > > Thanks, > Kazu > >> >> Thanks, >> Mikhail >> >> >> On 03.01.2020 21:55, HAGIO KAZUHITO(萩尾 一仁) wrote: >>> Hi Lianbo, Mikhail, >>> >>>> -----Original Message----- >>>>>> >>>>>> In addition, the above code confused me, it will always return 0 on s390(please refer to my logs). >>>>> >>>>> The aim of get_kaslr_offset() here is only setting info->kaslr_offset to the value >>>>> from vmcoreinfo for the SYMBOL_INIT() macro. >>>>> (get_kaslr_offset() returns the kaslr offset in the resolve_config_entry().) >>>>> >>>> Thanks for your explanation, Kazu. >>>> >>>>> But yeah, the get_kaslr_offset(SYMBOL(_stext)) is confusing and not good. >>>>> Passing 0 might be a bit better..? >>>>> >>>> Yes, looks good to me. >>> >>> OK, I pushed an additional patch fixing it to the test branch: >>> https://github.com/k-hagio/makedumpfile/tree/add-get_kaslr_offset_general >>> Thanks Lianbo for pointing it out. >>> >>> Mikhail, if you update your patch on top of the tree above, >>> I'll merge it upstream. >>> >>> Thanks, >>> Kazu >>> >>> P.S. My email address has been changed to k-hagio-ab@xxxxxxx. >>> Please send email to this address in the future. Thanks. >>> (Ugh, it seems I cannot remove my kanji name in the From: field..) >>> >
From 5d30ddfc2f97b48e923688c0a295106c68fd56df Mon Sep 17 00:00:00 2001 From: Mikhail Zaslonko <zaslonko@xxxxxxxxxxxxx> Date: Tue, 7 Jan 2020 13:38:14 +0100 Subject: [PATCH] makedumpfile/s390: Use get_kaslr_offset_general() for s390x Since kernel v5.2 KASLR is supported on s390. Use recently introduced get_kaslr_offset_general() for s390x in order to derive kaslr offset from vmcoreinfo when -x makedumpfile option specified. Signed-off-by: Mikhail Zaslonko <zaslonko@xxxxxxxxxxxxx> --- makedumpfile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makedumpfile.h b/makedumpfile.h index 067fa48..e6c815d 100644 --- a/makedumpfile.h +++ b/makedumpfile.h @@ -1075,7 +1075,7 @@ int is_iomem_phys_addr_s390x(unsigned long addr); #define get_phys_base() stub_true() #define get_machdep_info() get_machdep_info_s390x() #define get_versiondep_info() stub_true() -#define get_kaslr_offset(X) stub_false() +#define get_kaslr_offset(X) get_kaslr_offset_general(X) #define vaddr_to_paddr(X) vaddr_to_paddr_s390x(X) #define paddr_to_vaddr(X) paddr_to_vaddr_general(X) #define is_phys_addr(X) is_iomem_phys_addr_s390x(X) -- 2.17.1
_______________________________________________ kexec mailing list kexec@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/kexec
