Merge d96ed13cbd into aa0aecbd80

If thread 1 is executing kasan_unpoison but a scheduling occurs and the block is trampled upon, the displayed backtracking may still be from the previously allocated backtracking

Signed-off-by: wangmingrong1 <wangmingrong1@xiaomi.com>

arch/risc-v/include/irq.h

@@ -702,6 +702,29 @@ irqstate_t up_irq_enable(void);
 
 int up_cpu_index(void) noinstrument_function;
 
+/****************************************************************************
+ * Schedule acceleration macros
+ ****************************************************************************/
+
+/* If RISCV_PERCPU_SCRATCH is not enabled, we can use the scratch register
+ * to store the current task pointer.
+ */
+
+#ifndef CONFIG_RISCV_PERCPU_SCRATCH
+#define up_this_task() \
+  ({ \
+    struct tcb_s *t; \
+    t = (struct tcb_s *)READ_CSR(CSR_SCRATCH); \
+    t; \
+  })
+
+#define up_update_task(t) WRITE_CSR(CSR_SCRATCH, (uintptr_t)t)
+#else
+/* TODO: Implement up_this_task()/up_update_task() if RISCV_PERCPU_SCRATCH
+ * enabled.
+ */
+#endif
+
 /****************************************************************************
  * Name: up_this_cpu
  *

arch/risc-v/src/common/riscv_cpustart.c

@@ -37,6 +37,8 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/sched_note.h>
 
+#include <arch/irq.h>
+
 #include "sched/sched.h"
 #include "init/init.h"
 #include "riscv_internal.h"
@@ -69,6 +71,8 @@
 
 void riscv_cpu_boot(int cpu)
 {
+  struct tcb_s *tcb;
+
   /* Clear IPI for CPU(cpu) */
 
   riscv_ipi_clear(cpu);
@@ -100,8 +104,9 @@ void riscv_cpu_boot(int cpu)
 
   sinfo("CPU%d Started\n", this_cpu());
 
+  tcb = current_task(this_cpu());
+
 #ifdef CONFIG_STACK_COLORATION
-  struct tcb_s *tcb = this_task();
 
   /* If stack debug is enabled, then fill the stack with a
    * recognizable value that we can use later to test for high
@@ -111,6 +116,8 @@ void riscv_cpu_boot(int cpu)
   riscv_stack_color(tcb->stack_alloc_ptr, 0);
 #endif
 
+  up_update_task(tcb);
+
   /* TODO: Setup FPU */
 
   /* Clear machine software interrupt for CPU(cpu) */

mm/mempool/mempool.c

@@ -397,16 +397,17 @@ retry:
 
   pool->nalloc++;
   spin_unlock_irqrestore(&pool->lock, flags);
-  blk = kasan_unpoison(blk, pool->blocksize);
-#ifdef CONFIG_MM_FILL_ALLOCATIONS
-  memset(blk, MM_ALLOC_MAGIC, pool->blocksize);
-#endif
 
 #if CONFIG_MM_BACKTRACE >= 0
   mempool_add_backtrace(pool, (FAR struct mempool_backtrace_s *)
                               ((FAR char *)blk + pool->blocksize));
 #endif
 
+  blk = kasan_unpoison(blk, pool->blocksize);
+#ifdef CONFIG_MM_FILL_ALLOCATIONS
+  memset(blk, MM_ALLOC_MAGIC, pool->blocksize);
+#endif
+
   return blk;
 }