From: Michael Holzheu <holzheu@linux.vnet.ibm.com> To: Vivek Goyal <vgoyal@redhat.com>, HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com> Cc: Jan Willeke <willeke@de.ibm.com>, Martin Schwidefsky <schwidefsky@de.ibm.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, linux-kernel@vger.kernel.org, kexec@lists.infradead.org Subject: [PATCH v6 4/5] s390/vmcore: Implement remap_oldmem_pfn_range for s390 Date: Mon, 1 Jul 2013 21:32:38 +0200 [thread overview] Message-ID: <1372707159-10425-5-git-send-email-holzheu@linux.vnet.ibm.com> (raw) In-Reply-To: <1372707159-10425-1-git-send-email-holzheu@linux.vnet.ibm.com> From: Jan Willeke <willeke@de.ibm.com> This patch introduces the s390 specific way to map pages from oldmem. The memory area below OLDMEM_SIZE is mapped with offset OLDMEM_BASE. The other old memory is mapped directly. Signed-off-by: Jan Willeke <willeke@de.ibm.com> Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com> --- arch/s390/kernel/crash_dump.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c index bfb9cda..9769aa3 100644 --- a/arch/s390/kernel/crash_dump.c +++ b/arch/s390/kernel/crash_dump.c @@ -56,6 +56,32 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, } /* + * Remap "oldmem" + * + * For the kdump reserved memory this functions performs a swap operation: + * [0 - OLDMEM_SIZE] is mapped to [OLDMEM_BASE - OLDMEM_BASE + OLDMEM_SIZE] + */ +int remap_oldmem_pfn_range(struct vm_area_struct *vma, unsigned long from, + unsigned long pfn, unsigned long size, pgprot_t prot) +{ + unsigned long size_old; + int rc; + + if (pfn < OLDMEM_SIZE >> PAGE_SHIFT) { + size_old = min(size, OLDMEM_SIZE - (pfn << PAGE_SHIFT)); + rc = remap_pfn_range(vma, from, + pfn + (OLDMEM_BASE >> PAGE_SHIFT), + size_old, prot); + if (rc || size == size_old) + return rc; + size -= size_old; + from += size_old; + pfn += size_old >> PAGE_SHIFT; + } + return remap_pfn_range(vma, from, pfn, size, prot); +} + +/* * Copy memory from old kernel */ int copy_from_oldmem(void *dest, void *src, size_t count) -- 1.8.2.2
WARNING: multiple messages have this Message-ID (diff)
From: Michael Holzheu <holzheu@linux.vnet.ibm.com> To: Vivek Goyal <vgoyal@redhat.com>, HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>, kexec@lists.infradead.org, Heiko Carstens <heiko.carstens@de.ibm.com>, Jan Willeke <willeke@de.ibm.com>, linux-kernel@vger.kernel.org Subject: [PATCH v6 4/5] s390/vmcore: Implement remap_oldmem_pfn_range for s390 Date: Mon, 1 Jul 2013 21:32:38 +0200 [thread overview] Message-ID: <1372707159-10425-5-git-send-email-holzheu@linux.vnet.ibm.com> (raw) In-Reply-To: <1372707159-10425-1-git-send-email-holzheu@linux.vnet.ibm.com> From: Jan Willeke <willeke@de.ibm.com> This patch introduces the s390 specific way to map pages from oldmem. The memory area below OLDMEM_SIZE is mapped with offset OLDMEM_BASE. The other old memory is mapped directly. Signed-off-by: Jan Willeke <willeke@de.ibm.com> Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com> --- arch/s390/kernel/crash_dump.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c index bfb9cda..9769aa3 100644 --- a/arch/s390/kernel/crash_dump.c +++ b/arch/s390/kernel/crash_dump.c @@ -56,6 +56,32 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, } /* + * Remap "oldmem" + * + * For the kdump reserved memory this functions performs a swap operation: + * [0 - OLDMEM_SIZE] is mapped to [OLDMEM_BASE - OLDMEM_BASE + OLDMEM_SIZE] + */ +int remap_oldmem_pfn_range(struct vm_area_struct *vma, unsigned long from, + unsigned long pfn, unsigned long size, pgprot_t prot) +{ + unsigned long size_old; + int rc; + + if (pfn < OLDMEM_SIZE >> PAGE_SHIFT) { + size_old = min(size, OLDMEM_SIZE - (pfn << PAGE_SHIFT)); + rc = remap_pfn_range(vma, from, + pfn + (OLDMEM_BASE >> PAGE_SHIFT), + size_old, prot); + if (rc || size == size_old) + return rc; + size -= size_old; + from += size_old; + pfn += size_old >> PAGE_SHIFT; + } + return remap_pfn_range(vma, from, pfn, size, prot); +} + +/* * Copy memory from old kernel */ int copy_from_oldmem(void *dest, void *src, size_t count) -- 1.8.2.2 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2013-07-01 19:32 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-07-01 19:32 [PATCH v6 0/5] kdump: Allow ELF header creation in new kernel Michael Holzheu 2013-07-01 19:32 ` Michael Holzheu 2013-07-01 19:32 ` [PATCH v6 1/5] vmcore: Introduce ELF header in new memory feature Michael Holzheu 2013-07-01 19:32 ` Michael Holzheu 2013-07-02 15:27 ` Vivek Goyal 2013-07-02 15:27 ` Vivek Goyal 2013-07-01 19:32 ` [PATCH v6 2/5] s390/vmcore: Use " Michael Holzheu 2013-07-01 19:32 ` Michael Holzheu 2013-07-02 16:23 ` Vivek Goyal 2013-07-02 16:23 ` Vivek Goyal 2013-07-03 7:59 ` Michael Holzheu 2013-07-03 7:59 ` Michael Holzheu 2013-07-03 14:15 ` Vivek Goyal 2013-07-03 14:15 ` Vivek Goyal 2013-07-03 14:39 ` Michael Holzheu 2013-07-03 14:39 ` Michael Holzheu 2013-07-03 14:50 ` Vivek Goyal 2013-07-03 14:50 ` Vivek Goyal 2013-07-01 19:32 ` [PATCH v6 3/5] vmcore: Introduce remap_oldmem_pfn_range() Michael Holzheu 2013-07-01 19:32 ` Michael Holzheu 2013-07-02 15:42 ` Vivek Goyal 2013-07-02 15:42 ` Vivek Goyal 2013-07-03 13:59 ` Michael Holzheu 2013-07-03 13:59 ` Michael Holzheu 2013-07-03 14:16 ` Vivek Goyal 2013-07-03 14:16 ` Vivek Goyal 2013-07-15 13:44 ` Michael Holzheu 2013-07-15 13:44 ` Michael Holzheu 2013-07-15 14:27 ` Vivek Goyal 2013-07-15 14:27 ` Vivek Goyal 2013-07-16 9:25 ` Michael Holzheu 2013-07-16 9:25 ` Michael Holzheu 2013-07-16 14:04 ` Vivek Goyal 2013-07-16 14:04 ` Vivek Goyal 2013-07-16 15:37 ` Michael Holzheu 2013-07-16 15:37 ` Michael Holzheu 2013-07-16 15:55 ` Vivek Goyal 2013-07-16 15:55 ` Vivek Goyal 2013-07-08 5:32 ` HATAYAMA Daisuke 2013-07-08 5:32 ` HATAYAMA Daisuke 2013-07-08 9:28 ` Michael Holzheu 2013-07-08 9:28 ` Michael Holzheu 2013-07-08 14:28 ` Vivek Goyal 2013-07-08 14:28 ` Vivek Goyal 2013-07-09 5:49 ` HATAYAMA Daisuke 2013-07-09 5:49 ` HATAYAMA Daisuke 2013-07-10 8:42 ` Michael Holzheu 2013-07-10 8:42 ` Michael Holzheu 2013-07-10 9:50 ` HATAYAMA Daisuke 2013-07-10 9:50 ` HATAYAMA Daisuke 2013-07-10 11:00 ` Michael Holzheu 2013-07-10 11:00 ` Michael Holzheu 2013-07-12 16:02 ` HATAYAMA Daisuke 2013-07-12 16:02 ` HATAYAMA Daisuke 2013-07-15 9:21 ` Martin Schwidefsky 2013-07-15 9:21 ` Martin Schwidefsky 2013-07-16 0:51 ` HATAYAMA Daisuke 2013-07-16 0:51 ` HATAYAMA Daisuke 2013-07-10 14:33 ` Vivek Goyal 2013-07-10 14:33 ` Vivek Goyal 2013-07-12 11:05 ` HATAYAMA Daisuke 2013-07-12 11:05 ` HATAYAMA Daisuke 2013-07-15 14:20 ` Vivek Goyal 2013-07-15 14:20 ` Vivek Goyal 2013-07-16 0:27 ` HATAYAMA Daisuke 2013-07-16 0:27 ` HATAYAMA Daisuke 2013-07-16 9:40 ` HATAYAMA Daisuke 2013-07-16 9:40 ` HATAYAMA Daisuke 2013-07-09 5:31 ` HATAYAMA Daisuke 2013-07-09 5:31 ` HATAYAMA Daisuke 2013-07-01 19:32 ` Michael Holzheu [this message] 2013-07-01 19:32 ` [PATCH v6 4/5] s390/vmcore: Implement remap_oldmem_pfn_range for s390 Michael Holzheu 2013-07-01 19:32 ` [PATCH v6 5/5] s390/vmcore: Use vmcore for zfcpdump Michael Holzheu 2013-07-01 19:32 ` Michael Holzheu
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=1372707159-10425-5-git-send-email-holzheu@linux.vnet.ibm.com \ --to=holzheu@linux.vnet.ibm.com \ --cc=d.hatayama@jp.fujitsu.com \ --cc=heiko.carstens@de.ibm.com \ --cc=kexec@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=schwidefsky@de.ibm.com \ --cc=vgoyal@redhat.com \ --cc=willeke@de.ibm.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.