| Message ID | 20221108125703.1463577-3-apatel@ventanamicro.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Nested virtualization fixes for QEMU | expand |
On Tue, Nov 8, 2022 at 11:07 PM Anup Patel <apatel@ventanamicro.com> wrote: > > The htimedelta[h] CSR has impact on the VS timer comparison so we > should call riscv_timer_write_timecmp() whenever htimedelta changes. > > Fixes: 3ec0fe18a31f ("target/riscv: Add vstimecmp suppor") > Signed-off-by: Anup Patel <apatel@ventanamicro.com> > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> This patch breaks my Xvisor test. When running OpenSBI and Xvisor like this: qemu-system-riscv64 -machine virt \ -m 1G -serial mon:stdio -serial null -nographic \ -append 'vmm.console=uart@10000000 vmm.bootcmd="vfs mount initrd /;vfs run /boot.xscript;vfs cat /system/banner.txt; guest kick guest0; vserial bind guest0/uart0"' \ -smp 4 -d guest_errors \ -bios none \ -device loader,file=./images/qemuriscv64/vmm.bin,addr=0x80200000 \ -kernel ./images/qemuriscv64/fw_jump.elf \ -initrd ./images/qemuriscv64/vmm-disk-linux.img -cpu rv64,h=true Running: Xvisor v0.3.0-129-gbc33f339 (Jan 1 1970 00:00:00) I see this failure: INIT: bootcmd: guest kick guest0 guest0: Kicked INIT: bootcmd: vserial bind guest0/uart0 [guest0/uart0] cpu_vcpu_stage2_map: guest_phys=0x000000003B9AC000 size=0x4096 map failed do_error: CPU3: VCPU=guest0/vcpu0 page fault failed (error -1) zero=0x0000000000000000 ra=0x0000000080001B4E sp=0x000000008001CF80 gp=0x0000000000000000 tp=0x0000000000000000 s0=0x000000008001CFB0 s1=0x0000000000000000 a0=0x0000000010001048 a1=0x0000000000000000 a2=0x0000000000989680 a3=0x000000003B9ACA00 a4=0x0000000000000048 a5=0x0000000000000000 a6=0x0000000000019000 a7=0x0000000000000000 s2=0x0000000000000000 s3=0x0000000000000000 s4=0x0000000000000000 s5=0x0000000000000000 s6=0x0000000000000000 s7=0x0000000000000000 s8=0x0000000000000000 s9=0x0000000000000000 s10=0x0000000000000000 s11=0x0000000000000000 t0=0x0000000000004000 t1=0x0000000000000100 t2=0x0000000000000000 t3=0x0000000000000000 t4=0x0000000000000000 t5=0x0000000000000000 t6=0x0000000000000000 sepc=0x0000000080001918 sstatus=0x0000000200004120 hstatus=0x00000002002001C0 sp_exec=0x0000000010A64000 scause=0x0000000000000017 stval=0x000000003B9ACAF8 htval=0x000000000EE6B2BE htinst=0x0000000000D03021 I have tried updating to a newer Xvisor release, but with that I don't get any serial output. Can you help get the Xvisor tests back up and running? Alistair
On Thu, Dec 8, 2022 at 9:00 AM Alistair Francis <alistair23@gmail.com> wrote: > > On Tue, Nov 8, 2022 at 11:07 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > The htimedelta[h] CSR has impact on the VS timer comparison so we > > should call riscv_timer_write_timecmp() whenever htimedelta changes. > > > > Fixes: 3ec0fe18a31f ("target/riscv: Add vstimecmp suppor") > > Signed-off-by: Anup Patel <apatel@ventanamicro.com> > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > > This patch breaks my Xvisor test. When running OpenSBI and Xvisor like this: > > qemu-system-riscv64 -machine virt \ > -m 1G -serial mon:stdio -serial null -nographic \ > -append 'vmm.console=uart@10000000 vmm.bootcmd="vfs mount initrd > /;vfs run /boot.xscript;vfs cat /system/banner.txt; guest kick guest0; > vserial bind guest0/uart0"' \ > -smp 4 -d guest_errors \ > -bios none \ > -device loader,file=./images/qemuriscv64/vmm.bin,addr=0x80200000 \ > -kernel ./images/qemuriscv64/fw_jump.elf \ > -initrd ./images/qemuriscv64/vmm-disk-linux.img -cpu rv64,h=true > > Running: > > Xvisor v0.3.0-129-gbc33f339 (Jan 1 1970 00:00:00) > > I see this failure: > > INIT: bootcmd: guest kick guest0 > > guest0: Kicked > > INIT: bootcmd: vserial bind guest0/uart0 > > [guest0/uart0] cpu_vcpu_stage2_map: guest_phys=0x000000003B9AC000 > size=0x4096 map failed > > do_error: CPU3: VCPU=guest0/vcpu0 page fault failed (error -1) > > zero=0x0000000000000000 ra=0x0000000080001B4E > > sp=0x000000008001CF80 gp=0x0000000000000000 > > tp=0x0000000000000000 s0=0x000000008001CFB0 > > s1=0x0000000000000000 a0=0x0000000010001048 > > a1=0x0000000000000000 a2=0x0000000000989680 > > a3=0x000000003B9ACA00 a4=0x0000000000000048 > > a5=0x0000000000000000 a6=0x0000000000019000 > > a7=0x0000000000000000 s2=0x0000000000000000 > > s3=0x0000000000000000 s4=0x0000000000000000 > > s5=0x0000000000000000 s6=0x0000000000000000 > > s7=0x0000000000000000 s8=0x0000000000000000 > > s9=0x0000000000000000 s10=0x0000000000000000 > > s11=0x0000000000000000 t0=0x0000000000004000 > > t1=0x0000000000000100 t2=0x0000000000000000 > > t3=0x0000000000000000 t4=0x0000000000000000 > > t5=0x0000000000000000 t6=0x0000000000000000 > > sepc=0x0000000080001918 sstatus=0x0000000200004120 > > hstatus=0x00000002002001C0 sp_exec=0x0000000010A64000 > > scause=0x0000000000000017 stval=0x000000003B9ACAF8 > > htval=0x000000000EE6B2BE htinst=0x0000000000D03021 > > I have tried updating to a newer Xvisor release, but with that I don't > get any serial output. > > Can you help get the Xvisor tests back up and running? I tried the latest Xvisor-next (https://github.com/avpatel/xvisor-next) with your QEMU riscv-to-apply.next branch and it works fine (both with and without Sstc). Here's the QEMU command which I use: qemu-system-riscv64 -M virt -m 512M -nographic \ -bios opensbi/build/platform/generic/firmware/fw_jump.bin \ -kernel ../xvisor-next/build/vmm.bin \ -initrd rbd_v64.img \ -append "vmm.bootcmd=\"vfs mount initrd /;vfs run /boot.xscript;vfs cat /system/banner.txt\"" \ -smp 4 Also, I will be releasing Xvisor-0.3.2 by the end of Dec 2022 so I suggest using this upcoming release in your test. Regards, Anup
On Thu, Dec 8, 2022 at 6:41 PM Anup Patel <apatel@ventanamicro.com> wrote: > > On Thu, Dec 8, 2022 at 9:00 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > On Tue, Nov 8, 2022 at 11:07 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > The htimedelta[h] CSR has impact on the VS timer comparison so we > > > should call riscv_timer_write_timecmp() whenever htimedelta changes. > > > > > > Fixes: 3ec0fe18a31f ("target/riscv: Add vstimecmp suppor") > > > Signed-off-by: Anup Patel <apatel@ventanamicro.com> > > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > > > > This patch breaks my Xvisor test. When running OpenSBI and Xvisor like this: > > > > qemu-system-riscv64 -machine virt \ > > -m 1G -serial mon:stdio -serial null -nographic \ > > -append 'vmm.console=uart@10000000 vmm.bootcmd="vfs mount initrd > > /;vfs run /boot.xscript;vfs cat /system/banner.txt; guest kick guest0; > > vserial bind guest0/uart0"' \ > > -smp 4 -d guest_errors \ > > -bios none \ > > -device loader,file=./images/qemuriscv64/vmm.bin,addr=0x80200000 \ > > -kernel ./images/qemuriscv64/fw_jump.elf \ > > -initrd ./images/qemuriscv64/vmm-disk-linux.img -cpu rv64,h=true > > > > Running: > > > > Xvisor v0.3.0-129-gbc33f339 (Jan 1 1970 00:00:00) > > > > I see this failure: > > > > INIT: bootcmd: guest kick guest0 > > > > guest0: Kicked > > > > INIT: bootcmd: vserial bind guest0/uart0 > > > > [guest0/uart0] cpu_vcpu_stage2_map: guest_phys=0x000000003B9AC000 > > size=0x4096 map failed > > > > do_error: CPU3: VCPU=guest0/vcpu0 page fault failed (error -1) > > > > zero=0x0000000000000000 ra=0x0000000080001B4E > > > > sp=0x000000008001CF80 gp=0x0000000000000000 > > > > tp=0x0000000000000000 s0=0x000000008001CFB0 > > > > s1=0x0000000000000000 a0=0x0000000010001048 > > > > a1=0x0000000000000000 a2=0x0000000000989680 > > > > a3=0x000000003B9ACA00 a4=0x0000000000000048 > > > > a5=0x0000000000000000 a6=0x0000000000019000 > > > > a7=0x0000000000000000 s2=0x0000000000000000 > > > > s3=0x0000000000000000 s4=0x0000000000000000 > > > > s5=0x0000000000000000 s6=0x0000000000000000 > > > > s7=0x0000000000000000 s8=0x0000000000000000 > > > > s9=0x0000000000000000 s10=0x0000000000000000 > > > > s11=0x0000000000000000 t0=0x0000000000004000 > > > > t1=0x0000000000000100 t2=0x0000000000000000 > > > > t3=0x0000000000000000 t4=0x0000000000000000 > > > > t5=0x0000000000000000 t6=0x0000000000000000 > > > > sepc=0x0000000080001918 sstatus=0x0000000200004120 > > > > hstatus=0x00000002002001C0 sp_exec=0x0000000010A64000 > > > > scause=0x0000000000000017 stval=0x000000003B9ACAF8 > > > > htval=0x000000000EE6B2BE htinst=0x0000000000D03021 > > > > I have tried updating to a newer Xvisor release, but with that I don't > > get any serial output. > > > > Can you help get the Xvisor tests back up and running? > > I tried the latest Xvisor-next (https://github.com/avpatel/xvisor-next) > with your QEMU riscv-to-apply.next branch and it works fine (both > with and without Sstc). Does it work with the latest release? Alistair > > Here's the QEMU command which I use: > > qemu-system-riscv64 -M virt -m 512M -nographic \ > -bios opensbi/build/platform/generic/firmware/fw_jump.bin \ > -kernel ../xvisor-next/build/vmm.bin \ > -initrd rbd_v64.img \ > -append "vmm.bootcmd=\"vfs mount initrd /;vfs run /boot.xscript;vfs > cat /system/banner.txt\"" \ > -smp 4 > > Also, I will be releasing Xvisor-0.3.2 by the end of Dec 2022 so I > suggest using this upcoming release in your test. > > Regards, > Anup
On Mon, Dec 12, 2022 at 11:23 AM Alistair Francis <alistair23@gmail.com> wrote: > > On Thu, Dec 8, 2022 at 6:41 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > On Thu, Dec 8, 2022 at 9:00 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > On Tue, Nov 8, 2022 at 11:07 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > The htimedelta[h] CSR has impact on the VS timer comparison so we > > > > should call riscv_timer_write_timecmp() whenever htimedelta changes. > > > > > > > > Fixes: 3ec0fe18a31f ("target/riscv: Add vstimecmp suppor") > > > > Signed-off-by: Anup Patel <apatel@ventanamicro.com> > > > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > > > > > > This patch breaks my Xvisor test. When running OpenSBI and Xvisor like this: > > > > > > qemu-system-riscv64 -machine virt \ > > > -m 1G -serial mon:stdio -serial null -nographic \ > > > -append 'vmm.console=uart@10000000 vmm.bootcmd="vfs mount initrd > > > /;vfs run /boot.xscript;vfs cat /system/banner.txt; guest kick guest0; > > > vserial bind guest0/uart0"' \ > > > -smp 4 -d guest_errors \ > > > -bios none \ > > > -device loader,file=./images/qemuriscv64/vmm.bin,addr=0x80200000 \ > > > -kernel ./images/qemuriscv64/fw_jump.elf \ > > > -initrd ./images/qemuriscv64/vmm-disk-linux.img -cpu rv64,h=true > > > > > > Running: > > > > > > Xvisor v0.3.0-129-gbc33f339 (Jan 1 1970 00:00:00) > > > > > > I see this failure: > > > > > > INIT: bootcmd: guest kick guest0 > > > > > > guest0: Kicked > > > > > > INIT: bootcmd: vserial bind guest0/uart0 > > > > > > [guest0/uart0] cpu_vcpu_stage2_map: guest_phys=0x000000003B9AC000 > > > size=0x4096 map failed > > > > > > do_error: CPU3: VCPU=guest0/vcpu0 page fault failed (error -1) > > > > > > zero=0x0000000000000000 ra=0x0000000080001B4E > > > > > > sp=0x000000008001CF80 gp=0x0000000000000000 > > > > > > tp=0x0000000000000000 s0=0x000000008001CFB0 > > > > > > s1=0x0000000000000000 a0=0x0000000010001048 > > > > > > a1=0x0000000000000000 a2=0x0000000000989680 > > > > > > a3=0x000000003B9ACA00 a4=0x0000000000000048 > > > > > > a5=0x0000000000000000 a6=0x0000000000019000 > > > > > > a7=0x0000000000000000 s2=0x0000000000000000 > > > > > > s3=0x0000000000000000 s4=0x0000000000000000 > > > > > > s5=0x0000000000000000 s6=0x0000000000000000 > > > > > > s7=0x0000000000000000 s8=0x0000000000000000 > > > > > > s9=0x0000000000000000 s10=0x0000000000000000 > > > > > > s11=0x0000000000000000 t0=0x0000000000004000 > > > > > > t1=0x0000000000000100 t2=0x0000000000000000 > > > > > > t3=0x0000000000000000 t4=0x0000000000000000 > > > > > > t5=0x0000000000000000 t6=0x0000000000000000 > > > > > > sepc=0x0000000080001918 sstatus=0x0000000200004120 > > > > > > hstatus=0x00000002002001C0 sp_exec=0x0000000010A64000 > > > > > > scause=0x0000000000000017 stval=0x000000003B9ACAF8 > > > > > > htval=0x000000000EE6B2BE htinst=0x0000000000D03021 > > > > > > I have tried updating to a newer Xvisor release, but with that I don't > > > get any serial output. > > > > > > Can you help get the Xvisor tests back up and running? > > > > I tried the latest Xvisor-next (https://github.com/avpatel/xvisor-next) > > with your QEMU riscv-to-apply.next branch and it works fine (both > > with and without Sstc). > > Does it work with the latest release? Yes, the latest Xvisor-next repo works for QEMU v7.2.0-rc4 and your riscv-to-apply.next branch (commit 51bb9de2d188) Regards, Anup > > Alistair > > > > > Here's the QEMU command which I use: > > > > qemu-system-riscv64 -M virt -m 512M -nographic \ > > -bios opensbi/build/platform/generic/firmware/fw_jump.bin \ > > -kernel ../xvisor-next/build/vmm.bin \ > > -initrd rbd_v64.img \ > > -append "vmm.bootcmd=\"vfs mount initrd /;vfs run /boot.xscript;vfs > > cat /system/banner.txt\"" \ > > -smp 4 > > > > Also, I will be releasing Xvisor-0.3.2 by the end of Dec 2022 so I > > suggest using this upcoming release in your test. > > > > Regards, > > Anup
On Mon, Dec 12, 2022 at 9:12 PM Anup Patel <apatel@ventanamicro.com> wrote: > > On Mon, Dec 12, 2022 at 11:23 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > On Thu, Dec 8, 2022 at 6:41 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > On Thu, Dec 8, 2022 at 9:00 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > > > On Tue, Nov 8, 2022 at 11:07 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > > > The htimedelta[h] CSR has impact on the VS timer comparison so we > > > > > should call riscv_timer_write_timecmp() whenever htimedelta changes. > > > > > > > > > > Fixes: 3ec0fe18a31f ("target/riscv: Add vstimecmp suppor") > > > > > Signed-off-by: Anup Patel <apatel@ventanamicro.com> > > > > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > > > > > > > > This patch breaks my Xvisor test. When running OpenSBI and Xvisor like this: > > > > > > > > qemu-system-riscv64 -machine virt \ > > > > -m 1G -serial mon:stdio -serial null -nographic \ > > > > -append 'vmm.console=uart@10000000 vmm.bootcmd="vfs mount initrd > > > > /;vfs run /boot.xscript;vfs cat /system/banner.txt; guest kick guest0; > > > > vserial bind guest0/uart0"' \ > > > > -smp 4 -d guest_errors \ > > > > -bios none \ > > > > -device loader,file=./images/qemuriscv64/vmm.bin,addr=0x80200000 \ > > > > -kernel ./images/qemuriscv64/fw_jump.elf \ > > > > -initrd ./images/qemuriscv64/vmm-disk-linux.img -cpu rv64,h=true > > > > > > > > Running: > > > > > > > > Xvisor v0.3.0-129-gbc33f339 (Jan 1 1970 00:00:00) > > > > > > > > I see this failure: > > > > > > > > INIT: bootcmd: guest kick guest0 > > > > > > > > guest0: Kicked > > > > > > > > INIT: bootcmd: vserial bind guest0/uart0 > > > > > > > > [guest0/uart0] cpu_vcpu_stage2_map: guest_phys=0x000000003B9AC000 > > > > size=0x4096 map failed > > > > > > > > do_error: CPU3: VCPU=guest0/vcpu0 page fault failed (error -1) > > > > > > > > zero=0x0000000000000000 ra=0x0000000080001B4E > > > > > > > > sp=0x000000008001CF80 gp=0x0000000000000000 > > > > > > > > tp=0x0000000000000000 s0=0x000000008001CFB0 > > > > > > > > s1=0x0000000000000000 a0=0x0000000010001048 > > > > > > > > a1=0x0000000000000000 a2=0x0000000000989680 > > > > > > > > a3=0x000000003B9ACA00 a4=0x0000000000000048 > > > > > > > > a5=0x0000000000000000 a6=0x0000000000019000 > > > > > > > > a7=0x0000000000000000 s2=0x0000000000000000 > > > > > > > > s3=0x0000000000000000 s4=0x0000000000000000 > > > > > > > > s5=0x0000000000000000 s6=0x0000000000000000 > > > > > > > > s7=0x0000000000000000 s8=0x0000000000000000 > > > > > > > > s9=0x0000000000000000 s10=0x0000000000000000 > > > > > > > > s11=0x0000000000000000 t0=0x0000000000004000 > > > > > > > > t1=0x0000000000000100 t2=0x0000000000000000 > > > > > > > > t3=0x0000000000000000 t4=0x0000000000000000 > > > > > > > > t5=0x0000000000000000 t6=0x0000000000000000 > > > > > > > > sepc=0x0000000080001918 sstatus=0x0000000200004120 > > > > > > > > hstatus=0x00000002002001C0 sp_exec=0x0000000010A64000 > > > > > > > > scause=0x0000000000000017 stval=0x000000003B9ACAF8 > > > > > > > > htval=0x000000000EE6B2BE htinst=0x0000000000D03021 > > > > > > > > I have tried updating to a newer Xvisor release, but with that I don't > > > > get any serial output. > > > > > > > > Can you help get the Xvisor tests back up and running? > > > > > > I tried the latest Xvisor-next (https://github.com/avpatel/xvisor-next) > > > with your QEMU riscv-to-apply.next branch and it works fine (both > > > with and without Sstc). > > > > Does it work with the latest release? > > Yes, the latest Xvisor-next repo works for QEMU v7.2.0-rc4 and > your riscv-to-apply.next branch (commit 51bb9de2d188) I can't get anything to work with this patch. I have dropped this and the patches after this. I'm building the latest Xvisor release with: export CROSS_COMPILE=riscv64-linux-gnu- ARCH=riscv make generic-64b-defconfig make and running it as above, yet nothing. What am I missing here? Alistair > > Regards, > Anup > > > > > Alistair > > > > > > > > Here's the QEMU command which I use: > > > > > > qemu-system-riscv64 -M virt -m 512M -nographic \ > > > -bios opensbi/build/platform/generic/firmware/fw_jump.bin \ > > > -kernel ../xvisor-next/build/vmm.bin \ > > > -initrd rbd_v64.img \ > > > -append "vmm.bootcmd=\"vfs mount initrd /;vfs run /boot.xscript;vfs > > > cat /system/banner.txt\"" \ > > > -smp 4 > > > > > > Also, I will be releasing Xvisor-0.3.2 by the end of Dec 2022 so I > > > suggest using this upcoming release in your test. > > > > > > Regards, > > > Anup
On Thu, Dec 15, 2022 at 8:55 AM Alistair Francis <alistair23@gmail.com> wrote: > > On Mon, Dec 12, 2022 at 9:12 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > On Mon, Dec 12, 2022 at 11:23 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > On Thu, Dec 8, 2022 at 6:41 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > On Thu, Dec 8, 2022 at 9:00 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > > > > > On Tue, Nov 8, 2022 at 11:07 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > > > > > The htimedelta[h] CSR has impact on the VS timer comparison so we > > > > > > should call riscv_timer_write_timecmp() whenever htimedelta changes. > > > > > > > > > > > > Fixes: 3ec0fe18a31f ("target/riscv: Add vstimecmp suppor") > > > > > > Signed-off-by: Anup Patel <apatel@ventanamicro.com> > > > > > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > > > > > > > > > > This patch breaks my Xvisor test. When running OpenSBI and Xvisor like this: > > > > > > > > > > qemu-system-riscv64 -machine virt \ > > > > > -m 1G -serial mon:stdio -serial null -nographic \ > > > > > -append 'vmm.console=uart@10000000 vmm.bootcmd="vfs mount initrd > > > > > /;vfs run /boot.xscript;vfs cat /system/banner.txt; guest kick guest0; > > > > > vserial bind guest0/uart0"' \ > > > > > -smp 4 -d guest_errors \ > > > > > -bios none \ > > > > > -device loader,file=./images/qemuriscv64/vmm.bin,addr=0x80200000 \ > > > > > -kernel ./images/qemuriscv64/fw_jump.elf \ > > > > > -initrd ./images/qemuriscv64/vmm-disk-linux.img -cpu rv64,h=true > > > > > > > > > > Running: > > > > > > > > > > Xvisor v0.3.0-129-gbc33f339 (Jan 1 1970 00:00:00) > > > > > > > > > > I see this failure: > > > > > > > > > > INIT: bootcmd: guest kick guest0 > > > > > > > > > > guest0: Kicked > > > > > > > > > > INIT: bootcmd: vserial bind guest0/uart0 > > > > > > > > > > [guest0/uart0] cpu_vcpu_stage2_map: guest_phys=0x000000003B9AC000 > > > > > size=0x4096 map failed > > > > > > > > > > do_error: CPU3: VCPU=guest0/vcpu0 page fault failed (error -1) > > > > > > > > > > zero=0x0000000000000000 ra=0x0000000080001B4E > > > > > > > > > > sp=0x000000008001CF80 gp=0x0000000000000000 > > > > > > > > > > tp=0x0000000000000000 s0=0x000000008001CFB0 > > > > > > > > > > s1=0x0000000000000000 a0=0x0000000010001048 > > > > > > > > > > a1=0x0000000000000000 a2=0x0000000000989680 > > > > > > > > > > a3=0x000000003B9ACA00 a4=0x0000000000000048 > > > > > > > > > > a5=0x0000000000000000 a6=0x0000000000019000 > > > > > > > > > > a7=0x0000000000000000 s2=0x0000000000000000 > > > > > > > > > > s3=0x0000000000000000 s4=0x0000000000000000 > > > > > > > > > > s5=0x0000000000000000 s6=0x0000000000000000 > > > > > > > > > > s7=0x0000000000000000 s8=0x0000000000000000 > > > > > > > > > > s9=0x0000000000000000 s10=0x0000000000000000 > > > > > > > > > > s11=0x0000000000000000 t0=0x0000000000004000 > > > > > > > > > > t1=0x0000000000000100 t2=0x0000000000000000 > > > > > > > > > > t3=0x0000000000000000 t4=0x0000000000000000 > > > > > > > > > > t5=0x0000000000000000 t6=0x0000000000000000 > > > > > > > > > > sepc=0x0000000080001918 sstatus=0x0000000200004120 > > > > > > > > > > hstatus=0x00000002002001C0 sp_exec=0x0000000010A64000 > > > > > > > > > > scause=0x0000000000000017 stval=0x000000003B9ACAF8 > > > > > > > > > > htval=0x000000000EE6B2BE htinst=0x0000000000D03021 > > > > > > > > > > I have tried updating to a newer Xvisor release, but with that I don't > > > > > get any serial output. > > > > > > > > > > Can you help get the Xvisor tests back up and running? > > > > > > > > I tried the latest Xvisor-next (https://github.com/avpatel/xvisor-next) > > > > with your QEMU riscv-to-apply.next branch and it works fine (both > > > > with and without Sstc). > > > > > > Does it work with the latest release? > > > > Yes, the latest Xvisor-next repo works for QEMU v7.2.0-rc4 and > > your riscv-to-apply.next branch (commit 51bb9de2d188) > > I can't get anything to work with this patch. I have dropped this and > the patches after this. > > I'm building the latest Xvisor release with: > > export CROSS_COMPILE=riscv64-linux-gnu- > ARCH=riscv make generic-64b-defconfig > make > > and running it as above, yet nothing. What am I missing here? I tried multiple times with the latest Xvisor on different machines but still can't reproduce the issue you are seeing. We generally provide pre-built binaries with every Xvisor release so I will share with you pre-built binaries of the upcoming Xvisor-0.3.2 release. Maybe that would help you ? Regards, Anup > > Alistair > > > > > Regards, > > Anup > > > > > > > > Alistair > > > > > > > > > > > Here's the QEMU command which I use: > > > > > > > > qemu-system-riscv64 -M virt -m 512M -nographic \ > > > > -bios opensbi/build/platform/generic/firmware/fw_jump.bin \ > > > > -kernel ../xvisor-next/build/vmm.bin \ > > > > -initrd rbd_v64.img \ > > > > -append "vmm.bootcmd=\"vfs mount initrd /;vfs run /boot.xscript;vfs > > > > cat /system/banner.txt\"" \ > > > > -smp 4 > > > > > > > > Also, I will be releasing Xvisor-0.3.2 by the end of Dec 2022 so I > > > > suggest using this upcoming release in your test. > > > > > > > > Regards, > > > > Anup
On Fri, Dec 23, 2022 at 11:14 PM Anup Patel <apatel@ventanamicro.com> wrote: > > On Thu, Dec 15, 2022 at 8:55 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > On Mon, Dec 12, 2022 at 9:12 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > On Mon, Dec 12, 2022 at 11:23 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > > > On Thu, Dec 8, 2022 at 6:41 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > > > On Thu, Dec 8, 2022 at 9:00 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > > > > > > > On Tue, Nov 8, 2022 at 11:07 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > > > > > > > The htimedelta[h] CSR has impact on the VS timer comparison so we > > > > > > > should call riscv_timer_write_timecmp() whenever htimedelta changes. > > > > > > > > > > > > > > Fixes: 3ec0fe18a31f ("target/riscv: Add vstimecmp suppor") > > > > > > > Signed-off-by: Anup Patel <apatel@ventanamicro.com> > > > > > > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > > > > > > > > > > > > This patch breaks my Xvisor test. When running OpenSBI and Xvisor like this: > > > > > > > > > > > > qemu-system-riscv64 -machine virt \ > > > > > > -m 1G -serial mon:stdio -serial null -nographic \ > > > > > > -append 'vmm.console=uart@10000000 vmm.bootcmd="vfs mount initrd > > > > > > /;vfs run /boot.xscript;vfs cat /system/banner.txt; guest kick guest0; > > > > > > vserial bind guest0/uart0"' \ > > > > > > -smp 4 -d guest_errors \ > > > > > > -bios none \ > > > > > > -device loader,file=./images/qemuriscv64/vmm.bin,addr=0x80200000 \ > > > > > > -kernel ./images/qemuriscv64/fw_jump.elf \ > > > > > > -initrd ./images/qemuriscv64/vmm-disk-linux.img -cpu rv64,h=true > > > > > > > > > > > > Running: > > > > > > > > > > > > Xvisor v0.3.0-129-gbc33f339 (Jan 1 1970 00:00:00) > > > > > > > > > > > > I see this failure: > > > > > > > > > > > > INIT: bootcmd: guest kick guest0 > > > > > > > > > > > > guest0: Kicked > > > > > > > > > > > > INIT: bootcmd: vserial bind guest0/uart0 > > > > > > > > > > > > [guest0/uart0] cpu_vcpu_stage2_map: guest_phys=0x000000003B9AC000 > > > > > > size=0x4096 map failed > > > > > > > > > > > > do_error: CPU3: VCPU=guest0/vcpu0 page fault failed (error -1) > > > > > > > > > > > > zero=0x0000000000000000 ra=0x0000000080001B4E > > > > > > > > > > > > sp=0x000000008001CF80 gp=0x0000000000000000 > > > > > > > > > > > > tp=0x0000000000000000 s0=0x000000008001CFB0 > > > > > > > > > > > > s1=0x0000000000000000 a0=0x0000000010001048 > > > > > > > > > > > > a1=0x0000000000000000 a2=0x0000000000989680 > > > > > > > > > > > > a3=0x000000003B9ACA00 a4=0x0000000000000048 > > > > > > > > > > > > a5=0x0000000000000000 a6=0x0000000000019000 > > > > > > > > > > > > a7=0x0000000000000000 s2=0x0000000000000000 > > > > > > > > > > > > s3=0x0000000000000000 s4=0x0000000000000000 > > > > > > > > > > > > s5=0x0000000000000000 s6=0x0000000000000000 > > > > > > > > > > > > s7=0x0000000000000000 s8=0x0000000000000000 > > > > > > > > > > > > s9=0x0000000000000000 s10=0x0000000000000000 > > > > > > > > > > > > s11=0x0000000000000000 t0=0x0000000000004000 > > > > > > > > > > > > t1=0x0000000000000100 t2=0x0000000000000000 > > > > > > > > > > > > t3=0x0000000000000000 t4=0x0000000000000000 > > > > > > > > > > > > t5=0x0000000000000000 t6=0x0000000000000000 > > > > > > > > > > > > sepc=0x0000000080001918 sstatus=0x0000000200004120 > > > > > > > > > > > > hstatus=0x00000002002001C0 sp_exec=0x0000000010A64000 > > > > > > > > > > > > scause=0x0000000000000017 stval=0x000000003B9ACAF8 > > > > > > > > > > > > htval=0x000000000EE6B2BE htinst=0x0000000000D03021 > > > > > > > > > > > > I have tried updating to a newer Xvisor release, but with that I don't > > > > > > get any serial output. > > > > > > > > > > > > Can you help get the Xvisor tests back up and running? > > > > > > > > > > I tried the latest Xvisor-next (https://github.com/avpatel/xvisor-next) > > > > > with your QEMU riscv-to-apply.next branch and it works fine (both > > > > > with and without Sstc). > > > > > > > > Does it work with the latest release? > > > > > > Yes, the latest Xvisor-next repo works for QEMU v7.2.0-rc4 and > > > your riscv-to-apply.next branch (commit 51bb9de2d188) > > > > I can't get anything to work with this patch. I have dropped this and > > the patches after this. > > > > I'm building the latest Xvisor release with: > > > > export CROSS_COMPILE=riscv64-linux-gnu- > > ARCH=riscv make generic-64b-defconfig > > make > > > > and running it as above, yet nothing. What am I missing here? > > I tried multiple times with the latest Xvisor on different machines but > still can't reproduce the issue you are seeing. Odd > > We generally provide pre-built binaries with every Xvisor release > so I will share with you pre-built binaries of the upcoming Xvisor-0.3.2 > release. Maybe that would help you ? That would work. Let me know when the release happens and I can update my images. Alistair
Hi Alistair, On Wed, Dec 28, 2022 at 11:08 AM Alistair Francis <alistair23@gmail.com> wrote: > > On Fri, Dec 23, 2022 at 11:14 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > On Thu, Dec 15, 2022 at 8:55 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > On Mon, Dec 12, 2022 at 9:12 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > On Mon, Dec 12, 2022 at 11:23 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > > > > > On Thu, Dec 8, 2022 at 6:41 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > > > > > On Thu, Dec 8, 2022 at 9:00 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > > > > > > > > > On Tue, Nov 8, 2022 at 11:07 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > > > > > > > > > The htimedelta[h] CSR has impact on the VS timer comparison so we > > > > > > > > should call riscv_timer_write_timecmp() whenever htimedelta changes. > > > > > > > > > > > > > > > > Fixes: 3ec0fe18a31f ("target/riscv: Add vstimecmp suppor") > > > > > > > > Signed-off-by: Anup Patel <apatel@ventanamicro.com> > > > > > > > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > > > > > > > > > > > > > > This patch breaks my Xvisor test. When running OpenSBI and Xvisor like this: > > > > > > > > > > > > > > qemu-system-riscv64 -machine virt \ > > > > > > > -m 1G -serial mon:stdio -serial null -nographic \ > > > > > > > -append 'vmm.console=uart@10000000 vmm.bootcmd="vfs mount initrd > > > > > > > /;vfs run /boot.xscript;vfs cat /system/banner.txt; guest kick guest0; > > > > > > > vserial bind guest0/uart0"' \ > > > > > > > -smp 4 -d guest_errors \ > > > > > > > -bios none \ > > > > > > > -device loader,file=./images/qemuriscv64/vmm.bin,addr=0x80200000 \ > > > > > > > -kernel ./images/qemuriscv64/fw_jump.elf \ > > > > > > > -initrd ./images/qemuriscv64/vmm-disk-linux.img -cpu rv64,h=true > > > > > > > > > > > > > > Running: > > > > > > > > > > > > > > Xvisor v0.3.0-129-gbc33f339 (Jan 1 1970 00:00:00) > > > > > > > > > > > > > > I see this failure: > > > > > > > > > > > > > > INIT: bootcmd: guest kick guest0 > > > > > > > > > > > > > > guest0: Kicked > > > > > > > > > > > > > > INIT: bootcmd: vserial bind guest0/uart0 > > > > > > > > > > > > > > [guest0/uart0] cpu_vcpu_stage2_map: guest_phys=0x000000003B9AC000 > > > > > > > size=0x4096 map failed > > > > > > > > > > > > > > do_error: CPU3: VCPU=guest0/vcpu0 page fault failed (error -1) > > > > > > > > > > > > > > zero=0x0000000000000000 ra=0x0000000080001B4E > > > > > > > > > > > > > > sp=0x000000008001CF80 gp=0x0000000000000000 > > > > > > > > > > > > > > tp=0x0000000000000000 s0=0x000000008001CFB0 > > > > > > > > > > > > > > s1=0x0000000000000000 a0=0x0000000010001048 > > > > > > > > > > > > > > a1=0x0000000000000000 a2=0x0000000000989680 > > > > > > > > > > > > > > a3=0x000000003B9ACA00 a4=0x0000000000000048 > > > > > > > > > > > > > > a5=0x0000000000000000 a6=0x0000000000019000 > > > > > > > > > > > > > > a7=0x0000000000000000 s2=0x0000000000000000 > > > > > > > > > > > > > > s3=0x0000000000000000 s4=0x0000000000000000 > > > > > > > > > > > > > > s5=0x0000000000000000 s6=0x0000000000000000 > > > > > > > > > > > > > > s7=0x0000000000000000 s8=0x0000000000000000 > > > > > > > > > > > > > > s9=0x0000000000000000 s10=0x0000000000000000 > > > > > > > > > > > > > > s11=0x0000000000000000 t0=0x0000000000004000 > > > > > > > > > > > > > > t1=0x0000000000000100 t2=0x0000000000000000 > > > > > > > > > > > > > > t3=0x0000000000000000 t4=0x0000000000000000 > > > > > > > > > > > > > > t5=0x0000000000000000 t6=0x0000000000000000 > > > > > > > > > > > > > > sepc=0x0000000080001918 sstatus=0x0000000200004120 > > > > > > > > > > > > > > hstatus=0x00000002002001C0 sp_exec=0x0000000010A64000 > > > > > > > > > > > > > > scause=0x0000000000000017 stval=0x000000003B9ACAF8 > > > > > > > > > > > > > > htval=0x000000000EE6B2BE htinst=0x0000000000D03021 > > > > > > > > > > > > > > I have tried updating to a newer Xvisor release, but with that I don't > > > > > > > get any serial output. > > > > > > > > > > > > > > Can you help get the Xvisor tests back up and running? > > > > > > > > > > > > I tried the latest Xvisor-next (https://github.com/avpatel/xvisor-next) > > > > > > with your QEMU riscv-to-apply.next branch and it works fine (both > > > > > > with and without Sstc). > > > > > > > > > > Does it work with the latest release? > > > > > > > > Yes, the latest Xvisor-next repo works for QEMU v7.2.0-rc4 and > > > > your riscv-to-apply.next branch (commit 51bb9de2d188) > > > > > > I can't get anything to work with this patch. I have dropped this and > > > the patches after this. > > > > > > I'm building the latest Xvisor release with: > > > > > > export CROSS_COMPILE=riscv64-linux-gnu- > > > ARCH=riscv make generic-64b-defconfig > > > make > > > > > > and running it as above, yet nothing. What am I missing here? > > > > I tried multiple times with the latest Xvisor on different machines but > > still can't reproduce the issue you are seeing. > > Odd > > > > > We generally provide pre-built binaries with every Xvisor release > > so I will share with you pre-built binaries of the upcoming Xvisor-0.3.2 > > release. Maybe that would help you ? > > That would work. Let me know when the release happens and I can update > my images. Please download the Xvisor v0.3.2 pre-built binary tarball from: https://xhypervisor.org/tarball/xvisor-0.3.2-bins.tar.xz After untarring the above tarball, you can try the following command: $ qemu-system-riscv64 -M virt -m 512M -nographic -bios opensbi/build/platform/generic/firmware/fw_jump.bin -kernel xvisor-0.3.2-bins/riscv/rv64/xvisor/vmm.bin -initrd xvisor-0.3.2-bins/riscv/rv64/guest/virt64/disk-linux-6.1.1-one_guest_virt64.ext2 -append "vmm.bootcmd=\"vfs mount initrd /;vfs run /boot.xscript;vfs cat /system/banner.txt\"" OR $ qemu-system-riscv32 -M virt -m 512M -nographic -bios opensbi/build/platform/generic/firmware/fw_jump.bin -kernel xvisor-0.3.2-bins/riscv/rv32/xvisor/vmm.bin -initrd xvisor-0.3.2-bins/riscv/rv32/guest/virt32/disk-linux-6.1.1-one_guest_virt32.ext2 -append "vmm.bootcmd=\"vfs mount initrd /;vfs run /boot.xscript;vfs cat /system/banner.txt\"" Regards, Anup
Hi Alistair, On Tue, Jan 3, 2023 at 9:43 PM Anup Patel <apatel@ventanamicro.com> wrote: > > Hi Alistair, > > On Wed, Dec 28, 2022 at 11:08 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > On Fri, Dec 23, 2022 at 11:14 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > On Thu, Dec 15, 2022 at 8:55 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > > > On Mon, Dec 12, 2022 at 9:12 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > > > On Mon, Dec 12, 2022 at 11:23 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > > > > > > > On Thu, Dec 8, 2022 at 6:41 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > > > > > > > On Thu, Dec 8, 2022 at 9:00 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > > > > > > > > > > > On Tue, Nov 8, 2022 at 11:07 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > > > > > > > > > > > The htimedelta[h] CSR has impact on the VS timer comparison so we > > > > > > > > > should call riscv_timer_write_timecmp() whenever htimedelta changes. > > > > > > > > > > > > > > > > > > Fixes: 3ec0fe18a31f ("target/riscv: Add vstimecmp suppor") > > > > > > > > > Signed-off-by: Anup Patel <apatel@ventanamicro.com> > > > > > > > > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > > > > > > > > > > > > > > > > This patch breaks my Xvisor test. When running OpenSBI and Xvisor like this: > > > > > > > > > > > > > > > > qemu-system-riscv64 -machine virt \ > > > > > > > > -m 1G -serial mon:stdio -serial null -nographic \ > > > > > > > > -append 'vmm.console=uart@10000000 vmm.bootcmd="vfs mount initrd > > > > > > > > /;vfs run /boot.xscript;vfs cat /system/banner.txt; guest kick guest0; > > > > > > > > vserial bind guest0/uart0"' \ > > > > > > > > -smp 4 -d guest_errors \ > > > > > > > > -bios none \ > > > > > > > > -device loader,file=./images/qemuriscv64/vmm.bin,addr=0x80200000 \ > > > > > > > > -kernel ./images/qemuriscv64/fw_jump.elf \ > > > > > > > > -initrd ./images/qemuriscv64/vmm-disk-linux.img -cpu rv64,h=true > > > > > > > > > > > > > > > > Running: > > > > > > > > > > > > > > > > Xvisor v0.3.0-129-gbc33f339 (Jan 1 1970 00:00:00) > > > > > > > > > > > > > > > > I see this failure: > > > > > > > > > > > > > > > > INIT: bootcmd: guest kick guest0 > > > > > > > > > > > > > > > > guest0: Kicked > > > > > > > > > > > > > > > > INIT: bootcmd: vserial bind guest0/uart0 > > > > > > > > > > > > > > > > [guest0/uart0] cpu_vcpu_stage2_map: guest_phys=0x000000003B9AC000 > > > > > > > > size=0x4096 map failed > > > > > > > > > > > > > > > > do_error: CPU3: VCPU=guest0/vcpu0 page fault failed (error -1) > > > > > > > > > > > > > > > > zero=0x0000000000000000 ra=0x0000000080001B4E > > > > > > > > > > > > > > > > sp=0x000000008001CF80 gp=0x0000000000000000 > > > > > > > > > > > > > > > > tp=0x0000000000000000 s0=0x000000008001CFB0 > > > > > > > > > > > > > > > > s1=0x0000000000000000 a0=0x0000000010001048 > > > > > > > > > > > > > > > > a1=0x0000000000000000 a2=0x0000000000989680 > > > > > > > > > > > > > > > > a3=0x000000003B9ACA00 a4=0x0000000000000048 > > > > > > > > > > > > > > > > a5=0x0000000000000000 a6=0x0000000000019000 > > > > > > > > > > > > > > > > a7=0x0000000000000000 s2=0x0000000000000000 > > > > > > > > > > > > > > > > s3=0x0000000000000000 s4=0x0000000000000000 > > > > > > > > > > > > > > > > s5=0x0000000000000000 s6=0x0000000000000000 > > > > > > > > > > > > > > > > s7=0x0000000000000000 s8=0x0000000000000000 > > > > > > > > > > > > > > > > s9=0x0000000000000000 s10=0x0000000000000000 > > > > > > > > > > > > > > > > s11=0x0000000000000000 t0=0x0000000000004000 > > > > > > > > > > > > > > > > t1=0x0000000000000100 t2=0x0000000000000000 > > > > > > > > > > > > > > > > t3=0x0000000000000000 t4=0x0000000000000000 > > > > > > > > > > > > > > > > t5=0x0000000000000000 t6=0x0000000000000000 > > > > > > > > > > > > > > > > sepc=0x0000000080001918 sstatus=0x0000000200004120 > > > > > > > > > > > > > > > > hstatus=0x00000002002001C0 sp_exec=0x0000000010A64000 > > > > > > > > > > > > > > > > scause=0x0000000000000017 stval=0x000000003B9ACAF8 > > > > > > > > > > > > > > > > htval=0x000000000EE6B2BE htinst=0x0000000000D03021 > > > > > > > > > > > > > > > > I have tried updating to a newer Xvisor release, but with that I don't > > > > > > > > get any serial output. > > > > > > > > > > > > > > > > Can you help get the Xvisor tests back up and running? > > > > > > > > > > > > > > I tried the latest Xvisor-next (https://github.com/avpatel/xvisor-next) > > > > > > > with your QEMU riscv-to-apply.next branch and it works fine (both > > > > > > > with and without Sstc). > > > > > > > > > > > > Does it work with the latest release? > > > > > > > > > > Yes, the latest Xvisor-next repo works for QEMU v7.2.0-rc4 and > > > > > your riscv-to-apply.next branch (commit 51bb9de2d188) > > > > > > > > I can't get anything to work with this patch. I have dropped this and > > > > the patches after this. > > > > > > > > I'm building the latest Xvisor release with: > > > > > > > > export CROSS_COMPILE=riscv64-linux-gnu- > > > > ARCH=riscv make generic-64b-defconfig > > > > make > > > > > > > > and running it as above, yet nothing. What am I missing here? > > > > > > I tried multiple times with the latest Xvisor on different machines but > > > still can't reproduce the issue you are seeing. > > > > Odd > > > > > > > > We generally provide pre-built binaries with every Xvisor release > > > so I will share with you pre-built binaries of the upcoming Xvisor-0.3.2 > > > release. Maybe that would help you ? > > > > That would work. Let me know when the release happens and I can update > > my images. > > Please download the Xvisor v0.3.2 pre-built binary tarball from: > https://xhypervisor.org/tarball/xvisor-0.3.2-bins.tar.xz > > After untarring the above tarball, you can try the following command: > $ qemu-system-riscv64 -M virt -m 512M -nographic -bios > opensbi/build/platform/generic/firmware/fw_jump.bin -kernel > xvisor-0.3.2-bins/riscv/rv64/xvisor/vmm.bin -initrd > xvisor-0.3.2-bins/riscv/rv64/guest/virt64/disk-linux-6.1.1-one_guest_virt64.ext2 > -append "vmm.bootcmd=\"vfs mount initrd /;vfs run /boot.xscript;vfs > cat /system/banner.txt\"" > OR > $ qemu-system-riscv32 -M virt -m 512M -nographic -bios > opensbi/build/platform/generic/firmware/fw_jump.bin -kernel > xvisor-0.3.2-bins/riscv/rv32/xvisor/vmm.bin -initrd > xvisor-0.3.2-bins/riscv/rv32/guest/virt32/disk-linux-6.1.1-one_guest_virt32.ext2 > -append "vmm.bootcmd=\"vfs mount initrd /;vfs run /boot.xscript;vfs > cat /system/banner.txt\"" Do you want me to rebase and resend the patches which are not merged ? Regards, Anup
On Mon, Jan 16, 2023 at 3:20 PM Anup Patel <apatel@ventanamicro.com> wrote: > > Hi Alistair, > > On Tue, Jan 3, 2023 at 9:43 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > Hi Alistair, > > > > On Wed, Dec 28, 2022 at 11:08 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > On Fri, Dec 23, 2022 at 11:14 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > On Thu, Dec 15, 2022 at 8:55 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > > > > > On Mon, Dec 12, 2022 at 9:12 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > > > > > On Mon, Dec 12, 2022 at 11:23 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > > > > > > > > > On Thu, Dec 8, 2022 at 6:41 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > > > > > > > > > On Thu, Dec 8, 2022 at 9:00 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > > > > > > > > > > > > > On Tue, Nov 8, 2022 at 11:07 PM Anup Patel <apatel@ventanamicro.com> wrote: > > > > > > > > > > > > > > > > > > > > The htimedelta[h] CSR has impact on the VS timer comparison so we > > > > > > > > > > should call riscv_timer_write_timecmp() whenever htimedelta changes. > > > > > > > > > > > > > > > > > > > > Fixes: 3ec0fe18a31f ("target/riscv: Add vstimecmp suppor") > > > > > > > > > > Signed-off-by: Anup Patel <apatel@ventanamicro.com> > > > > > > > > > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > > > > > > > > > > > > > > > > > > This patch breaks my Xvisor test. When running OpenSBI and Xvisor like this: > > > > > > > > > > > > > > > > > > qemu-system-riscv64 -machine virt \ > > > > > > > > > -m 1G -serial mon:stdio -serial null -nographic \ > > > > > > > > > -append 'vmm.console=uart@10000000 vmm.bootcmd="vfs mount initrd > > > > > > > > > /;vfs run /boot.xscript;vfs cat /system/banner.txt; guest kick guest0; > > > > > > > > > vserial bind guest0/uart0"' \ > > > > > > > > > -smp 4 -d guest_errors \ > > > > > > > > > -bios none \ > > > > > > > > > -device loader,file=./images/qemuriscv64/vmm.bin,addr=0x80200000 \ > > > > > > > > > -kernel ./images/qemuriscv64/fw_jump.elf \ > > > > > > > > > -initrd ./images/qemuriscv64/vmm-disk-linux.img -cpu rv64,h=true > > > > > > > > > > > > > > > > > > Running: > > > > > > > > > > > > > > > > > > Xvisor v0.3.0-129-gbc33f339 (Jan 1 1970 00:00:00) > > > > > > > > > > > > > > > > > > I see this failure: > > > > > > > > > > > > > > > > > > INIT: bootcmd: guest kick guest0 > > > > > > > > > > > > > > > > > > guest0: Kicked > > > > > > > > > > > > > > > > > > INIT: bootcmd: vserial bind guest0/uart0 > > > > > > > > > > > > > > > > > > [guest0/uart0] cpu_vcpu_stage2_map: guest_phys=0x000000003B9AC000 > > > > > > > > > size=0x4096 map failed > > > > > > > > > > > > > > > > > > do_error: CPU3: VCPU=guest0/vcpu0 page fault failed (error -1) > > > > > > > > > > > > > > > > > > zero=0x0000000000000000 ra=0x0000000080001B4E > > > > > > > > > > > > > > > > > > sp=0x000000008001CF80 gp=0x0000000000000000 > > > > > > > > > > > > > > > > > > tp=0x0000000000000000 s0=0x000000008001CFB0 > > > > > > > > > > > > > > > > > > s1=0x0000000000000000 a0=0x0000000010001048 > > > > > > > > > > > > > > > > > > a1=0x0000000000000000 a2=0x0000000000989680 > > > > > > > > > > > > > > > > > > a3=0x000000003B9ACA00 a4=0x0000000000000048 > > > > > > > > > > > > > > > > > > a5=0x0000000000000000 a6=0x0000000000019000 > > > > > > > > > > > > > > > > > > a7=0x0000000000000000 s2=0x0000000000000000 > > > > > > > > > > > > > > > > > > s3=0x0000000000000000 s4=0x0000000000000000 > > > > > > > > > > > > > > > > > > s5=0x0000000000000000 s6=0x0000000000000000 > > > > > > > > > > > > > > > > > > s7=0x0000000000000000 s8=0x0000000000000000 > > > > > > > > > > > > > > > > > > s9=0x0000000000000000 s10=0x0000000000000000 > > > > > > > > > > > > > > > > > > s11=0x0000000000000000 t0=0x0000000000004000 > > > > > > > > > > > > > > > > > > t1=0x0000000000000100 t2=0x0000000000000000 > > > > > > > > > > > > > > > > > > t3=0x0000000000000000 t4=0x0000000000000000 > > > > > > > > > > > > > > > > > > t5=0x0000000000000000 t6=0x0000000000000000 > > > > > > > > > > > > > > > > > > sepc=0x0000000080001918 sstatus=0x0000000200004120 > > > > > > > > > > > > > > > > > > hstatus=0x00000002002001C0 sp_exec=0x0000000010A64000 > > > > > > > > > > > > > > > > > > scause=0x0000000000000017 stval=0x000000003B9ACAF8 > > > > > > > > > > > > > > > > > > htval=0x000000000EE6B2BE htinst=0x0000000000D03021 > > > > > > > > > > > > > > > > > > I have tried updating to a newer Xvisor release, but with that I don't > > > > > > > > > get any serial output. > > > > > > > > > > > > > > > > > > Can you help get the Xvisor tests back up and running? > > > > > > > > > > > > > > > > I tried the latest Xvisor-next (https://github.com/avpatel/xvisor-next) > > > > > > > > with your QEMU riscv-to-apply.next branch and it works fine (both > > > > > > > > with and without Sstc). > > > > > > > > > > > > > > Does it work with the latest release? > > > > > > > > > > > > Yes, the latest Xvisor-next repo works for QEMU v7.2.0-rc4 and > > > > > > your riscv-to-apply.next branch (commit 51bb9de2d188) > > > > > > > > > > I can't get anything to work with this patch. I have dropped this and > > > > > the patches after this. > > > > > > > > > > I'm building the latest Xvisor release with: > > > > > > > > > > export CROSS_COMPILE=riscv64-linux-gnu- > > > > > ARCH=riscv make generic-64b-defconfig > > > > > make > > > > > > > > > > and running it as above, yet nothing. What am I missing here? > > > > > > > > I tried multiple times with the latest Xvisor on different machines but > > > > still can't reproduce the issue you are seeing. > > > > > > Odd > > > > > > > > > > > We generally provide pre-built binaries with every Xvisor release > > > > so I will share with you pre-built binaries of the upcoming Xvisor-0.3.2 > > > > release. Maybe that would help you ? > > > > > > That would work. Let me know when the release happens and I can update > > > my images. > > > > Please download the Xvisor v0.3.2 pre-built binary tarball from: > > https://xhypervisor.org/tarball/xvisor-0.3.2-bins.tar.xz > > > > After untarring the above tarball, you can try the following command: > > $ qemu-system-riscv64 -M virt -m 512M -nographic -bios > > opensbi/build/platform/generic/firmware/fw_jump.bin -kernel > > xvisor-0.3.2-bins/riscv/rv64/xvisor/vmm.bin -initrd > > xvisor-0.3.2-bins/riscv/rv64/guest/virt64/disk-linux-6.1.1-one_guest_virt64.ext2 > > -append "vmm.bootcmd=\"vfs mount initrd /;vfs run /boot.xscript;vfs > > cat /system/banner.txt\"" > > OR > > $ qemu-system-riscv32 -M virt -m 512M -nographic -bios > > opensbi/build/platform/generic/firmware/fw_jump.bin -kernel > > xvisor-0.3.2-bins/riscv/rv32/xvisor/vmm.bin -initrd > > xvisor-0.3.2-bins/riscv/rv32/guest/virt32/disk-linux-6.1.1-one_guest_virt32.ext2 > > -append "vmm.bootcmd=\"vfs mount initrd /;vfs run /boot.xscript;vfs > > cat /system/banner.txt\"" Great! I have updated my tests and they are passing on the current QEMU master. > > Do you want me to rebase and resend the patches which > are not merged ? Yes please :) Alistair > > Regards, > Anup
diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 716f9d960e..4b1a608260 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -2722,6 +2722,8 @@ static RISCVException read_htimedelta(CPURISCVState *env, int csrno, static RISCVException write_htimedelta(CPURISCVState *env, int csrno, target_ulong val) { + RISCVCPU *cpu = env_archcpu(env); + if (!env->rdtime_fn) { return RISCV_EXCP_ILLEGAL_INST; } @@ -2731,6 +2733,12 @@ static RISCVException write_htimedelta(CPURISCVState *env, int csrno, } else { env->htimedelta = val; } + + if (cpu->cfg.ext_sstc && env->rdtime_fn) { + riscv_timer_write_timecmp(cpu, env->vstimer, env->vstimecmp, + env->htimedelta, MIP_VSTIP); + } + return RISCV_EXCP_NONE; } @@ -2748,11 +2756,19 @@ static RISCVException read_htimedeltah(CPURISCVState *env, int csrno, static RISCVException write_htimedeltah(CPURISCVState *env, int csrno, target_ulong val) { + RISCVCPU *cpu = env_archcpu(env); + if (!env->rdtime_fn) { return RISCV_EXCP_ILLEGAL_INST; } env->htimedelta = deposit64(env->htimedelta, 32, 32, (uint64_t)val); + + if (cpu->cfg.ext_sstc && env->rdtime_fn) { + riscv_timer_write_timecmp(cpu, env->vstimer, env->vstimecmp, + env->htimedelta, MIP_VSTIP); + } + return RISCV_EXCP_NONE; }
The htimedelta[h] CSR has impact on the VS timer comparison so we should call riscv_timer_write_timecmp() whenever htimedelta changes. Fixes: 3ec0fe18a31f ("target/riscv: Add vstimecmp suppor") Signed-off-by: Anup Patel <apatel@ventanamicro.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> --- target/riscv/csr.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)