aboutsummaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorIan Moffett <ian@osmora.org>2024-06-28 23:12:32 -0400
committerIan Moffett <ian@osmora.org>2024-06-28 23:12:32 -0400
commit45ab1dd925162659d59d65a95105120d9dc96978 (patch)
tree8054643780fefb3f8ed979ceff83c8cff83ccf50 /sys/arch/amd64
parent1bc9042af8907260659f28e8941837213dd37a8b (diff)
kernel/amd64: Focus md_td_init() to fork MD code
Rename md_td_init() to md_fork() and change up what it does to keep things as simple as possible. Signed-off-by: Ian Moffett <ian@osmora.org>
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/amd64/proc_machdep.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/sys/arch/amd64/amd64/proc_machdep.c b/sys/arch/amd64/amd64/proc_machdep.c
index eb3866a..d2eb599 100644
--- a/sys/arch/amd64/amd64/proc_machdep.c
+++ b/sys/arch/amd64/amd64/proc_machdep.c
@@ -46,12 +46,12 @@
* @ip: Instruction pointer.
*/
int
-md_td_init(struct proc *p, struct proc *parent, uintptr_t ip)
+md_fork(struct proc *p, struct proc *parent, uintptr_t ip)
{
uintptr_t stack_base;
- struct trapframe *tfp, *parent_tfp;
+ struct trapframe *tfp;
struct pcb *pcbp;
- uint8_t rpl;
+ uint8_t rpl = 0;
int error;
tfp = &p->tf;
@@ -61,18 +61,15 @@ md_td_init(struct proc *p, struct proc *parent, uintptr_t ip)
if ((error = pmap_new_vas(&pcbp->addrsp)) != 0)
return error;
+ memcpy(tfp, &parent->tf, sizeof(p->tf));
+
/*
- * If parent is NULL, assume kernel space and zero the
- * trapframe. Otherwise we can just set it up normally.
+ * Kernel threads cannot be on the lower half.
+ * If 'ip' is on the lower half, assume that it
+ * is a userspace program and set RPL to ring 3.
*/
- if (parent == NULL) {
- rpl = 0;
- memset(tfp, 0, sizeof(*tfp));
- } else {
- parent_tfp = &parent->tf;
- rpl = parent_tfp->cs & 3;
- memcpy(tfp, &parent->tf, sizeof(*tfp));
- }
+ if (ip < VM_HIGHER_HALF)
+ rpl = 3;
/*
* RPL being 3 indicates that the parent thread is in