exterr: allow exterr to fit pointers on CHERI targets
ClosedPublic
Actions

Authored by brooks on Mon, Jul 6, 4:05 PM.

Details

Reviewers

kib
mckusick

Group Reviewers

cheri

Commits

rG844009378da9: exterr: allow exterr to fit pointers on CHERI targets

Summary

Switch to uint64ptr_t which is a uint64_t on traditional architectures
and a uintptr_t on CHERI architectures. This has no ABI impact on
non-CHERI kernels.

Fix truncation of 64-bit values on 32-bit kernels.

Effort: CHERI upstreaming
Sponsored by: Innovate UK

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 74805
Build 71688: arc lint + arc unit

Event Timeline

brooks created this revision.Mon, Jul 6, 4:05 PM

Herald added a subscriber: imp. · View Herald TranscriptMon, Jul 6, 4:05 PM

brooks requested review of this revision.Mon, Jul 6, 4:05 PM

Herald added a reviewer: cheri. · View Herald TranscriptMon, Jul 6, 4:05 PM

Harbormaster completed remote builds in B74549: Diff 181369.Mon, Jul 6, 4:05 PM

brooks added a parent revision: D58055: exterrctl(2): add kern_exterrctl.Mon, Jul 6, 4:05 PM

brooks added a child revision: D58057: exterr: clear tags from arguments on CHERI targets.

brooks added inline comments.Mon, Jul 6, 4:13 PM

sys/sys/_uexterror.h
23–25	Probably these should also be `__uint64ptr_t`. On CHERI there's also an 8-byte gap above p1 which should maybe be explicit.
sys/sys/exterrvar.h
62	This was truncating 64-bit values on 32-bit kernels.

kib accepted this revision.Tue, Jul 7, 1:55 AM

This revision is now accepted and ready to land.Tue, Jul 7, 1:55 AM

Expand __uint64ptr_t to spares

This revision now requires review to proceed.Tue, Jul 14, 8:03 PM

Harbormaster completed remote builds in B74805: Diff 181993.Tue, Jul 14, 8:03 PM

This revision was not accepted when it landed; it landed in state Needs Review.Wed, Jul 15, 9:33 AM

Closed by commit rG844009378da9: exterr: allow exterr to fit pointers on CHERI targets (authored by brooks). · Explain Why

This revision was automatically updated to reflect the committed changes.

brooks added a commit: rG844009378da9: exterr: allow exterr to fit pointers on CHERI targets.

This change broke the build on armv7 (32-bit ARM). I addressed the definition/declaration mismatch in rG5cafd6213f14.

In D58056#1336831, @ngie wrote:

This change broke the build on armv7 (32-bit ARM). I addressed the definition/declaration mismatch in rG5cafd6213f14.

This is the supposed fix, I am waiting for tinderbox to finish.

diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index c867867f2618..c16e806e0bd7 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -2353,8 +2353,8 @@ kern_exterrctl(struct thread *td, u_int op, u_int flags, void *ptr)
 }
 
 int
-exterr_set(int eerror, int category, const char *mmsg, uintptr_t pp1,
-    uintptr_t pp2, int line)
+exterr_set(int eerror, int category, const char *mmsg, uint64ptr_t pp1,
+    uint64ptr_t pp2, int line)
 {
   struct thread *td;

In D58056#1336833, @kib wrote:
In D58056#1336831, @ngie wrote:

This change broke the build on armv7 (32-bit ARM). I addressed the definition/declaration mismatch in rG5cafd6213f14.

This is the supposed fix, I am waiting for tinderbox to finish.
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index c867867f2618..c16e806e0bd7 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -2353,8 +2353,8 @@ kern_exterrctl(struct thread *td, u_int op, u_int flags, void *ptr)
 }
 
 int
-exterr_set(int eerror, int category, const char *mmsg, uintptr_t pp1,
-    uintptr_t pp2, int line)
+exterr_set(int eerror, int category, const char *mmsg, uint64ptr_t pp1,
+    uint64ptr_t pp2, int line)
 {
   struct thread *td;
 

I *just* committed that 😅...

In D58056#1336834, @ngie wrote:
In D58056#1336833, @kib wrote:
In D58056#1336831, @ngie wrote:

This change broke the build on armv7 (32-bit ARM). I addressed the definition/declaration mismatch in rG5cafd6213f14.

This is the supposed fix, I am waiting for tinderbox to finish.
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index c867867f2618..c16e806e0bd7 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -2353,8 +2353,8 @@ kern_exterrctl(struct thread *td, u_int op, u_int flags, void *ptr)
 }
 
 int
-exterr_set(int eerror, int category, const char *mmsg, uintptr_t pp1,
-    uintptr_t pp2, int line)
+exterr_set(int eerror, int category, const char *mmsg, uint64ptr_t pp1,
+    uint64ptr_t pp2, int line)
 {
   struct thread *td;
 
I *just* committed that 😅...