public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Amerigo Wang <amwang@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: tony.luck@intel.com, linux-ia64@vger.kernel.org,
	Neil Horman <nhorman@redhat.com>,
	"Eric W. Biederman" <ebiederm@xmission.com>,
	kamezawa.hiroyu@jp.fujitsu.com, Andi Kleen <andi@firstfloor.org>,
	Amerigo Wang <amwang@redhat.com>,
	Michael Ellerman <michael@ellerman.id.au>,
	"M. Mohan Kumar" <mohan@in.ibm.com>,
	akpm@linux-foundation.org, bernhard.walle@gmx.de,
	Fenghua Yu <fenghua.yu@intel.com>, Ingo Molnar <mingo@elte.hu>,
	Anton Vorontsov <avorontsov@ru.mvista.com>
Subject: [Patch 8/8] kexec: allow to shrink reserved memory
Date: Wed, 26 Aug 2009 23:17:03 -0400	[thread overview]
Message-ID: <20090827031930.4534.92513.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20090827031800.4534.94868.sendpatchset@localhost.localdomain>

This patch implements shrinking the reserved memory for crash kernel,
if it is more than enough.

For example, if you have already reserved 128M, now you just want 100M,
you can do:

# echo $((100*1024*1024)) > /sys/kernel/kexec_crash_size

Note, you can only do this before loading the crash kernel.

Cc: Neil Horman <nhorman@redhat.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: WANG Cong <amwang@redhat.com>

---

Index: linux-2.6/include/linux/kexec.h
===================================================================
--- linux-2.6.orig/include/linux/kexec.h
+++ linux-2.6/include/linux/kexec.h
@@ -206,6 +206,8 @@ extern size_t vmcoreinfo_max_size;
 
 int __init parse_crashkernel(char *cmdline, unsigned long long system_ram,
 		unsigned long long *crash_size, unsigned long long *crash_base);
+int crash_shrink_memory(unsigned long new_size);
+size_t crash_get_memory_size(void);
 
 #else /* !CONFIG_KEXEC */
 struct pt_regs;
Index: linux-2.6/kernel/kexec.c
===================================================================
--- linux-2.6.orig/kernel/kexec.c
+++ linux-2.6/kernel/kexec.c
@@ -31,6 +31,7 @@
 #include <linux/cpu.h>
 #include <linux/console.h>
 #include <linux/vmalloc.h>
+#include <linux/swap.h>
 
 #include <asm/page.h>
 #include <asm/uaccess.h>
@@ -1083,6 +1084,64 @@ void crash_kexec(struct pt_regs *regs)
 	}
 }
 
+size_t crash_get_memory_size(void)
+{
+	size_t size;
+	mutex_lock(&kexec_mutex);
+	size = crashk_res.end - crashk_res.start + 1;
+	mutex_unlock(&kexec_mutex);
+	return size;
+}
+
+static void free_reserved_phys_range(unsigned long begin, unsigned long end)
+{
+	unsigned long addr;
+
+	for (addr = begin; addr < end; addr += PAGE_SIZE) {
+		ClearPageReserved(pfn_to_page(addr >> PAGE_SHIFT));
+		init_page_count(pfn_to_page(addr >> PAGE_SHIFT));
+		free_page((unsigned long)__va(addr));
+		totalram_pages++;
+	}
+}
+
+int crash_shrink_memory(unsigned long new_size)
+{
+	int ret = 0;
+	unsigned long start, end;
+
+	mutex_lock(&kexec_mutex);
+
+	if (kexec_crash_image) {
+		ret = -ENOENT;
+		goto unlock;
+	}
+	start = crashk_res.start;
+	end = crashk_res.end;
+
+	if (new_size >= end - start + 1) {
+		ret = -EINVAL;
+		if (new_size == end - start + 1)
+			ret = 0;
+		goto unlock;
+	}
+
+	start = roundup(start, PAGE_SIZE);
+	end = roundup(start + new_size, PAGE_SIZE);
+
+	free_reserved_phys_range(end, crashk_res.end);
+
+	if (start == end) {
+		crashk_res.end = end;
+		release_resource(&crashk_res);
+	} else
+		crashk_res.end = end - 1;
+
+unlock:
+	mutex_unlock(&kexec_mutex);
+	return ret;
+}
+
 static u32 *append_elf_note(u32 *buf, char *name, unsigned type, void *data,
 			    size_t data_len)
 {
Index: linux-2.6/kernel/ksysfs.c
===================================================================
--- linux-2.6.orig/kernel/ksysfs.c
+++ linux-2.6/kernel/ksysfs.c
@@ -100,6 +100,26 @@ static ssize_t kexec_crash_loaded_show(s
 }
 KERNEL_ATTR_RO(kexec_crash_loaded);
 
+static ssize_t kexec_crash_size_show(struct kobject *kobj,
+				       struct kobj_attribute *attr, char *buf)
+{
+	return sprintf(buf, "%lu\n", crash_get_memory_size());
+}
+static ssize_t kexec_crash_size_store(struct kobject *kobj,
+				   struct kobj_attribute *attr,
+				   const char *buf, size_t count)
+{
+	unsigned long cnt;
+	int ret;
+
+	if (strict_strtoul(buf, 0, &cnt))
+		return -EINVAL;
+
+	ret = crash_shrink_memory(cnt);
+	return ret < 0 ? ret : count;
+}
+KERNEL_ATTR_RW(kexec_crash_size);
+
 static ssize_t vmcoreinfo_show(struct kobject *kobj,
 			       struct kobj_attribute *attr, char *buf)
 {
@@ -147,6 +167,7 @@ static struct attribute * kernel_attrs[]
 #ifdef CONFIG_KEXEC
 	&kexec_loaded_attr.attr,
 	&kexec_crash_loaded_attr.attr,
+	&kexec_crash_size_attr.attr,
 	&vmcoreinfo_attr.attr,
 #endif
 	NULL

  parent reply	other threads:[~2009-08-27  3:17 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-27  3:15 [Patch 0/8] V5 Implement crashkernel=auto Amerigo Wang
2009-08-27  3:15 ` [Patch 1/8] x86: add CONFIG_KEXEC_AUTO_RESERVE Amerigo Wang
2009-08-27  3:15 ` [Patch 2/8] x86: implement crashkernel=auto Amerigo Wang
2009-08-27  3:16 ` [Patch 3/8] ia64: add CONFIG_KEXEC_AUTO_RESERVE Amerigo Wang
2009-08-27  3:16 ` [Patch 4/8] ia64: implement crashkernel=auto Amerigo Wang
2009-08-27  4:19   ` Yu, Fenghua
2009-08-27 10:26     ` Amerigo Wang
2009-08-27 18:13       ` Yu, Fenghua
2009-08-28 10:04         ` Amerigo Wang
2009-08-28 20:08           ` Yu, Fenghua
2009-08-27  3:16 ` [Patch 5/8] powerpc: add CONFIG_KEXEC_AUTO_RESERVE Amerigo Wang
2009-08-27  3:16 ` [Patch 6/8] powerpc: implement crashkernel=auto Amerigo Wang
2009-08-27 18:22   ` Yu, Fenghua
2009-08-27  3:16 ` [Patch 7/8] doc: update the kdump document Amerigo Wang
2009-08-27  3:17 ` Amerigo Wang [this message]
2009-08-31  0:54 ` [Patch 0/8] V5 Implement crashkernel=auto Michael Ellerman
2009-08-31  3:03   ` Eric W. Biederman
2009-08-31  3:25     ` Amerigo Wang
2009-08-31  3:27   ` Amerigo Wang
  -- strict thread matches above, loose matches on Subject: below --
2009-09-04 10:08 [Patch 0/8] V6 " Amerigo Wang
2009-09-04 10:09 ` [Patch 8/8] kexec: allow to shrink reserved memory Amerigo Wang
2009-08-12  8:15 [Patch 0/8] V3 Implement crashkernel=auto Amerigo Wang
2009-08-12  8:16 ` [Patch 8/8] kexec: allow to shrink reserved memory Amerigo Wang
2009-08-13  3:11   ` Eric W. Biederman
2009-08-13  3:32     ` Amerigo Wang
2009-08-13  6:18       ` Eric W. Biederman
2009-08-13  8:23         ` Amerigo Wang
2009-08-14 22:17           ` Eric W. Biederman
2009-08-17  9:50             ` Amerigo Wang
2009-08-18  0:29               ` KAMEZAWA Hiroyuki
2009-08-18  6:31                 ` Amerigo Wang
2009-08-18  8:25                   ` KAMEZAWA Hiroyuki
2009-08-18  8:51                     ` Amerigo Wang
2009-08-18 10:35                     ` Amerigo Wang
2009-08-18 23:57                       ` KAMEZAWA Hiroyuki
2009-08-19  2:41                         ` Amerigo Wang
2009-08-19  8:13                           ` KAMEZAWA Hiroyuki
2009-08-19 10:47                             ` Amerigo Wang
2009-08-20  9:15                             ` Amerigo Wang
2009-08-21  0:34                               ` KAMEZAWA Hiroyuki
2009-08-21  1:59                                 ` Amerigo Wang
2009-08-21  2:03                                   ` KAMEZAWA Hiroyuki
2009-08-21  2:47                                     ` Amerigo Wang

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=20090827031930.4534.92513.sendpatchset@localhost.localdomain \
    --to=amwang@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=andi@firstfloor.org \
    --cc=avorontsov@ru.mvista.com \
    --cc=bernhard.walle@gmx.de \
    --cc=ebiederm@xmission.com \
    --cc=fenghua.yu@intel.com \
    --cc=kamezawa.hiroyu@jp.fujitsu.com \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michael@ellerman.id.au \
    --cc=mingo@elte.hu \
    --cc=mohan@in.ibm.com \
    --cc=nhorman@redhat.com \
    --cc=tony.luck@intel.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