From 981c54d5d0e5e031bcfab26ad7d80c26ddf791e4 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Tue, 15 Oct 2024 18:05:35 +0100 Subject: [PATCH 1/2] Add kern.features.cheri_purecap_kernel Rename misleading kern.features.cheriabi_kernel to kern.features.cheri_purecap_kernel and make clear that it's a pure-capaiblity kernel (not CheriABI which refers to userspace). --- sys/cheri/cheri_sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cheri/cheri_sysctl.c b/sys/cheri/cheri_sysctl.c index 66dd6df95b6a..aba0cd94be17 100644 --- a/sys/cheri/cheri_sysctl.c +++ b/sys/cheri/cheri_sysctl.c @@ -37,7 +37,7 @@ #include #ifdef __CHERI_PURE_CAPABILITY__ -FEATURE(cheriabi_kernel, "CheriABI kernel"); +FEATURE(cheri_purecap_kernel, "CHERI pure-capability kernel"); #ifdef __CHERI_SUBOBJECT_BOUNDS__ FEATURE(subobject_bounds, "CheriABI kernel with sub-object bounds"); #endif From 0203c36b4cd88c1cb795e5d899ac55a6ee50e1a1 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Wed, 4 Dec 2024 01:44:40 +0000 Subject: [PATCH 2/2] Improve CHERI kernel ABI feature sysctls subobject_bounds -> cheri_subobject_bounds_kernel benchmark_abi_kernel -> morello_purecap_benchmark_abi_kernel Make it clear that these are kernel things and that subobject bounds is realted to CHERI. --- sys/cheri/cheri_sysctl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/cheri/cheri_sysctl.c b/sys/cheri/cheri_sysctl.c index aba0cd94be17..b6ed6bb26e76 100644 --- a/sys/cheri/cheri_sysctl.c +++ b/sys/cheri/cheri_sysctl.c @@ -39,10 +39,11 @@ #ifdef __CHERI_PURE_CAPABILITY__ FEATURE(cheri_purecap_kernel, "CHERI pure-capability kernel"); #ifdef __CHERI_SUBOBJECT_BOUNDS__ -FEATURE(subobject_bounds, "CheriABI kernel with sub-object bounds"); +FEATURE(cheri_subobject_bounds_kernel, + "CHERI pure-capability kernel with sub-object bounds"); #endif #ifdef __ARM_MORELLO_PURECAP_BENCHMARK_ABI -FEATURE(benchmark_abi_kernel, "Morello benchmark ABI kernel"); +FEATURE(morello_purecap_benchmark_abi_kernel, "Morello benchmark ABI kernel"); #endif #endif /* __CHERI_PURE_CAPABILITY__ */