From 1ba4387a37838354b3f258aef6c1710762046324b6fcd1cce39bc518d0a466a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Thu, 11 May 2017 15:50:06 +0000 Subject: [PATCH 1/5] Accepting request 494686 from home:ptesarik:branches:Kernel:kdump Upgrade to makedumpfile-1.6.1 OBS-URL: https://build.opensuse.org/request/show/494686 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/makedumpfile?expand=0&rev=100 --- makedumpfile-1.6.0.tar.gz | 3 - makedumpfile-1.6.1.tar.gz | 3 + makedumpfile-_count-_refcount-rename.patch | 102 --------------------- makedumpfile-rpmlintrc | 2 +- makedumpfile.changes | 10 ++ makedumpfile.spec | 6 +- 6 files changed, 16 insertions(+), 110 deletions(-) delete mode 100644 makedumpfile-1.6.0.tar.gz create mode 100644 makedumpfile-1.6.1.tar.gz delete mode 100644 makedumpfile-_count-_refcount-rename.patch diff --git a/makedumpfile-1.6.0.tar.gz b/makedumpfile-1.6.0.tar.gz deleted file mode 100644 index f808109..0000000 --- a/makedumpfile-1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3147abc52df2ceac1e9affef45bf37e2f2e1d9979bc94a761ee11e4044072ac -size 175080 diff --git a/makedumpfile-1.6.1.tar.gz b/makedumpfile-1.6.1.tar.gz new file mode 100644 index 0000000..5cd9c20 --- /dev/null +++ b/makedumpfile-1.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b6e73106998670407887de9e1a505b3a2dbb2fb517a4b968a665eda8fb097ce +size 176228 diff --git a/makedumpfile-_count-_refcount-rename.patch b/makedumpfile-_count-_refcount-rename.patch deleted file mode 100644 index ee179d6..0000000 --- a/makedumpfile-_count-_refcount-rename.patch +++ /dev/null @@ -1,102 +0,0 @@ -From: Vitaly Kuznetsov -Date: Fri, 17 Jun 2016 18:41:26 +0900 -Subject: [PATCH v2] Support _count -> _refcount rename in struct page -Patch-mainline: Released-1-6-1? -Git-commit: 2c21d4656e8d3c2af2b1e14809d076941ae69e96 - -_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 - ---- - makedumpfile.c | 26 +++++++++++++++++++++----- - makedumpfile.h | 3 ++- - 2 files changed, 23 insertions(+), 6 deletions(-) - ---- a/makedumpfile.c -+++ b/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 lon - 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) { ---- a/makedumpfile.h -+++ b/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; diff --git a/makedumpfile-rpmlintrc b/makedumpfile-rpmlintrc index d139c39..f57d373 100644 --- a/makedumpfile-rpmlintrc +++ b/makedumpfile-rpmlintrc @@ -1 +1 @@ -addFilter("devel-file-in-non-devel-package .*/usr/share/makedumpfile-1\.6\.0/eppic_scripts/.*\.c") +addFilter("devel-file-in-non-devel-package .*/usr/share/makedumpfile-1\.6\.1/eppic_scripts/.*\.c") diff --git a/makedumpfile.changes b/makedumpfile.changes index dbe1b9f..c6c5c27 100644 --- a/makedumpfile.changes +++ b/makedumpfile.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu May 11 15:32:13 UTC 2017 - ptesarik@suse.com + +- Update to 1.6.1 + * Enhance support for aarch64 + * Enhance support for ppc64 + * Support kernels up to 4.8 +- Drop upstreamed patch + * makedumpfile-_count-_refcount-rename.patch + ------------------------------------------------------------------- Tue Jul 12 15:56:04 UTC 2016 - ptesarik@suse.com diff --git a/makedumpfile.spec b/makedumpfile.spec index 121004d..d0ad1e8 100644 --- a/makedumpfile.spec +++ b/makedumpfile.spec @@ -1,7 +1,7 @@ # # spec file for package makedumpfile # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ %endif Name: makedumpfile -Version: 1.6.0 +Version: 1.6.1 Release: 0 Summary: Partial kernel dump License: GPL-2.0 @@ -38,7 +38,6 @@ Url: https://sourceforge.net/projects/makedumpfile/ Source: https://sourceforge.net/projects/makedumpfile/files/makedumpfile/%{version}/%{name}-%{version}.tar.gz Source99: %{name}-rpmlintrc Patch0: %{name}-coptflags.diff -Patch1: %{name}-_count-_refcount-rename.patch Patch2: %{name}-override-libtinfo.patch BuildRequires: libdw-devel BuildRequires: libebl-devel @@ -68,7 +67,6 @@ via gdb or crash utility. %prep %setup -q %patch0 -p1 -%patch1 -p1 %patch2 -p1 %build From 028147a9e7386f46910c72e2841a8b63ea4abf0bc932aa9bb8c914edb15f2466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Thu, 11 May 2017 16:51:37 +0000 Subject: [PATCH 2/5] Accepting request 494701 from home:ptesarik:branches:Kernel:kdump Upgrade to 1.6.1 - Merge with updates on SLE12 SP2 (FATE#318012, bsc#992885, bsc#999869). OBS-URL: https://build.opensuse.org/request/show/494701 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/makedumpfile?expand=0&rev=101 --- makedumpfile.changes | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/makedumpfile.changes b/makedumpfile.changes index c6c5c27..359ae0b 100644 --- a/makedumpfile.changes +++ b/makedumpfile.changes @@ -7,6 +7,8 @@ Thu May 11 15:32:13 UTC 2017 - ptesarik@suse.com * Support kernels up to 4.8 - Drop upstreamed patch * makedumpfile-_count-_refcount-rename.patch +- Merge with updates on SLE12 SP2 (FATE#318012, bsc#992885, + bsc#999869). ------------------------------------------------------------------- Tue Jul 12 15:56:04 UTC 2016 - ptesarik@suse.com @@ -31,7 +33,7 @@ Tue Jul 12 10:08:41 UTC 2016 - ptesarik@suse.com ------------------------------------------------------------------- Tue Jul 12 09:13:25 UTC 2016 - ptesarik@suse.com -- Update to 1.6.0 +- Update to 1.6.0 (FATE#320955). * Exclude page structures of non-dumped pages. - Drop upstreamed patch * Looking-for-page.compound_order-compound_dtor-.patch @@ -57,6 +59,7 @@ Sun Feb 14 08:11:59 UTC 2016 - mpluskal@suse.com - Update to 1.5.9 * support for aarch64 * Support kernels up to 4.1 + * Enable compressed dump formats for Xen (FATE#316467). - Drop upstreamed patch * makedumpfile-add-aarch64.diff - Use url for source @@ -124,7 +127,7 @@ Wed May 7 14:00:57 UTC 2014 - ptesarik@suse.cz o support for Linux 3.13 o include sample eppic scripts o eppic: Add support for module data structures - o ability to filter Xen Dom0 dumps + o ability to filter Xen Dom0 dumps (bnc#864910, bnc#829646). - makedumpfile-fix-sprintf-append.patch: now upstream - makedumpfile-kernel-3.12-supported.patch: now upstream @@ -132,7 +135,7 @@ Wed May 7 14:00:57 UTC 2014 - ptesarik@suse.cz ------------------------------------------------------------------- Fri Mar 21 09:50:53 UTC 2014 - ptesarik@suse.cz -- enable snappy compression +- enable snappy compression (FATE#315726). ------------------------------------------------------------------- Tue Feb 25 11:53:37 UTC 2014 - ptesarik@suse.cz From ed3ea5d9ef164b2c59c2cb5c62db3844ec60ce3c5ad0d656fac5584ce0da003f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Thu, 11 May 2017 16:54:19 +0000 Subject: [PATCH 3/5] Remove non-break spaces from Changelog. OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/makedumpfile?expand=0&rev=102 --- makedumpfile.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makedumpfile.changes b/makedumpfile.changes index 359ae0b..722745e 100644 --- a/makedumpfile.changes +++ b/makedumpfile.changes @@ -331,8 +331,8 @@ Fri Feb 20 09:59:02 CET 2009 - bwalle@suse.de - Update to 1.3.2 o Add --dump-dmesg option (Dumping dmesg buffer from /proc/vmcore to a file) -  o Fix a typo in README file. -  o Code Cleanup + o Fix a typo in README file. + o Code Cleanup ------------------------------------------------------------------- Wed Dec 03 19:59:35 CET 2008 - bwalle@suse.de From a974cc55a12a9228eb633336dfe531dea7bccd06109076f7be301a3ea5535835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Thu, 11 May 2017 16:56:40 +0000 Subject: [PATCH 4/5] - Update to 1.6.1 (FATE#322011). OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/makedumpfile?expand=0&rev=103 --- makedumpfile.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makedumpfile.changes b/makedumpfile.changes index 722745e..4ea30f8 100644 --- a/makedumpfile.changes +++ b/makedumpfile.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu May 11 15:32:13 UTC 2017 - ptesarik@suse.com -- Update to 1.6.1 +- Update to 1.6.1 (FATE#322011). * Enhance support for aarch64 * Enhance support for ppc64 * Support kernels up to 4.8 From 4e663c03428c1e107dc55b853ed3c77a7a0133c7c14160c19269e2dd93cfda23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Mon, 15 May 2017 18:11:35 +0000 Subject: [PATCH 5/5] Accepting request 495008 from home:ptesarik:branches:Kernel:kdump * support for aarch64 (FATE#318444) OBS-URL: https://build.opensuse.org/request/show/495008 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/makedumpfile?expand=0&rev=104 --- makedumpfile.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makedumpfile.changes b/makedumpfile.changes index 4ea30f8..bb0264f 100644 --- a/makedumpfile.changes +++ b/makedumpfile.changes @@ -57,7 +57,7 @@ Fri Jul 8 05:57:04 UTC 2016 - mkubecek@suse.cz Sun Feb 14 08:11:59 UTC 2016 - mpluskal@suse.com - Update to 1.5.9 - * support for aarch64 + * support for aarch64 (FATE#318444) * Support kernels up to 4.1 * Enable compressed dump formats for Xen (FATE#316467). - Drop upstreamed patch