|
 |
a6d77e |
Return-Path: yishimat@redhat.com
|
|
|
a6d77e |
Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO
|
|
|
a6d77e |
zmta01.collab.prod.int.phx2.redhat.com) (10.5.81.8) by
|
|
|
a6d77e |
zmail24.collab.prod.int.phx2.redhat.com with LMTP; Thu, 2 Jul 2015 01:10:45
|
|
|
a6d77e |
-0400 (EDT)
|
|
|
a6d77e |
Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26])
|
|
|
a6d77e |
by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 5C0B61835A9;
|
|
|
a6d77e |
Thu, 2 Jul 2015 01:10:45 -0400 (EDT)
|
|
|
a6d77e |
Received: from [10.3.112.13] ([10.3.112.13])
|
|
|
a6d77e |
by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t625AhFu027595;
|
|
|
a6d77e |
Thu, 2 Jul 2015 01:10:43 -0400
|
|
|
a6d77e |
Subject: [RHEL7.2 PATCH resend v3 5/5] Add support for --splitblock-size.
|
|
|
a6d77e |
To: kexec-kdump-list@redhat.com
|
|
|
a6d77e |
References: <55929D94.4020500@redhat.com> <5594C62C.3030407@redhat.com>
|
|
|
a6d77e |
Cc: Minfei Huang <mhuang@redhat.com>, bhe@redhat.com, yishimat@redhat.com
|
|
|
a6d77e |
From: Yasuaki Ishimatsu <yishimat@redhat.com>
|
|
|
a6d77e |
Message-ID: <5594C7D2.8030300@redhat.com>
|
|
|
a6d77e |
Date: Thu, 2 Jul 2015 01:10:42 -0400
|
|
|
a6d77e |
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101
|
|
|
a6d77e |
Thunderbird/38.0.1
|
|
|
a6d77e |
MIME-Version: 1.0
|
|
|
a6d77e |
In-Reply-To: <5594C62C.3030407@redhat.com>
|
|
|
a6d77e |
Content-Type: text/plain; charset=utf-8
|
|
|
a6d77e |
Content-Transfer-Encoding: 7bit
|
|
|
a6d77e |
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26
|
|
|
a6d77e |
Content-Length: 4028
|
|
|
a6d77e |
|
|
|
a6d77e |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1182379
|
|
|
a6d77e |
|
|
|
a6d77e |
The patch is back ported directory from the following upstream commit:
|
|
|
a6d77e |
|
|
|
a6d77e |
commit 33521799757a52f0e97cbfb7c6a5e24de3b8cb50
|
|
|
a6d77e |
Author: Zhou Wenjian <zhouwj-fnst@cn.fujitsu.com>
|
|
|
a6d77e |
Date: Fri Nov 7 09:45:04 2014 +0900
|
|
|
a6d77e |
|
|
|
a6d77e |
[PATCH v5 5/5] Add support for --splitblock-size.
|
|
|
a6d77e |
|
|
|
a6d77e |
Use --splitblock-size to specify splitblock size (KB)
|
|
|
a6d77e |
When --split is specified in cyclic mode,splitblock table will be
|
|
|
a6d77e |
generated in create_dump_bitmap().
|
|
|
a6d77e |
|
|
|
a6d77e |
Signed-off-by: Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
|
|
|
a6d77e |
Signed-off-by: Zhou Wenjian <zhouwj-fnst@cn.fujitsu.com>
|
|
|
a6d77e |
|
|
|
a6d77e |
Resolves: rhbz#1182379
|
|
|
a6d77e |
Signed-off-by: Yasuaki Ishimatsu <yishimat@redhat.com>
|
|
|
a6d77e |
|
|
|
a6d77e |
---
|
|
|
a6d77e |
makedumpfile-1.5.7/makedumpfile.8 | 10 ++++++++++
|
|
|
a6d77e |
makedumpfile-1.5.7/makedumpfile.c | 4 ++++
|
|
|
a6d77e |
makedumpfile-1.5.7/makedumpfile.h | 1 +
|
|
|
a6d77e |
makedumpfile-1.5.7/print_info.c | 5 +++++
|
|
|
a6d77e |
4 files changed, 20 insertions(+), 0 deletions(-)
|
|
|
a6d77e |
|
|
|
a6d77e |
diff --git a/makedumpfile-1.5.7/makedumpfile.8 b/makedumpfile-1.5.7/makedumpfile.8
|
|
|
a6d77e |
index 9cb12c0..5e121fd 100644
|
|
|
a6d77e |
--- a/makedumpfile-1.5.7/makedumpfile.8
|
|
|
a6d77e |
+++ b/makedumpfile-1.5.7/makedumpfile.8
|
|
|
a6d77e |
@@ -386,6 +386,16 @@ size, so ordinary users don't need to specify this option.
|
|
|
a6d77e |
# makedumpfile \-\-cyclic\-buffer 1024 \-d 31 \-x vmlinux /proc/vmcore dumpfile
|
|
|
a6d77e |
|
|
|
a6d77e |
.TP
|
|
|
a6d77e |
+\fB\-\-splitblock\-size\fR \fIsplitblock_size\fR
|
|
|
a6d77e |
+Specify the splitblock size in kilo bytes for analysis in the cyclic mode with --split.
|
|
|
a6d77e |
+If --splitblock N is specified, difference of each splitted dumpfile size is at most N
|
|
|
a6d77e |
+kilo bytes.
|
|
|
a6d77e |
+.br
|
|
|
a6d77e |
+.B Example:
|
|
|
a6d77e |
+.br
|
|
|
a6d77e |
+# makedumpfile \-\-splitblock\-size 1024 \-d 31 \-x vmlinux \-\-split /proc/vmcore dumpfile1 dumpfile2
|
|
|
a6d77e |
+
|
|
|
a6d77e |
+.TP
|
|
|
a6d77e |
\fB\-\-non\-cyclic\fR
|
|
|
a6d77e |
Running in the non-cyclic mode, this mode uses the old filtering logic same as v1.4.4 or before.
|
|
|
a6d77e |
If you feel the cyclic mode is too slow, please try this mode.
|
|
|
a6d77e |
diff --git a/makedumpfile-1.5.7/makedumpfile.c b/makedumpfile-1.5.7/makedumpfile.c
|
|
|
a6d77e |
index c4309af..f3e76c9 100644
|
|
|
a6d77e |
--- a/makedumpfile-1.5.7/makedumpfile.c
|
|
|
a6d77e |
+++ b/makedumpfile-1.5.7/makedumpfile.c
|
|
|
a6d77e |
@@ -9570,6 +9570,7 @@ static struct option longopts[] = {
|
|
|
a6d77e |
{"eppic", required_argument, NULL, OPT_EPPIC},
|
|
|
a6d77e |
{"non-mmap", no_argument, NULL, OPT_NON_MMAP},
|
|
|
a6d77e |
{"mem-usage", no_argument, NULL, OPT_MEM_USAGE},
|
|
|
a6d77e |
+ {"splitblock-size", required_argument, NULL, OPT_SPLITBLOCK_SIZE},
|
|
|
a6d77e |
{0, 0, 0, 0}
|
|
|
a6d77e |
};
|
|
|
a6d77e |
|
|
|
a6d77e |
@@ -9710,6 +9711,9 @@ main(int argc, char *argv[])
|
|
|
a6d77e |
case OPT_CYCLIC_BUFFER:
|
|
|
a6d77e |
info->bufsize_cyclic = atoi(optarg);
|
|
|
a6d77e |
break;
|
|
|
a6d77e |
+ case OPT_SPLITBLOCK_SIZE:
|
|
|
a6d77e |
+ info->splitblock_size = atoi(optarg);
|
|
|
a6d77e |
+ break;
|
|
|
a6d77e |
case '?':
|
|
|
a6d77e |
MSG("Commandline parameter is invalid.\n");
|
|
|
a6d77e |
MSG("Try `makedumpfile --help' for more information.\n");
|
|
|
a6d77e |
diff --git a/makedumpfile-1.5.7/makedumpfile.h b/makedumpfile-1.5.7/makedumpfile.h
|
|
|
a6d77e |
index f9d9332..0cb54a3 100644
|
|
|
a6d77e |
--- a/makedumpfile-1.5.7/makedumpfile.h
|
|
|
a6d77e |
+++ b/makedumpfile-1.5.7/makedumpfile.h
|
|
|
a6d77e |
@@ -1885,6 +1885,7 @@ struct elf_prstatus {
|
|
|
a6d77e |
#define OPT_EPPIC OPT_START+12
|
|
|
a6d77e |
#define OPT_NON_MMAP OPT_START+13
|
|
|
a6d77e |
#define OPT_MEM_USAGE OPT_START+14
|
|
|
a6d77e |
+#define OPT_SPLITBLOCK_SIZE OPT_START+15
|
|
|
a6d77e |
|
|
|
a6d77e |
/*
|
|
|
a6d77e |
* Function Prototype.
|
|
|
a6d77e |
diff --git a/makedumpfile-1.5.7/print_info.c b/makedumpfile-1.5.7/print_info.c
|
|
|
a6d77e |
index f6342d3..efdf578 100644
|
|
|
a6d77e |
--- a/makedumpfile-1.5.7/print_info.c
|
|
|
a6d77e |
+++ b/makedumpfile-1.5.7/print_info.c
|
|
|
a6d77e |
@@ -203,6 +203,11 @@ print_usage(void)
|
|
|
a6d77e |
MSG(" By default, BUFFER_SIZE will be calculated automatically depending on\n");
|
|
|
a6d77e |
MSG(" system memory size, so ordinary users don't need to specify this option.\n");
|
|
|
a6d77e |
MSG("\n");
|
|
|
a6d77e |
+ MSG(" [--splitblock-size SPLITBLOCK_SIZE]:\n");
|
|
|
a6d77e |
+ MSG(" Specify the splitblock size in kilo bytes for analysis in the cyclic mode\n");
|
|
|
a6d77e |
+ MSG(" with --split. If --splitblock N is specified, difference of each splitted\n");
|
|
|
a6d77e |
+ MSG(" dumpfile size is at most N kilo bytes.\n");
|
|
|
a6d77e |
+ MSG("\n");
|
|
|
a6d77e |
MSG(" [--non-cyclic]:\n");
|
|
|
a6d77e |
MSG(" Running in the non-cyclic mode, this mode uses the old filtering logic\n");
|
|
|
a6d77e |
MSG(" same as v1.4.4 or before.\n");
|
|
|
a6d77e |
--
|
|
|
a6d77e |
1.7.1
|
|
|
a6d77e |
|