* [Qemu-devel] [PATCH] fix bits 39:32 of the final physical address when using 4M page
@ 2012-12-22 7:13 Wen Congyang
2013-01-07 12:06 ` Markus Armbruster
2013-01-09 11:47 ` Luiz Capitulino
0 siblings, 2 replies; 5+ messages in thread
From: Wen Congyang @ 2012-12-22 7:13 UTC (permalink / raw)
To: qemu-devel, Luiz Capitulino, Markus Armbruster
((pde & 0x1fe000) << 19) is the bits 39:32 of the final physical address, and
we shouldn't use unit32_t to calculate it. Convert the type to hwaddr to fix
this problem.
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
---
target-i386/arch_memory_mapping.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c
index c6c7874..844893f 100644
--- a/target-i386/arch_memory_mapping.c
+++ b/target-i386/arch_memory_mapping.c
@@ -115,7 +115,7 @@ static void walk_pde2(MemoryMappingList *list,
hwaddr pde_start_addr, int32_t a20_mask,
bool pse)
{
- hwaddr pde_addr, pte_start_addr, start_paddr;
+ hwaddr pde_addr, pte_start_addr, start_paddr, high_paddr;
uint32_t pde;
target_ulong line_addr, start_vaddr;
int i;
@@ -130,8 +130,13 @@ static void walk_pde2(MemoryMappingList *list,
line_addr = (((unsigned int)i & 0x3ff) << 22);
if ((pde & PG_PSE_MASK) && pse) {
- /* 4 MB page */
- start_paddr = (pde & ~0x3fffff) | ((pde & 0x1fe000) << 19);
+ /*
+ * 4 MB page:
+ * bits 39:32 are bits 20:13 of the PDE
+ * bit3 31:22 are bits 31:22 of the PDE
+ */
+ high_paddr = ((hwaddr)(pde & 0x1fe000) << 19);
+ start_paddr = (pde & ~0x3fffff) | high_paddr;
if (cpu_physical_memory_is_io(start_paddr)) {
/* I/O region */
continue;
--
1.8.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH] fix bits 39:32 of the final physical address when using 4M page
2012-12-22 7:13 [Qemu-devel] [PATCH] fix bits 39:32 of the final physical address when using 4M page Wen Congyang
@ 2013-01-07 12:06 ` Markus Armbruster
2013-01-07 13:10 ` Andreas Färber
2013-01-09 11:47 ` Luiz Capitulino
1 sibling, 1 reply; 5+ messages in thread
From: Markus Armbruster @ 2013-01-07 12:06 UTC (permalink / raw)
To: Wen Congyang; +Cc: qemu-devel, Luiz Capitulino
Wen Congyang <wency@cn.fujitsu.com> writes:
> ((pde & 0x1fe000) << 19) is the bits 39:32 of the final physical address, and
> we shouldn't use unit32_t to calculate it. Convert the type to hwaddr to fix
> this problem.
Spotted by Coverity.
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
>
> ---
> target-i386/arch_memory_mapping.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c
> index c6c7874..844893f 100644
> --- a/target-i386/arch_memory_mapping.c
> +++ b/target-i386/arch_memory_mapping.c
> @@ -115,7 +115,7 @@ static void walk_pde2(MemoryMappingList *list,
> hwaddr pde_start_addr, int32_t a20_mask,
> bool pse)
> {
> - hwaddr pde_addr, pte_start_addr, start_paddr;
> + hwaddr pde_addr, pte_start_addr, start_paddr, high_paddr;
> uint32_t pde;
> target_ulong line_addr, start_vaddr;
> int i;
> @@ -130,8 +130,13 @@ static void walk_pde2(MemoryMappingList *list,
>
> line_addr = (((unsigned int)i & 0x3ff) << 22);
> if ((pde & PG_PSE_MASK) && pse) {
> - /* 4 MB page */
> - start_paddr = (pde & ~0x3fffff) | ((pde & 0x1fe000) << 19);
> + /*
> + * 4 MB page:
> + * bits 39:32 are bits 20:13 of the PDE
> + * bit3 31:22 are bits 31:22 of the PDE
> + */
> + high_paddr = ((hwaddr)(pde & 0x1fe000) << 19);
> + start_paddr = (pde & ~0x3fffff) | high_paddr;
> if (cpu_physical_memory_is_io(start_paddr)) {
> /* I/O region */
> continue;
Extra points for extending the comment.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH] fix bits 39:32 of the final physical address when using 4M page
2013-01-07 12:06 ` Markus Armbruster
@ 2013-01-07 13:10 ` Andreas Färber
2013-01-07 13:40 ` Luiz Capitulino
0 siblings, 1 reply; 5+ messages in thread
From: Andreas Färber @ 2013-01-07 13:10 UTC (permalink / raw)
To: Wen Congyang; +Cc: Luiz Capitulino, Markus Armbruster, qemu-devel
Am 07.01.2013 13:06, schrieb Markus Armbruster:
> Wen Congyang <wency@cn.fujitsu.com> writes:
>
>> ((pde & 0x1fe000) << 19) is the bits 39:32 of the final physical address, and
>> we shouldn't use unit32_t to calculate it. Convert the type to hwaddr to fix
>> this problem.
>
> Spotted by Coverity.
>
>> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
>>
>> ---
>> target-i386/arch_memory_mapping.c | 11 ++++++++---
>> 1 file changed, 8 insertions(+), 3 deletions(-)
>>
>> diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c
>> index c6c7874..844893f 100644
>> --- a/target-i386/arch_memory_mapping.c
>> +++ b/target-i386/arch_memory_mapping.c
>> @@ -115,7 +115,7 @@ static void walk_pde2(MemoryMappingList *list,
>> hwaddr pde_start_addr, int32_t a20_mask,
>> bool pse)
>> {
>> - hwaddr pde_addr, pte_start_addr, start_paddr;
>> + hwaddr pde_addr, pte_start_addr, start_paddr, high_paddr;
>> uint32_t pde;
>> target_ulong line_addr, start_vaddr;
>> int i;
>> @@ -130,8 +130,13 @@ static void walk_pde2(MemoryMappingList *list,
>>
>> line_addr = (((unsigned int)i & 0x3ff) << 22);
>> if ((pde & PG_PSE_MASK) && pse) {
>> - /* 4 MB page */
>> - start_paddr = (pde & ~0x3fffff) | ((pde & 0x1fe000) << 19);
>> + /*
>> + * 4 MB page:
>> + * bits 39:32 are bits 20:13 of the PDE
>> + * bit3 31:22 are bits 31:22 of the PDE
>> + */
>> + high_paddr = ((hwaddr)(pde & 0x1fe000) << 19);
>> + start_paddr = (pde & ~0x3fffff) | high_paddr;
>> if (cpu_physical_memory_is_io(start_paddr)) {
>> /* I/O region */
>> continue;
>
> Extra points for extending the comment.
...and a "target-i386: " prefix in the subject would be appreciated,
since it does not seem to fix a general issue.
Andreas
>
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
>
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH] fix bits 39:32 of the final physical address when using 4M page
2013-01-07 13:10 ` Andreas Färber
@ 2013-01-07 13:40 ` Luiz Capitulino
0 siblings, 0 replies; 5+ messages in thread
From: Luiz Capitulino @ 2013-01-07 13:40 UTC (permalink / raw)
To: Andreas Färber; +Cc: Markus Armbruster, qemu-devel
On Mon, 07 Jan 2013 14:10:46 +0100
Andreas Färber <afaerber@suse.de> wrote:
> Am 07.01.2013 13:06, schrieb Markus Armbruster:
> > Wen Congyang <wency@cn.fujitsu.com> writes:
> >
> >> ((pde & 0x1fe000) << 19) is the bits 39:32 of the final physical address, and
> >> we shouldn't use unit32_t to calculate it. Convert the type to hwaddr to fix
> >> this problem.
> >
> > Spotted by Coverity.
> >
> >> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
> >>
> >> ---
> >> target-i386/arch_memory_mapping.c | 11 ++++++++---
> >> 1 file changed, 8 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c
> >> index c6c7874..844893f 100644
> >> --- a/target-i386/arch_memory_mapping.c
> >> +++ b/target-i386/arch_memory_mapping.c
> >> @@ -115,7 +115,7 @@ static void walk_pde2(MemoryMappingList *list,
> >> hwaddr pde_start_addr, int32_t a20_mask,
> >> bool pse)
> >> {
> >> - hwaddr pde_addr, pte_start_addr, start_paddr;
> >> + hwaddr pde_addr, pte_start_addr, start_paddr, high_paddr;
> >> uint32_t pde;
> >> target_ulong line_addr, start_vaddr;
> >> int i;
> >> @@ -130,8 +130,13 @@ static void walk_pde2(MemoryMappingList *list,
> >>
> >> line_addr = (((unsigned int)i & 0x3ff) << 22);
> >> if ((pde & PG_PSE_MASK) && pse) {
> >> - /* 4 MB page */
> >> - start_paddr = (pde & ~0x3fffff) | ((pde & 0x1fe000) << 19);
> >> + /*
> >> + * 4 MB page:
> >> + * bits 39:32 are bits 20:13 of the PDE
> >> + * bit3 31:22 are bits 31:22 of the PDE
> >> + */
> >> + high_paddr = ((hwaddr)(pde & 0x1fe000) << 19);
> >> + start_paddr = (pde & ~0x3fffff) | high_paddr;
> >> if (cpu_physical_memory_is_io(start_paddr)) {
> >> /* I/O region */
> >> continue;
> >
> > Extra points for extending the comment.
>
> ...and a "target-i386: " prefix in the subject would be appreciated,
> since it does not seem to fix a general issue.
I can do that myself when I apply the patch (which will take a little bit,
as I'm just back from vacation).
>
> Andreas
>
> >
> > Reviewed-by: Markus Armbruster <armbru@redhat.com>
> >
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] fix bits 39:32 of the final physical address when using 4M page
2012-12-22 7:13 [Qemu-devel] [PATCH] fix bits 39:32 of the final physical address when using 4M page Wen Congyang
2013-01-07 12:06 ` Markus Armbruster
@ 2013-01-09 11:47 ` Luiz Capitulino
1 sibling, 0 replies; 5+ messages in thread
From: Luiz Capitulino @ 2013-01-09 11:47 UTC (permalink / raw)
To: Wen Congyang; +Cc: qemu-devel, Markus Armbruster
On Sat, 22 Dec 2012 15:13:54 +0800
Wen Congyang <wency@cn.fujitsu.com> wrote:
> ((pde & 0x1fe000) << 19) is the bits 39:32 of the final physical address, and
> we shouldn't use unit32_t to calculate it. Convert the type to hwaddr to fix
> this problem.
>
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Applied to the qmp branch, thanks.
>
> ---
> target-i386/arch_memory_mapping.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c
> index c6c7874..844893f 100644
> --- a/target-i386/arch_memory_mapping.c
> +++ b/target-i386/arch_memory_mapping.c
> @@ -115,7 +115,7 @@ static void walk_pde2(MemoryMappingList *list,
> hwaddr pde_start_addr, int32_t a20_mask,
> bool pse)
> {
> - hwaddr pde_addr, pte_start_addr, start_paddr;
> + hwaddr pde_addr, pte_start_addr, start_paddr, high_paddr;
> uint32_t pde;
> target_ulong line_addr, start_vaddr;
> int i;
> @@ -130,8 +130,13 @@ static void walk_pde2(MemoryMappingList *list,
>
> line_addr = (((unsigned int)i & 0x3ff) << 22);
> if ((pde & PG_PSE_MASK) && pse) {
> - /* 4 MB page */
> - start_paddr = (pde & ~0x3fffff) | ((pde & 0x1fe000) << 19);
> + /*
> + * 4 MB page:
> + * bits 39:32 are bits 20:13 of the PDE
> + * bit3 31:22 are bits 31:22 of the PDE
> + */
> + high_paddr = ((hwaddr)(pde & 0x1fe000) << 19);
> + start_paddr = (pde & ~0x3fffff) | high_paddr;
> if (cpu_physical_memory_is_io(start_paddr)) {
> /* I/O region */
> continue;
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-01-09 12:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-22 7:13 [Qemu-devel] [PATCH] fix bits 39:32 of the final physical address when using 4M page Wen Congyang
2013-01-07 12:06 ` Markus Armbruster
2013-01-07 13:10 ` Andreas Färber
2013-01-07 13:40 ` Luiz Capitulino
2013-01-09 11:47 ` Luiz Capitulino
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).