Skip to content

sync: rvck #291: KVM: riscv: selftests: Backport upstream SBI header refactoring fixes#239

Merged
xmzzz merged 4 commits into
RVCK-Project:OLK-6.6from
ieiao:PR291@rvck
Jun 19, 2026
Merged

sync: rvck #291: KVM: riscv: selftests: Backport upstream SBI header refactoring fixes#239
xmzzz merged 4 commits into
RVCK-Project:OLK-6.6from
ieiao:PR291@rvck

Conversation

@ieiao

@ieiao ieiao commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Sync commits from rvck PR 291.
Source PR: RVCK-Project/rvck#291

ZhenXing Zhu and others added 4 commits June 9, 2026 12:38
… file"

dist inclusion
category: cleanup
bugzilla: RVCK-Project/rvck#290

--------------------------------

This reverts commit 7ecf0f611aeffd856662d76fd17c38a4dde3ff78.

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>
[sync from rvck.]
Signed-off-by: WeiHao Li <cn.liweihao@gmail.com>
mainline inclusion
from Linux 6.10-rc1
commit 9408a23fac62d31de067bd2b0099eb9151395345
category: feature
bugzilla: RVCK-Project/rvck#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>
[sync from rvck.]
Signed-off-by: WeiHao Li <cn.liweihao@gmail.com>
mainline inclusion
from Linux 6.10-rc1
commit 0fc670d07d5de36a54f061f457743c9cde1d8b46
category: bugfix
bugzilla: RVCK-Project/rvck#290

--------------------------------

Due to commit 2b7deea3ec7c ("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: dee7ea42a1eb ("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>
[sync from rvck.]
Signed-off-by: WeiHao Li <cn.liweihao@gmail.com>
mainline inclusion
from Linux 6.9-rc1
commit b4b12469c5c3fbd9b9f8e5070e6e47a4337b87c6
category: bugfix
bugzilla: RVCK-Project/rvck#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>
[sync from rvck.]
Signed-off-by: WeiHao Li <cn.liweihao@gmail.com>
@github-actions

github-actions Bot commented Jun 12, 2026

Copy link
Copy Markdown

开始测试 log: https://github.com/RVCK-Project/rvck-olk/actions/runs/27406321010

参数解析结果
args value
repository RVCK-Project/rvck-olk
head ref pull/239/head
base ref OLK-6.6
LAVA repo RVCK-Project/lavaci
LAVA hardware ['qemu']
LAVA Testcase path lava-testcases/common-test/ltp/ltp.yaml
need run job kunit-test,kernel-build,check-patch,lava-trigger

测试完成

详细结果:
check result
kunit-test failure
kernel-build success
check-patch success
lava-trigger-qemu success
lava-trigger-sg2042 skipped
lava-trigger-k1 skipped
lava-trigger-lpi4a skipped

Kunit Test Result

kunit test failed

Kernel Build Result

Check Patch Result

Total Errors 0
Total Warnings 0

LAVA Check (qemu)

args value
testcase_repo RVCK-Project/lavaci
lava_template lava-job-template/qemu/qemu-ltp.yaml
testcase_path lava-testcases/common-test/ltp/ltp.yaml
kernel_download_url http://10.30.190.110/openEuler-RISC-V/RVCK/OERV-RVCI/RVCK-Project/rvck-olk/239_27406321010_1/Image
initramfs_download_url http://10.30.190.110/openEuler-RISC-V/RVCK/OERV-RVCI/RVCK-Project/rvck-olk/239_27406321010_1/initramfs.img
rootfs_download_url https://fast-mirror.isrc.ac.cn/openeuler-sig-riscv/openEuler-RISC-V/RVCK/openEuler24.03-LTS-SP1/openeuler-rootfs.img.zst
testcase_ref main
testitem_name RVCK-Project_rvck-olk_pull_request_target_239__common-test_qemu

result: Lava check done!

@xmzzz
xmzzz merged commit 0844854 into RVCK-Project:OLK-6.6 Jun 19, 2026
51 of 53 checks passed
@ieiao
ieiao deleted the PR291@rvck branch June 25, 2026 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants