From: Baoquan He <bhe@redhat.com>
To: kexec@lists.infradead.org
Cc: kumagai-atsushi@mxc.nes.nec.co.jp, Baoquan He <bhe@redhat.com>,
vgoyal@redhat.com
Subject: [PATCH v4 2/8] functions to get crashkernel memory range
Date: Mon, 25 Aug 2014 11:33:06 +0800 [thread overview]
Message-ID: <1408937592-2609-3-git-send-email-bhe@redhat.com> (raw)
In-Reply-To: <1408937592-2609-1-git-send-email-bhe@redhat.com>
These functions are used to parse /proc/iomem code and get memory
ranges of specific type. They are implemented in kexec-tools and
borrowed here to get the crashkernel memory range. Since crashkernel
memory range should be excluded from dumpable memory ranges.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
makedumpfile.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
makedumpfile.h | 7 +++++
2 files changed, 89 insertions(+)
diff --git a/makedumpfile.c b/makedumpfile.c
index a01703e..44cf26f 100644
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -9043,6 +9043,88 @@ calculate_cyclic_buffer_size(void) {
return TRUE;
}
+
+
+//#define CRASH_RESERVED_MEM_NR 8
+struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR];
+int crash_reserved_mem_nr;
+
+/*
+ * iomem_for_each_line()
+ *
+ * Iterate over each line in the file returned by proc_iomem(). If match is
+ * NULL or if the line matches with our match-pattern then call the
+ * callback if non-NULL.
+ *
+ * Return the number of lines matched.
+ */
+int iomem_for_each_line(char *match,
+ int (*callback)(void *data,
+ int nr,
+ char *str,
+ unsigned long base,
+ unsigned long length),
+ void *data)
+{
+ const char iomem[] = "/proc/iomem";
+ char line[BUFSIZE_FGETS];
+ FILE *fp;
+ unsigned long long start, end, size;
+ char *str;
+ int consumed;
+ int count;
+ int nr = 0;
+
+ fp = fopen(iomem, "r");
+ if (!fp) {
+ ERRMSG("Cannot open %s\n", iomem);
+ return nr;
+ }
+
+ while(fgets(line, sizeof(line), fp) != 0) {
+ count = sscanf(line, "%Lx-%Lx : %n", &start, &end, &consumed);
+ if (count != 2)
+ continue;
+ str = line + consumed;
+ size = end - start + 1;
+ if (!match || memcmp(str, match, strlen(match)) == 0) {
+ if (callback
+ && callback(data, nr, str, start, size) < 0) {
+ break;
+ }
+ nr++;
+ }
+ }
+
+ fclose(fp);
+
+ return nr;
+}
+
+static int crashkernel_mem_callback(void *data, int nr,
+ char *str,
+ unsigned long base,
+ unsigned long length)
+{
+ if (nr >= CRASH_RESERVED_MEM_NR)
+ return 1;
+
+ crash_reserved_mem[nr].start = base;
+ crash_reserved_mem[nr].end = base + length - 1;
+ return 0;
+}
+
+int is_crashkernel_mem_reserved(void)
+{
+ int ret;
+
+ ret = iomem_for_each_line("Crash kernel\n",
+ crashkernel_mem_callback, NULL);
+ crash_reserved_mem_nr = ret;
+
+ return !!crash_reserved_mem_nr;
+}
+
static struct option longopts[] = {
{"split", no_argument, NULL, OPT_SPLIT},
{"reassemble", no_argument, NULL, OPT_REASSEMBLE},
diff --git a/makedumpfile.h b/makedumpfile.h
index 9f90b53..ed584af 100644
--- a/makedumpfile.h
+++ b/makedumpfile.h
@@ -1540,6 +1540,13 @@ extern struct array_table array_table;
extern struct number_table number_table;
extern struct srcfile_table srcfile_table;
+struct memory_range {
+ unsigned long long start, end;
+};
+
+#define CRASH_RESERVED_MEM_NR 8
+struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR];
+int crash_reserved_mem_nr;
int readmem(int type_addr, unsigned long long addr, void *bufptr, size_t size);
int get_str_osrelease_from_vmlinux(void);
--
1.8.5.3
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2014-08-25 3:35 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-25 3:33 [PATCH v4 0/8] add a new interface to show the memory usage of 1st kernel Baoquan He
2014-08-25 3:33 ` [PATCH v4 1/8] initialize pfn_memhole in get_num_dumpable_cyclic Baoquan He
2014-08-25 3:33 ` Baoquan He [this message]
2014-08-25 3:33 ` [PATCH v4 3/8] preparation functions for parsing vmcoreinfo Baoquan He
2014-08-25 5:45 ` [PATCH v5 " Baoquan He
2014-08-25 6:33 ` [PATCH v4 " Baoquan He
2014-08-25 3:33 ` [PATCH v4 4/8] set vmcoreinfo for kcore Baoquan He
2014-08-25 3:33 ` [PATCH v4 5/8] prepare the dump loads for kcore analysis Baoquan He
2014-08-25 3:33 ` [PATCH v4 6/8] introduce a function exclude_zero_pages_cyclic() Baoquan He
2014-08-25 3:33 ` [PATCH v4 7/8] implement a function to print the memory usage Baoquan He
2014-08-25 3:33 ` [PATCH v4 8/8] add a new interface to show the memory usage of 1st kernel Baoquan He
2014-08-25 6:36 ` [PATCH v5 " Baoquan He
2014-08-25 20:04 ` Vivek Goyal
2014-08-26 6:37 ` Baoquan He
2014-08-26 13:10 ` Vivek Goyal
2014-08-27 0:32 ` Atsushi Kumagai
2014-08-29 9:37 ` bhe
2014-08-25 7:03 ` [PATCH v4 " Baoquan He
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408937592-2609-3-git-send-email-bhe@redhat.com \
--to=bhe@redhat.com \
--cc=kexec@lists.infradead.org \
--cc=kumagai-atsushi@mxc.nes.nec.co.jp \
--cc=vgoyal@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox