feat(panic): FUCK [panic] mode=strict|fallback + realtest image variant
- UTSM panic_full returns in fallback mode (logs [PANIC:FALLBACK] + code + hit count); panic_halt keeps always-halt sites (CPU exception, VMM-E11 LA57, VMM-E15 DSK jump, UTSM-E42 test hook). Call sites given safe continuations. - Mode passed to DSK/FirstInit/login/desktop via DSK_BOOT_FLAG_PANIC_FALLBACK; DKM kernel_api.panic / kern.log.panic return to driver; ext4 fatal aborts the op via setjmp/longjmp and DSK falls back to FAT32 ESP. - build.ps1/Makefile: dev=strict, release=fallback, new realtest (release options + strict); default -Variant all; serialized iso packing under -j. - Fix '*/' inside comments (dkm.h, kernel_api.h, bus.c) that broke the build. - Includes pending work: dkm_bus service bus, mt7920/wlan drivers, desktop files/startmenu/prank, pe-tools, diskinfo, docs. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Linehu
@@ -406,6 +406,43 @@ static void pic_remap(void) {
|
||||
outb(PIC2_DATA, 0xFF); /* mask all slave */
|
||||
}
|
||||
|
||||
/* P1（万物互联）: kern.irq.unmask/mask 总线服务后端 —— PIC IMR 位操作。
|
||||
* 仅 ISA IRQ 0-15（越界 = 编程错误，IRQ-E01 零降级）。
|
||||
* unmask IRQ8-15 时自动放开主片 IRQ2 级联。
|
||||
* 注意 apic_route=1 时 PIC 已全屏蔽、由 IOAPIC 接管（B7）；该路径下
|
||||
* 的解屏蔽随 P6 真 IRQ 输入走 IOAPIC 重定向表接线。 */
|
||||
void pic_irq_unmask(u8 irq) {
|
||||
if (irq > 15) {
|
||||
panic_full("IRQ-E01 IRQ OUT OF RANGE",
|
||||
"pic_irq_unmask: ISA IRQ range is 0-15", 0);
|
||||
return;
|
||||
}
|
||||
if (irq < 8) {
|
||||
u8 m = inb(PIC1_DATA);
|
||||
outb(PIC1_DATA, m & (u8)~(1u << irq));
|
||||
} else {
|
||||
u8 m = inb(PIC2_DATA);
|
||||
outb(PIC2_DATA, m & (u8)~(1u << (irq - 8)));
|
||||
u8 m1 = inb(PIC1_DATA);
|
||||
outb(PIC1_DATA, m1 & (u8)~(1u << 2)); /* 主片 IRQ2 级联 */
|
||||
}
|
||||
}
|
||||
|
||||
void pic_irq_mask(u8 irq) {
|
||||
if (irq > 15) {
|
||||
panic_full("IRQ-E01 IRQ OUT OF RANGE",
|
||||
"pic_irq_mask: ISA IRQ range is 0-15", 0);
|
||||
return;
|
||||
}
|
||||
if (irq < 8) {
|
||||
u8 m = inb(PIC1_DATA);
|
||||
outb(PIC1_DATA, m | (u8)(1u << irq));
|
||||
} else {
|
||||
u8 m = inb(PIC2_DATA);
|
||||
outb(PIC2_DATA, m | (u8)(1u << (irq - 8)));
|
||||
}
|
||||
}
|
||||
|
||||
/* 运行时读取当前内核 CS — 必须与实际生效的 GDT 一致。
|
||||
* 注意:UTSM 运行在 Limine 提供的 GDT 下(CS=0x28),不能假设
|
||||
* OSDev 教程布局(0x08=code)。若 IDT gate selector 指向无效/非64位
|
||||
@@ -664,8 +701,8 @@ void idt_handler(isr_frame *frame) {
|
||||
sym[8] = (char)(hi < 10 ? '0' + hi : 'A' + hi - 10);
|
||||
sym[9] = (char)(lo < 10 ? '0' + lo : 'A' + lo - 10);
|
||||
sym[10] = 0;
|
||||
panic_full(sym, "cpu exception", &pr);
|
||||
for (;;) { __asm__ volatile ("cli; hlt"); } /* 兜底（panic_full 不返回） */
|
||||
/* 异常帧上无法安全恢复执行：两种 panic 模式都 halt */
|
||||
panic_halt(sym, "cpu exception", &pr);
|
||||
}
|
||||
|
||||
/* PIC IRQ: vectors 0x20-0x2F (32-47)
|
||||
|
||||
@@ -35,22 +35,25 @@ __attribute__((used, section(".sealed")))
|
||||
static const char g_sealed_brand[] = "DESHAB-SEALED-MEMORY-V1-DEAICUP";
|
||||
|
||||
/* 极早期封缄初始化：任何不就绪都在这里 panic，绝不带病前进 */
|
||||
void utsm_sealed_early_init(void) {
|
||||
int utsm_sealed_early_init(void) {
|
||||
u64 region = (u64)(__sealed_end - __sealed_start);
|
||||
if (region == 0) {
|
||||
/* .sealed 区为空 = 没有任何数据被真正封缄 = 基础设施未就绪 */
|
||||
panic_full("UTSM-E01 SEALED MEMORY NOT READY",
|
||||
".sealed section is empty: sealing infrastructure not implemented", 0);
|
||||
return -1;
|
||||
}
|
||||
const u64 *rk = drr_get_root_key();
|
||||
if (!rk) {
|
||||
panic_full("UTSM-E02 SEALED NO ROOT KEY",
|
||||
"root key unavailable before sealing .sealed region", 0);
|
||||
return -1;
|
||||
}
|
||||
utsm_blake2b(__sealed_start, region, rk, 32, g_sealed_mac, UTSM_SEALED_MAC_LEN);
|
||||
g_sealed_ready = 1;
|
||||
log_hex64("[SEAL] .sealed region bytes=", region);
|
||||
log_info("[SEAL] sealed MAC established");
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* 封缄完整性校验：重算 MAC 并与 init 时的封缄比对 */
|
||||
@@ -58,6 +61,7 @@ void utsm_sealed_verify(void) {
|
||||
if (!g_sealed_ready) {
|
||||
panic_full("UTSM-E04 SEALED VERIFY BEFORE INIT",
|
||||
"utsm_sealed_verify called before utsm_sealed_early_init", 0);
|
||||
return;
|
||||
}
|
||||
u64 region = (u64)(__sealed_end - __sealed_start);
|
||||
u8 mac[UTSM_SEALED_MAC_LEN];
|
||||
|
||||
@@ -414,7 +414,9 @@ int dkm_load_elf_rel(const void *address, u64 size, const struct dkm_symbol_scan
|
||||
handle.flags = desc->flags;
|
||||
|
||||
dkm_log_set_driver(desc->name); /* D4: 驱动自己的颜色 */
|
||||
dkm_bus_set_current_provider(&handle); /* D6: 总线 provider 上下文 */
|
||||
int result = init(dkm_get_kernel_api(), &handle);
|
||||
dkm_bus_set_current_provider(0);
|
||||
dkm_log_set_driver(0);
|
||||
handle.init_status = result;
|
||||
if (result != 0) {
|
||||
|
||||
@@ -0,0 +1,318 @@
|
||||
/* ===================================================================
|
||||
* D6 万物互联：dkm_bus 双向服务总线
|
||||
*
|
||||
* "没有主内核，每个模块都是内核——总线就是万物的神经。"
|
||||
*
|
||||
* kapi（kernel_api.c）是内核→模块的单向只读导出表；本文件把它双向化：
|
||||
* 任何 .drv 模块在 driver_init 里注册 srv.* 服务，任何模块按名消费。
|
||||
* kern.* 仅内核可注册（provider==NULL 时），srv.* 仅模块可注册。
|
||||
*
|
||||
* 失败策略（铁律映射）：
|
||||
* register 名字非法/身份不符 → BUS-E01 panic（编程错误）
|
||||
* register 重名 → BUS-E02 panic
|
||||
* register 表满 → BUS-E03 panic
|
||||
* lookup 未命中 → BUS-E04 panic（硬依赖未满足=编程错误）
|
||||
* unregister 违规 → BUS-E05 panic
|
||||
* probe 未命中 → 返回 -1（能力缺席=设计内双路径，白名单）
|
||||
*
|
||||
* 设计定稿：docs/RE/万物互联与服务总线设计.md §1。
|
||||
* =================================================================== */
|
||||
|
||||
#include <utsm/dkm.h>
|
||||
#include <utsm/log.h>
|
||||
#include <utsm/panic.h>
|
||||
#include <utsm/idt.h>
|
||||
#include <utsm/mm.h>
|
||||
#include <utsm/dma.h>
|
||||
#include <utsm/drr.h>
|
||||
#include <utsm/utrw.h>
|
||||
#include <utsm/block.h>
|
||||
#include <utsm/pe.h>
|
||||
#include <utsm/linux_compat.h>
|
||||
#include "../kernel/ini_parser.h"
|
||||
|
||||
/* manifest.c 提供；签名见 dkm.h 头注释（避免头依赖） */
|
||||
void dsm_load_named(const ini_config *cfg, const char *name);
|
||||
/* kernel/main.c 提供：FUCK 启动配置只读访问（g_boot_cfg） */
|
||||
const ini_config *utsm_boot_cfg_get(void);
|
||||
|
||||
static dkm_bus_service g_services[DKM_BUS_MAX_SERVICES];
|
||||
static u32 g_service_count;
|
||||
static struct dkm_driver_handle *g_current_provider; /* NULL = 内核 */
|
||||
|
||||
/* ---- 名字工具 ---- */
|
||||
|
||||
static int bus_streq(const char *a, const char *b) {
|
||||
usize i = 0;
|
||||
while (a[i] && b[i]) {
|
||||
if (a[i] != b[i]) return 0;
|
||||
i++;
|
||||
}
|
||||
return a[i] == b[i];
|
||||
}
|
||||
|
||||
static int bus_prefix_of(const char *s, const char *prefix) {
|
||||
usize i = 0;
|
||||
while (prefix[i]) {
|
||||
if (s[i] != prefix[i]) return 0;
|
||||
i++;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int bus_find(const char *name) {
|
||||
for (u32 i = 0; i < g_service_count; i++) {
|
||||
if (bus_streq(g_services[i].name, name)) return (int)i;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* ---- 总线原语（BUS-E 全部 panic，零降级） ---- */
|
||||
|
||||
static int bus_register_impl(const char *name, u32 version, void *fn) {
|
||||
if (!name || !fn || !name[0]) {
|
||||
panic_full("BUS-E01 INVALID SERVICE NAME",
|
||||
"dkm_bus: null/empty service name or fn", 0);
|
||||
return -1;
|
||||
}
|
||||
usize len = 0;
|
||||
while (name[len]) {
|
||||
if (len >= DKM_BUS_MAX_NAME) {
|
||||
log_error("[BUS] name too long: ");
|
||||
log_info(name);
|
||||
panic_full("BUS-E01 INVALID SERVICE NAME",
|
||||
"dkm_bus: service name exceeds DKM_BUS_MAX_NAME", 0);
|
||||
return -1;
|
||||
}
|
||||
len++;
|
||||
}
|
||||
int is_kern = bus_prefix_of(name, "kern.");
|
||||
int is_srv = bus_prefix_of(name, "srv.");
|
||||
if (!is_kern && !is_srv) {
|
||||
log_error("[BUS] name without namespace prefix: ");
|
||||
log_info(name);
|
||||
panic_full("BUS-E01 INVALID SERVICE NAME",
|
||||
"dkm_bus: service name must start with kern. or srv.", 0);
|
||||
return -1;
|
||||
}
|
||||
if (is_kern && g_current_provider != 0) {
|
||||
log_error("[BUS] module tried to register kern.*: ");
|
||||
log_info(name);
|
||||
panic_full("BUS-E01 INVALID SERVICE NAME",
|
||||
"dkm_bus: only the kernel may register kern.* services", 0);
|
||||
return -1;
|
||||
}
|
||||
if (is_srv && g_current_provider == 0) {
|
||||
log_error("[BUS] kernel tried to register srv.*: ");
|
||||
log_info(name);
|
||||
panic_full("BUS-E01 INVALID SERVICE NAME",
|
||||
"dkm_bus: kernel services must use the kern.* namespace", 0);
|
||||
return -1;
|
||||
}
|
||||
if (bus_find(name) >= 0) {
|
||||
log_error("[BUS] duplicate service: ");
|
||||
log_info(name);
|
||||
panic_full("BUS-E02 DUPLICATE SERVICE",
|
||||
"dkm_bus: service name already registered", 0);
|
||||
return -1;
|
||||
}
|
||||
if (g_service_count >= DKM_BUS_MAX_SERVICES) {
|
||||
panic_full("BUS-E03 SERVICE TABLE FULL",
|
||||
"dkm_bus: g_services overflow (DKM_BUS_MAX_SERVICES)", 0);
|
||||
return -1;
|
||||
}
|
||||
|
||||
dkm_bus_service *s = &g_services[g_service_count];
|
||||
for (usize i = 0; i < len; i++) s->name[i] = name[i];
|
||||
s->name[len] = 0;
|
||||
s->version = version;
|
||||
s->fn = fn;
|
||||
/* 存 desc 而非 handle：loader 的 handle 是栈局部（init 返回即悬垂），
|
||||
* desc 在驱动镜像内存里持久；注销校验按 desc 指针判身份。 */
|
||||
s->provider = g_current_provider ? g_current_provider->desc : 0;
|
||||
if (is_kern) {
|
||||
s->flags = DKM_BUS_F_KERNEL;
|
||||
} else if (g_current_provider && (g_current_provider->flags & DKM_F_NO_UNLOAD)) {
|
||||
s->flags = DKM_BUS_F_NO_UNLOAD;
|
||||
} else {
|
||||
s->flags = 0;
|
||||
}
|
||||
g_service_count++;
|
||||
|
||||
log_info("[BUS] service registered: ");
|
||||
log_info(name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int bus_unregister_impl(const char *name) {
|
||||
int idx = name ? bus_find(name) : -1;
|
||||
if (idx < 0) {
|
||||
log_error("[BUS] unregister unknown service: ");
|
||||
log_info(name ? name : "(null)");
|
||||
panic_full("BUS-E05 UNREGISTER VIOLATION",
|
||||
"dkm_bus: unregister of unknown service", 0);
|
||||
return -1;
|
||||
}
|
||||
dkm_bus_service *s = &g_services[idx];
|
||||
if (s->flags & (DKM_BUS_F_KERNEL | DKM_BUS_F_NO_UNLOAD)) {
|
||||
log_error("[BUS] unregister of permanent service: ");
|
||||
log_info(name);
|
||||
panic_full("BUS-E05 UNREGISTER VIOLATION",
|
||||
"dkm_bus: F_KERNEL/F_NO_UNLOAD service cannot be unregistered", 0);
|
||||
return -1;
|
||||
}
|
||||
if (s->provider != (g_current_provider ? g_current_provider->desc : 0)) {
|
||||
log_error("[BUS] unregister by non-provider: ");
|
||||
log_info(name);
|
||||
panic_full("BUS-E05 UNREGISTER VIOLATION",
|
||||
"dkm_bus: only the provider may unregister its service", 0);
|
||||
return -1;
|
||||
}
|
||||
/* 紧缩（顺序无关紧要，表小） */
|
||||
for (u32 i = (u32)idx; i + 1 < g_service_count; i++) {
|
||||
g_services[i] = g_services[i + 1];
|
||||
}
|
||||
g_service_count--;
|
||||
log_info("[BUS] service unregistered: ");
|
||||
log_info(name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int bus_lookup_impl(const char *name, void **out_fn, u32 *out_version) {
|
||||
int idx = name ? bus_find(name) : -1;
|
||||
if (idx < 0) {
|
||||
log_error("[BUS] lookup miss: ");
|
||||
log_info(name ? name : "(null)");
|
||||
panic_full("BUS-E04 LOOKUP MISS",
|
||||
"dkm_bus: required service not registered (hard dependency)", 0);
|
||||
return -1;
|
||||
}
|
||||
if (out_fn) *out_fn = g_services[idx].fn;
|
||||
if (out_version) *out_version = g_services[idx].version;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int bus_probe_impl(const char *name, void **out_fn, u32 *out_version) {
|
||||
int idx = name ? bus_find(name) : -1;
|
||||
if (idx < 0) return -1;
|
||||
if (out_fn) *out_fn = g_services[idx].fn;
|
||||
if (out_version) *out_version = g_services[idx].version;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static u32 bus_count_impl(void) {
|
||||
return g_service_count;
|
||||
}
|
||||
|
||||
static const dkm_bus_service *bus_at_impl(u32 index) {
|
||||
if (index >= g_service_count) return 0;
|
||||
return &g_services[index];
|
||||
}
|
||||
|
||||
static const dkm_bus_api g_bus_api = {
|
||||
.magic = DKM_BUS_MAGIC,
|
||||
.version = DKM_BUS_VERSION,
|
||||
.register_service = bus_register_impl,
|
||||
.unregister_service = bus_unregister_impl,
|
||||
.lookup = bus_lookup_impl,
|
||||
.probe = bus_probe_impl,
|
||||
.count = bus_count_impl,
|
||||
.at = bus_at_impl,
|
||||
};
|
||||
|
||||
const dkm_bus_api *dkm_bus_get_api(void) {
|
||||
return &g_bus_api;
|
||||
}
|
||||
|
||||
void dkm_bus_set_current_provider(struct dkm_driver_handle *h) {
|
||||
g_current_provider = h;
|
||||
}
|
||||
|
||||
int dkm_bus_prefix_registered(const char *prefix) {
|
||||
if (!prefix) return 0;
|
||||
usize len = 0;
|
||||
while (prefix[len]) len++;
|
||||
for (u32 i = 0; i < g_service_count; i++) {
|
||||
const char *n = g_services[i].name;
|
||||
if (bus_streq(n, prefix)) return 1;
|
||||
/* 前缀命中：n == "prefix.xxx" */
|
||||
if (bus_prefix_of(n, prefix) && n[len] == '.') return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* ===================================================================
|
||||
* kern.* 播种
|
||||
*
|
||||
* kapi 14 条（log.* dma/irq/mm/apic/drr/utrw）以 kern. 前缀重新播种
|
||||
* （旧无前缀 kapi 名冻结不动，兼容层）；另加 block/pe/lxc/probe/config/
|
||||
* load_by_name。dsk_boot_context.reserved[] 的逐槽替代服务（srv.*）随
|
||||
* P2-P4 各模块落地注册，本表不抢跑。
|
||||
* kern.probe.info 随 P4b（shell 消费方）落地；kern.bootlog.milestone
|
||||
* 随 P2（fat32.drv 实装）落地。
|
||||
* =================================================================== */
|
||||
|
||||
static void bus_kern_panic(const char *msg) {
|
||||
panic_full("DKM-PANIC", msg, 0);
|
||||
}
|
||||
|
||||
static int bus_kern_load_by_name(const char *name) {
|
||||
/* P3 接线后带 FUCK cfg 过滤；当前调用方（内部）走 manifest 语义。 */
|
||||
dsm_load_named(0, name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const char *bus_kern_config_get(const char *section, const char *key) {
|
||||
const ini_config *cfg = utsm_boot_cfg_get();
|
||||
if (!cfg) return 0;
|
||||
return ini_get(cfg, section, key);
|
||||
}
|
||||
|
||||
static int bus_seed(const char *name, void *fn) {
|
||||
return bus_register_impl(name, 1u, fn);
|
||||
}
|
||||
|
||||
void dkm_bus_init(void) {
|
||||
static int s_inited = 0;
|
||||
if (s_inited) return;
|
||||
s_inited = 1;
|
||||
|
||||
g_service_count = 0;
|
||||
g_current_provider = 0;
|
||||
|
||||
/* log（kapi 4 条迁移） */
|
||||
bus_seed("kern.log.info", (void *)log_info);
|
||||
bus_seed("kern.log.warn", (void *)log_warn);
|
||||
bus_seed("kern.log.error", (void *)log_error);
|
||||
bus_seed("kern.log.panic", (void *)bus_kern_panic);
|
||||
/* dma / irq / mm / apic（kapi 迁移 + P6 真 IRQ 输入新增 unmask/mask） */
|
||||
bus_seed("kern.dma.alloc_pages", (void *)dma_alloc_pages);
|
||||
bus_seed("kern.irq.register", (void *)irq_register);
|
||||
bus_seed("kern.irq.vector_alloc", (void *)irq_vector_alloc);
|
||||
bus_seed("kern.irq.vector_free", (void *)irq_vector_free);
|
||||
bus_seed("kern.irq.unmask", (void *)pic_irq_unmask);
|
||||
bus_seed("kern.irq.mask", (void *)pic_irq_mask);
|
||||
bus_seed("kern.mm.map_mmio", (void *)mm_map_mmio);
|
||||
bus_seed("kern.mm.unmap_mmio", (void *)mm_unmap_mmio);
|
||||
bus_seed("kern.apic.register_eoi", (void *)idt_register_apic_eoi);
|
||||
/* drr / utrw（kapi 迁移） */
|
||||
bus_seed("kern.drr.snapshot_dirty", (void *)drr_ckpt_snapshot_dirty);
|
||||
bus_seed("kern.drr.rollback_pages", (void *)drr_rollback_pages);
|
||||
bus_seed("kern.utrw.debug_dump", (void *)utrw_debug_dump_page);
|
||||
/* block registry 前端（替代 desktop 的 api+0xA8 裸偏移读） */
|
||||
{
|
||||
const dkm_block_api *b = block_get_api();
|
||||
bus_seed("kern.block.read", (void *)b->read);
|
||||
bus_seed("kern.block.write", (void *)b->write);
|
||||
}
|
||||
/* PE / Linux 兼容层服务（替代 reserved[4]/reserved[5]） */
|
||||
bus_seed("kern.pe.service", (void *)pe_get_service);
|
||||
bus_seed("kern.lxc.service", (void *)linux_compat_get_service);
|
||||
/* 按名加载（session.drv 的排序拉手，P3 接 FUCK 过滤） */
|
||||
bus_seed("kern.dkm.load_by_name", (void *)bus_kern_load_by_name);
|
||||
/* FUCK 配置只读访问（替代 reserved[] 内散落的配置回传） */
|
||||
bus_seed("kern.config.get", (void *)bus_kern_config_get);
|
||||
|
||||
log_info("[BUS] ready services=");
|
||||
log_hex64("[BUS] count=", g_service_count);
|
||||
}
|
||||
@@ -21,11 +21,9 @@ static void dkm_api_error(const char *msg) {
|
||||
}
|
||||
|
||||
static void dkm_api_panic(const char *msg) {
|
||||
/* F1: 驱动 panic 统一走莲花崩溃屏（串口 dump + DRR 归档 + 帧缓冲） */
|
||||
/* F1: 驱动 panic 统一走莲花崩溃屏（串口 dump + DRR 归档 + 帧缓冲）。
|
||||
* fallback 模式下返回驱动，由驱动调用点走其备用路径。 */
|
||||
panic_full("DKM-PANIC", msg, 0);
|
||||
for (;;) {
|
||||
__asm__ volatile("cli; hlt");
|
||||
}
|
||||
}
|
||||
|
||||
static const dkm_log_api g_log_api = {
|
||||
@@ -85,7 +83,8 @@ static dkm_kernel_api g_kernel_api = {
|
||||
.mm_unmap_mmio = 0,
|
||||
.register_apic_eoi = 0,
|
||||
.sched = 0,
|
||||
.kapi = 0
|
||||
.kapi = 0,
|
||||
.bus = 0
|
||||
};
|
||||
|
||||
const dkm_kernel_api *dkm_get_kernel_api(void) {
|
||||
@@ -142,6 +141,11 @@ extern volatile struct limine_module_request g_module_request;
|
||||
extern volatile struct limine_hhdm_request g_hhdm_request;
|
||||
|
||||
void dkm_fill_platform_info(void) {
|
||||
/* D6 万物互联：总线先播种再挂载（必须先于一切驱动加载——
|
||||
* driver_init 里即可 api->bus->register_service）。 */
|
||||
dkm_bus_init();
|
||||
g_kernel_api.bus = dkm_bus_get_api();
|
||||
|
||||
g_kernel_api.dma = dma_get_api();
|
||||
g_kernel_api.net = net_get_api();
|
||||
g_kernel_api.block = block_get_api();
|
||||
@@ -206,4 +210,4 @@ void dkm_sipi_wake_ap(u32 lapic_id, u64 entry_eip) {
|
||||
(void)lapic_id; (void)entry_eip;
|
||||
panic_full("DKM-E03 SIPI AP WAKE NOT IMPLEMENTED",
|
||||
"AP startup framework: designed, not implemented (BSP-only)", 0);
|
||||
}
|
||||
}
|
||||
|
||||
+242
-53
@@ -12,6 +12,7 @@ void dsm_load_by_manifest_ex(const ini_config *cfg);
|
||||
#define DSM_MAX_STAGES 4
|
||||
#define DSM_MAX_DEPENDS 4
|
||||
#define DSM_MAX_PROVIDES 4
|
||||
#define DSM_MAX_CAPS 128
|
||||
|
||||
typedef struct dsm_driver_entry {
|
||||
char name[32];
|
||||
@@ -24,6 +25,9 @@ typedef struct dsm_driver_entry {
|
||||
u32 provide_count;
|
||||
struct limine_file *boot_module;
|
||||
int loaded;
|
||||
/* P0（万物互联）：终态标志——已加载/被 FUCK 关闭/模块缺失/加载失败，
|
||||
* 不再是本轮不动点迭代的候选。resolved 但 !loaded 的驱动不登记 provides。 */
|
||||
int resolved;
|
||||
} dsm_driver_entry;
|
||||
|
||||
typedef struct dsm_stage_entry {
|
||||
@@ -37,6 +41,119 @@ typedef struct dsm_stage_entry {
|
||||
static dsm_stage_entry g_stages[DSM_MAX_STAGES];
|
||||
static u32 g_stage_count;
|
||||
|
||||
static int streq_static(const char *a, const char *b);
|
||||
|
||||
/* ===================================================================
|
||||
* P0（万物互联）：DSM 依赖图强制
|
||||
*
|
||||
* capability 集合 = 已成功加载驱动的 provides token 并集。
|
||||
* 加载前校验 depends 全满足（miss → DKM-E44）；
|
||||
* 同 stage 内按依赖不动点迭代（环 → DKM-E47）。
|
||||
* 性能不是目标（多趟扫描），正确性第一——设计定稿见
|
||||
* docs/RE/万物互联与服务总线设计.md §1.5。
|
||||
* =================================================================== */
|
||||
static char g_caps[DSM_MAX_CAPS][32];
|
||||
static u32 g_cap_count;
|
||||
|
||||
static int dsm_capability_satisfied(const char *token) {
|
||||
for (u32 i = 0; i < g_cap_count; i++) {
|
||||
if (streq_static(g_caps[i], token)) return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void dsm_capability_add(const char *token) {
|
||||
if (dsm_capability_satisfied(token)) return;
|
||||
if (g_cap_count >= DSM_MAX_CAPS) {
|
||||
panic_full("DKM-E48 CAPABILITY TABLE FULL",
|
||||
"P0 dependency graph: g_caps overflow (DSM_MAX_CAPS)", 0);
|
||||
return;
|
||||
}
|
||||
for (u32 i = 0; i + 1 < 32 && token[i]; i++) {
|
||||
g_caps[g_cap_count][i] = token[i];
|
||||
}
|
||||
g_caps[g_cap_count][31] = 0;
|
||||
g_cap_count++;
|
||||
}
|
||||
|
||||
static void dsm_register_provides(const dsm_driver_entry *drv) {
|
||||
for (u32 i = 0; i < drv->provide_count; i++) {
|
||||
dsm_capability_add(drv->provides[i]);
|
||||
}
|
||||
}
|
||||
|
||||
/* P1（万物互联）：stage>=4 的 provides 总线契约校验——driver_init 成功后，
|
||||
* 每个 provides token T 必须已有 "srv.T" 或 "srv.T.*" 服务注册到总线，
|
||||
* 否则 DKM-E45（零降级：provides 是对消费者/排序者的承诺，注册不到即违约）。
|
||||
* stage0-3 老 14 驱动豁免：其 provides 由内核注册表兑现（ahci→block
|
||||
* registry 等），不经总线。豁免清单 = manifest.json 现有 stage0-3 全部条目。 */
|
||||
static void dsm_verify_provides(const dsm_stage_entry *stage, const dsm_driver_entry *drv) {
|
||||
if (stage->id < 4) return;
|
||||
for (u32 i = 0; i < drv->provide_count; i++) {
|
||||
char srv_name[40];
|
||||
const char *token = drv->provides[i];
|
||||
srv_name[0] = 's'; srv_name[1] = 'r'; srv_name[2] = 'v'; srv_name[3] = '.';
|
||||
u32 p = 4;
|
||||
while (token[p - 4] && p + 1 < sizeof(srv_name)) {
|
||||
srv_name[p] = token[p - 4];
|
||||
p++;
|
||||
}
|
||||
srv_name[p] = 0;
|
||||
if (!dkm_bus_prefix_registered(srv_name)) {
|
||||
log_error("[DSM] provides token not registered on bus: ");
|
||||
log_info(drv->name);
|
||||
log_info(token);
|
||||
panic_full("DKM-E45 PROVIDES NOT REGISTERED",
|
||||
"stage>=4 driver provides token has no matching srv.* bus service", 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* depends 全满足返回 1；否则返回 0 并（可选）写出第一个未满足 token 的下标 */
|
||||
static int dsm_deps_satisfied(const dsm_driver_entry *drv, u32 *missing_idx) {
|
||||
for (u32 i = 0; i < drv->depend_count; i++) {
|
||||
if (!dsm_capability_satisfied(drv->depends[i])) {
|
||||
if (missing_idx) *missing_idx = i;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* token 是否由本 stage 尚未 resolved 的候选提供（用于区分缺依赖 vs 成环） */
|
||||
static int dsm_dep_pending_in_stage(const dsm_stage_entry *stage, const char *token) {
|
||||
for (u32 di = 0; di < stage->driver_count; di++) {
|
||||
const dsm_driver_entry *drv = &stage->drivers[di];
|
||||
if (drv->resolved) continue;
|
||||
for (u32 i = 0; i < drv->provide_count; i++) {
|
||||
if (streq_static(drv->provides[i], token)) return 1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* 不动点停滞：先判真缺依赖（DKM-E44），全在剩余候选里则判环（DKM-E47）。
|
||||
* 零降级：两者都是编程/manifest 错误，莲花屏。 */
|
||||
static void dsm_report_dependency_stall(const dsm_stage_entry *stage) {
|
||||
for (u32 di = 0; di < stage->driver_count; di++) {
|
||||
const dsm_driver_entry *drv = &stage->drivers[di];
|
||||
if (drv->resolved) continue;
|
||||
for (u32 i = 0; i < drv->depend_count; i++) {
|
||||
const char *dep = drv->depends[i];
|
||||
if (!dsm_capability_satisfied(dep) && !dsm_dep_pending_in_stage(stage, dep)) {
|
||||
log_error("[DSM] dependency not satisfied: ");
|
||||
log_info(drv->name);
|
||||
log_info(dep);
|
||||
panic_full("DKM-E44 DEPENDENCY NOT SATISFIED",
|
||||
"manifest depends token not provided by any loaded/pending driver", 0);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
panic_full("DKM-E47 DEPENDENCY CYCLE",
|
||||
"manifest stage dependency graph has a cycle (no progress)", 0);
|
||||
}
|
||||
|
||||
extern volatile struct limine_module_request g_module_request;
|
||||
|
||||
static int dsm_skip_ws(const char **p) {
|
||||
@@ -136,6 +253,7 @@ static void dsm_parse_driver(const char **p, dsm_driver_entry *drv) {
|
||||
drv->required = 1;
|
||||
drv->boot_module = 0;
|
||||
drv->loaded = 0;
|
||||
drv->resolved = 0;
|
||||
drv->class_id = 0;
|
||||
|
||||
if (dsm_expect(p, '{') != 0) return;
|
||||
@@ -345,70 +463,115 @@ static void dsm_load_stage_range(const ini_config *cfg, int limit_stage, u32 max
|
||||
log_info(stage->name);
|
||||
log_hex64("[DSM] driver count=", stage->driver_count);
|
||||
|
||||
/* P0：同 stage 内按依赖不动点迭代——每趟加载 deps 已满足的候选，
|
||||
* 直到全部 resolved；停滞即 DKM-E44/E47（见 dsm_report_dependency_stall）。
|
||||
* 多趟扫描 O(n²·趟数)，性能刻意不管，正确性第一。 */
|
||||
u32 pending = 0;
|
||||
for (u32 di = 0; di < stage->driver_count; di++) {
|
||||
dsm_driver_entry *drv = &stage->drivers[di];
|
||||
struct limine_file *f;
|
||||
struct dkm_symbol_scan symbols;
|
||||
int result;
|
||||
if (!stage->drivers[di].resolved) pending++;
|
||||
}
|
||||
|
||||
if (drv->loaded) continue;
|
||||
while (pending > 0) {
|
||||
u32 pending_before = pending;
|
||||
|
||||
/* === FUCK [drivers] 驱动开关检查 === */
|
||||
if (cfg) {
|
||||
int enabled = ini_get_bool(cfg, "drivers", drv->name, 1);
|
||||
if (!enabled) {
|
||||
log_info("[DSM] driver disabled by FUCK: ");
|
||||
for (u32 di = 0; di < stage->driver_count; di++) {
|
||||
dsm_driver_entry *drv = &stage->drivers[di];
|
||||
struct limine_file *f;
|
||||
struct dkm_symbol_scan symbols;
|
||||
int result;
|
||||
|
||||
if (drv->resolved) continue;
|
||||
|
||||
/* === FUCK [drivers] 驱动开关检查 ===
|
||||
* 关闭即退出候选（provides 不登记，依赖它的模块将 DKM-E44）。 */
|
||||
if (cfg) {
|
||||
int enabled = ini_get_bool(cfg, "drivers", drv->name, 1);
|
||||
if (!enabled) {
|
||||
log_info("[DSM] driver disabled by FUCK: ");
|
||||
log_info(drv->name);
|
||||
drv->resolved = 1;
|
||||
pending--;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
/* P0：depends 校验——暂不满足先跳过，等本 stage 后续候选登记
|
||||
* provides 后下一趟重试；整体停滞时统一判罚（零降级）。 */
|
||||
if (!dsm_deps_satisfied(drv, 0)) continue;
|
||||
|
||||
drv->boot_module = dsm_find_boot_module(drv->path);
|
||||
if (!drv->boot_module) {
|
||||
log_info("[DSM] module not found");
|
||||
log_info(drv->name);
|
||||
drv->resolved = 1;
|
||||
pending--;
|
||||
if (drv->required && stage->required) {
|
||||
/* 严格错误策略插桩：required 驱动缺模块零降级（DKM-E04） */
|
||||
panic_full("DKM-E04 REQUIRED DRIVER MODULE MISSING",
|
||||
"required driver boot module not found in manifest stage", 0);
|
||||
break;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
drv->boot_module = dsm_find_boot_module(drv->path);
|
||||
if (!drv->boot_module) {
|
||||
log_info("[DSM] module not found");
|
||||
f = drv->boot_module;
|
||||
log_info("[DSM] loading driver");
|
||||
log_info(drv->name);
|
||||
if (drv->required && stage->required) {
|
||||
/* 严格错误策略插桩：required 驱动缺模块零降级（DKM-E04） */
|
||||
panic_full("DKM-E04 REQUIRED DRIVER MODULE MISSING",
|
||||
"required driver boot module not found in manifest stage", 0);
|
||||
break;
|
||||
|
||||
if (dkm_check_elf64(f->address, f->size) != 0) {
|
||||
log_error("[DSM] ELF check failed");
|
||||
if (drv->required && stage->required) {
|
||||
panic_full("DKM-E05 REQUIRED DRIVER ELF INVALID",
|
||||
"required driver boot module failed ELF64 check", 0);
|
||||
}
|
||||
drv->resolved = 1;
|
||||
pending--;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (dkm_scan_symbols(f->address, f->size, &symbols) != 0) {
|
||||
log_error("[DSM] symbol scan failed");
|
||||
if (drv->required && stage->required) {
|
||||
panic_full("DKM-E06 REQUIRED DRIVER SYMBOL SCAN FAILED",
|
||||
"required driver symbol scan failed", 0);
|
||||
}
|
||||
drv->resolved = 1;
|
||||
pending--;
|
||||
continue;
|
||||
}
|
||||
|
||||
result = dkm_load_elf_rel(f->address, f->size, &symbols);
|
||||
if (result != 0) {
|
||||
log_error("[DSM] load failed");
|
||||
if (drv->required && stage->required) {
|
||||
/* 严格错误策略插桩：required 驱动加载失败零降级（DKM-E07） */
|
||||
panic_full("DKM-E07 REQUIRED DRIVER LOAD FAILED",
|
||||
"required driver relocation/load failed", 0);
|
||||
}
|
||||
drv->resolved = 1;
|
||||
pending--;
|
||||
} else {
|
||||
drv->loaded = 1;
|
||||
drv->resolved = 1;
|
||||
pending--;
|
||||
/* P0：加载成功才登记 provides（disabled/missing/failed 一律不登记） */
|
||||
dsm_register_provides(drv);
|
||||
/* P1：stage>=4 provides 总线契约校验（DKM-E45） */
|
||||
dsm_verify_provides(stage, drv);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
f = drv->boot_module;
|
||||
log_info("[DSM] loading driver");
|
||||
log_info(drv->name);
|
||||
|
||||
if (dkm_check_elf64(f->address, f->size) != 0) {
|
||||
log_error("[DSM] ELF check failed");
|
||||
if (drv->required && stage->required) {
|
||||
panic_full("DKM-E05 REQUIRED DRIVER ELF INVALID",
|
||||
"required driver boot module failed ELF64 check", 0);
|
||||
if (pending > 0 && pending == pending_before) {
|
||||
/* 一整趟零进展：真缺依赖（DKM-E44）或依赖环（DKM-E47） */
|
||||
dsm_report_dependency_stall(stage);
|
||||
/* fallback：停滞的候选全部放弃（不登记 provides），结束本 stage */
|
||||
for (u32 di = 0; di < stage->driver_count; di++) {
|
||||
if (stage->drivers[di].resolved) continue;
|
||||
log_warn("[DSM] fallback: driver skipped (unresolved deps): ");
|
||||
log_info(stage->drivers[di].name);
|
||||
stage->drivers[di].resolved = 1;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (dkm_scan_symbols(f->address, f->size, &symbols) != 0) {
|
||||
log_error("[DSM] symbol scan failed");
|
||||
if (drv->required && stage->required) {
|
||||
panic_full("DKM-E06 REQUIRED DRIVER SYMBOL SCAN FAILED",
|
||||
"required driver symbol scan failed", 0);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
result = dkm_load_elf_rel(f->address, f->size, &symbols);
|
||||
if (result != 0) {
|
||||
log_error("[DSM] load failed");
|
||||
if (drv->required && stage->required) {
|
||||
/* 严格错误策略插桩：required 驱动加载失败零降级（DKM-E07） */
|
||||
panic_full("DKM-E07 REQUIRED DRIVER LOAD FAILED",
|
||||
"required driver relocation/load failed", 0);
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
drv->loaded = 1;
|
||||
pending = 0;
|
||||
}
|
||||
}
|
||||
log_info("[DSM] stage end");
|
||||
@@ -419,7 +582,12 @@ void dsm_load_by_manifest_upto(const ini_config *cfg, u32 max_stage_id) {
|
||||
dsm_load_stage_range(cfg, 1, max_stage_id);
|
||||
}
|
||||
|
||||
void dsm_load_named(const ini_config *cfg, const char *name) {
|
||||
/* 按名加载公共实现。strict_deps=1：depends 校验强制（DKM-E44）——供
|
||||
* kern.dkm.load_by_name（万物互联 P3）等常规路径使用；
|
||||
* strict_deps=0：顺序豁免版——唯一调用方是 kernel/main.c VMM 路径的
|
||||
* pci+ahci 预加载（必须先于 apic/stage0，否则 guest 陷入 IDTR=0
|
||||
* VM-exit 风暴，见 main.c 注释）。设计内顺序豁免，登记于设计文档 §6。 */
|
||||
static void dsm_load_named_impl(const ini_config *cfg, const char *name, int strict_deps) {
|
||||
if (!name || dsm_ensure_manifest() != 0) {
|
||||
/* 严格错误策略插桩：按名加载 manifest 缺失零降级（DKM-E11） */
|
||||
panic_full("DKM-E11 NAMED LOAD MANIFEST MISSING",
|
||||
@@ -442,6 +610,14 @@ void dsm_load_named(const ini_config *cfg, const char *name) {
|
||||
log_info(drv->name);
|
||||
return;
|
||||
}
|
||||
/* P0：按名加载同样强制依赖（此时无同 stage 重试机会，miss 即判罚） */
|
||||
if (strict_deps && !dsm_deps_satisfied(drv, 0)) {
|
||||
log_error("[DSM] named driver dependency not satisfied: ");
|
||||
log_info(drv->name);
|
||||
panic_full("DKM-E44 DEPENDENCY NOT SATISFIED",
|
||||
"dsm_load_named: depends token not provided by any loaded driver", 0);
|
||||
return;
|
||||
}
|
||||
drv->boot_module = dsm_find_boot_module(drv->path);
|
||||
if (!drv->boot_module) {
|
||||
log_warn("[DSM] named module not found");
|
||||
@@ -477,6 +653,11 @@ void dsm_load_named(const ini_config *cfg, const char *name) {
|
||||
return;
|
||||
}
|
||||
drv->loaded = 1;
|
||||
drv->resolved = 1;
|
||||
/* P0：按名加载成功同样登记 provides */
|
||||
dsm_register_provides(drv);
|
||||
/* P1：stage>=4 provides 总线契约校验（DKM-E45） */
|
||||
dsm_verify_provides(stage, drv);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -487,6 +668,14 @@ void dsm_load_named(const ini_config *cfg, const char *name) {
|
||||
"dsm_load_named: named driver not found in manifest", 0);
|
||||
}
|
||||
|
||||
void dsm_load_named(const ini_config *cfg, const char *name) {
|
||||
dsm_load_named_impl(cfg, name, 1);
|
||||
}
|
||||
|
||||
void dsm_load_named_boot(const ini_config *cfg, const char *name) {
|
||||
dsm_load_named_impl(cfg, name, 0);
|
||||
}
|
||||
|
||||
void dsm_load_by_manifest_ex(const ini_config *cfg) {
|
||||
dsm_load_stage_range(cfg, 0, 0);
|
||||
}
|
||||
|
||||
@@ -378,6 +378,7 @@ void drr_driver_recovery_dispatch(const dkm_driver_recovery_ops *ops, void *drv)
|
||||
if (!ops) {
|
||||
panic_full("DRR-E06 DRIVER RECOVERY OPS MISSING",
|
||||
"driver did not provide dkm_driver_recovery_ops", 0);
|
||||
return;
|
||||
}
|
||||
panic_full("DRR-E07 DRIVER RECOVERY NOT IMPLEMENTED",
|
||||
"quiesce/reset/reinit dispatch: designed (DKM README), not implemented", 0);
|
||||
|
||||
@@ -57,6 +57,52 @@ typedef struct {
|
||||
#define DKM_KAPI_MAGIC 0x4b415049u /* "KAPI" */
|
||||
#define DKM_KAPI_VERSION 1u
|
||||
|
||||
/* ===================================================================
|
||||
* D6 万物互联：dkm_bus 双向服务总线
|
||||
*
|
||||
* kapi 是内核→模块的单向只读导出表；bus 把它双向化：
|
||||
* 任何模块在 driver_init 里注册 srv.* 服务，任何模块按名消费。
|
||||
* 命名空间：kern.* 仅内核可注册，srv.* 仅模块可注册（BUS-E01）。
|
||||
* 失败策略：lookup miss = BUS-E04 panic（硬依赖未满足=编程错误）；
|
||||
* probe miss = 返回 -1（能力缺席=设计内双路径，白名单登记）。
|
||||
* 生命周期：driver_init = 注册服务；"运行"也是服务（srv.<mod>.run）。
|
||||
* 设计定稿：docs/RE/万物互联与服务总线设计.md §1。
|
||||
* =================================================================== */
|
||||
#define DKM_BUS_MAGIC 0x53425553u /* "SBUS" */
|
||||
#define DKM_BUS_VERSION 1u
|
||||
#define DKM_BUS_MAX_SERVICES 128
|
||||
#define DKM_BUS_MAX_NAME 48
|
||||
|
||||
#define DKM_BUS_F_KERNEL 1u /* 内核注册，不可注销 */
|
||||
#define DKM_BUS_F_NO_UNLOAD 2u /* provider 声明 NO_UNLOAD，注销即 BUS-E05 */
|
||||
|
||||
typedef struct dkm_bus_service {
|
||||
char name[DKM_BUS_MAX_NAME]; /* NUL 终止；必须带命名空间前缀 */
|
||||
u32 version; /* 服务契约版本，消费方校验 */
|
||||
u32 flags; /* DKM_BUS_F_* */
|
||||
void *fn; /* 服务入口，签名由各服务契约定义 */
|
||||
const struct dkm_driver_desc *provider; /* NULL = 内核；存 desc 而非
|
||||
* handle——loader 的 handle 是栈
|
||||
* 局部变量会悬垂，desc 在驱动
|
||||
* 镜像内存里持久且每驱动唯一 */
|
||||
} dkm_bus_service;
|
||||
|
||||
typedef struct dkm_bus_api {
|
||||
u32 magic;
|
||||
u32 version;
|
||||
/* 注册：name 必须带命名空间前缀且与调用方身份匹配（BUS-E01）、
|
||||
* 重名 BUS-E02、表满 BUS-E03——全部 panic，成功返回 0。 */
|
||||
int (*register_service)(const char *name, u32 version, void *fn);
|
||||
/* 注销：仅 provider 本人可注销；F_KERNEL/F_NO_UNLOAD 或不存在 → BUS-E05。 */
|
||||
int (*unregister_service)(const char *name);
|
||||
/* 必存在查找：未命中 → BUS-E04 panic，绝不返回 NULL 伪装成功。 */
|
||||
int (*lookup)(const char *name, void **out_fn, u32 *out_version);
|
||||
/* 可选探测：未命中返回 -1；调用方必须显式处理缺席（白名单登记）。 */
|
||||
int (*probe)(const char *name, void **out_fn, u32 *out_version);
|
||||
u32 (*count)(void); /* 诊断 / /dev/services */
|
||||
const dkm_bus_service *(*at)(u32 index); /* 按 index 枚举 */
|
||||
} dkm_bus_api;
|
||||
|
||||
typedef struct dkm_driver_desc {
|
||||
u32 magic;
|
||||
u16 abi_version;
|
||||
@@ -160,6 +206,9 @@ typedef struct dkm_kernel_api {
|
||||
/* D3: 按名导出表（尾部追加，ABI 兼容）。驱动/用户态枚举内核服务并
|
||||
* 按名取函数指针；固定偏移 struct 字段不受影响。 */
|
||||
const dkm_kapi_table *kapi;
|
||||
/* D6 万物互联：双向服务总线（尾部追加，ABI 兼容）。kern.* 与 srv.* 按名
|
||||
* 注册-消费；driver_init = 注册服务的地方。 */
|
||||
const dkm_bus_api *bus;
|
||||
} dkm_kernel_api;
|
||||
|
||||
typedef enum dkm_driver_state {
|
||||
@@ -191,6 +240,15 @@ void dkm_log_set_driver(const char *name);
|
||||
int dkm_load_builtin(const dkm_builtin_driver *driver);
|
||||
void dkm_scan_boot_modules(void);
|
||||
void dsm_load_by_manifest(void);
|
||||
/* P0（万物互联）：按名加载。dsm_load_named 严格版（depends 校验强制，供
|
||||
* kern.dkm.load_by_name 等常规路径）；dsm_load_named_boot 顺序豁免版
|
||||
* （唯一合法调用方 = kernel/main.c VMM 路径 pci+ahci 预加载，先于 apic，
|
||||
* 否则 guest 陷入 IDTR=0 VM-exit 风暴——设计内豁免，见
|
||||
* docs/RE/万物互联与服务总线设计.md §6）。
|
||||
* 签名（ini_config 定义在 kernel/ini_parser.h，此处避免头依赖）：
|
||||
* void dsm_load_named(const ini_config *cfg, const char *name);
|
||||
* void dsm_load_named_boot(const ini_config *cfg, const char *name);
|
||||
* 调用方自行前向声明（同 kernel/main.c 既有模式）。 */
|
||||
void dkm_fill_platform_info(void);
|
||||
const dkm_kernel_api *dkm_get_kernel_api(void);
|
||||
|
||||
@@ -198,6 +256,17 @@ const dkm_kernel_api *dkm_get_kernel_api(void);
|
||||
const struct drr_recovery_api *drr_get_recovery_api(void);
|
||||
const struct utsm_sched_api *utsm_sched_get_api(void);
|
||||
|
||||
/* D6 万物互联：服务总线（dkm/bus.c 提供）。dkm_bus_init 播种 kern.*
|
||||
* 并挂入 kernel_api（dkm_fill_platform_info 内调用，先于一切驱动加载）；
|
||||
* loader 在 driver_init 前后 set/clear provider 上下文（仿 D4 颜色上下文），
|
||||
* kern.* 只能在 provider==NULL 时注册。 */
|
||||
void dkm_bus_init(void);
|
||||
const dkm_bus_api *dkm_bus_get_api(void);
|
||||
void dkm_bus_set_current_provider(struct dkm_driver_handle *h);
|
||||
/* loader 专用：token T 是否已有 "prefix" 或 "prefix.*" 服务注册
|
||||
* （stage>=4 provides 校验用，DKM-E45）。命中返回 1。 */
|
||||
int dkm_bus_prefix_registered(const char *prefix);
|
||||
|
||||
/* exposed for manifest parser */
|
||||
struct dkm_symbol_scan {
|
||||
const void *driver_desc;
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
#define DSK_BOOT_FLAG_DKM_READY (1ULL << 1)
|
||||
#define DSK_BOOT_FLAG_FAT32_PATH (1ULL << 2)
|
||||
#define DSK_BOOT_FLAG_PROBE_INFO (1ULL << 3)
|
||||
/* FUCK [panic] mode=fallback：DSK/desktop/login/FirstInit 的 *_fatal 记录后返回，
|
||||
* 调用点走备用路径（见 utsm/panic.h）。未置位 = strict。 */
|
||||
#define DSK_BOOT_FLAG_PANIC_FALLBACK (1ULL << 4)
|
||||
|
||||
/* ---- Probe 信息结构（通过 reserved[6] 传递给 shell/desktop） ---- */
|
||||
#define PROBE_INFO_MAGIC 0x50524F42u /* "PRFB" — Probe inFo Buffer */
|
||||
|
||||
@@ -7,7 +7,8 @@
|
||||
* L1 wf_theme 主题令牌（色板 + 圆角），g_wf_light / g_wf_dark 预设
|
||||
* L2 原语 du_wf_acrylic（读背景 alpha 混合圆角面板）、du_wf_shadow、
|
||||
* du_wf_line（Bresenham 带宽线）、du_wf_ring（圆环/半弧）
|
||||
* L3 组件 按钮/图标钮/开关/滑块/列表项/卡片/文本框/滚动条/提示
|
||||
* L3 组件 按钮/图标钮/开关/滑块/列表项/卡片/文本框/滚动条/提示 +
|
||||
* 复选框/进度条/标签页/分隔线/应用瓦片/菜单行/徽标（M3 开始菜单批次）
|
||||
* L4 图标 du_wf_icon 矢量线性图标（24 网格设计，2px 笔触）
|
||||
*
|
||||
* 约定（与 deshab_ui.h 相同）：包含本头前，编译单元须已定义 g_ascii
|
||||
@@ -315,6 +316,92 @@ static inline void du_wf_tooltip(du_context *ctx, du_i64 x, du_i64 y,
|
||||
t->text_primary, t->acrylic_solid, DU_ASCII_STEP);
|
||||
}
|
||||
|
||||
/* ============ M3 新增组件（开始菜单/快速设置批次）============ */
|
||||
|
||||
/* 复选框：20×20 圆角 4 方框，选中画 accent 对勾 + accent 底 */
|
||||
static inline void du_wf_checkbox(du_context *ctx, du_i64 x, du_i64 y,
|
||||
int checked, const wf_theme *t) {
|
||||
du_fill_rounded_rect(ctx, x, y, 20, 20,
|
||||
checked ? t->accent : t->acrylic_solid, 4);
|
||||
du_rect_outline(ctx, x, y, 20, 20,
|
||||
checked ? t->accent : t->control_stroke, 4);
|
||||
if (checked) {
|
||||
du_wf_line(ctx, x + 4, y + 10, x + 8, y + 15, 2, t->on_accent);
|
||||
du_wf_line(ctx, x + 8, y + 15, x + 16, y + 4, 2, t->on_accent);
|
||||
}
|
||||
}
|
||||
|
||||
/* 进度条：6px 圆角轨道 + accent 填充（val 0..100） */
|
||||
static inline void du_wf_progress(du_context *ctx, du_i64 x, du_i64 y,
|
||||
du_i64 w, int val, const wf_theme *t) {
|
||||
if (val < 0) val = 0;
|
||||
if (val > 100) val = 100;
|
||||
du_fill_rounded_rect(ctx, x, y, w, 6, t->control_stroke, 3);
|
||||
du_i64 fw = w * val / 100;
|
||||
if (fw < 4) fw = 4;
|
||||
if (fw > w) fw = w;
|
||||
du_fill_rounded_rect(ctx, x, y, fw, 6, t->accent, 3);
|
||||
}
|
||||
|
||||
/* 标签页（pill）：圆角 full，active 填 accent_secondary 底 */
|
||||
static inline void du_wf_pill(du_context *ctx, du_i64 x, du_i64 y,
|
||||
const char *label, const wf_theme *t, int active) {
|
||||
du_i64 len = 0;
|
||||
while (label[len]) len++;
|
||||
du_i64 w = len * (du_i64)DU_ASCII_STEP + 20;
|
||||
du_fill_rounded_rect(ctx, x, y, w, 26,
|
||||
active ? t->accent : t->acrylic_solid, 13);
|
||||
du_draw_string(ctx, label, x + 10, y + (26 - (du_i64)DU_ASCII_CELL_H) / 2,
|
||||
active ? t->on_accent : t->text_secondary,
|
||||
active ? t->accent : t->acrylic_solid, DU_ASCII_STEP);
|
||||
}
|
||||
|
||||
/* 分隔线：1px divider */
|
||||
static inline void du_wf_separator(du_context *ctx, du_i64 x, du_i64 y,
|
||||
du_i64 w, const wf_theme *t) {
|
||||
du_fill_rect(ctx, x, y, w, 1, t->divider);
|
||||
}
|
||||
|
||||
/* 应用瓦片：圆角 8 悬浮底 + 居中图标 + 底部标签区（中文标签由调用方
|
||||
* zh_draw_string 绘制，ASCII 图标由本组件画）。hover/selected 蒙层。 */
|
||||
static inline void du_wf_app_tile(du_context *ctx, du_i64 x, du_i64 y,
|
||||
du_i64 w, du_i64 h, wf_icon_id icon,
|
||||
const wf_theme *t, wf_btn_state st,
|
||||
int selected) {
|
||||
if (st == WF_BTN_HOVER)
|
||||
du_wf_overlay(ctx, x, y, w, h, 0x14000000u);
|
||||
if (selected)
|
||||
du_wf_overlay(ctx, x, y, w, h, 0x1E000000u);
|
||||
du_i64 isz = h / 3;
|
||||
if (isz < 24) isz = 24;
|
||||
if (isz > 36) isz = 36;
|
||||
du_wf_icon(ctx, icon, x + (w - isz) / 2, y + (h - isz) / 2 - 8, isz,
|
||||
selected ? t->accent : t->text_primary);
|
||||
/* 选中态：底部 3px accent 指示条 */
|
||||
if (selected)
|
||||
du_fill_rounded_rect(ctx, x + w / 2 - 8, y + h - 6, 16, 3, t->accent, 1);
|
||||
}
|
||||
|
||||
/* 菜单行：36px 行高 + 左侧图标 + ASCII 标签（右箭头区由调用方补充） */
|
||||
static inline void du_wf_menu_item(du_context *ctx, du_i64 x, du_i64 y,
|
||||
du_i64 w, wf_icon_id icon, const char *label,
|
||||
const wf_theme *t, wf_btn_state st) {
|
||||
if (st == WF_BTN_HOVER)
|
||||
du_wf_overlay(ctx, x, y, w, 36, 0x14000000u);
|
||||
du_wf_icon(ctx, icon, x + 10, y + 6, 22, t->text_primary);
|
||||
du_draw_string(ctx, label, x + 44, y + (36 - (du_i64)DU_ASCII_CELL_H) / 2,
|
||||
t->text_primary, 0, DU_ASCII_STEP);
|
||||
}
|
||||
|
||||
/* 徽标：8px 圆点（通知/在线状态角标） */
|
||||
static inline void du_wf_badge(du_context *ctx, du_i64 cx, du_i64 cy,
|
||||
du_u32 color) {
|
||||
for (du_i64 dy = -4; dy <= 4; dy++)
|
||||
for (du_i64 dx = -4; dx <= 4; dx++)
|
||||
if (dx * dx + dy * dy <= 16)
|
||||
du_pixel(ctx, cx + dx, cy + dy, color);
|
||||
}
|
||||
|
||||
/* ===================================================================
|
||||
* L4 — 矢量图标（24 网格设计，线性 2px 笔触，Win11 Segoe 风格）
|
||||
*
|
||||
@@ -343,6 +430,18 @@ typedef enum {
|
||||
WF_ICON_MAX, /* □ */
|
||||
WF_ICON_RESTORE, /* 双层 □ */
|
||||
WF_ICON_USER, /* 人形 */
|
||||
/* M3 开始菜单/系统工具批次 */
|
||||
WF_ICON_APPS, /* 3×3 点阵（应用列表） */
|
||||
WF_ICON_CLOCK, /* 圆 + 指针 */
|
||||
WF_ICON_INFO, /* 圆 + i */
|
||||
WF_ICON_DISK, /* 圆柱（磁盘） */
|
||||
WF_ICON_PICTURE, /* 山 + 太阳（画板/图片） */
|
||||
WF_ICON_MUSIC, /* 音符 */
|
||||
WF_ICON_GAME, /* 手柄 */
|
||||
WF_ICON_CHIP, /* CPU 芯片 */
|
||||
WF_ICON_REFRESH, /* 环形箭头 */
|
||||
WF_ICON_LOCK, /* 挂锁 */
|
||||
WF_ICON_TRASH, /* 垃圾桶 */
|
||||
} wf_icon_id;
|
||||
|
||||
static inline void du_wf_icon(du_context *ctx, wf_icon_id id,
|
||||
@@ -466,6 +565,80 @@ static inline void du_wf_icon(du_context *ctx, wf_icon_id id,
|
||||
du_wf_ring(ctx, x + 12 * u, y + 8 * u, 4 * u, s, 0, color);
|
||||
du_wf_ring(ctx, x + 12 * u, y + 26 * u, 9 * u, s, 1, color);
|
||||
break;
|
||||
case WF_ICON_APPS:
|
||||
for (int gy = 0; gy < 3; gy++)
|
||||
for (int gx = 0; gx < 3; gx++)
|
||||
du_fill_rounded_rect(ctx, x + (3 + gx * 7) * u,
|
||||
y + (3 + gy * 7) * u, 4 * u, 4 * u,
|
||||
color, (du_u32)u);
|
||||
break;
|
||||
case WF_ICON_CLOCK:
|
||||
du_wf_ring(ctx, x + 12 * u, y + 12 * u, 9 * u, s, 0, color);
|
||||
du_wf_line(ctx, x + 12 * u, y + 12 * u, x + 12 * u, y + 6 * u, u + 1, color);
|
||||
du_wf_line(ctx, x + 12 * u, y + 12 * u, x + 17 * u, y + 14 * u, u + 1, color);
|
||||
break;
|
||||
case WF_ICON_INFO:
|
||||
du_wf_ring(ctx, x + 12 * u, y + 12 * u, 9 * u, s, 0, color);
|
||||
du_fill_rect(ctx, x + 11 * u, y + 7 * u, s, 5 * u, color);
|
||||
du_fill_rect(ctx, x + 11 * u, y + 14 * u, s, 4 * u, color);
|
||||
break;
|
||||
case WF_ICON_DISK:
|
||||
/* 圆柱：顶椭圆 + 两侧竖线 + 底弧 */
|
||||
du_wf_ring(ctx, x + 12 * u, y + 7 * u, 8 * u, s, -1, color);
|
||||
du_fill_rect(ctx, x + 4 * u, y + 7 * u, s, 10 * u, color);
|
||||
du_fill_rect(ctx, x + 18 * u, y + 7 * u, s, 10 * u, color);
|
||||
du_wf_ring(ctx, x + 12 * u, y + 17 * u, 8 * u, s, -1, color);
|
||||
break;
|
||||
case WF_ICON_PICTURE:
|
||||
du_rect_outline(ctx, x + 3 * u, y + 5 * u, 18 * u, 14 * u, color, (du_u32)u);
|
||||
du_wf_ring(ctx, x + 8 * u, y + 9 * u, u + 1, u + 1, 0, color);
|
||||
du_wf_line(ctx, x + 5 * u, y + 17 * u, x + 11 * u, y + 11 * u, u + 1, color);
|
||||
du_wf_line(ctx, x + 11 * u, y + 11 * u, x + 15 * u, y + 15 * u, u + 1, color);
|
||||
du_wf_line(ctx, x + 15 * u, y + 15 * u, x + 19 * u, y + 9 * u, u + 1, color);
|
||||
break;
|
||||
case WF_ICON_MUSIC:
|
||||
/* 八分音符：符头椭圆 + 符干 + 旗 */
|
||||
du_fill_rounded_rect(ctx, x + 5 * u, y + 15 * u, 6 * u, 4 * u, color, (du_u32)u);
|
||||
du_fill_rect(ctx, x + 10 * u, y + 4 * u, s, 12 * u, color);
|
||||
du_wf_line(ctx, x + 11 * u, y + 4 * u, x + 18 * u, y + 8 * u, s, color);
|
||||
break;
|
||||
case WF_ICON_GAME:
|
||||
du_rect_outline(ctx, x + 2 * u, y + 7 * u, 20 * u, 10 * u, color, (du_u32)(4 * u));
|
||||
/* 十字键 */
|
||||
du_fill_rect(ctx, x + 7 * u, y + 9 * u, 2 * u, 6 * u, color);
|
||||
du_fill_rect(ctx, x + 5 * u, y + 11 * u, 6 * u, 2 * u, color);
|
||||
/* AB 钮 */
|
||||
du_wf_ring(ctx, x + 16 * u, y + 12 * u, u + 1, u + 1, 0, color);
|
||||
du_wf_ring(ctx, x + 19 * u, y + 12 * u, u + 1, u + 1, 0, color);
|
||||
break;
|
||||
case WF_ICON_CHIP:
|
||||
du_rect_outline(ctx, x + 6 * u, y + 6 * u, 12 * u, 12 * u, color, (du_u32)u);
|
||||
du_rect_outline(ctx, x + 10 * u, y + 10 * u, 4 * u, 4 * u, color, (du_u32)u);
|
||||
for (int i = 0; i < 3; i++) {
|
||||
du_fill_rect(ctx, x + (8 + i * 4) * u, y + 2 * u, s, 4 * u, color);
|
||||
du_fill_rect(ctx, x + (8 + i * 4) * u, y + 18 * u, s, 4 * u, color);
|
||||
du_fill_rect(ctx, x + 2 * u, y + (8 + i * 4) * u, 4 * u, s, color);
|
||||
du_fill_rect(ctx, x + 18 * u, y + (8 + i * 4) * u, 4 * u, s, color);
|
||||
}
|
||||
break;
|
||||
case WF_ICON_REFRESH:
|
||||
du_wf_ring(ctx, x + 12 * u, y + 12 * u, 8 * u, s, 1, color);
|
||||
/* 箭头（右上端点） */
|
||||
du_wf_line(ctx, x + 16 * u, y + 2 * u, x + 20 * u, y + 7 * u, s, color);
|
||||
du_wf_line(ctx, x + 20 * u, y + 7 * u, x + 14 * u, y + 8 * u, s, color);
|
||||
break;
|
||||
case WF_ICON_LOCK:
|
||||
du_rect_outline(ctx, x + 5 * u, y + 10 * u, 14 * u, 10 * u, color, (du_u32)u);
|
||||
du_wf_ring(ctx, x + 12 * u, y + 10 * u, 5 * u, s, 1, color);
|
||||
du_fill_rect(ctx, x + 11 * u, y + 14 * u, s, 3 * u, color);
|
||||
break;
|
||||
case WF_ICON_TRASH:
|
||||
du_fill_rect(ctx, x + 9 * u, y + 3 * u, 6 * u, s, color);
|
||||
du_rect_outline(ctx, x + 5 * u, y + 6 * u, 14 * u, 15 * u, color, (du_u32)u);
|
||||
du_fill_rect(ctx, x + 8 * u, y + 9 * u, s, 9 * u, color);
|
||||
du_fill_rect(ctx, x + 12 * u, y + 9 * u, s, 9 * u, color);
|
||||
du_fill_rect(ctx, x + 16 * u, y + 9 * u, s, 9 * u, color);
|
||||
break;
|
||||
default:
|
||||
du_rect_outline(ctx, x + 4 * u, y + 4 * u, 16 * u, 16 * u, color, (du_u32)u);
|
||||
break;
|
||||
|
||||
@@ -58,4 +58,12 @@ void idt_irq_eoi(u8 vector);
|
||||
typedef int (*idt_exception_hook_t)(u64 vector, u64 error_code, u64 rip);
|
||||
void idt_set_exception_hook(idt_exception_hook_t hook);
|
||||
|
||||
/* P1（万物互联）: PIC IMR 位操作 —— kern.irq.unmask/mask 总线服务后端。
|
||||
* 仅 ISA IRQ 0-15（越界 → IRQ-E01 panic 零降级）；
|
||||
* unmask IRQ8-15 自动放开主片 IRQ2 级联。
|
||||
* apic_route=1 时 PIC 已全屏蔽（IOAPIC 接管），本操作无效果——该路径的
|
||||
* 解屏蔽随 P6 真 IRQ 输入走 IOAPIC 接线。 */
|
||||
void pic_irq_unmask(u8 irq);
|
||||
void pic_irq_mask(u8 irq);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -27,9 +27,32 @@ typedef struct panic_regs {
|
||||
u64 rax, rcx, rdx, rsi, rdi, r8, r9, r10, r11;
|
||||
} panic_regs;
|
||||
|
||||
/* 统一 panic 入口：画莲花崩溃屏 + 串口日志 + DRR 归档 + halt（不返回） */
|
||||
/* ===================================================================
|
||||
* panic 模式（FUCK [panic] mode=strict|fallback，默认 strict）
|
||||
*
|
||||
* strict ：panic_full 画莲花屏 + DRR 归档 + halt，不返回（零降级铁律）。
|
||||
* fallback：panic_full 只留串口坐标 + 计数后返回，调用点必须紧跟一条
|
||||
* 可执行的备用路径（返回错误码 / 跳过该能力 / 回退实现）。
|
||||
* 寄存器帧非空（CPU 异常）时无论模式都 halt。
|
||||
*
|
||||
* panic_halt 无视模式恒 halt，仅用于"没有任何可继续的状态"的终点：
|
||||
* CPU 异常、LA57 激活（4 级页表 walk 会写坏内存）、DSK 交接失败、
|
||||
* panic_test 演示钩子。
|
||||
* =================================================================== */
|
||||
|
||||
/* 统一 panic 入口：strict 模式不返回；fallback 模式记录后返回 */
|
||||
void panic_full(const char *symbol, const char *msg, const panic_regs *regs);
|
||||
|
||||
/* 恒 halt 的 panic（不受 fallback 模式影响） */
|
||||
__attribute__((noreturn))
|
||||
void panic_halt(const char *symbol, const char *msg, const panic_regs *regs);
|
||||
|
||||
/* 设置/查询 fallback 模式（kernel/main.c 读 FUCK 后设置一次） */
|
||||
void panic_set_fallback(int enable);
|
||||
int panic_fallback_enabled(void);
|
||||
/* fallback 模式下被吞掉的 panic 次数 */
|
||||
u32 panic_fallback_hits(void);
|
||||
|
||||
/* 兼容旧接口：panic("msg") = panic_full("UTSM-PANIC", msg, 0) */
|
||||
void panic(const char *msg);
|
||||
|
||||
|
||||
@@ -116,6 +116,8 @@ void attest_check(const void *cfg) {
|
||||
if (first_required_missing) {
|
||||
panic_full(first_required_missing->errcode,
|
||||
"required capability not ready at boot (attestation)", 0);
|
||||
log_warn("[ATTEST] fallback: booting with required capabilities missing");
|
||||
return;
|
||||
}
|
||||
|
||||
/* 全部缺失项均被 FUCK 显式豁免（设计内白名单），放行 */
|
||||
|
||||
@@ -131,6 +131,6 @@ void boot_panic_test(const ini_config *cfg) {
|
||||
extern int ini_get_bool(const ini_config *cfg, const char *section, const char *key, int defval);
|
||||
if (ini_get_bool(cfg, "boot", "panic_test", 0)) {
|
||||
log_warn("[boot] panic_test=1 -> triggering lotus panic screen");
|
||||
panic_full("UTSM-E42", "lotus panic selftest", 0);
|
||||
panic_halt("UTSM-E42", "lotus panic selftest", 0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1026,6 +1026,7 @@ static void dsk_fill_boot_context(dsk_boot_context *ctx) {
|
||||
ctx->abi_version = DSK_BOOT_ABI_VERSION;
|
||||
ctx->size = sizeof(*ctx);
|
||||
ctx->flags = DSK_BOOT_FLAG_FROM_UTSM | DSK_BOOT_FLAG_DKM_READY | DSK_BOOT_FLAG_FAT32_PATH;
|
||||
if (panic_fallback_enabled()) ctx->flags |= DSK_BOOT_FLAG_PANIC_FALLBACK;
|
||||
|
||||
if (g_hhdm_request.response) {
|
||||
ctx->hhdm_offset = g_hhdm_request.response->offset;
|
||||
|
||||
+58
-26
@@ -25,6 +25,8 @@ extern volatile struct limine_module_request g_module_request;
|
||||
/* dkm/manifest.c: 带 FUCK [drivers] 过滤的 manifest 加载入口 */
|
||||
void dsm_load_by_manifest_ex(const ini_config *cfg);
|
||||
void dsm_load_named(const ini_config *cfg, const char *name);
|
||||
/* P0 顺序豁免版：唯一调用方就是下方 VMM 路径（pci+ahci 必须先于 apic） */
|
||||
void dsm_load_named_boot(const ini_config *cfg, const char *name);
|
||||
|
||||
/* dsk_loader.c: 按路径读取 FAT32 文件到 g_dsk_fat32_filedata 静态缓冲。
|
||||
* Phase 1 已支持 LFN 长文件名 + 子目录遍历。 */
|
||||
@@ -51,6 +53,17 @@ int g_sched_enabled_cfg = 1; /* FUCK [sched] enable
|
||||
|
||||
/* 将 FUCK [compat] 区的配置应用到兼容层全局变量。
|
||||
* 必须在 utsm_apply_config 之后调用。 */
|
||||
/* FUCK [panic] mode=strict|fallback（默认 strict）。其余取值按 strict 处理。 */
|
||||
static void utsm_apply_panic_config(const ini_config *cfg) {
|
||||
const char *mode = ini_get(cfg, "panic", "mode");
|
||||
const char *want = "fallback";
|
||||
int fallback = mode ? 1 : 0;
|
||||
for (int i = 0; fallback && (mode[i] || want[i]); i++) {
|
||||
if (mode[i] != want[i]) fallback = 0;
|
||||
}
|
||||
panic_set_fallback(fallback);
|
||||
}
|
||||
|
||||
static void utsm_apply_compat_config(const ini_config *cfg) {
|
||||
if (!cfg) return;
|
||||
const char *lib_path = ini_get(cfg, "compat", "lib_path");
|
||||
@@ -128,6 +141,12 @@ static void utsm_apply_config(const ini_config *cfg) {
|
||||
/* ---- 全局启动配置（从 FUCK 文件读取） ---- */
|
||||
static ini_config g_boot_cfg;
|
||||
static int g_boot_cfg_loaded = 0;
|
||||
|
||||
/* D6 万物互联：FUCK 启动配置只读访问（kern.config.get 总线服务后端，
|
||||
* bus.c 经前向声明调用；未加载时返回 NULL，消费方自行处理缺席）。 */
|
||||
const ini_config *utsm_boot_cfg_get(void) {
|
||||
return g_boot_cfg_loaded ? &g_boot_cfg : 0;
|
||||
}
|
||||
static int g_vmm_init_ok = 0; /* attest: vmm_vmx 能力打点 */
|
||||
|
||||
/* 从 Limine boot module 读取 FUCK 配置。
|
||||
@@ -263,9 +282,9 @@ void kernel_main(void) {
|
||||
if (cr4 & (1ULL << 12)) {
|
||||
log_error("[UTSM] LA57 is ACTIVE — this kernel requires 4-level paging");
|
||||
log_error("[UTSM] Refusing to boot. Disable LA57 in firmware settings.");
|
||||
panic_full("VMM-E11 LA57 ACTIVE REFUSE BOOT",
|
||||
/* 无备用路径：paging.c/mmio.c 的 4 级 walk 会写坏 5 级页表 */
|
||||
panic_halt("VMM-E11 LA57 ACTIVE REFUSE BOOT",
|
||||
"5-level paging active; kernel requires 4-level paging", 0);
|
||||
arch_halt_forever();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -311,6 +330,8 @@ void kernel_main(void) {
|
||||
* 颜色只走串口，BOOTLOG.TXT 保持纯文本） */
|
||||
log_color_enable(ini_get_bool(cfg, "debug", "color_log", 1));
|
||||
|
||||
utsm_apply_panic_config(cfg);
|
||||
|
||||
/* ---- 插桩: FUCK 配置加载完成 ---- */
|
||||
INSTR_PROBE(BOOT, (u64)g_boot_cfg_loaded, 0, 0, 0);
|
||||
|
||||
@@ -372,9 +393,8 @@ void kernel_main(void) {
|
||||
/* === 封缄内存极早期初始化（UTSM-E01..E04） ===
|
||||
* .sealed 区为空 / root key 缺失 → 此处极早期 panic，绝不带病前进。 */
|
||||
{
|
||||
extern void utsm_sealed_early_init(void);
|
||||
utsm_sealed_early_init();
|
||||
attest_report_ready("sealed_mem", "UTSM-E05");
|
||||
extern int utsm_sealed_early_init(void);
|
||||
attest_report("sealed_mem", "UTSM-E05", utsm_sealed_early_init() == 0);
|
||||
}
|
||||
|
||||
/* === SAS-R0-PCQ 调度器：bootstrap 任务绑定（Phase 7） ===
|
||||
@@ -395,8 +415,11 @@ void kernel_main(void) {
|
||||
* 调度器没有真正立起来，零降级 panic（SAS-E01） */
|
||||
panic_full("SAS-E01 SCHED BOOTSTRAP FAILED",
|
||||
"SAS-R0-PCQ scheduler bootstrap failed (was: non-fatal)", 0);
|
||||
/* fallback：不开 demo 窗口，sched 能力不报就绪 */
|
||||
g_sched_enabled_cfg = 0;
|
||||
} else {
|
||||
attest_report_ready("sched", "SAS-E02");
|
||||
}
|
||||
attest_report_ready("sched", "SAS-E02");
|
||||
}
|
||||
|
||||
INSTR_TS_DECL(ts_dkm);
|
||||
@@ -430,31 +453,38 @@ void kernel_main(void) {
|
||||
|
||||
/* Only pci+ahci before linux_launch. Loading apic/stage0 first
|
||||
* left the guest in an IDTR=0 VM-exit storm. Remaining DKM
|
||||
* still loads after the guest parks. */
|
||||
dsm_load_named(cfg, "pci");
|
||||
dsm_load_named(cfg, "ahci");
|
||||
* still loads after the guest parks.
|
||||
* P0 依赖图：此处用顺序豁免版（pci depends irq/apic 未加载），
|
||||
* 豁免登记见 docs/RE/万物互联与服务总线设计.md §6。 */
|
||||
dsm_load_named_boot(cfg, "pci");
|
||||
dsm_load_named_boot(cfg, "ahci");
|
||||
|
||||
/* === Linux guest — 可通过 FUCK [boot] linux_guest=0 跳过 ===
|
||||
* 严格错误策略：linux_guest=1 即"请求了 guest"——模块缺失、
|
||||
* 启动失败、IPC 失败一律 panic（VMM-E/LNX-E），零降级。 */
|
||||
int run_linux = ini_get_bool(cfg, "boot", "linux_guest", 1);
|
||||
if (run_linux) {
|
||||
if (linux_loader_init() != 0) {
|
||||
panic_full("VMM-E01 LINUX BZIMAGE MISSING",
|
||||
"linux_guest=1 but bzImage boot module not found", 0);
|
||||
}
|
||||
int linux_ready = run_linux;
|
||||
if (run_linux && linux_loader_init() != 0) {
|
||||
panic_full("VMM-E01 LINUX BZIMAGE MISSING",
|
||||
"linux_guest=1 but bzImage boot module not found", 0);
|
||||
linux_ready = 0; /* fallback：跳过 Linux guest */
|
||||
}
|
||||
if (linux_ready) {
|
||||
INSTR_TS_DECL(ts_linux);
|
||||
INSTR_TS_BEGIN(ts_linux);
|
||||
log_info("[UTSM] Linux loader init ok");
|
||||
|
||||
int lin_st = -1;
|
||||
int launched = 0;
|
||||
if (ipc_shm_init() == 0) {
|
||||
log_info("[UTSM] IPC shm init ok");
|
||||
lin_st = linux_launch();
|
||||
launched = 1;
|
||||
} else {
|
||||
panic_full("LNX-E03 IPC SHM INIT FAILED",
|
||||
"IPC shared memory init failed (was: non-fatal)", 0);
|
||||
log_warn("[UTSM] fallback: Linux guest launch skipped (no IPC)");
|
||||
}
|
||||
|
||||
int lin_st = linux_launch();
|
||||
INSTR_TS_END(ts_linux, "linux_launch");
|
||||
if (lin_st == 0) {
|
||||
log_info("[UTSM] Linux guest parked (daemon ready)");
|
||||
@@ -480,14 +510,14 @@ void kernel_main(void) {
|
||||
"vscode tarball install into guest failed", 0);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
} else if (launched) {
|
||||
/* 严格错误策略插桩：guest 启动失败零降级（VMM-E02） */
|
||||
log_error("[UTSM] Linux launch failed");
|
||||
log_hex64("[UTSM] Linux st=", (u64)(i64)lin_st);
|
||||
panic_full("VMM-E02 LINUX LAUNCH FAILED",
|
||||
"linux_guest=1 requested but VMX launch failed", 0);
|
||||
}
|
||||
} else {
|
||||
} else if (!run_linux) {
|
||||
log_warn("[UTSM] Linux guest disabled by FUCK (linux_guest=0)");
|
||||
}
|
||||
} else {
|
||||
@@ -503,11 +533,11 @@ void kernel_main(void) {
|
||||
* 严格错误策略：xj380_guest=1 即"请求了 guest"——模块缺失或
|
||||
* 启动失败一律 panic（VMM-E03/E04），零降级。 */
|
||||
int run_xj380 = ini_get_bool(cfg, "boot", "xj380_guest", 1);
|
||||
if (run_xj380) {
|
||||
if (xj380_loader_init() != 0) {
|
||||
panic_full("VMM-E03 XJ380 KERNEL.KRL MISSING",
|
||||
"xj380_guest=1 but kernel.krl boot module not found", 0);
|
||||
}
|
||||
if (run_xj380 && xj380_loader_init() != 0) {
|
||||
panic_full("VMM-E03 XJ380 KERNEL.KRL MISSING",
|
||||
"xj380_guest=1 but kernel.krl boot module not found", 0);
|
||||
log_warn("[UTSM] fallback: XJ380 guest skipped");
|
||||
} else if (run_xj380) {
|
||||
INSTR_TS_DECL(ts_xj380);
|
||||
INSTR_TS_BEGIN(ts_xj380);
|
||||
log_info("[UTSM] XJ380 loader init ok");
|
||||
@@ -554,7 +584,9 @@ void kernel_main(void) {
|
||||
attest_report("pkg", "PKG-E10", 0);
|
||||
attest_report("brand_anim", "BRAND-E10", 0);
|
||||
attest_report("dkm_hot_unload", "DKM-E60", 0);
|
||||
attest_report("dkm_api_export", "DKM-E61", 0);
|
||||
/* D6 万物互联：dkm_bus 落地，按名服务导出能力翻绿
|
||||
* （kapi 只读表 + bus 双向注册-消费）。 */
|
||||
attest_report("dkm_api_export", "DKM-E61", 1);
|
||||
attest_report("nvme_rw", "NVME-E30", 0);
|
||||
attest_report("virtio_net", "VNET-E30", 0);
|
||||
}
|
||||
@@ -578,7 +610,6 @@ void kernel_main(void) {
|
||||
log_error("[UTSM] SELFTEST FAIL");
|
||||
panic_full("VMM-E14 SELFTEST FAIL",
|
||||
"utsm_selftest_run returned non-zero", 0);
|
||||
arch_halt_forever();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -620,7 +651,8 @@ void kernel_main(void) {
|
||||
|
||||
if (dsk_load_and_jump() != 0) {
|
||||
log_error("[UTSM] DSK jump failed");
|
||||
panic_full("VMM-E15 DSK JUMP FAILED",
|
||||
/* 启动链终点，无可继续的路径：两种模式都上莲花屏 */
|
||||
panic_halt("VMM-E15 DSK JUMP FAILED",
|
||||
"dsk_load_and_jump returned non-zero", 0);
|
||||
}
|
||||
|
||||
|
||||
@@ -106,18 +106,22 @@ static int net_connect_impl(u32 index, const char *ssid, const char *password) {
|
||||
if (index >= g_net_device_count) return -2;
|
||||
const dkm_net_device_desc *dev = &g_net_devices[index];
|
||||
/* 严格错误策略：无线设备未提供关联回调 = 驱动后端未实现，零降级 panic */
|
||||
if (!dev->connect)
|
||||
if (!dev->connect) {
|
||||
panic_full("NET-E20 WLAN CONNECT NOT SUPPORTED",
|
||||
"wireless netdev has no connect backend (native chip driver pending)", 0);
|
||||
return -3;
|
||||
}
|
||||
return dev->connect(dev->ctx, ssid, password);
|
||||
}
|
||||
|
||||
static int net_disconnect_impl(u32 index) {
|
||||
if (index >= g_net_device_count) return -2;
|
||||
const dkm_net_device_desc *dev = &g_net_devices[index];
|
||||
if (!dev->disconnect)
|
||||
if (!dev->disconnect) {
|
||||
panic_full("NET-E21 WLAN DISCONNECT NOT SUPPORTED",
|
||||
"wireless netdev has no disconnect backend (native chip driver pending)", 0);
|
||||
return -3;
|
||||
}
|
||||
return dev->disconnect(dev->ctx);
|
||||
}
|
||||
|
||||
|
||||
+97
-30
@@ -43,9 +43,59 @@ static void pregline(fbc_ctx *p, const char *name, u64 v, i64 x, i64 y, u32 fg)
|
||||
phex64(p, v, x + 5 * g_ascii_w, y, fg);
|
||||
}
|
||||
|
||||
/* ---- DRR 归档（drr.h 声明，drr_stub.c 提供；未初始化时返回 -1） ---- */
|
||||
/* 按屏宽折行居中。返回下一行 y。超出 y_limit 的行不画。 */
|
||||
static i64 pwrap(fbc_ctx *p, const char *s, i64 y, i64 y_limit, u32 fg) {
|
||||
i64 cols;
|
||||
if (!s) return y;
|
||||
cols = (i64)p->w / g_ascii_w - 2;
|
||||
if (cols < 8) cols = 8;
|
||||
if (cols > 120) cols = 120;
|
||||
while (*s && y + g_ascii_h <= y_limit) {
|
||||
char line[121];
|
||||
i64 n = 0;
|
||||
while (s[n] && n < cols) { line[n] = s[n]; n++; }
|
||||
line[n] = 0;
|
||||
s += n;
|
||||
fbc_string_center(p, line, y, fg);
|
||||
y += g_ascii_h + 4;
|
||||
}
|
||||
return y;
|
||||
}
|
||||
|
||||
/* ---- panic 模式（panic.h 头注释） ---- */
|
||||
|
||||
static int g_panic_fallback;
|
||||
static u32 g_panic_fallback_hits;
|
||||
|
||||
void panic_set_fallback(int enable) {
|
||||
g_panic_fallback = enable ? 1 : 0;
|
||||
log_info(g_panic_fallback ? "[PANIC] mode=fallback (panic points take backup paths)"
|
||||
: "[PANIC] mode=strict (zero degradation)");
|
||||
}
|
||||
|
||||
int panic_fallback_enabled(void) {
|
||||
return g_panic_fallback;
|
||||
}
|
||||
|
||||
u32 panic_fallback_hits(void) {
|
||||
return g_panic_fallback_hits;
|
||||
}
|
||||
|
||||
void panic_full(const char *symbol, const char *msg, const panic_regs *regs) {
|
||||
if (g_panic_fallback && !regs) {
|
||||
g_panic_fallback_hits++;
|
||||
log_warn("[PANIC:FALLBACK] panic point hit, taking backup path");
|
||||
if (symbol) log_warn(symbol);
|
||||
if (msg) log_warn(msg);
|
||||
log_hex64("[PANIC:FALLBACK] hits=", g_panic_fallback_hits);
|
||||
return;
|
||||
}
|
||||
panic_halt(symbol, msg, regs);
|
||||
}
|
||||
|
||||
/* ---- DRR 归档（drr.h 声明，drr_stub.c 提供；未初始化时返回 -1） ---- */
|
||||
|
||||
void panic_halt(const char *symbol, const char *msg, const panic_regs *regs) {
|
||||
log_error("[PANIC] ==========================================");
|
||||
log_error("[PANIC] panic_full: 莲花崩溃屏");
|
||||
if (symbol) { log_error("[PANIC] symbol:"); log_error(symbol); }
|
||||
@@ -75,43 +125,60 @@ void panic_full(const char *symbol, const char *msg, const panic_regs *regs) {
|
||||
/* 背景色 = Logo 图片背景色（四角平均，gen_panic_logo.py 生成） */
|
||||
fbc_fill_bg(p, g_panic_logo_bg);
|
||||
|
||||
/* DEAICUP 莲花 Logo 居中，文字随 logo 下缘排布 */
|
||||
i64 ly = ((i64)p->h - (i64)g_panic_logo_h) / 2 - 40;
|
||||
if (ly < 8) ly = 8;
|
||||
fbc_draw_rgba(p, g_panic_logo_rgba,
|
||||
(i64)g_panic_logo_w, (i64)g_panic_logo_h,
|
||||
((i64)p->w - (i64)g_panic_logo_w) / 2, ly);
|
||||
|
||||
/* 底部留给错误码：莲花按整数步进缩小，保证 symbol/msg 落在屏内。
|
||||
* 长串按屏宽折行，避免居中后错误码被裁出左右边缘。 */
|
||||
const u32 fg = 0xFFF0E8D8, dim = 0xFFB0A8C0, acc = 0xFFF0D080;
|
||||
i64 y = ly + (i64)g_panic_logo_h + 8;
|
||||
fbc_string_center(p, "DESHAB PANIC", y, acc);
|
||||
y += g_ascii_h + 8;
|
||||
if (symbol) { fbc_string_center(p, symbol, y, fg); y += g_ascii_h + 8; }
|
||||
if (msg) {
|
||||
/* 单行截断 60 字符 */
|
||||
char line[61];
|
||||
u32 i = 0;
|
||||
while (msg[i] && i < 60) { line[i] = msg[i]; i++; }
|
||||
line[i] = 0;
|
||||
fbc_string_center(p, line, y, fg);
|
||||
y += g_ascii_h + 8;
|
||||
}
|
||||
if (regs) {
|
||||
if (y + g_ascii_h * 6 < (i64)p->h) {
|
||||
pregline(p, "RIP ", regs->rip, (i64)p->w / 2 - 14 * g_ascii_w / 2, y, dim); y += g_ascii_h + 2;
|
||||
pregline(p, "RSP ", regs->rsp, (i64)p->w / 2 - 14 * g_ascii_w / 2, y, dim); y += g_ascii_h + 2;
|
||||
pregline(p, "FLG ", regs->rflags, (i64)p->w / 2 - 14 * g_ascii_w / 2, y, dim); y += g_ascii_h + 2;
|
||||
if (regs->vector == 14) {
|
||||
pregline(p, "CR2 ", regs->cr2, (i64)p->w / 2 - 14 * g_ascii_w / 2, y, dim);
|
||||
i64 text_need = (g_ascii_h + 6) * (regs ? 8 : 5);
|
||||
i64 step = 1;
|
||||
while (step < 8 &&
|
||||
(i64)g_panic_logo_h / step + text_need + 24 > (i64)p->h)
|
||||
step++;
|
||||
i64 dw = (i64)g_panic_logo_w / step;
|
||||
i64 dh = (i64)g_panic_logo_h / step;
|
||||
i64 ly = ((i64)p->h - dh - text_need) / 2;
|
||||
if (ly < 4) ly = 4;
|
||||
{
|
||||
i64 lx = ((i64)p->w - dw) / 2;
|
||||
for (i64 r = 0; r < dh; r++) {
|
||||
for (i64 c = 0; c < dw; c++) {
|
||||
const unsigned char *px4 =
|
||||
g_panic_logo_rgba + (((u64)r * (u64)step) * (u64)g_panic_logo_w
|
||||
+ (u64)c * (u64)step) * 4;
|
||||
u32 a = px4[3];
|
||||
if (a < 8) continue;
|
||||
u32 col = 0xFF000000u | ((u32)px4[0] << 16) | ((u32)px4[1] << 8) | px4[2];
|
||||
if (a < 250) col = fbc_blend(fbc_pixel_read(p, lx + c, ly + r), col, a);
|
||||
fbc_pixel(p, lx + c, ly + r, col);
|
||||
}
|
||||
}
|
||||
}
|
||||
fbc_string_center(p, archived == 0 ? "crash archived to DRR" : "DRR archive unavailable",
|
||||
(i64)p->h - g_ascii_h - 24, dim);
|
||||
|
||||
i64 y_limit = (i64)p->h - 4;
|
||||
i64 y = ly + dh + 8;
|
||||
if (y + text_need > y_limit) y = y_limit - text_need;
|
||||
if (y < 4) y = 4;
|
||||
y = pwrap(p, "DESHAB PANIC", y, y_limit, acc);
|
||||
y += 4;
|
||||
y = pwrap(p, symbol, y, y_limit, fg);
|
||||
y = pwrap(p, msg, y, y_limit, fg);
|
||||
if (regs && y + g_ascii_h * 3 < y_limit) {
|
||||
i64 rx = (i64)p->w / 2 - 12 * g_ascii_w;
|
||||
if (rx < 4) rx = 4;
|
||||
pregline(p, "RIP ", regs->rip, rx, y, dim); y += g_ascii_h + 2;
|
||||
if (y + g_ascii_h < y_limit) { pregline(p, "RSP ", regs->rsp, rx, y, dim); y += g_ascii_h + 2; }
|
||||
if (y + g_ascii_h < y_limit) { pregline(p, "FLG ", regs->rflags, rx, y, dim); y += g_ascii_h + 2; }
|
||||
if (regs->vector == 14 && y + g_ascii_h < y_limit)
|
||||
pregline(p, "CR2 ", regs->cr2, rx, y, dim);
|
||||
}
|
||||
if ((i64)p->h > g_ascii_h + 8) {
|
||||
fbc_string_center(p, archived == 0 ? "crash archived to DRR" : "DRR archive unavailable",
|
||||
(i64)p->h - g_ascii_h - 8, dim);
|
||||
}
|
||||
}
|
||||
|
||||
log_error("[PANIC] halt");
|
||||
arch_halt_forever();
|
||||
for (;;) __asm__ volatile("cli; hlt");
|
||||
}
|
||||
|
||||
void panic(const char *msg) {
|
||||
|
||||
@@ -284,6 +284,52 @@ int utsm_selftest_run(void) {
|
||||
log_info("[UTSM] selftest kapi ok");
|
||||
}
|
||||
|
||||
/* ==== D6 万物互联：dkm_bus 双向服务总线 ====
|
||||
* 覆盖：表存在/magic、kern.* lookup 命中、probe 命中与缺席、
|
||||
* 内核侧非法注册（BUS-E01/E02 走 panic——selftest 只能验证合法路径，
|
||||
* 违规路径由负向测试专用构建验证）。 */
|
||||
{
|
||||
const dkm_kernel_api *api = dkm_get_kernel_api();
|
||||
if (!api->bus || api->bus->magic != DKM_BUS_MAGIC) {
|
||||
log_error("[UTSM] selftest bus table missing");
|
||||
panic_full("TST-E34 BUS TABLE MISSING",
|
||||
"utsm_selftest: bus api missing or bad magic", 0);
|
||||
return UTSM_ERR_INVALID;
|
||||
}
|
||||
/* kern.* 播种命中：lookup（必存在语义） */
|
||||
void *fn = 0;
|
||||
u32 ver = 0;
|
||||
if (api->bus->lookup("kern.log.info", &fn, &ver) != 0 || !fn) {
|
||||
log_error("[UTSM] selftest bus kern.log.info lookup failed");
|
||||
panic_full("TST-E35 BUS KERN LOOKUP FAILED",
|
||||
"utsm_selftest: bus lookup kern.log.info failed", 0);
|
||||
return UTSM_ERR_INVALID;
|
||||
}
|
||||
/* probe 命中（可选语义正例） */
|
||||
if (api->bus->probe("kern.block.read", &fn, &ver) != 0 || !fn) {
|
||||
log_error("[UTSM] selftest bus kern.block.read probe failed");
|
||||
panic_full("TST-E36 BUS KERN PROBE FAILED",
|
||||
"utsm_selftest: bus probe kern.block.read failed", 0);
|
||||
return UTSM_ERR_INVALID;
|
||||
}
|
||||
/* probe 缺席（可选语义负例：返回 -1，不 panic） */
|
||||
if (api->bus->probe("srv.no.such.thing", &fn, &ver) == 0) {
|
||||
log_error("[UTSM] selftest bus probe negative failed");
|
||||
panic_full("TST-E37 BUS PROBE NEGATIVE FAILED",
|
||||
"utsm_selftest: probe of absent service unexpectedly hit", 0);
|
||||
return UTSM_ERR_INVALID;
|
||||
}
|
||||
/* 服务数合理（P1 播种 22 条；后续 phase 只增不减） */
|
||||
if (api->bus->count() < 22) {
|
||||
log_error("[UTSM] selftest bus seed count too low");
|
||||
panic_full("TST-E38 BUS SEED COUNT LOW",
|
||||
"utsm_selftest: bus seeded service count below minimum", 0);
|
||||
return UTSM_ERR_INVALID;
|
||||
}
|
||||
log_hex64("[UTSM] selftest bus services=", api->bus->count());
|
||||
log_info("[UTSM] selftest bus ok");
|
||||
}
|
||||
|
||||
/* ==== SCHED-1: O(1) runqueue 语义（合成 TCB，协作式，无 tick） ==== */
|
||||
/* ==== SCHED-1 + SCHED-2: runqueue / block-wake（tick 竞态保护） ==== */
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user