Changeset c0d814a in mainline for kernel/generic/src/mm/frame.c

Timestamp:

2025-04-10T20:02:30Z (4 days ago)

Author:

GitHub <noreply@…>

Children:

b8b031f

Parents:

a92290d (diff), 90dd8aee (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Wayne Thornton <wmthornton-dev@…> (2025-04-10 20:02:30)

git-committer:

GitHub <noreply@…> (2025-04-10 20:02:30)

Message:

Merge pull request #6 from HelenOS/master

Merge pending changes from downstream helenos/master

File:

• kernel/generic/src/mm/frame.c (modified) (5 diffs)

kernel/generic/src/mm/frame.c

@@ -72 +72 @@
  * available.
  */
-static MUTEX_INITIALIZE(mem_avail_mtx, MUTEX_ACTIVE);
+static IRQ_SPINLOCK_INITIALIZE(mem_avail_lock);
 static CONDVAR_INITIALIZE(mem_avail_cv);
 static size_t mem_avail_req = 0;  /**< Number of frames requested. */
@@ -951 +951 @@
 #endif
 
-                /*
-                 * Since the mem_avail_mtx is an active mutex, we need to
-                 * disable interrupts to prevent deadlock with TLB shootdown.
-                 */
-                ipl_t ipl = interrupts_disable();
-                mutex_lock(&mem_avail_mtx);
+                /* Disabled interrupts needed to prevent deadlock with TLB shootdown. */
+                irq_spinlock_lock(&mem_avail_lock, true);
 
                 if (mem_avail_req > 0)
@@ -966 +962 @@
 
                 while (gen == mem_avail_gen)
-                        condvar_wait(&mem_avail_cv, &mem_avail_mtx);
-
-                mutex_unlock(&mem_avail_mtx);
-                interrupts_restore(ipl);
+                        condvar_wait(&mem_avail_cv, &mem_avail_lock);
+
+                irq_spinlock_unlock(&mem_avail_lock, true);
 
 #ifdef CONFIG_DEBUG
@@ -1027 +1022 @@
         irq_spinlock_unlock(&zones.lock, true);
 
-        /*
-         * Signal that some memory has been freed.
-         * Since the mem_avail_mtx is an active mutex,
-         * we need to disable interruptsto prevent deadlock
-         * with TLB shootdown.
-         */
-
-        ipl_t ipl = interrupts_disable();
-        mutex_lock(&mem_avail_mtx);
+        /* Signal that some memory has been freed. */
+
+        /* Disabled interrupts needed to prevent deadlock with TLB shootdown. */
+        irq_spinlock_lock(&mem_avail_lock, true);
 
         if (mem_avail_req > 0)
@@ -1045 +1035 @@
         }
 
-        mutex_unlock(&mem_avail_mtx);
-        interrupts_restore(ipl);
+        irq_spinlock_unlock(&mem_avail_lock, true);
 
         if (!(flags & FRAME_NO_RESERVE))