| Message ID | CAAhSdy2mLBzE63wpQrOaHtOV0rwqkaxTUMBA9oMZsk68o0EHMg@mail.gmail.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [GIT,PULL] KVM/riscv changes for 6.13, part #2 | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On Thu, Nov 21, 2024 at 1:55 PM Anup Patel <anup@brainfault.org> wrote: > > Hi Paolo, > > As mentioned in the last PR, here are the remaining KVM RISC-V > changes for 6.13 which mainly consists of Svade/Svadu extension > support for Host and Guest/VM. > > Please note that Palmer has not yet sent the RISC-V PR for 6.13 > so these patches will conflict with the RISC-V tree. The RISC-V PR has not been merged yet (has it been sent?) and I am not sure what's happening here. If these are merged first, presumably Linus will bump the arch/riscv/include/asm/hwcap.h constants -- leaving SVADE/SVADU at 87 and 88 and adjusting the others. Should I do that or is it delayed to 6.14 at this point? Paolo > Please pull. > > Regards, > Anup > > The following changes since commit 332fa4a802b16ccb727199da685294f85f9880cb: > > riscv: kvm: Fix out-of-bounds array access (2024-11-05 13:27:32 +0530) > > are available in the Git repository at: > > https://github.com/kvm-riscv/linux.git tags/kvm-riscv-6.13-2 > > for you to fetch changes up to c74bfe4ffe8c1ca94e3d60ec7af06cf679e23583: > > KVM: riscv: selftests: Add Svade and Svadu Extension to get-reg-list > test (2024-11-21 17:40:16 +0530) > > ---------------------------------------------------------------- > KVM/riscv changes for 6.13 part #2 > > - Svade and Svadu extension support for Host and Guest/VM > > ---------------------------------------------------------------- > Yong-Xuan Wang (4): > RISC-V: Add Svade and Svadu Extensions Support > dt-bindings: riscv: Add Svade and Svadu Entries > RISC-V: KVM: Add Svade and Svadu Extensions Support for Guest/VM > KVM: riscv: selftests: Add Svade and Svadu Extension to get-reg-list test > > .../devicetree/bindings/riscv/extensions.yaml | 28 ++++++++++++++++++++++ > arch/riscv/Kconfig | 1 + > arch/riscv/include/asm/csr.h | 1 + > arch/riscv/include/asm/hwcap.h | 2 ++ > arch/riscv/include/asm/pgtable.h | 13 +++++++++- > arch/riscv/include/uapi/asm/kvm.h | 2 ++ > arch/riscv/kernel/cpufeature.c | 12 ++++++++++ > arch/riscv/kvm/vcpu.c | 4 ++++ > arch/riscv/kvm/vcpu_onereg.c | 15 ++++++++++++ > tools/testing/selftests/kvm/riscv/get-reg-list.c | 8 +++++++ > 10 files changed, 85 insertions(+), 1 deletion(-) >
On Wed, Nov 27, 2024 at 10:08 PM Paolo Bonzini <pbonzini@redhat.com> wrote: > > On Thu, Nov 21, 2024 at 1:55 PM Anup Patel <anup@brainfault.org> wrote: > > > > Hi Paolo, > > > > As mentioned in the last PR, here are the remaining KVM RISC-V > > changes for 6.13 which mainly consists of Svade/Svadu extension > > support for Host and Guest/VM. > > > > Please note that Palmer has not yet sent the RISC-V PR for 6.13 > > so these patches will conflict with the RISC-V tree. > > The RISC-V PR has not been merged yet (has it been sent?) and I am not > sure what's happening here. If these are merged first, presumably > Linus will bump the arch/riscv/include/asm/hwcap.h constants -- > leaving SVADE/SVADU at 87 and 88 and adjusting the others. Should I do > that or is it delayed to 6.14 at this point? Yes, Palmer send-out RISC-V PR one hour ago. (subject "[GIT PULL] RISC-V Paches for the 6.13 Merge Window, Part 1") (git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git tags/riscv-for-linus-6.13-mw1) We have already skipped Svade & Svadu support in the 6.12 merge window. If possible please take it in this merge window. Regards, Anup > > Paolo > > > Please pull. > > > > Regards, > > Anup > > > > The following changes since commit 332fa4a802b16ccb727199da685294f85f9880cb: > > > > riscv: kvm: Fix out-of-bounds array access (2024-11-05 13:27:32 +0530) > > > > are available in the Git repository at: > > > > https://github.com/kvm-riscv/linux.git tags/kvm-riscv-6.13-2 > > > > for you to fetch changes up to c74bfe4ffe8c1ca94e3d60ec7af06cf679e23583: > > > > KVM: riscv: selftests: Add Svade and Svadu Extension to get-reg-list > > test (2024-11-21 17:40:16 +0530) > > > > ---------------------------------------------------------------- > > KVM/riscv changes for 6.13 part #2 > > > > - Svade and Svadu extension support for Host and Guest/VM > > > > ---------------------------------------------------------------- > > Yong-Xuan Wang (4): > > RISC-V: Add Svade and Svadu Extensions Support > > dt-bindings: riscv: Add Svade and Svadu Entries > > RISC-V: KVM: Add Svade and Svadu Extensions Support for Guest/VM > > KVM: riscv: selftests: Add Svade and Svadu Extension to get-reg-list test > > > > .../devicetree/bindings/riscv/extensions.yaml | 28 ++++++++++++++++++++++ > > arch/riscv/Kconfig | 1 + > > arch/riscv/include/asm/csr.h | 1 + > > arch/riscv/include/asm/hwcap.h | 2 ++ > > arch/riscv/include/asm/pgtable.h | 13 +++++++++- > > arch/riscv/include/uapi/asm/kvm.h | 2 ++ > > arch/riscv/kernel/cpufeature.c | 12 ++++++++++ > > arch/riscv/kvm/vcpu.c | 4 ++++ > > arch/riscv/kvm/vcpu_onereg.c | 15 ++++++++++++ > > tools/testing/selftests/kvm/riscv/get-reg-list.c | 8 +++++++ > > 10 files changed, 85 insertions(+), 1 deletion(-) > > >
On Wed, Nov 27, 2024 at 5:44 PM Anup Patel <anup@brainfault.org> wrote: > > On Wed, Nov 27, 2024 at 10:08 PM Paolo Bonzini <pbonzini@redhat.com> wrote: > > > > On Thu, Nov 21, 2024 at 1:55 PM Anup Patel <anup@brainfault.org> wrote: > > > > > > Hi Paolo, > > > > > > As mentioned in the last PR, here are the remaining KVM RISC-V > > > changes for 6.13 which mainly consists of Svade/Svadu extension > > > support for Host and Guest/VM. > > > > > > Please note that Palmer has not yet sent the RISC-V PR for 6.13 > > > so these patches will conflict with the RISC-V tree. > > > > The RISC-V PR has not been merged yet (has it been sent?) and I am not > > sure what's happening here. If these are merged first, presumably > > Linus will bump the arch/riscv/include/asm/hwcap.h constants -- > > leaving SVADE/SVADU at 87 and 88 and adjusting the others. Should I do > > that or is it delayed to 6.14 at this point? > > Yes, Palmer send-out RISC-V PR one hour ago. > (subject "[GIT PULL] RISC-V Paches for the 6.13 Merge Window, Part 1") > (git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git > tags/riscv-for-linus-6.13-mw1) > > We have already skipped Svade & Svadu support in the 6.12 merge > window. If possible please take it in this merge window. Ok, will do. But I'd like to understand if KVM patches needed the bare metal support. If not, and the only reason to skip it in 6.12 was the hwcap.h constants, then there was no reason to delay it. Just send the hwcap.h update as a pull request to both me and Palmer, and we'll merge it from the same commit into our trees. Paolo
On Wed, Nov 27, 2024 at 10:17 PM Paolo Bonzini <pbonzini@redhat.com> wrote: > > On Wed, Nov 27, 2024 at 5:44 PM Anup Patel <anup@brainfault.org> wrote: > > > > On Wed, Nov 27, 2024 at 10:08 PM Paolo Bonzini <pbonzini@redhat.com> wrote: > > > > > > On Thu, Nov 21, 2024 at 1:55 PM Anup Patel <anup@brainfault.org> wrote: > > > > > > > > Hi Paolo, > > > > > > > > As mentioned in the last PR, here are the remaining KVM RISC-V > > > > changes for 6.13 which mainly consists of Svade/Svadu extension > > > > support for Host and Guest/VM. > > > > > > > > Please note that Palmer has not yet sent the RISC-V PR for 6.13 > > > > so these patches will conflict with the RISC-V tree. > > > > > > The RISC-V PR has not been merged yet (has it been sent?) and I am not > > > sure what's happening here. If these are merged first, presumably > > > Linus will bump the arch/riscv/include/asm/hwcap.h constants -- > > > leaving SVADE/SVADU at 87 and 88 and adjusting the others. Should I do > > > that or is it delayed to 6.14 at this point? > > > > Yes, Palmer send-out RISC-V PR one hour ago. > > (subject "[GIT PULL] RISC-V Paches for the 6.13 Merge Window, Part 1") > > (git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git > > tags/riscv-for-linus-6.13-mw1) > > > > We have already skipped Svade & Svadu support in the 6.12 merge > > window. If possible please take it in this merge window. > > Ok, will do. But I'd like to understand if KVM patches needed the bare > metal support. If not, and the only reason to skip it in 6.12 was the > hwcap.h constants, then there was no reason to delay it. Just send the > hwcap.h update as a pull request to both me and Palmer, and we'll > merge it from the same commit into our trees. It was skipped in 6.12 due to confusion between myself and Palmer about which tree these patches will go through and we did not resolve this in time. Regards, Anup
On Wed, Nov 27, 2024 at 5:51 PM Anup Patel <anup@brainfault.org> wrote: > > Ok, will do. But I'd like to understand if KVM patches needed the bare > > metal support. If not, and the only reason to skip it in 6.12 was the > > hwcap.h constants, then there was no reason to delay it. Just send the > > hwcap.h update as a pull request to both me and Palmer, and we'll > > merge it from the same commit into our trees. > > It was skipped in 6.12 due to confusion between myself and Palmer > about which tree these patches will go through and we did not resolve > this in time. I still don't understand if KVM patches need any bare metal code though. :) It's also unclear to me why "RISC-V: KVM: Allow Smnpm and Ssnpm extensions for guests" came through the RISC-V tree, thus causing conflicts in the KVM_RISCV_ISA_EXT_ID enum. It doesn't seem to need bare metal support, so it should have come through your tree. This split between patches that you send to me and those that others send to someone else is not your fault but it's a mess, and the RISC-V maintainers should not have gone for the least-work option. If anything has a bare metal and a KVM part it's totally okay that you send it to me as a separate pull request, but the right way to do it is to *include a topic branch from the RISC-V tree* and base the KVM changes on top. Not to let Linus and myself sort out the conflicts. Paolo
Hi Paolo, As mentioned in the last PR, here are the remaining KVM RISC-V changes for 6.13 which mainly consists of Svade/Svadu extension support for Host and Guest/VM. Please note that Palmer has not yet sent the RISC-V PR for 6.13 so these patches will conflict with the RISC-V tree. Please pull. Regards, Anup The following changes since commit 332fa4a802b16ccb727199da685294f85f9880cb: riscv: kvm: Fix out-of-bounds array access (2024-11-05 13:27:32 +0530) are available in the Git repository at: https://github.com/kvm-riscv/linux.git tags/kvm-riscv-6.13-2 for you to fetch changes up to c74bfe4ffe8c1ca94e3d60ec7af06cf679e23583: KVM: riscv: selftests: Add Svade and Svadu Extension to get-reg-list test (2024-11-21 17:40:16 +0530) ---------------------------------------------------------------- KVM/riscv changes for 6.13 part #2 - Svade and Svadu extension support for Host and Guest/VM ---------------------------------------------------------------- Yong-Xuan Wang (4): RISC-V: Add Svade and Svadu Extensions Support dt-bindings: riscv: Add Svade and Svadu Entries RISC-V: KVM: Add Svade and Svadu Extensions Support for Guest/VM KVM: riscv: selftests: Add Svade and Svadu Extension to get-reg-list test .../devicetree/bindings/riscv/extensions.yaml | 28 ++++++++++++++++++++++ arch/riscv/Kconfig | 1 + arch/riscv/include/asm/csr.h | 1 + arch/riscv/include/asm/hwcap.h | 2 ++ arch/riscv/include/asm/pgtable.h | 13 +++++++++- arch/riscv/include/uapi/asm/kvm.h | 2 ++ arch/riscv/kernel/cpufeature.c | 12 ++++++++++ arch/riscv/kvm/vcpu.c | 4 ++++ arch/riscv/kvm/vcpu_onereg.c | 15 ++++++++++++ tools/testing/selftests/kvm/riscv/get-reg-list.c | 8 +++++++ 10 files changed, 85 insertions(+), 1 deletion(-)