Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
2ecd1aba
Commit
2ecd1aba
authored
Nov 19, 2013
by
Gleb Natapov
Browse files
Options
Browse Files
Download
Plain Diff
Merge tag 'kvm-arm-fixes-3.13-1' of
git://git.linaro.org/people/cdall/linux-kvm-arm
into next
Fix percpu vmalloc allocations
parents
f0804804
40c2729b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
6 deletions
+28
-6
arch/arm/kvm/mmu.c
arch/arm/kvm/mmu.c
+28
-6
No files found.
arch/arm/kvm/mmu.c
View file @
2ecd1aba
...
...
@@ -334,6 +334,17 @@ static int __create_hyp_mappings(pgd_t *pgdp,
return
err
;
}
static
phys_addr_t
kvm_kaddr_to_phys
(
void
*
kaddr
)
{
if
(
!
is_vmalloc_addr
(
kaddr
))
{
BUG_ON
(
!
virt_addr_valid
(
kaddr
));
return
__pa
(
kaddr
);
}
else
{
return
page_to_phys
(
vmalloc_to_page
(
kaddr
))
+
offset_in_page
(
kaddr
);
}
}
/**
* create_hyp_mappings - duplicate a kernel virtual address range in Hyp mode
* @from: The virtual kernel start address of the range
...
...
@@ -345,16 +356,27 @@ static int __create_hyp_mappings(pgd_t *pgdp,
*/
int
create_hyp_mappings
(
void
*
from
,
void
*
to
)
{
unsigned
long
phys_addr
=
virt_to_phys
(
from
);
phys_addr_t
phys_addr
;
unsigned
long
virt_addr
;
unsigned
long
start
=
KERN_TO_HYP
((
unsigned
long
)
from
);
unsigned
long
end
=
KERN_TO_HYP
((
unsigned
long
)
to
);
/* Check for a valid kernel memory mapping */
if
(
!
virt_addr_valid
(
from
)
||
!
virt_addr_valid
(
to
-
1
))
return
-
EINVAL
;
start
=
start
&
PAGE_MASK
;
end
=
PAGE_ALIGN
(
end
);
return
__create_hyp_mappings
(
hyp_pgd
,
start
,
end
,
__phys_to_pfn
(
phys_addr
),
PAGE_HYP
);
for
(
virt_addr
=
start
;
virt_addr
<
end
;
virt_addr
+=
PAGE_SIZE
)
{
int
err
;
phys_addr
=
kvm_kaddr_to_phys
(
from
+
virt_addr
-
start
);
err
=
__create_hyp_mappings
(
hyp_pgd
,
virt_addr
,
virt_addr
+
PAGE_SIZE
,
__phys_to_pfn
(
phys_addr
),
PAGE_HYP
);
if
(
err
)
return
err
;
}
return
0
;
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment