target/riscv: Fix the bug of HLVX/HLV/HSV
PATCH 1/1 target/riscv: Fix the bug of HLVX/HLV/HSV
We found that the hypervisor virtual-machine load and store instructions, included HLVX/HLV/HSV, couldn't access guest userspace memory.
In the riscv-privileged spec, HLVX/HLV/HSV is defined as follow:
"As usual when V=1, two-stage address translation is applied, and the HS-level sstatus.SUM is ignored."
But get_physical_address() doesn't ignore sstatus.SUM, when HLVX/HLV/HSV accesses guest userspace memory. So this patch fixes it.
--- target/riscv/cpu_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
target/riscv/cpu_helper.c +2 -1
@@ -367,7 +367,8 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical, vm =get_field (env->hgatp,HGATP_MODE ); widened =2 ; } - sum =get_field (env->mstatus,MSTATUS_SUM ); +/* status.SUM will be ignored if execute on background */ + sum =get_field (env->mstatus,MSTATUS_SUM ) || use_background;switch (vm) {case VM_1_10_SV32 : levels =2 ; ptidxbits =10 ; ptesize =4 ;break ;
Signature · 1 line
2.19.1
Quoted 8 lines · Yifei Jiang
We found that the hypervisor virtual-machine load and store instructions, included HLVX/HLV/HSV, couldn't access guest userspace memory.
In the riscv-privileged spec, HLVX/HLV/HSV is defined as follow:
"As usual when V=1, two-stage address translation is applied, and the HS-level sstatus.SUM is ignored."
Quoted 5 lines
But
get_physical_address()doesn't ignore sstatus.SUM, when HLVX/HLV/HSV accesses guest userspace memory. So this patch fixes it.Signed-off-by Yifei Jiang <[email protected]>Signed-off-by Yipeng Yin <[email protected]>
Alistair
Quoted 22 lines
--- target/riscv/cpu_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)target/riscv/cpu_helper.c +2
-2@@ -367,7 +367,8 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical, vm =get_field (env->hgatp,HGATP_MODE ); widened =2 ; } - sum =get_field (env->mstatus,MSTATUS_SUM ); +/* status.SUM will be ignored if execute on background */ + sum =get_field (env->mstatus,MSTATUS_SUM ) || use_background;switch (vm) {case VM_1_10_SV32 : levels =2 ; ptidxbits =10 ; ptesize =4 ;break ; --2.19.1
Alistair Francis
AppliedQuoted 8 lines · Yifei Jiang
We found that the hypervisor virtual-machine load and store instructions, included HLVX/HLV/HSV, couldn't access guest userspace memory.
In the riscv-privileged spec, HLVX/HLV/HSV is defined as follow:
"As usual when V=1, two-stage address translation is applied, and the HS-level sstatus.SUM is ignored."
Quoted 5 lines
But
get_physical_address()doesn't ignore sstatus.SUM, when HLVX/HLV/HSV accesses guest userspace memory. So this patch fixes it.Signed-off-by Yifei Jiang <[email protected]>Signed-off-by Yipeng Yin <[email protected]>
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 22 lines
--- target/riscv/cpu_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)target/riscv/cpu_helper.c +2
-2@@ -367,7 +367,8 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical, vm =get_field (env->hgatp,HGATP_MODE ); widened =2 ; } - sum =get_field (env->mstatus,MSTATUS_SUM ); +/* status.SUM will be ignored if execute on background */ + sum =get_field (env->mstatus,MSTATUS_SUM ) || use_background;switch (vm) {case VM_1_10_SV32 : levels =2 ; ptidxbits =10 ; ptesize =4 ;break ; --2.19.1