Skip to content

config: 基于 linux-6.6.143 清理并标准化内核默认配置 - #337

Merged
sterling-teng merged 3 commits into
RVCK-Project:rvck-6.6from
sterling-teng:restore-config
Aug 3, 2026
Merged

config: 基于 linux-6.6.143 清理并标准化内核默认配置#337
sterling-teng merged 3 commits into
RVCK-Project:rvck-6.6from
sterling-teng:restore-config

Conversation

@sterling-teng

@sterling-teng sterling-teng commented Jul 19, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

基于上游 linux-6.6.y 最新稳定版本，规整 RVCK 内核配置，清理冗余的下游板级定制配置，优化代码库碎片化问题。

RVCK 是面向 RISC-V 架构的同源统一内核项目，核心目标是整合各厂商的下游内核代码、解决跨板级代码冲突，实现单套代码统一适配、启动所有硬件板卡。此前项目长期占用上游原生通用 defconfig，同时累积了大量冗余的板级BSP专用配置，不仅存在遗漏上游修复补丁的风险，也持续导致代码库碎片化，不利于长期维护与上游同步。

该补丁集共包含三项递进式优化改动：

  1. 复制现有通用默认配置，独立创建 rvck_defconfig 专属配置文件，不再占用上游 linux-6.6.y 原生 defconfig，规避同步过程中遗漏上游修复补丁的风险。
  2. 清理大量冗余、过剩的板级BSP专属配置，遏制代码库持续碎片化问题，保障RVCK同源统一内核的代码一致性。
  3. 完整还原所有内核配置，对齐上游最新稳定标签 linux-6.6.143，实现配置基线与上游内核标准完全统一。

本次所有补丁无任何功能变更。所有改动仅优化配置管理方式、统一上游配置基线，彻底解决配置碎片化问题，为后续RVCK项目持续同步上游代码、迭代维护奠定标准化基础。

fixed #251

@github-actions

github-actions Bot commented Jul 19, 2026 •
edited
Loading

Copy link
Copy Markdown

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

参数解析结果
args value
repository RVCK-Project/rvck
head ref pull/337/head
base ref rvck-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 success
kernel-build failure
check-patch success
lava-trigger-qemu skipped
lava-trigger-sg2042 skipped
lava-trigger-k1 skipped
lava-trigger-lpi4a skipped

Kunit Test Result

[13:31:38] Testing complete. Ran 482 tests: passed: 465, skipped: 17

Kernel Build Result

Check Patch Result
Total Errors 0
Total Warnings 0

@unicornx

unicornx commented Jul 20, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

有个疑问：恢复上游的 defconfig 后，我发现直接拿这个配置编译 rvck 内核会失败，报错:

arch/riscv/mm/init.c:187:2: error: #error Please unset CONFIG_DEBUG_VM when CONFIG_HIGHMEM is set, because CONFIG_DEBUG_VM will trigger VM_BUG_ON_PAGE in __free_pages()->put_page_testzero().
  187 | #error Please unset CONFIG_DEBUG_VM when CONFIG_HIGHMEM is set, \
      |  ^~~~~
  CC      drivers/irqchip/irq-riscv-intc.o
  CC      block/bio.o
  CC      net/ethernet/eth.o
  AR      arch/riscv/errata/sifive/built-in.a
  CC      fs/file_table.o
make[6]: *** [scripts/Makefile.build:243: arch/riscv/mm/init.o] Error 1
make[6]: *** Waiting for unfinished jobs....

我尝试参考 rvck_defconfig 关闭了 CONFIG_HIGHMEM， 可以编译成功，但是拿这个内核去启动 QEMU 上的 openEuler 启动会失败(以前基于 rvck-6.6 分支的 defconfig 是可以启动)。

请问以后怎么对待 defconfig 这个文件，我们需要让 rvck 支持它么？

另外还有一个问题，就是这个 PR 的改动对 ci 是有影响的吧？ 原先 ci 用的是 defconfig 吧？如果 ci 有影响并且需要修改这个 rvck 仓库，我建议需要在本 PR 中一起解决掉（单独一个 commit）。

@unicornx
unicornx self-requested a review July 20, 2026 07:32
@github-actions

github-actions Bot commented Jul 20, 2026 •
edited
Loading

Copy link
Copy Markdown

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

参数解析结果
args value
repository RVCK-Project/rvck
head ref pull/337/head
base ref rvck-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 success
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

[10:57:33] Testing complete. Ran 482 tests: passed: 465, skipped: 17

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/337_29688916906_2/Image
initramfs_download_url http://10.30.190.110/openEuler-RISC-V/RVCK/OERV-RVCI/RVCK-Project/rvck/337_29688916906_2/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_pull_request_target_337__common-test_qemu

result: Lava check done!

@unicornx unicornx mentioned this pull request Jul 23, 2026
Merged
@sterling-teng

sterling-teng commented Jul 24, 2026

Copy link
Copy Markdown
Contributor Author

有个疑问：恢复上游的 defconfig 后，我发现直接拿这个配置编译 rvck 内核会失败，报错:

arch/riscv/mm/init.c:187:2: error: #error Please unset CONFIG_DEBUG_VM when CONFIG_HIGHMEM is set, because CONFIG_DEBUG_VM will trigger VM_BUG_ON_PAGE in __free_pages()->put_page_testzero().
  187 | #error Please unset CONFIG_DEBUG_VM when CONFIG_HIGHMEM is set, \
      |  ^~~~~
  CC      drivers/irqchip/irq-riscv-intc.o
  CC      block/bio.o
  CC      net/ethernet/eth.o
  AR      arch/riscv/errata/sifive/built-in.a
  CC      fs/file_table.o
make[6]: *** [scripts/Makefile.build:243: arch/riscv/mm/init.o] Error 1
make[6]: *** Waiting for unfinished jobs....

我尝试参考 rvck_defconfig 关闭了 CONFIG_HIGHMEM， 可以编译成功，但是拿这个内核去启动 QEMU 上的 openEuler 启动会失败(以前基于 rvck-6.6 分支的 defconfig 是可以启动)。

请问以后怎么对待 defconfig 这个文件，我们需要让 rvck 支持它么？

另外还有一个问题，就是这个 PR 的改动对 ci 是有影响的吧？ 原先 ci 用的是 defconfig 吧？如果 ci 有影响并且需要修改这个 rvck 仓库，我建议需要在本 PR 中一起解决掉（单独一个 commit）。

当下的defconfig是纯净的linux-6.6.y的defconfig，这个只是保持linux-6.6.y基的完整性，rvck不做支持。

unicornx
unicornx approved these changes Jul 24, 2026
View reviewed changes

@unicornx unicornx left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed-by: Chen Wang wangchen20@iscas.ac.cn

@unicornx unicornx mentioned this pull request Jul 27, 2026
Closed
Yanteng Si added 3 commits August 4, 2026 01:41
Yanteng Si
RISCV: rvck: Create dedicated rvck_defconfig by copying existing defc…
c37e68b 
…onfig

dist inclusion
category: cleanup
Link: RVCK-Project#251

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

The RVCK kernel currently reuses the generic defconfig from
linux-6.6.y. Sharing this defconfig introduces potential risks,
such as missing relevant fix patches.

This patch simply duplicates the existing defconfig and renames
the copy to rvck_defconfig. No functional changes are introduced.

Signed-off-by: Yanteng Si <siyanteng@iscas.ac.cn>
Yanteng Si
RISCV: rvck: Clean up redundant board-specific BSP configs
668088f 
dist inclusion
category: cleanup
Link: RVCK-Project#251

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

RVCK is a unified RISC-V kernel project that integrates vendor-specific
downstream kernels from multiple manufacturers. It resolves
cross-vendor conflicts and maintains a single codebase capable of
booting all supported boards.

Introducing too many BSP-exclusive configs will gradually fragment the
unified codebase. This patch cleans up these redundant configurations.

Signed-off-by: Yanteng Si <siyanteng@iscas.ac.cn>
Yanteng Si
RISCV: rvck: Restore all upstream linux-6.6.y configs
4cf8480 
dist inclusion
category: cleanup
Link: RVCK-Project#251

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

Restore all config files aligned with upstream linux-6.6.y.
The latest stable upstream tag at present is linux-6.6.143.

Signed-off-by: Yanteng Si <siyanteng@iscas.ac.cn>
@sterling-teng

sterling-teng commented Aug 3, 2026

Copy link
Copy Markdown
Contributor Author

已经合并进rvck-6.6。

@github-actions

github-actions Bot commented Aug 3, 2026 •
edited
Loading

Copy link
Copy Markdown

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

参数解析结果
args value
repository RVCK-Project/rvck
head ref pull/337/head
base ref rvck-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 success
kernel-build failure
check-patch success
lava-trigger-qemu skipped
lava-trigger-sg2042 skipped
lava-trigger-k1 skipped
lava-trigger-lpi4a skipped

Kunit Test Result

[17:48:01] Testing complete. Ran 482 tests: passed: 465, skipped: 17

Kernel Build Result

Check Patch Result
Total Errors 0
Total Warnings 0

@sterling-teng
sterling-teng merged commit 858eced into RVCK-Project:rvck-6.6 Aug 3, 2026
4 of 5 checks passed
@github-actions

github-actions Bot commented Aug 10, 2026 •
edited
Loading

Copy link
Copy Markdown

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

参数解析结果
args value
repository RVCK-Project/rvck
head ref pull/337/head
base ref rvck-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 success
kernel-build success
check-patch failure
lava-trigger-qemu success
lava-trigger-sg2042 skipped
lava-trigger-k1 skipped
lava-trigger-lpi4a skipped

Kunit Test Result

[03:28:15] Testing complete. Ran 482 tests: passed: 465, skipped: 17

Kernel Build Result

Check Patch Result
Total Errors 60694
Total Warnings 122033

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/337_30838023947_2/Image
initramfs_download_url http://10.30.190.110/openEuler-RISC-V/RVCK/OERV-RVCI/RVCK-Project/rvck/337_30838023947_2/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_pull_request_target_337__common-test_qemu

result: Lava check done!

@wangliu-iscas

wangliu-iscas commented Aug 10, 2026 •
edited by github-actions Bot
Loading

Copy link
Copy Markdown
Collaborator

/check

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

参数解析结果
args value
repository RVCK-Project/rvck
head ref pull/337/head
base ref rvck-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 success
kernel-build success
check-patch failure
lava-trigger-qemu success
lava-trigger-sg2042 skipped
lava-trigger-k1 skipped
lava-trigger-lpi4a skipped

Kunit Test Result

[13:14:31] Testing complete. Ran 482 tests: passed: 465, skipped: 17

Kernel Build Result

Check Patch Result
Total Errors 60694
Total Warnings 122033

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/337_31391480112_1/Image
initramfs_download_url http://10.30.190.110/openEuler-RISC-V/RVCK/OERV-RVCI/RVCK-Project/rvck/337_31391480112_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_issue_comment_337__5240726497_common-test_qemu

result: Lava check done!

zhuzhenxxx-collab pushed a commit to zhuzhenxxx-collab/rvck that referenced this pull request Aug 11, 2026
@sean-jc @gregkh
KVM: x86: Ignore pending PV EOI if the vCPU has since disabled PV EOIs
8e9f7a9 
commit 9285e40 upstream.

Ignore KVM's internal "service pending PV EOI" request if the vCPU has
disabled PV EOIs since the request was made.  Asserting that PV EOIs are
enabled can fail if reading guest memory in pv_eoi_get_user() fails, i.e.
if pv_eoi_test_and_clr_pending() bails early, *and* the vCPU also disables
PV EOIs.

  kernel BUG at arch/x86/kvm/lapic.c:3338!
  Oops: invalid opcode: 0000 [RVCK-Project#1] SMP
  CPU: 4 UID: 1000 PID: 890 Comm: pv_eoi_test Not tainted 7.0.0-d585aa5894d8-vm RVCK-Project#337 PREEMPT
  Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015
  RIP: 0010:kvm_lapic_sync_from_vapic+0x12b/0x140 [kvm]
  Call Trace:
   <TASK>
   kvm_arch_vcpu_ioctl_run+0x1075/0x1c30 [kvm]
   kvm_vcpu_ioctl+0x2d5/0x980 [kvm]
   __x64_sys_ioctl+0x8a/0xd0
   do_syscall_64+0xb5/0xb40
   entry_SYSCALL_64_after_hwframe+0x4b/0x53
   </TASK>
  Modules linked in: kvm_intel kvm irqbypass
  ---[ end trace 0000000000000000 ]---

Fixes: ae7a2a3 ("KVM: host side for eoi optimization")
Cc: stable@vger.kernel.org
Reviewed-by: Kai Huang <kai.huang@intel.com>
Link: https://patch.msgid.link/20260624220516.3033391-1-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@unicornx unicornx mentioned this pull request Aug 27, 2026
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@unicornx unicornx unicornx approved these changes

Assignees

No one assigned

Labels

ISCAS

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

【config】调整arch/riscv/config目录下的文件

3 participants

@sterling-teng @unicornx @wangliu-iscas