Changeset 732b406

Timestamp:

Jul 9, 2020, 3:37:03 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

3a32b3a

Parents:

34b61882

Message:

Added missing lock around release_consumed_submission

File:

• libcfa/src/concurrency/io.cfa (modified) (4 diffs)

libcfa/src/concurrency/io.cfa

@@ -130 +130 @@
 
                 __spinlock_t lock;
+                __spinlock_t release_lock;
 
                 // A buffer of sqes (not the actual ring)
@@ -270 +271 @@
 
                 (sq.lock){};
+                (sq.release_lock){};
 
                 if( io_flags & ( CFA_CLUSTER_IO_POLLER_THREAD_SUBMITS | CFA_CLUSTER_IO_EAGER_SUBMITS ) ) {
@@ -836 +838 @@
                         __atomic_fetch_add(tail, 1ul32, __ATOMIC_SEQ_CST);
 
+                        /* paranoid */ verify( ring.submit_q.sqes[ idx ].user_data != 0 );
+
                         // Submit however, many entries need to be submitted
                         int ret = syscall( __NR_io_uring_enter, ring.fd, 1, 0, 0, 0p, 0);
@@ -889 +893 @@
         static uint32_t __release_consumed_submission( struct __io_data & ring ) {
                 const uint32_t smask = *ring.submit_q.mask;
+
+                if( !try_lock(ring.submit_q.release_lock __cfaabi_dbg_ctx2) ) return 0;
                 uint32_t chead = *ring.submit_q.head;
                 uint32_t phead = ring.submit_q.prev_head;
                 ring.submit_q.prev_head = chead;
+                unlock(ring.submit_q.release_lock);
+
                 uint32_t count = chead - phead;
                 for( i; count ) {