From 62bdb51618e97e7e3e3a7c4ee51bf53d45406026 Mon Sep 17 00:00:00 2001
From: Max Wash <mbswash@gmail.com>
Date: Sat, 14 Mar 2026 22:25:15 +0000
Subject: [PATCH] kernel: add functions to lock/unlock a pair of locks without
 saving irq flags

---
 include/kernel/locks.h | 26 ++++++++++++++++++++++++++
 kernel/object.c        | 30 ++++++++++++------------------
 2 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/include/kernel/locks.h b/include/kernel/locks.h
index 1db2d11..9a49107 100644
--- a/include/kernel/locks.h
+++ b/include/kernel/locks.h
@@ -22,6 +22,32 @@ typedef __aligned(8) ml_hwlock_t spin_lock_t;
 #define spin_unlock_irqrestore(lck, flags)                                     \
 	ml_hwlock_unlock_irqrestore(lck, flags);
 
+static inline void spin_lock_pair(spin_lock_t *a, spin_lock_t *b)
+{
+	if (a == b) {
+		spin_lock(a);
+	} else if (a < b) {
+		spin_lock(a);
+		spin_lock(b);
+	} else {
+		spin_lock(b);
+		spin_lock(a);
+	}
+}
+
+static inline void spin_unlock_pair(spin_lock_t *a, spin_lock_t *b)
+{
+	if (a == b) {
+		spin_unlock(a);
+	} else if (a < b) {
+		spin_unlock(b);
+		spin_unlock(a);
+	} else {
+		spin_unlock(a);
+		spin_unlock(b);
+	}
+}
+
 static inline void spin_lock_pair_irqsave(
 	spin_lock_t *a,
 	spin_lock_t *b,
diff --git a/kernel/object.c b/kernel/object.c
index b763880..4bd68de 100644
--- a/kernel/object.c
+++ b/kernel/object.c
@@ -180,20 +180,22 @@ void object_unlock_irqrestore(struct object *obj, unsigned long flags)
 	spin_unlock_irqrestore(&obj->ob_lock, flags);
 }
 
+void object_lock_pair(struct object *a, struct object *b)
+{
+	spin_lock_pair(&a->ob_lock, &b->ob_lock);
+}
+
+void object_unlock_pair(struct object *a, struct object *b)
+{
+	spin_unlock_pair(&a->ob_lock, &b->ob_lock);
+}
+
 void object_lock_pair_irqsave(
 	struct object *a,
 	struct object *b,
 	unsigned long *flags)
 {
-	if (a == b) {
-		object_lock_irqsave(a, flags);
-	} else if (a < b) {
-		object_lock_irqsave(a, flags);
-		object_lock(b);
-	} else {
-		object_lock_irqsave(b, flags);
-		object_lock(a);
-	}
+	spin_lock_pair_irqsave(&a->ob_lock, &b->ob_lock, flags);
 }
 
 void object_unlock_pair_irqrestore(
@@ -201,15 +203,7 @@ void object_unlock_pair_irqrestore(
 	struct object *b,
 	unsigned long flags)
 {
-	if (a == b) {
-		object_unlock_irqrestore(a, flags);
-	} else if (a < b) {
-		object_unlock(b);
-		object_unlock_irqrestore(a, flags);
-	} else {
-		object_unlock(a);
-		object_unlock_irqrestore(b, flags);
-	}
+	spin_unlock_pair_irqrestore(&a->ob_lock, &b->ob_lock, flags);
 }
 
 void *object_data(struct object *obj)