KVM: riscv: selftests: Backport upstream SBI header refactoring fixes#291
Open
zhuzhenxxx-collab wants to merge 4 commits into
Open
KVM: riscv: selftests: Backport upstream SBI header refactoring fixes#291zhuzhenxxx-collab wants to merge 4 commits into
zhuzhenxxx-collab wants to merge 4 commits into
Conversation
… file" dist inclusion category: cleanup bugzilla: RVCK-Project#290 -------------------------------- This reverts commit 7ecf0f6. The original backport only modified steal_time.c but missed the key changes to processor.h, sbi.h, and ucall.h. Upstream has a complete version of this commit which will be cherry-picked next. Signed-off-by: ZhenXing Zhu <zhenxing.zhu@linux.alibaba.com>
mainline inclusion from Linux 6.10-rc1 commit 9408a23 category: feature bugzilla: RVCK-Project#290 -------------------------------- The SBI definitions will continue to grow. Move the sbi related definitions to its own header file from processor.h Suggested-by: Andrew Jones <ajones@ventanamicro.com> Reviewed-by: Andrew Jones <ajones@ventanamicro.com> Signed-off-by: Atish Patra <atishp@rivosinc.com> Reviewed-by: Anup Patel <anup@brainfault.org> Link: https://lore.kernel.org/r/20240420151741.962500-18-atishp@rivosinc.com Signed-off-by: Anup Patel <anup@brainfault.org> [Resolve conflicts with existing backported SBI PMU definitions and keep local SATP mode macros. - ZhenXing Zhu] Signed-off-by: Fangyu Yu <fangyu.yu@linux.alibaba.com> Signed-off-by: ZhenXing Zhu <zhenxing.zhu@linux.alibaba.com>
mainline inclusion from Linux 6.10-rc1 commit 0fc670d category: bugfix bugzilla: RVCK-Project#290 -------------------------------- Due to commit 2b7deea ("Revert "kvm: selftests: move base kvm_util.h declarations to kvm_util_base.h"") kvm selftests now requires explicitly including ucall_common.h when needed. The commit added the directives everywhere they were needed at the time, but, by merge time, new places had been merged for RISC-V. Add those now to fix RISC-V compilation. Fixes: dee7ea4 ("Merge tag kvm-x86-selftests_utils-6.10 of https://github.com/kvm-x86/linux into HEAD") Signed-off-by: Andrew Jones <ajones@ventanamicro.com> Link: https://lore.kernel.org/r/20240603122045.323064-2-ajones@ventanamicro.com Signed-off-by: Anup Patel <anup@brainfault.org> Signed-off-by: Fangyu Yu <fangyu.yu@linux.alibaba.com> Signed-off-by: ZhenXing Zhu <zhenxing.zhu@linux.alibaba.com>
mainline inclusion from Linux 6.9-rc1 commit b4b1246 category: bugfix bugzilla: RVCK-Project#290 -------------------------------- Since only 64bit KVM selftests were supported on all architectures, add the CONFIG_64BIT definition in kvm/Makefile to ensure only 64bit definitions were available in the corresponding included files. Suggested-by: Andrew Jones <ajones@ventanamicro.com> Signed-off-by: Haibo Xu <haibo1.xu@intel.com> Reviewed-by: Andrew Jones <ajones@ventanamicro.com> Signed-off-by: Anup Patel <anup@brainfault.org> Signed-off-by: Fangyu Yu <fangyu.yu@linux.alibaba.com> Signed-off-by: ZhenXing Zhu <zhenxing.zhu@linux.alibaba.com>
|
开始测试 log: https://github.com/RVCK-Project/rvck/actions/runs/26623410235 参数解析结果
测试完成 详细结果:
Kunit Test Result[07:11:48] Testing complete. Ran 457 tests: passed: 445, skipped: 12
Kernel Build Result
Check Patch Result
LAVA Check (qemu)
result: Lava check done!
|
Author
|
@sterling-teng 帮忙review下这笔 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport upstream SBI header refactoring and related fixes to resolve KVM RISC-V selftests build failures.
Patch List
Conflict Resolution (Patch 2)
Conflicts arose because local PMU selftests backports were already in place:
include/riscv/processor.h — Keep local SATP_MODE_* macros; remove SBI definitions already migrated to sbi.h
include/riscv/sbi.h — Keep locally backported PMU/snapshot definitions; merge in the upstream base migration framework
Issue：#290