From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757345AbXJKCMW (ORCPT ); Wed, 10 Oct 2007 22:12:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755558AbXJKCMP (ORCPT ); Wed, 10 Oct 2007 22:12:15 -0400 Received: from mga03.intel.com ([143.182.124.21]:30590 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754033AbXJKCMO (ORCPT ); Wed, 10 Oct 2007 22:12:14 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.21,256,1188802800"; d="scan'208";a="296349044" Subject: [PATCH 2/2 -mm] kexec based hibernation -v5: kexec restore From: "Huang, Ying" To: "Eric W. Biederman" , Pavel Machek , nigel@nigel.suspend2.net, "Rafael J. Wysocki" , Andrew Morton , Jeremy Maitin-Shepard Cc: linux-kernel@vger.kernel.org, linux-pm@lists.linux-foundation.org, Kexec Mailing List Content-Type: text/plain Content-Transfer-Encoding: 7bit Date: Thu, 11 Oct 2007 10:14:17 +0800 Message-Id: <1192068857.27482.15.camel@caritas-dev.intel.com> Mime-Version: 1.0 X-Mailer: Evolution 2.10.3 X-OriginalArrivalTime: 11 Oct 2007 02:12:05.0809 (UTC) FILETIME=[1EBDBA10:01C80BAC] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org This patch adds writing support for /dev/oldmem. This is used to restore the memory contents of hibernated system. Signed-off-by: Huang Ying --- Index: linux-2.6.23-rc6/arch/i386/kernel/crash_dump.c =================================================================== --- linux-2.6.23-rc6.orig/arch/i386/kernel/crash_dump.c 2007-09-28 09:46:22.000000000 +0800 +++ linux-2.6.23-rc6/arch/i386/kernel/crash_dump.c 2007-09-28 09:46:25.000000000 +0800 @@ -58,6 +58,33 @@ return csize; } +ssize_t write_oldmem_page(unsigned long pfn, const char *buf, + size_t csize, unsigned long offset, int userbuf) +{ + void *vaddr; + + if (!csize) + return 0; + + if (!userbuf) { + vaddr = kmap_atomic_pfn(pfn, KM_PTE0); + memcpy(vaddr + offset, buf, csize); + } else { + if (!kdump_buf_page) { + printk(KERN_WARNING "Kdump: Kdump buffer page not" + " allocated\n"); + return -EFAULT; + } + if (copy_from_user(kdump_buf_page, buf, csize)) + return -EFAULT; + vaddr = kmap_atomic_pfn(pfn, KM_PTE0); + memcpy(vaddr + offset, kdump_buf_page, csize); + } + kunmap_atomic(vaddr, KM_PTE0); + + return csize; +} + static int __init kdump_buf_page_init(void) { int ret = 0; Index: linux-2.6.23-rc6/include/linux/crash_dump.h =================================================================== --- linux-2.6.23-rc6.orig/include/linux/crash_dump.h 2007-09-28 09:46:22.000000000 +0800 +++ linux-2.6.23-rc6/include/linux/crash_dump.h 2007-09-28 09:46:25.000000000 +0800 @@ -11,6 +11,8 @@ extern unsigned long long elfcorehdr_addr; extern ssize_t copy_oldmem_page(unsigned long, char *, size_t, unsigned long, int); +extern ssize_t write_oldmem_page(unsigned long, const char *, size_t, + unsigned long, int); extern const struct file_operations proc_vmcore_operations; extern struct proc_dir_entry *proc_vmcore; Index: linux-2.6.23-rc6/drivers/char/mem.c =================================================================== --- linux-2.6.23-rc6.orig/drivers/char/mem.c 2007-09-28 09:46:22.000000000 +0800 +++ linux-2.6.23-rc6/drivers/char/mem.c 2007-09-28 09:46:25.000000000 +0800 @@ -348,6 +348,37 @@ } return read; } + +/* + * Write memory corresponding to the old kernel. + */ +static ssize_t write_oldmem(struct file *file, const char __user *buf, + size_t count, loff_t *ppos) +{ + unsigned long pfn, offset; + size_t write = 0, csize; + int rc = 0; + + while (count) { + pfn = *ppos / PAGE_SIZE; + if (pfn > saved_max_pfn) + return write; + + offset = (unsigned long)(*ppos % PAGE_SIZE); + if (count > PAGE_SIZE - offset) + csize = PAGE_SIZE - offset; + else + csize = count; + rc = write_oldmem_page(pfn, buf, csize, offset, 1); + if (rc < 0) + return rc; + buf += csize; + *ppos += csize; + write += csize; + count -= csize; + } + return write; +} #endif extern long vread(char *buf, char *addr, unsigned long count); @@ -783,6 +814,7 @@ #ifdef CONFIG_CRASH_DUMP static const struct file_operations oldmem_fops = { .read = read_oldmem, + .write = write_oldmem, .open = open_oldmem, }; #endif