kexec July 2016

kexec@lists.fedoraproject.org

7 participants
11 discussions

[PATCH V5 0/5] Rebuild initrd in case of watchdog state change
by Pratyush Anand 21 Jul '16

21 Jul '16

Fedora dracut-044-75 release has all the component needed to support initrd rebuild in case of watchdog state change. Therefore sending these patches for inclusion in kexec-tools. Please note that these patches should only be added in those fedora versions which has dracut version dracut-044-75 or latter. Anyway, we already have dependency specified in spec file as well. Testing: Most of the rebuild test cases have been mentioned in the commit log of 2/5. Other than that, I have also tested effect of adding either "-o watchdog" or "-a watchdog" or none of them. They have been found to behave as expected. So, when we pass -o watchdog in dracut_args, it does not include kernel watchdog module whether state is active or inactive. In all other cases, it adds kernel module only when state is active. I have also verified that dracut watchdog module is not added when we do not have at least one active watchdog device. Changes since V5: - fixes watchdog module removal in case more than one device Changes since V4: - When a watchdog was active previously but now watchdog kernel module does not exists then rebuild initrd - When there is not any active watchdog device then do not add "-a watchdog". - Updated howto file accordingly. Changes since V3: - Now we only look for "-o watchdog" in dracut_args. If it is not passed then we add "-a watchdog" in dracut_args by default. - Notes in howto modified accordingly Changes since V2: - Removed NOWDT argument. Using dracut_args instead. - Removed man page update. Included notes in howto - Reorganized mkdumprd code for watchdog dracut argument addition Changes since V1: - Removed patch 4/5 which was updating kdumpctl man page. - Added all necessary information in kdump.conf man page (patch 2/4). Pratyush Anand (5): mkdumprd: Add dracut watchdog module as default option kdumpctl: force rebuild in case of watchdog state change howto: Notes on watchdog module handling watchdog: do not add watchdog module in rd.driver.pre now spec: Update to add dependency on dracut version >= 044-75 dracut-module-setup.sh | 9 --------- kdump-lib.sh | 24 ++++++++++++++++++++++++ kdumpctl | 40 ++++++++++++++++++++++++++++++++++++++++ kexec-kdump-howto.txt | 14 ++++++++++++++ kexec-tools.spec | 3 ++- mkdumprd | 20 +++++++++++++++++++- 6 files changed, 99 insertions(+), 11 deletions(-) -- 2.5.5

3 10

[PATCH V5 0/5] Rebuild initrd in case of watchdog state change
by Pratyush Anand 20 Jul '16

20 Jul '16

Fedora dracut-044-75 release has all the component needed to support initrd rebuild in case of watchdog state change. Therefore sending these patches for inclusion in kexec-tools. Please note that these patches should only be added in those fedora versions which has dracut version dracut-044-75 or latter. Anyway, we already have dependency specified in spec file as well. Testing: Most of the rebuild test cases have been mentioned in the commit log of 2/5. Other than that, I have also tested effect of adding either "-o watchdog" or "-a watchdog" or none of them. They have been found to behave as expected. So, when we pass -o watchdog in dracut_args, it does not include kernel watchdog module whether state is active or inactive. In all other cases, it adds kernel module only when state is active. I have also verified that dracut watchdog module is not added when we do not have at least one active watchdog device. Changes since V4: - When a watchdog was active previously but now watchdog kernel module does not exists then rebuild initrd - When there is not any active watchdog device then do not add "-a watchdog". - Updated howto file accordingly. Changes since V3: - Now we only look for "-o watchdog" in dracut_args. If it is not passed then we add "-a watchdog" in dracut_args by default. - Notes in howto modified accordingly Changes since V2: - Removed NOWDT argument. Using dracut_args instead. - Removed man page update. Included notes in howto - Reorganized mkdumprd code for watchdog dracut argument addition Changes since V1: - Removed patch 4/5 which was updating kdumpctl man page. - Added all necessary information in kdump.conf man page (patch 2/4). Pratyush Anand (5): mkdumprd: Add dracut watchdog module as default option kdumpctl: force rebuild in case of watchdog state change howto: Notes on watchdog module handling watchdog: do not add watchdog module in rd.driver.pre now spec: Update to add dependency on dracut version >= 044-75 dracut-module-setup.sh | 9 --------- kdump-lib.sh | 24 ++++++++++++++++++++++++ kdumpctl | 36 ++++++++++++++++++++++++++++++++++++ kexec-kdump-howto.txt | 14 ++++++++++++++ kexec-tools.spec | 3 ++- mkdumprd | 20 +++++++++++++++++++- 6 files changed, 95 insertions(+), 11 deletions(-) -- 2.5.5

3 10

[PATCH 0/2] kdump.conf and kdump.conf.5 documentation fixes
by Xunlei Pang 19 Jul '16

19 Jul '16

This was formerly done by Freeman, now I take it over with a few further fixes. Xunlei Pang (2): kdump.conf comments fixes kdump.conf man page fixes kdump.conf | 193 +++++++++++++++++++++++++++++++---------------------------- kdump.conf.5 | 113 +++++++++++++++++----------------- 2 files changed, 154 insertions(+), 152 deletions(-) -- 1.8.3.1

3 6

[PATCH V2 0/4] Rebuild initrd in case of watchdog state change
by Pratyush Anand 18 Jul '16

18 Jul '16

4 19

[PATCH V4 0/5] Rebuild initrd in case of watchdog state change
by Pratyush Anand 14 Jul '16

14 Jul '16

Fedora dracut-044-75 release has all the component needed to support initrd rebuild in case of watchdog state change. Therefore sending these patches for inclusion in kexec-tools. Please note that these patches should only be added in those fedora versions which has dracut version dracut-044-75 or latter. Anyway, we already have dependency specified in spec file as well. Testing: Most of the rebuild test cases have been mentioned in the commit log of 2/5. Other than that, I have also tested effect of adding either "-o watchdog" or "-a watchdog" or none of them. They have been found to behave as expected. So, when we pass -o watchdog in dracut_args, it does not include kernel watchdog module whether state is active or inactive. In all other cases, it adds kernel module only when state is active. Changes since V3: - Now we only look for "-o watchdog" in dracut_args. If it is not passed then we add "-a watchdog" in dracut_args by default. - Notes in howto modified accordingly Changes since V2: - Removed NOWDT argument. Using dracut_args instead. - Removed man page update. Included notes in howto - Reorganized mkdumprd code for watchdog dracut argument addition Changes since V1: - Removed patch 4/5 which was updating kdumpctl man page. - Added all necessary information in kdump.conf man page (patch 2/4). Pratyush Anand (5): mkdumprd: Add dracut watchdog module as default option kdumpctl: force rebuild in case of watchdog state change howto: Notes on watchdog module handling watchdog: do not add watchdog module in rd.driver.pre now spec: Update to add dependency on dracut version >= 044-75 dracut-module-setup.sh | 9 --------- kdump-lib.sh | 24 ++++++++++++++++++++++++ kdumpctl | 32 ++++++++++++++++++++++++++++++++ kexec-kdump-howto.txt | 14 ++++++++++++++ kexec-tools.spec | 3 ++- mkdumprd | 5 ++++- 6 files changed, 76 insertions(+), 11 deletions(-) -- 2.5.5

3 9

[PATCH V3 0/5] Rebuild initrd in case of watchdog state change
by Pratyush Anand 14 Jul '16

14 Jul '16

Fedora dracut-044-75 release has all the component needed to support initrd rebuild in case of watchdog state change. Therefore sending these patches for inclusion in kexec-tools. Please note that these patches should only be added in those fedora versions which has dracut version dracut-044-75 or latter. Anyway, we already have dependency specified in spec file as well. Testing: Most of the rebuild test cases have been mentioned in the commit log of 2/5. Other than that, I have also tested effect of adding either "-o watchdog" or "-a watchdog" or none of them. They have been found to behave as expected. So, when we pass -o watchdog in dracut_args, it does not include kernel watchdog module whether state is active or inactive. In all other cases, it adds kernel module only when state is active. Changes since V2: - Removed NOWDT argument. Using dracut_args instead. - Removed man page update. Included notes in howto - Reorganized mkdumprd code for watchdog dracut argument addition Changes since V1: - Removed patch 4/5 which was updating kdumpctl man page. - Added all necessary information in kdump.conf man page (patch 2/4). Pratyush Anand (5): mkdumprd: Add dracut watchdog module as default option kdumpctl: force rebuild in case of watchdog state change howto: Notes on watchdog module handling watchdog: do not add watchdog module in rd.driver.pre now spec: Update to add dependency on dracut version >= 044-75 dracut-module-setup.sh | 9 --------- kdump-lib.sh | 29 +++++++++++++++++++++++++++++ kdumpctl | 32 ++++++++++++++++++++++++++++++++ kexec-kdump-howto.txt | 16 ++++++++++++++++ kexec-tools.spec | 3 ++- mkdumprd | 5 ++++- 6 files changed, 83 insertions(+), 11 deletions(-) -- 2.5.5

2 11

[PATCH] makedumpfile: Support _count -> _refcount rename in struct page
by Pratyush Anand 12 Jul '16

12 Jul '16

Resolves: bz1342744 Upstream: https://sourceforge.net/p/makedumpfile/code/ci/2c21d4656e8d3c2af2b1e14809d0… Signed-off-by: Pratyush Anand <panand(a)redhat.com> --- ...pport-_count-_refcount-rename-in-struct-p.patch | 108 +++++++++++++++++++++ kexec-tools.spec | 2 + 2 files changed, 110 insertions(+) create mode 100644 kexec-tools-2.0.12-makedumpfile-Support-_count-_refcount-rename-in-struct-p.patch diff --git a/kexec-tools-2.0.12-makedumpfile-Support-_count-_refcount-rename-in-struct-p.patch b/kexec-tools-2.0.12-makedumpfile-Support-_count-_refcount-rename-in-struct-p.patch new file mode 100644 index 000000000000..479e234d04a1 --- /dev/null +++ b/kexec-tools-2.0.12-makedumpfile-Support-_count-_refcount-rename-in-struct-p.patch @@ -0,0 +1,108 @@ +From 2c21d4656e8d3c2af2b1e14809d076941ae69e96 Mon Sep 17 00:00:00 2001 +Message-Id: <2c21d4656e8d3c2af2b1e14809d076941ae69e96.1468205827.git.panand(a)redhat.com> +From: Vitaly Kuznetsov <vkuznets(a)redhat.com> +Date: Fri, 17 Jun 2016 18:41:26 +0900 +Subject: [PATCH] [PATCH v2] Support _count -> _refcount rename in struct page + +_count member was renamed to _refcount in linux commit 0139aa7b7fa12 +("mm: rename _count, field of the struct page, to _refcount") and this +broke makedumpfile. The reason for making the change was to find all users +accessing it directly and not through the recommended API. I tried +suggesting to revert the change but failed, I see no other choice than to +start supporting both _count and _refcount in makedumpfile. + +Signed-off-by: Vitaly Kuznetsov <vkuznets(a)redhat.com> +--- + makedumpfile-1.6.0/makedumpfile.c | 26 +++++++++++++++++++++----- + makedumpfile-1.6.0/makedumpfile.h | 3 ++- + 2 files changed, 23 insertions(+), 6 deletions(-) + +diff --git a/makedumpfile-1.6.0/makedumpfile.c b/makedumpfile-1.6.0/makedumpfile.c +index 853b99951706..fd884d3796be 100644 +--- a/makedumpfile-1.6.0/makedumpfile.c ++++ b/makedumpfile-1.6.0/makedumpfile.c +@@ -1579,7 +1579,14 @@ get_structure_info(void) + */ + SIZE_INIT(page, "page"); + OFFSET_INIT(page.flags, "page", "flags"); +- OFFSET_INIT(page._count, "page", "_count"); ++ OFFSET_INIT(page._refcount, "page", "_refcount"); ++ if (OFFSET(page._refcount) == NOT_FOUND_STRUCTURE) { ++ info->flag_use_count = TRUE; ++ OFFSET_INIT(page._refcount, "page", "_count"); ++ } else { ++ info->flag_use_count = FALSE; ++ } ++ + OFFSET_INIT(page.mapping, "page", "mapping"); + OFFSET_INIT(page._mapcount, "page", "_mapcount"); + OFFSET_INIT(page.private, "page", "private"); +@@ -2044,7 +2051,7 @@ get_mem_type(void) + + if ((SIZE(page) == NOT_FOUND_STRUCTURE) + || (OFFSET(page.flags) == NOT_FOUND_STRUCTURE) +- || (OFFSET(page._count) == NOT_FOUND_STRUCTURE) ++ || (OFFSET(page._refcount) == NOT_FOUND_STRUCTURE) + || (OFFSET(page.mapping) == NOT_FOUND_STRUCTURE)) { + ret = NOT_FOUND_MEMTYPE; + } else if ((((SYMBOL(node_data) != NOT_FOUND_SYMBOL) +@@ -2151,7 +2158,10 @@ write_vmcoreinfo_data(void) + * write the member offset of 1st kernel + */ + WRITE_MEMBER_OFFSET("page.flags", page.flags); +- WRITE_MEMBER_OFFSET("page._count", page._count); ++ if (info->flag_use_count) ++ WRITE_MEMBER_OFFSET("page._count", page._refcount); ++ else ++ WRITE_MEMBER_OFFSET("page._refcount", page._refcount); + WRITE_MEMBER_OFFSET("page.mapping", page.mapping); + WRITE_MEMBER_OFFSET("page.lru", page.lru); + WRITE_MEMBER_OFFSET("page._mapcount", page._mapcount); +@@ -2491,7 +2501,13 @@ read_vmcoreinfo(void) + + + READ_MEMBER_OFFSET("page.flags", page.flags); +- READ_MEMBER_OFFSET("page._count", page._count); ++ READ_MEMBER_OFFSET("page._refcount", page._refcount); ++ if (OFFSET(page._refcount) == NOT_FOUND_STRUCTURE) { ++ info->flag_use_count = TRUE; ++ READ_MEMBER_OFFSET("page._count", page._refcount); ++ } else { ++ info->flag_use_count = FALSE; ++ } + READ_MEMBER_OFFSET("page.mapping", page.mapping); + READ_MEMBER_OFFSET("page.lru", page.lru); + READ_MEMBER_OFFSET("page._mapcount", page._mapcount); +@@ -5615,7 +5631,7 @@ __exclude_unnecessary_pages(unsigned long mem_map, + pcache = page_cache + (index_pg * SIZE(page)); + + flags = ULONG(pcache + OFFSET(page.flags)); +- _count = UINT(pcache + OFFSET(page._count)); ++ _count = UINT(pcache + OFFSET(page._refcount)); + mapping = ULONG(pcache + OFFSET(page.mapping)); + + if (OFFSET(page.compound_order) != NOT_FOUND_STRUCTURE) { +diff --git a/makedumpfile-1.6.0/makedumpfile.h b/makedumpfile-1.6.0/makedumpfile.h +index 251d4bfac060..533e5b89f345 100644 +--- a/makedumpfile-1.6.0/makedumpfile.h ++++ b/makedumpfile-1.6.0/makedumpfile.h +@@ -1100,6 +1100,7 @@ struct DumpInfo { + int flag_nospace; /* the flag of "No space on device" error */ + int flag_vmemmap; /* kernel supports vmemmap address space */ + int flag_excludevm; /* -e - excluding unused vmemmap pages */ ++ int flag_use_count; /* _refcount is named _count in struct page */ + unsigned long vaddr_for_vtop; /* virtual address for debugging */ + long page_size; /* size of page */ + long page_shift; +@@ -1483,7 +1484,7 @@ struct size_table { + struct offset_table { + struct page { + long flags; +- long _count; ++ long _refcount; + long mapping; + long lru; + long _mapcount; +-- +2.5.5 + diff --git a/kexec-tools.spec b/kexec-tools.spec index bca9df47507c..83295b1a7fb8 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -86,6 +86,7 @@ Patch503: kexec-tools-2.0.12-Properly-align-powerpc64-.toc.patch # Patches 601 onward are generic patches # Patch601: kexec-tools-2.0.3-disable-kexec-test.patch +Patch602: kexec-tools-2.0.12-makedumpfile-Support-_count-_refcount-rename-in-struct-p.patch %description kexec-tools provides /sbin/kexec binary that facilitates a new @@ -113,6 +114,7 @@ tar -z -x -v -f %{SOURCE23} %patch502 -p1 %patch503 -p1 %patch601 -p1 +%patch602 -p1 %ifarch ppc %define archdef ARCH=ppc -- 2.5.5

2 1

Re: [PATCH 4/5] Watchdog: Add notes for kdumpctl man page
by Dave Young 07 Jul '16

07 Jul '16

On 07/06/16 at 06:40pm, Pratyush Anand wrote: > On Wed, Jul 6, 2016 at 7:29 AM, Dave Young <dyoung(a)redhat.com> wrote: > > On 07/05/16 at 11:41am, Pratyush Anand wrote: > >> Add notes in kdumpctl man page with limitations of kdump when used in > >> conjunction with watchdog. > >> > >> Signed-off-by: Pratyush Anand <panand(a)redhat.com> > >> --- > >> kdumpctl.8 | 9 +++++++++ > >> 1 file changed, 9 insertions(+) > >> > >> diff --git a/kdumpctl.8 b/kdumpctl.8 > >> index b446b81bc37a..713342700b17 100644 > >> --- a/kdumpctl.8 > >> +++ b/kdumpctl.8 > >> @@ -16,6 +16,15 @@ to start / stop / enable kdump service instead. However, > >> .B kdumpctl > >> provides more details for debug and a helper to setup ssh key authentication. > >> > >> +.SH NOTES > >> +If a watchdog has been activated manually or by any daemon after kdump > >> +service start, then user must restart kdump service in order to rebuild > >> +kdump initrd with active watchdog module. > >> +If a custom application and not systemd daemon is used to activate and kick > >> +watchdog then, it is user's responsibility to pass name of the application > >> +in /etc/kdump.conf:extra_bins and the watchdog kick command in > >> +/etc/kdump.conf:kdump_pre. > > > > Maybe this is not necessary to be covered in kdumpctl manpage. Declare that > > we only support systemd wdt interface somewhere should be enough. > > I remember vaguely that I had got comment for RFC patch to include > these information in man page. > Yes, if we limit to systemd support only then it will be easier. But > where to put that information other than man page. Maybe add one section in the howto.txt about the wdt notes should be fine. Thanks Dave > > > > > Systemd wdt will always run before kdump service? > > Yes, > > > > > >> + > >> .SH COMMANDS > >> .TP > >> .I start > >> -- > >> 2.5.5 > >> _______________________________________________ > >> kexec mailing list > >> kexec(a)lists.fedoraproject.org > >> https://lists.fedoraproject.org/admin/lists/kexec@lists.fedoraproject.org > > ~Pratyush

2 1

Re: [PATCH 0/5] Rebuild initrd in case of watchdog state change
by Pratyush Anand 07 Jul '16

07 Jul '16

On 07-Jul-2016 9:07 pm, "Don Zickus" <dzickus(a)redhat.com> wrote: > > On Thu, Jul 07, 2016 at 08:24:00AM +0800, Dave Young wrote: > > On 07/06/16 at 10:26am, Don Zickus wrote: > > > On Wed, Jul 06, 2016 at 09:28:15AM +0800, Dave Young wrote: > > > > Ccing Don see if he has any comments about these wdt enablement patches. > > > > > > Unfortunately, I am not on this mailing list. Pointer to the archive? > > > > Don, it is not sorted correctly in a thread, I'm not sure how to get the > > right threaded link for the archive, anyway will cc you the several patches: > > https://lists.fedoraproject.org/archives/list/kexec@lists.fedoraproject.org/ > > > > If you would like to subscribe, here is a link, but seems Fedora mail list > > need login with an Fedora account first to subscribe now: > > https://lists.fedoraproject.org/admin/lists/kexec.lists.fedoraproject.org/ > > Thanks for the patches. I don't see any issues. Everything makes sense. > The first patch is the bulk of the work. I haven't convinced myself all the > cases are covered, but you can find/fix the corner cases later. For > example, I was wondering what happens if a wd module is already accidentally > added to dracut, then it doesn't get rebuilt (but maybe it doesn't > matter??). Yes it won't matter, if dracut has accidentally added it and watchdog is active, there will not be any rebuilt. But if it is inactive, then there will a rebuild and accidentally added driver will be removed. > > I will assume that a new kexec-tools update will force a rebuild to properly > pick up the new dracut -a/o watchdog option (this gets rid of the silly > initial conversion corner cases)? > > > Nice work! Good to finally see this. :-) Thanks a lot Don!!! > > Cheers, > Don > > > > > Thanks > > Dave > > > > > > Cheers, > > > Don > > > > > > > > > > > On 07/05/16 at 11:41am, Pratyush Anand wrote: > > > > > Fedora dracut-044-75 release has all the component needed to support initrd > > > > > rebuild in case of watchdog state change. Therefore sending these patches > > > > > for inclusion in kexec-tools. > > > > > > > > > > Please note that these patches should only be added in those fedora > > > > > versions which has dracut version dracut-044-75 or latter. Anyway, we > > > > > already have dependency specified in spec file as well. > > > > > > > > > > Pratyush Anand (5): > > > > > kdumpctl: force rebuild in case of watchdog state change > > > > > watchdog: Add nowdt argument in kdump.conf > > > > > watchdog: do not add watchdog module in rd.driver.pre now > > > > > Watchdog: Add notes for kdumpctl man page > > > > > spec: Update to add dependency on dracut version >= 044-75 > > > > > > > > > > dracut-module-setup.sh | 9 --------- > > > > > kdump.conf | 4 ++++ > > > > > kdump.conf.5 | 5 +++++ > > > > > kdumpctl | 34 +++++++++++++++++++++++++++++++++- > > > > > kdumpctl.8 | 9 +++++++++ > > > > > kexec-tools.spec | 3 ++- > > > > > mkdumprd | 8 +++++++- > > > > > 7 files changed, 60 insertions(+), 12 deletions(-) > > > > > > > > > > -- > > > > > 2.5.5 > > > > > _______________________________________________ > > > > > kexec mailing list > > > > > kexec(a)lists.fedoraproject.org > > > > > https://lists.fedoraproject.org/admin/lists/kexec@lists.fedoraproject.org

1 0

[PATCH 0/5] Rebuild initrd in case of watchdog state change
by Pratyush Anand 07 Jul '16

07 Jul '16

3 19

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

kexec July 2016