Relax reentrant assertion for custom executions instead of queuing notifications

Author: leikong

src/core/connection.c

@@ -692,11 +692,14 @@ QuicConnIndicateEvent(
         // MsQuic shouldn't indicate reentrancy to the app when at all possible.
         // The general exception to this rule is when the connection is being
         // closed because the API MUST block until all work is completed, so we
-        // have to execute the event callbacks inline.
+        // have to execute the event callbacks inline. Custom executions also
+        // allow reentrancy because set/get param must be executed inline to not
+        // block the thread, and the app is expected to handle reentrancy.
         //
         CXPLAT_DBG_ASSERT(
             !Connection->State.InlineApiExecution ||
-            Connection->State.HandleClosed);
+            Connection->State.HandleClosed ||
+            MsQuicLib.CustomExecutions);
         Status =
             Connection->ClientCallbackHandler(
                 (HQUIC)Connection,
@@ -3087,20 +3090,9 @@ QuicConnProcessPeerTransportParameters(
         &Connection->Streams,
         Connection->PeerTransportParams.InitialMaxBidiStreams,
         Connection->PeerTransportParams.InitialMaxUniStreams,
-        FromResumptionTicket);
+        !FromResumptionTicket);
 
-    if (FromResumptionTicket) {
-        //
-        // Defer the datagram state change notification to avoid reentrant
-        // callbacks when called from the resumption ticket path.
-        //
-        QUIC_OPERATION* Oper;
-        if ((Oper = QuicConnAllocOperation(Connection, QUIC_OPER_TYPE_DATAGRAM_STATE_CHANGED)) != NULL) {
-            QuicConnQueueOper(Connection, Oper);
-        }
-    } else {
-        QuicDatagramOnSendStateChanged(&Connection->Datagram);
-    }
+    QuicDatagramOnSendStateChanged(&Connection->Datagram);
 
     if (Connection->State.Started) {
         if (Connection->State.Disable1RttEncrytion &&
@@ -7970,20 +7962,6 @@ QuicConnDrainOperations(
                 Connection, Oper->ROUTE.PhysicalAddress, Oper->ROUTE.PathId, Oper->ROUTE.Succeeded);
             break;
 
-        case QUIC_OPER_TYPE_STREAMS_AVAILABLE:
-            if (Connection->State.ShutdownComplete) {
-                break; // Ignore if already shutdown
-            }
-            QuicStreamSetIndicateStreamsAvailable(&Connection->Streams);
-            break;
-
-        case QUIC_OPER_TYPE_DATAGRAM_STATE_CHANGED:
-            if (Connection->State.ShutdownComplete) {
-                break; // Ignore if already shutdown
-            }
-            QuicDatagramOnSendStateChanged(&Connection->Datagram);
-            break;
-
         default:
             CXPLAT_FRE_ASSERT(FALSE);
             break;

src/core/operation.h

@@ -31,8 +31,6 @@ typedef enum QUIC_OPERATION_TYPE {
     QUIC_OPER_TYPE_TIMER_EXPIRED,       // A timer expired.
     QUIC_OPER_TYPE_TRACE_RUNDOWN,       // A trace rundown was triggered.
     QUIC_OPER_TYPE_ROUTE_COMPLETION,    // Process route completion event.
-    QUIC_OPER_TYPE_STREAMS_AVAILABLE,    // Indicate streams available to the app.
-    QUIC_OPER_TYPE_DATAGRAM_STATE_CHANGED, // Indicate datagram state changed to the app.
 
     //
     // All stateless operations follow.

src/core/stream_set.c

@@ -347,7 +347,7 @@ QuicStreamSetInitializeTransportParameters(
     _Inout_ QUIC_STREAM_SET* StreamSet,
     _In_ uint64_t BidiStreamCount,
     _In_ uint64_t UnidiStreamCount,
-    _In_ BOOLEAN FromResumptionTicket
+    _In_ BOOLEAN FlushIfUnblocked
     )
 {
     QUIC_CONNECTION* Connection = QuicStreamSetGetConnection(StreamSet);
@@ -424,21 +424,10 @@ QuicStreamSetInitializeTransportParameters(
     }
 
     if (UpdateAvailableStreams) {
-        if (!FromResumptionTicket) {
-            QuicStreamSetIndicateStreamsAvailable(StreamSet);
-        } else {
-            //
-            // Defer the streams-available notification to avoid reentrant
-            // callbacks when called from the resumption ticket path.
-            //
-            QUIC_OPERATION* Oper;
-            if ((Oper = QuicConnAllocOperation(Connection, QUIC_OPER_TYPE_STREAMS_AVAILABLE)) != NULL) {
-                QuicConnQueueOper(Connection, Oper);
-            }
-        }
+        QuicStreamSetIndicateStreamsAvailable(StreamSet);
     }
 
-    if (MightBeUnblocked && !FromResumptionTicket) {
+    if (MightBeUnblocked && FlushIfUnblocked) {
         //
         // We opened the window, so start send. Rather than checking
         // the streams to see if one is actually unblocked, we risk starting

src/core/stream_set.h

@@ -131,16 +131,7 @@ QuicStreamSetInitializeTransportParameters(
     _Inout_ QUIC_STREAM_SET* StreamSet,
     _In_ uint64_t BidiStreamCount,
     _In_ uint64_t UnidiStreamCount,
-    _In_ BOOLEAN FromResumptionTicket
-    );
-
-//
-// Indicates available streams to the app via a connection event.
-//
-_IRQL_requires_max_(PASSIVE_LEVEL)
-void
-QuicStreamSetIndicateStreamsAvailable(
-    _Inout_ QUIC_STREAM_SET* StreamSet
+    _In_ BOOLEAN FlushIfUnblocked
     );
 
 //