mmap_vmcore: skip non-ram pages reported by hypervisors
Subsystems (2)
PATCH v2 1/1 mmap_vmcore: skip non-ram pages reported by hypervisors
We have a special check in read_vmcore() handler to check if the page was reported as ram or not by the hypervisor (pfn_is_ram()). However, when vmcore is read with mmap() no such check is performed. That can lead to unpredictable results, e.g. when running Xen PVHVM guest memcpy() after mmap() on /proc/vmcore will hang processing HVMMEM_mmio_dm pages creating enormous load in both DomU and Dom0.
Fix the issue by mapping each non-ram page to the zero page. Keep direct path with remap_oldmem_pfn_range() to avoid looping through all pages on bare metal.
The issue can also be solved by overriding remap_oldmem_pfn_range() in xen-specific code, as remap_oldmem_pfn_range() was been designed for. That, however, would involve non-obvious xen code path for all x86 builds with CONFIG_XEN_PVHVM=y and would prevent all other hypervisor-specific code on x86 arch from doing the same override.
Changes from v1:
- comment style changes
- change remap_oldmem_pfn_checked() interface to closer match the remap_oldmem_pfn() interface
- preserve formal parameters within the loop, make the loop conditions easier to understand
- use my_zero_pfn() for the zero page
- return remapped length instead of new offset
--- fs/proc/vmcore.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 84 insertions(+), 5 deletions(-)
fs/proc/vmcore.c +84 -5
@@ -328,6 +328,67 @@ static inline char *alloc_elfnotes_buf(size_t notes_sz)* virtually contiguous user-space in ELF layout. */ #ifdef CONFIG_MMU +/* +* remap_oldmem_pfn_checked - do remap_oldmem_pfn replacing all pages reported +* as not being ram with the zero page. +* +* @vma: vm_area_struct describing requested mapping +* @vma_addr: start remapping from +* @pfn: page frame number to start remapping to +* @size: remapping size +* +* Returns the remapped length. If no errors were hit during the remapping it +* should be equal to size. +*/ +static u64 remap_oldmem_pfn_checked (struct vm_area_struct *vma, +unsigned long vma_addr,unsigned long pfn, +unsigned long size) +{ +size_t map_size; +unsigned long pos_start, pos_end, pos; +unsigned long zeropage_pfn =my_zero_pfn (0 ); +u64 len =0 ; + + pos_start = pfn; + pos_end = pfn + (size >>PAGE_SHIFT ); + +for (pos = pos_start; pos < pos_end; ++pos) { +if (!pfn_is_ram (pos)) { +/* We hit a page which is not ram. Remap the continuous +* region between pos_start and pos-1 and replace +* the non-ram page at pos with the zero page. +*/ +if (pos > pos_start) { +/* Remap continuous region */ + map_size = (pos - pos_start) <<PAGE_SHIFT ; +if (remap_oldmem_pfn_range (vma, vma_addr + len, + pos_start, map_size, + vma->vm_page_prot)) +return len; + len += map_size; + } +/* Remap the zero page */ +if (remap_oldmem_pfn_range (vma, vma_addr + len, + zeropage_pfn, +PAGE_SIZE , + vma->vm_page_prot)) +return len; + len +=PAGE_SIZE ; + pos_start = pos +1 ; + } + } +if (pos > pos_start) { +/* Remap the rest */ + map_size = (pos - pos_start) <<PAGE_SHIFT ; +if (remap_oldmem_pfn_range (vma, vma_addr + len, pos_start, + map_size, + vma->vm_page_prot)) +return len; + len += map_size; + } +return len; +} +static int mmap_vmcore (struct file *file,struct vm_area_struct *vma) {size_t size = vma->vm_end - vma->vm_start;
@@ -387,13 +448,31 @@ static int mmap_vmcore(struct file *file, struct vm_area_struct *vma) tsz =min_t (size_t, m->offset + m->size - start, size); paddr = m->paddr + start - m->offset; -if (remap_oldmem_pfn_range (vma, vma->vm_start + len, - paddr >>PAGE_SHIFT , tsz, - vma->vm_page_prot)) - goto fail; + +/* Check if oldmem_pfn_is_ram was registered to avoid +looping over all pages without a reason. */ +if (oldmem_pfn_is_ram) { +u64 original_len; +unsigned long pfn, vma_addr; + + pfn = paddr >>PAGE_SHIFT ; + vma_addr = vma->vm_start + len; + original_len = len; + len +=remap_oldmem_pfn_checked (vma, vma_addr, + pfn, tsz); +if (len != original_len + tsz) + goto fail; + }else { +if (remap_oldmem_pfn_range (vma, + vma->vm_start + len, + paddr >>PAGE_SHIFT , + tsz, + vma->vm_page_prot)) + goto fail; + len += tsz; + } size -= tsz; start += tsz; - len += tsz;if (size ==0 )return 0 ;
Signature · 1 line
1.9.3
Quoted 42 lines · Vitaly Kuznetsov
We have a special check in
read_vmcore()handler to check if the page was reported as ram or not by the hypervisor (pfn_is_ram()). However, when vmcore is read withmmap()no such check is performed. That can lead to unpredictable results, e.g. when running Xen PVHVM guestmemcpy()aftermmap()on/proc/vmcorewill hang processingHVMMEM_mmio_dmpages creating enormous load in both DomU and Dom0.Fix the issue by mapping each non-ram page to the zero page. Keep direct path with
remap_oldmem_pfn_range()to avoid looping through all pages on bare metal.The issue can also be solved by overriding
remap_oldmem_pfn_range()in xen-specific code, asremap_oldmem_pfn_range()was been designed for. That, however, would involve non-obvious xen code path for all x86 builds withCONFIG_XEN_PVHVM=yand would prevent all other hypervisor-specific code on x86 arch from doing the same override.Changes from v1:
- comment style changes
- changeremap_oldmem_pfn_checked()interface to closer match theremap_oldmem_pfn()interface
- preserve formal parameters within the loop, make the loop conditions easier to understand
- usemy_zero_pfn()for the zero page
- return remapped length instead of new offsetSigned-off-by Vitaly Kuznetsov <[email protected]>Reviewed-by Andrew Jones <[email protected]>--- fs/proc/vmcore.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 84 insertions(+), 5 deletions(-)fs/proc/vmcore.c +2
-0@@ -328,6 +328,67 @@ static inline char *alloc_elfnotes_buf(size_t notes_sz)* virtually contiguous user-space in ELF layout. */ #ifdef CONFIG_MMU +/* +* remap_oldmem_pfn_checked - do remap_oldmem_pfn replacing all pages reported
fs/proc/vmcore.c static inline char *alloc_elfnotes_buf(size_t notes_sz) · line 342
Quoted 10 lines
fs/proc/vmcore.c +10
-0+* as not being ram with the zero page. +* +* @vma: vm_area_struct describing requested mapping +* @vma_addr: start remapping from +* @pfn: page frame number to start remapping to +* @size: remapping size +* +* Returns the remapped length. If no errors were hit during the remapping it +* should be equal to size. +*/
Hi,
So we are returning length of successful mapping so that it can be unmapped in outer loop in case of failure? If yes, can't we handle failure in this function itself instead of relying on outer function.
IOW, why not unmap whatever we have mapped in this function and return the error code. That sounds simpler to me.
Quoted 61 lines
fs/proc/vmcore.c +50
-4+static u64 remap_oldmem_pfn_checked (struct vm_area_struct *vma, +unsigned long vma_addr,unsigned long pfn, +unsigned long size) +{ +size_t map_size; +unsigned long pos_start, pos_end, pos; +unsigned long zeropage_pfn =my_zero_pfn (0 ); +u64 len =0 ; + + pos_start = pfn; + pos_end = pfn + (size >>PAGE_SHIFT ); + +for (pos = pos_start; pos < pos_end; ++pos) { +if (!pfn_is_ram (pos)) { +/* We hit a page which is not ram. Remap the continuous +* region between pos_start and pos-1 and replace +* the non-ram page at pos with the zero page. +*/ +if (pos > pos_start) { +/* Remap continuous region */ + map_size = (pos - pos_start) <<PAGE_SHIFT ; +if (remap_oldmem_pfn_range (vma, vma_addr + len, + pos_start, map_size, + vma->vm_page_prot)) +return len; + len += map_size; + } +/* Remap the zero page */ +if (remap_oldmem_pfn_range (vma, vma_addr + len, + zeropage_pfn, +PAGE_SIZE , + vma->vm_page_prot)) +return len; + len +=PAGE_SIZE ; + pos_start = pos +1 ; + } + } +if (pos > pos_start) { +/* Remap the rest */ + map_size = (pos - pos_start) <<PAGE_SHIFT ; +if (remap_oldmem_pfn_range (vma, vma_addr + len, pos_start, + map_size, + vma->vm_page_prot)) +return len; + len += map_size; + } +return len; +} +static int mmap_vmcore (struct file *file,struct vm_area_struct *vma) {size_t size = vma->vm_end - vma->vm_start;@@ -387,13 +448,31 @@ static int mmap_vmcore(struct file *file, struct vm_area_struct *vma) tsz =min_t (size_t, m->offset + m->size - start, size); paddr = m->paddr + start - m->offset; -if (remap_oldmem_pfn_range (vma, vma->vm_start + len, - paddr >>PAGE_SHIFT , tsz, - vma->vm_page_prot)) - goto fail; +
fs/proc/vmcore.c static int mmap_vmcore(struct file *file, struct vm_area_struct *vma) · line 461
Quoted 10 lines
fs/proc/vmcore.c +10
-0+/* Check if oldmem_pfn_is_ram was registered to avoid +looping over all pages without a reason. */ +if (oldmem_pfn_is_ram) { +u64 original_len; +unsigned long pfn, vma_addr; + + pfn = paddr >>PAGE_SHIFT ; + vma_addr = vma->vm_start + len; + original_len = len; + len += remap_oldmem_pfn_checked(vma, vma_addr,
How about keeping argument list same as remap_oldmem_pfn_range()? Just becomes easier to read.
fs/proc/vmcore.c static int mmap_vmcore(struct file *file, struct vm_area_struct *vma) · line 464
Quoted 3 lines
fs/proc/vmcore.c +3
-0+ pfn, tsz); +if (len != original_len + tsz) + goto fail;
If remap_oldmem_pfn_checked() can take care of internal error handling then this should simplify too.
fs/proc/vmcore.c static int mmap_vmcore(struct file *file, struct vm_area_struct *vma) · line 473
Quoted 9 lines
fs/proc/vmcore.c +9
-0+ }else { +if (remap_oldmem_pfn_range (vma, + vma->vm_start + len, + paddr >>PAGE_SHIFT , + tsz, + vma->vm_page_prot)) + goto fail; + len += tsz; + }
Can we move this code inside another wrapper function? This is looking little ugly inline.
May be something like.
vmcore_remap_pfn_range() {
if (oldmem_pfn_is_ram)
remap_oldmem_pfn_checked()
else
remap_pfn_range();
}This will also reduce the depth of braces and you might not have to use 5 lines to pass arguments to remap_oldmem_pfn_range().
Thanks
Vivek
Quoted 42 lines · Vitaly Kuznetsov
We have a special check in
read_vmcore()handler to check if the page was reported as ram or not by the hypervisor (pfn_is_ram()). However, when vmcore is read withmmap()no such check is performed. That can lead to unpredictable results, e.g. when running Xen PVHVM guestmemcpy()aftermmap()on/proc/vmcorewill hang processingHVMMEM_mmio_dmpages creating enormous load in both DomU and Dom0.Fix the issue by mapping each non-ram page to the zero page. Keep direct path with
remap_oldmem_pfn_range()to avoid looping through all pages on bare metal.The issue can also be solved by overriding
remap_oldmem_pfn_range()in xen-specific code, asremap_oldmem_pfn_range()was been designed for. That, however, would involve non-obvious xen code path for all x86 builds withCONFIG_XEN_PVHVM=yand would prevent all other hypervisor-specific code on x86 arch from doing the same override.Changes from v1:
- comment style changes
- changeremap_oldmem_pfn_checked()interface to closer match theremap_oldmem_pfn()interface
- preserve formal parameters within the loop, make the loop conditions easier to understand
- usemy_zero_pfn()for the zero page
- return remapped length instead of new offsetSigned-off-by Vitaly Kuznetsov <[email protected]>Reviewed-by Andrew Jones <[email protected]>--- fs/proc/vmcore.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 84 insertions(+), 5 deletions(-)fs/proc/vmcore.c +2
-0@@ -328,6 +328,67 @@ static inline char *alloc_elfnotes_buf(size_t notes_sz)* virtually contiguous user-space in ELF layout. */ #ifdef CONFIG_MMU +/* +* remap_oldmem_pfn_checked - do remap_oldmem_pfn replacing all pages reported
fs/proc/vmcore.c static inline char *alloc_elfnotes_buf(size_t notes_sz) · line 342
Quoted 10 lines
fs/proc/vmcore.c +10
-0+* as not being ram with the zero page. +* +* @vma: vm_area_struct describing requested mapping +* @vma_addr: start remapping from +* @pfn: page frame number to start remapping to +* @size: remapping size +* +* Returns the remapped length. If no errors were hit during the remapping it +* should be equal to size. +*/
Hi,
So we are returning length of successful mapping so that it can be unmapped in outer loop in case of failure? If yes, can't we handle failure in this function itself instead of relying on outer function.
IOW, why not unmap whatever we have mapped in this function and return the error code. That sounds simpler to me.
Quoted 61 lines
fs/proc/vmcore.c +50
-4+static u64 remap_oldmem_pfn_checked (struct vm_area_struct *vma, +unsigned long vma_addr,unsigned long pfn, +unsigned long size) +{ +size_t map_size; +unsigned long pos_start, pos_end, pos; +unsigned long zeropage_pfn =my_zero_pfn (0 ); +u64 len =0 ; + + pos_start = pfn; + pos_end = pfn + (size >>PAGE_SHIFT ); + +for (pos = pos_start; pos < pos_end; ++pos) { +if (!pfn_is_ram (pos)) { +/* We hit a page which is not ram. Remap the continuous +* region between pos_start and pos-1 and replace +* the non-ram page at pos with the zero page. +*/ +if (pos > pos_start) { +/* Remap continuous region */ + map_size = (pos - pos_start) <<PAGE_SHIFT ; +if (remap_oldmem_pfn_range (vma, vma_addr + len, + pos_start, map_size, + vma->vm_page_prot)) +return len; + len += map_size; + } +/* Remap the zero page */ +if (remap_oldmem_pfn_range (vma, vma_addr + len, + zeropage_pfn, +PAGE_SIZE , + vma->vm_page_prot)) +return len; + len +=PAGE_SIZE ; + pos_start = pos +1 ; + } + } +if (pos > pos_start) { +/* Remap the rest */ + map_size = (pos - pos_start) <<PAGE_SHIFT ; +if (remap_oldmem_pfn_range (vma, vma_addr + len, pos_start, + map_size, + vma->vm_page_prot)) +return len; + len += map_size; + } +return len; +} +static int mmap_vmcore (struct file *file,struct vm_area_struct *vma) {size_t size = vma->vm_end - vma->vm_start;@@ -387,13 +448,31 @@ static int mmap_vmcore(struct file *file, struct vm_area_struct *vma) tsz =min_t (size_t, m->offset + m->size - start, size); paddr = m->paddr + start - m->offset; -if (remap_oldmem_pfn_range (vma, vma->vm_start + len, - paddr >>PAGE_SHIFT , tsz, - vma->vm_page_prot)) - goto fail; +
fs/proc/vmcore.c static int mmap_vmcore(struct file *file, struct vm_area_struct *vma) · line 461
Quoted 10 lines
fs/proc/vmcore.c +10
-0+/* Check if oldmem_pfn_is_ram was registered to avoid +looping over all pages without a reason. */ +if (oldmem_pfn_is_ram) { +u64 original_len; +unsigned long pfn, vma_addr; + + pfn = paddr >>PAGE_SHIFT ; + vma_addr = vma->vm_start + len; + original_len = len; + len += remap_oldmem_pfn_checked(vma, vma_addr,
How about keeping argument list same as remap_oldmem_pfn_range()? Just becomes easier to read.
fs/proc/vmcore.c static int mmap_vmcore(struct file *file, struct vm_area_struct *vma) · line 464
Quoted 3 lines
fs/proc/vmcore.c +3
-0+ pfn, tsz); +if (len != original_len + tsz) + goto fail;
If remap_oldmem_pfn_checked() can take care of internal error handling then this should simplify too.
fs/proc/vmcore.c static int mmap_vmcore(struct file *file, struct vm_area_struct *vma) · line 473
Quoted 9 lines
fs/proc/vmcore.c +9
-0+ }else { +if (remap_oldmem_pfn_range (vma, + vma->vm_start + len, + paddr >>PAGE_SHIFT , + tsz, + vma->vm_page_prot)) + goto fail; + len += tsz; + }
Can we move this code inside another wrapper function? This is looking little ugly inline.
May be something like.
vmcore_remap_pfn_range() {
if (oldmem_pfn_is_ram)
remap_oldmem_pfn_checked()
else
remap_pfn_range();
}This will also reduce the depth of braces and you might not have to use 5 lines to pass arguments to remap_oldmem_pfn_range().
Thanks
Vivek
Quoted 26 lines · Vitaly Kuznetsov
We have a special check in
read_vmcore()handler to check if the page was reported as ram or not by the hypervisor (pfn_is_ram()). However, when vmcore is read withmmap()no such check is performed. That can lead to unpredictable results, e.g. when running Xen PVHVM guestmemcpy()aftermmap()on/proc/vmcorewill hang processingHVMMEM_mmio_dmpages creating enormous load in both DomU and Dom0.Fix the issue by mapping each non-ram page to the zero page. Keep direct path with
remap_oldmem_pfn_range()to avoid looping through all pages on bare metal.The issue can also be solved by overriding
remap_oldmem_pfn_range()in xen-specific code, asremap_oldmem_pfn_range()was been designed for. That, however, would involve non-obvious xen code path for all x86 builds withCONFIG_XEN_PVHVM=yand would prevent all other hypervisor-specific code on x86 arch from doing the same override.Changes from v1:
- comment style changes
- changeremap_oldmem_pfn_checked()interface to closer match theremap_oldmem_pfn()interface
- preserve formal parameters within the loop, make the loop conditions easier to understand
- usemy_zero_pfn()for the zero page
- return remapped length instead of new offset
Quoted 2 lines
Signed-off-by Vitaly Kuznetsov <[email protected]>Reviewed-by Andrew Jones <[email protected]>
Also please cc HATAYAMA Daisuke <[email protected]> in next posting. He did the mmap() work and might be interested in having a look at the patch.
Thanks
Vivek
Quoted 115 lines
--- fs/proc/vmcore.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 84 insertions(+), 5 deletions(-)fs/proc/vmcore.c +84
-5@@ -328,6 +328,67 @@ static inline char *alloc_elfnotes_buf(size_t notes_sz)* virtually contiguous user-space in ELF layout. */ #ifdef CONFIG_MMU +/* +* remap_oldmem_pfn_checked - do remap_oldmem_pfn replacing all pages reported +* as not being ram with the zero page. +* +* @vma: vm_area_struct describing requested mapping +* @vma_addr: start remapping from +* @pfn: page frame number to start remapping to +* @size: remapping size +* +* Returns the remapped length. If no errors were hit during the remapping it +* should be equal to size. +*/ +static u64 remap_oldmem_pfn_checked (struct vm_area_struct *vma, +unsigned long vma_addr,unsigned long pfn, +unsigned long size) +{ +size_t map_size; +unsigned long pos_start, pos_end, pos; +unsigned long zeropage_pfn =my_zero_pfn (0 ); +u64 len =0 ; + + pos_start = pfn; + pos_end = pfn + (size >>PAGE_SHIFT ); + +for (pos = pos_start; pos < pos_end; ++pos) { +if (!pfn_is_ram (pos)) { +/* We hit a page which is not ram. Remap the continuous +* region between pos_start and pos-1 and replace +* the non-ram page at pos with the zero page. +*/ +if (pos > pos_start) { +/* Remap continuous region */ + map_size = (pos - pos_start) <<PAGE_SHIFT ; +if (remap_oldmem_pfn_range (vma, vma_addr + len, + pos_start, map_size, + vma->vm_page_prot)) +return len; + len += map_size; + } +/* Remap the zero page */ +if (remap_oldmem_pfn_range (vma, vma_addr + len, + zeropage_pfn, +PAGE_SIZE , + vma->vm_page_prot)) +return len; + len +=PAGE_SIZE ; + pos_start = pos +1 ; + } + } +if (pos > pos_start) { +/* Remap the rest */ + map_size = (pos - pos_start) <<PAGE_SHIFT ; +if (remap_oldmem_pfn_range (vma, vma_addr + len, pos_start, + map_size, + vma->vm_page_prot)) +return len; + len += map_size; + } +return len; +} +static int mmap_vmcore (struct file *file,struct vm_area_struct *vma) {size_t size = vma->vm_end - vma->vm_start;@@ -387,13 +448,31 @@ static int mmap_vmcore(struct file *file, struct vm_area_struct *vma) tsz =min_t (size_t, m->offset + m->size - start, size); paddr = m->paddr + start - m->offset; -if (remap_oldmem_pfn_range (vma, vma->vm_start + len, - paddr >>PAGE_SHIFT , tsz, - vma->vm_page_prot)) - goto fail; + +/* Check if oldmem_pfn_is_ram was registered to avoid +looping over all pages without a reason. */ +if (oldmem_pfn_is_ram) { +u64 original_len; +unsigned long pfn, vma_addr; + + pfn = paddr >>PAGE_SHIFT ; + vma_addr = vma->vm_start + len; + original_len = len; + len +=remap_oldmem_pfn_checked (vma, vma_addr, + pfn, tsz); +if (len != original_len + tsz) + goto fail; + }else { +if (remap_oldmem_pfn_range (vma, + vma->vm_start + len, + paddr >>PAGE_SHIFT , + tsz, + vma->vm_page_prot)) + goto fail; + len += tsz; + } size -= tsz; start += tsz; - len += tsz;if (size ==0 )return 0 ;Signature · 1 line
1.9.3
Quoted 26 lines · Vitaly Kuznetsov
We have a special check in
read_vmcore()handler to check if the page was reported as ram or not by the hypervisor (pfn_is_ram()). However, when vmcore is read withmmap()no such check is performed. That can lead to unpredictable results, e.g. when running Xen PVHVM guestmemcpy()aftermmap()on/proc/vmcorewill hang processingHVMMEM_mmio_dmpages creating enormous load in both DomU and Dom0.Fix the issue by mapping each non-ram page to the zero page. Keep direct path with
remap_oldmem_pfn_range()to avoid looping through all pages on bare metal.The issue can also be solved by overriding
remap_oldmem_pfn_range()in xen-specific code, asremap_oldmem_pfn_range()was been designed for. That, however, would involve non-obvious xen code path for all x86 builds withCONFIG_XEN_PVHVM=yand would prevent all other hypervisor-specific code on x86 arch from doing the same override.Changes from v1:
- comment style changes
- changeremap_oldmem_pfn_checked()interface to closer match theremap_oldmem_pfn()interface
- preserve formal parameters within the loop, make the loop conditions easier to understand
- usemy_zero_pfn()for the zero page
- return remapped length instead of new offset
Quoted 2 lines
Signed-off-by Vitaly Kuznetsov <[email protected]>Reviewed-by Andrew Jones <[email protected]>
Also please cc HATAYAMA Daisuke <[email protected]> in next posting. He did the mmap() work and might be interested in having a look at the patch.
Thanks
Vivek
Quoted 115 lines
--- fs/proc/vmcore.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 84 insertions(+), 5 deletions(-)fs/proc/vmcore.c +84
-5@@ -328,6 +328,67 @@ static inline char *alloc_elfnotes_buf(size_t notes_sz)* virtually contiguous user-space in ELF layout. */ #ifdef CONFIG_MMU +/* +* remap_oldmem_pfn_checked - do remap_oldmem_pfn replacing all pages reported +* as not being ram with the zero page. +* +* @vma: vm_area_struct describing requested mapping +* @vma_addr: start remapping from +* @pfn: page frame number to start remapping to +* @size: remapping size +* +* Returns the remapped length. If no errors were hit during the remapping it +* should be equal to size. +*/ +static u64 remap_oldmem_pfn_checked (struct vm_area_struct *vma, +unsigned long vma_addr,unsigned long pfn, +unsigned long size) +{ +size_t map_size; +unsigned long pos_start, pos_end, pos; +unsigned long zeropage_pfn =my_zero_pfn (0 ); +u64 len =0 ; + + pos_start = pfn; + pos_end = pfn + (size >>PAGE_SHIFT ); + +for (pos = pos_start; pos < pos_end; ++pos) { +if (!pfn_is_ram (pos)) { +/* We hit a page which is not ram. Remap the continuous +* region between pos_start and pos-1 and replace +* the non-ram page at pos with the zero page. +*/ +if (pos > pos_start) { +/* Remap continuous region */ + map_size = (pos - pos_start) <<PAGE_SHIFT ; +if (remap_oldmem_pfn_range (vma, vma_addr + len, + pos_start, map_size, + vma->vm_page_prot)) +return len; + len += map_size; + } +/* Remap the zero page */ +if (remap_oldmem_pfn_range (vma, vma_addr + len, + zeropage_pfn, +PAGE_SIZE , + vma->vm_page_prot)) +return len; + len +=PAGE_SIZE ; + pos_start = pos +1 ; + } + } +if (pos > pos_start) { +/* Remap the rest */ + map_size = (pos - pos_start) <<PAGE_SHIFT ; +if (remap_oldmem_pfn_range (vma, vma_addr + len, pos_start, + map_size, + vma->vm_page_prot)) +return len; + len += map_size; + } +return len; +} +static int mmap_vmcore (struct file *file,struct vm_area_struct *vma) {size_t size = vma->vm_end - vma->vm_start;@@ -387,13 +448,31 @@ static int mmap_vmcore(struct file *file, struct vm_area_struct *vma) tsz =min_t (size_t, m->offset + m->size - start, size); paddr = m->paddr + start - m->offset; -if (remap_oldmem_pfn_range (vma, vma->vm_start + len, - paddr >>PAGE_SHIFT , tsz, - vma->vm_page_prot)) - goto fail; + +/* Check if oldmem_pfn_is_ram was registered to avoid +looping over all pages without a reason. */ +if (oldmem_pfn_is_ram) { +u64 original_len; +unsigned long pfn, vma_addr; + + pfn = paddr >>PAGE_SHIFT ; + vma_addr = vma->vm_start + len; + original_len = len; + len +=remap_oldmem_pfn_checked (vma, vma_addr, + pfn, tsz); +if (len != original_len + tsz) + goto fail; + }else { +if (remap_oldmem_pfn_range (vma, + vma->vm_start + len, + paddr >>PAGE_SHIFT , + tsz, + vma->vm_page_prot)) + goto fail; + len += tsz; + } size -= tsz; start += tsz; - len += tsz;if (size ==0 )return 0 ;Signature · 1 line
1.9.3