-#define imq_lock(mq) wait_queue_lock(&(mq)->imq_wait_queue)
-#define imq_lock_try(mq) wait_queue_lock_try(&(mq)->imq_wait_queue)
-#define imq_unlock(mq) wait_queue_unlock(&(mq)->imq_wait_queue)
-#define imq_held(mq) wait_queue_held(&(mq)->imq_wait_queue)
+#define imq_set_queue data.pset.setq
+#define imq_is_set(mq) waitqs_is_set(&(mq)->imq_set_queue)
+#define imq_is_queue(mq) waitq_is_queue(&(mq)->imq_wait_queue)
+#define imq_is_valid(mq) waitq_is_valid(&(mq)->imq_wait_queue)
+
+#define imq_lock(mq) waitq_lock(&(mq)->imq_wait_queue)
+#define imq_lock_try(mq) waitq_lock_try(&(mq)->imq_wait_queue)
+#define imq_unlock(mq) waitq_unlock(&(mq)->imq_wait_queue)
+#define imq_held(mq) waitq_held(&(mq)->imq_wait_queue)
+#define imq_valid(mq) waitq_valid(&(mq)->imq_wait_queue)
+
+/*
+ * Get an ipc_mqueue pointer from a waitq pointer. These are traditionally the
+ * same pointer, but this conversion makes no assumptions on union structure
+ * member positions - it should allow the waitq to move around in either the
+ * port-set mqueue or the port mqueue independently.
+ */
+#define imq_from_waitq(waitq) (waitq_is_set(waitq) ? \
+ ((struct ipc_mqueue *)((void *)( \
+ (uintptr_t)(waitq) - \
+ __offsetof(struct ipc_mqueue, imq_wait_queue)) \
+ )) : \
+ ((struct ipc_mqueue *)((void *)( \
+ (uintptr_t)(waitq) - \
+ __offsetof(struct ipc_mqueue, imq_set_queue)) \
+ )) \
+ )
+
+extern void imq_reserve_and_lock(ipc_mqueue_t mq,
+ uint64_t *reserved_prepost);
+
+extern void imq_release_and_unlock(ipc_mqueue_t mq,
+ uint64_t reserved_prepost);