WebSVN – HelenOS – Diff – //branches/tracing/kernel/generic/src/udebug/udebug_ipc.c

 static int udebug_rp_begin(call_t *call, phone_t *phone)
+{
     task_t *ta;
     ipl_t ipl;
+    int rc;
+    thread_t *t;
+    link_t *cur;
     klog_printf("debug_begin()");
     ipl = interrupts_disable();
     ta = get_lock_callee_task(phone);
     ta->debug_begin_call = call;
     if (ta->not_stoppable_count == 0) {
         ta->dt_state = UDEBUG_TS_ACTIVE;
         ta->debug_begin_call = NULL;
+        rc = 1; /* actually we need backsend with 0 retval */
+    } else {
+        rc = 0; /* no backsend */
+    }
+    /* Set debug_active on all of the task's userspace threads */
+    for (cur = ta->th_head.next; cur != &ta->th_head; cur = cur->next) {
+        t = list_get_instance(cur, thread_t, th_link);
-        spinlock_unlock(&ta->lock);
+        spinlock_lock(&t->lock);
-        interrupts_restore(ipl);
+        if ((t->flags & THREAD_FLAG_USPACE) != 0)
-        klog_printf("debug_begin(): immediate backsend");
+            t->debug_active = true;
-        return 1; /* actually we need backsend with 0 retval */
+        spinlock_unlock(&t->lock);
+    }
     spinlock_unlock(&ta->lock);
     interrupts_restore(ipl);
-    klog_printf("debug_begin() done (wait for stoppability)");
+    klog_printf("debug_begin() done (%s)",
+        rc ? "backsend" : "stoppability wait");
-    return 0;
+    return rc;
+}
 static int udebug_rp_go(call_t *call, phone_t *phone)
+{
     thread_t *t;
         spinlock_unlock(&threads_lock);
         interrupts_restore(ipl);
         return ENOENT;
+    }
+    if ((t->debug_active != true) || (t->debug_stop != true)) {
+        /* Not in debugging session or already has GO */
+        spinlock_unlock(&threads_lock);
+        interrupts_restore(ipl);
+        return EBUSY;
+    }
     t->debug_go_call = call;
     t->debug_stop = false;
     waitq_wakeup(&t->go_wq, WAKEUP_FIRST);
     spinlock_unlock(&threads_lock);
     task_t *ta;
     void *uspace_buffer;
     unative_t to_copy;
     int rc;
     ipl_t ipl;
+    unative_t buffer[6];
     klog_printf("debug_args_read()");
-    // FIXME: verify task/thread state
     ta = get_lock_callee_task(phone);
     klog_printf("task %llu", ta->taskid);
     spinlock_unlock(&ta->lock);
     t = (thread_t *) IPC_GET_ARG2(call->data);
     ipl = interrupts_disable();
     spinlock_lock(&threads_lock);
+    /* Verify that 't' exists and belongs to task 'ta' */
-    if (!thread_exists(t)) {
+    if (!thread_exists(t) || (t->task != ta)) {
         spinlock_unlock(&threads_lock);
         interrupts_restore(ipl);
         return ENOENT;
+    }
+    //FIXME: additionally we need to verify that we are inside a syscall
+    if ((t->debug_active != true) || (t->debug_stop != true)) {
+        /* Not in debugging session or has GO */
+        spinlock_unlock(&threads_lock);
+        interrupts_restore(ipl);
+        return EBUSY;
+    }
-    // FIXME: copy to a local buffer before releasing the lock
+    /* Copy to a local buffer before releasing the lock */
+    memcpy(buffer, t->syscall_args, 6 * sizeof(unative_t));
     spinlock_unlock(&threads_lock);
     interrupts_restore(ipl);
+    /* Now copy to userspace */
     uspace_buffer = (void *)IPC_GET_ARG3(call->data);
     to_copy = IPC_GET_ARG4(call->data);
     if (to_copy > 6 * sizeof(unative_t)) to_copy = 6 * sizeof(unative_t);
-    rc = copy_to_uspace(uspace_buffer, t->syscall_args, to_copy);
+    rc = copy_to_uspace(uspace_buffer, buffer, to_copy);
     if (rc != 0) {
         spinlock_unlock(&ta->lock);
         klog_printf("debug_args_read() - copy failed");
         return rc;
+    }
     istate_t *state;
     istate_t state_copy;
     ipl_t ipl;
     klog_printf("debug_regs_read()");
-    // FIXME: verify task/thread state
     ta = get_lock_callee_task(phone);
     spinlock_unlock(&ta->lock);
+    //FIXME: don't lock ta
     ipl = interrupts_disable();
     spinlock_lock(&threads_lock);
     t = (thread_t *) IPC_GET_ARG2(call->data);
+    /* Verify that 't' exists and belongs to task 'ta' */
-    if (!thread_exists(t)) {
+    if (!thread_exists(t) || (t->task != ta)) {
+        spinlock_unlock(&threads_lock);
+        interrupts_restore(ipl);
         return ENOENT;
+    }
+    if ((t->debug_active != true) || (t->debug_stop != true)) {
+        /* Not in debugging session or has GO */
+        spinlock_unlock(&threads_lock);
+        interrupts_restore(ipl);
+        return EBUSY;
+    }
     state = t->uspace_state;
     if (state == NULL) {
         spinlock_unlock(&threads_lock);
         interrupts_restore(ipl);
         klog_printf("debug_regs_read() - istate not available");
     if (rc != 0) {
         klog_printf("debug_regs_write() - copy failed");
         return rc;
+    }
-    // FIXME: verify task/thread state
     ta = get_lock_callee_task(phone);
     spinlock_unlock(&ta->lock);
+    //FIXME: don't lock ta
     /* Now try to change the thread's uspace_state */
     ipl = interrupts_disable();
     spinlock_lock(&threads_lock);
     t = (thread_t *) IPC_GET_ARG2(call->data);
+    /* Verify that 't' exists and belongs to task 'ta' */
-    if (!thread_exists(t)) {
+    if (!thread_exists(t) || (t->task != ta)) {
         spinlock_unlock(&threads_lock);
         interrupts_restore(ipl);
         return ENOENT;
+    }
+    if ((t->debug_active != true) || (t->debug_stop != true)) {
+        /* Not in debugging session or has GO */
+        spinlock_unlock(&threads_lock);
+        interrupts_restore(ipl);
+        return EBUSY;
+    }
     state = t->uspace_state;
     if (state == NULL) {
         spinlock_unlock(&threads_lock);
         interrupts_restore(ipl);
         klog_printf("debug_regs_write() - istate not available");
     ipl_t ipl;
     unative_t *buffer;
     int flags;
     klog_printf("debug_thread_read()");
-    // FIXME: verify task/thread state
     ipl = interrupts_disable();
     ta = get_lock_callee_task(phone);
+    /* Verify task state */
+    if (ta->dt_state != UDEBUG_TS_ACTIVE) {
+        spinlock_unlock(&ta->lock);
+        interrupts_restore(ipl);
+        return EBUSY;
+    }
     /* Count the threads first */
     num_threads = 0;
     for (cur = ta->th_head.next; cur != &ta->th_head; cur = cur->next) {
         /* Count all threads, to be on the safe side */
     unative_t to_copy;
     int rc;
     void *buffer;
     klog_printf("udebug_rp_mem_write()");
-    // FIXME: verify task/thread state
     uspace_data = (void *)IPC_GET_ARG2(call->data);
     to_copy = IPC_GET_ARG4(call->data);
     buffer = malloc(to_copy, 0); // ???
+{
     void *uspace_dst;
     unsigned size;
     void *buffer;
     int rc;
+    udebug_task_state_t dts;
     klog_printf("udebug_receive_mem_write()");
+    /* Verify task state */
+    spinlock_lock(&TASK->lock);
+    dts = TASK->dt_state;
+    spinlock_unlock(&TASK->lock);
+    if (dts != UDEBUG_TS_ACTIVE) {
+        IPC_SET_RETVAL(call->data, EBUSY);
+        ipc_answer(&TASK->kernel_box, call);
+        return;
+    }
     uspace_dst = (void *)IPC_GET_ARG3(call->data);
     size = IPC_GET_ARG4(call->data);
     buffer = call->buffer;
     klog_printf("dst=%u, size=%u", uspace_dst, size);
     /* NOTE: this is not strictly from a syscall... but that shouldn't
      * be a problem */
     rc = copy_to_uspace(uspace_dst, buffer, size);
     if (rc) {
         IPC_SET_RETVAL(call->data, rc);
+        ipc_answer(&TASK->kernel_box, call);
         return;
+    }
     IPC_SET_RETVAL(call->data, 0);

Subversion Repositories HelenOS

(root)//branches/tracing/kernel/generic/src/udebug/udebug_ipc.c – Rev 2826 → 2827