QUIC QSM: Infrastructure for tracking shutdown flush eligible streams

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21484)

diff --git a/include/internal/quic_stream_map.h b/include/internal/quic_stream_map.h
index bff2e11fd21ad633b56a3d463b891557bb8bb16a..74bfed7c8bc70128c3342604d40661c613c9089a 100644 (file)
--- a/include/internal/quic_stream_map.h
+++ b/include/internal/quic_stream_map.h
@@ -312,6 +312,8 @@ struct quic_stream_st {
     unsigned int    deleted                 : 1;
     /* Set to 1 once the above conditions are actually met. */
     unsigned int    ready_for_gc            : 1;
+    /* Set to 1 if this is currently counted in the shutdown flush stream count. */
+    unsigned int    shutdown_flush          : 1;
 };
 
 #define QUIC_STREAM_INITIATOR_CLIENT        0
@@ -517,7 +519,8 @@ typedef struct quic_stream_map_st {
     QUIC_STREAM_LIST_NODE   active_list;
     QUIC_STREAM_LIST_NODE   accept_list;
     QUIC_STREAM_LIST_NODE   ready_for_gc_list;
-    size_t                  rr_stepping, rr_counter, num_accept;
+    size_t                  rr_stepping, rr_counter;
+    size_t                  num_accept, num_shutdown_flush;
     QUIC_STREAM             *rr_cur;
     uint64_t                (*get_stream_limit_cb)(int uni, void *arg);
     void                    *get_stream_limit_cb_arg;
@@ -795,12 +798,32 @@ void ossl_quic_stream_map_remove_from_accept_queue(QUIC_STREAM_MAP *qsm,
 /* Returns the length of the accept queue. */
 size_t ossl_quic_stream_map_get_accept_queue_len(QUIC_STREAM_MAP *qsm);
 
+/*
+ * Shutdown Flush and GC
+ * =====================
+ */
+
 /*
  * Delete streams ready for GC. Pointers to those QUIC_STREAM objects become
  * invalid.
  */
 void ossl_quic_stream_map_gc(QUIC_STREAM_MAP *qsm);
 
+/*
+ * Begins shutdown stream flush triage. Analyses all streams, including deleted
+ * but not yet GC'd streams, to determine if we should wait for that stream to
+ * be fully flushed before shutdown. After calling this, call
+ * ossl_quic_stream_map_is_shutdown_flush_finished() to determine if all
+ * shutdown flush eligible streams have been flushed.
+ */
+void ossl_quic_stream_map_begin_shutdown_flush(QUIC_STREAM_MAP *qsm);
+
+/*
+ * Returns 1 if all shutdown flush eligible streams have finished flushing,
+ * or if ossl_quic_stream_map_begin_shutdown_flush() has not been called.
+ */
+int ossl_quic_stream_map_is_shutdown_flush_finished(QUIC_STREAM_MAP *qsm);
+
 /*
  * QUIC Stream Iterator
  * ====================

diff --git a/ssl/quic/quic_stream_map.c b/ssl/quic/quic_stream_map.c
index 1f8fff03bea489355bcc264490225ed9fc803e45..e50da2b101b2ae9a532a72a08fe155e782e3d746 100644 (file)
--- a/ssl/quic/quic_stream_map.c
+++ b/ssl/quic/quic_stream_map.c
@@ -100,7 +100,9 @@ int ossl_quic_stream_map_init(QUIC_STREAM_MAP *qsm,
     qsm->rr_stepping = 1;
     qsm->rr_counter  = 0;
     qsm->rr_cur      = NULL;
-    qsm->num_accept  = 0;
+
+    qsm->num_accept         = 0;
+    qsm->num_shutdown_flush = 0;
 
     qsm->get_stream_limit_cb        = get_stream_limit_cb;
     qsm->get_stream_limit_cb_arg    = get_stream_limit_cb_arg;
@@ -396,6 +398,16 @@ int ossl_quic_stream_map_notify_all_data_sent(QUIC_STREAM_MAP *qsm,
     }
 }
 
+static void shutdown_flush_done(QUIC_STREAM_MAP *qsm, QUIC_STREAM *qs)
+{
+    if (!qs->shutdown_flush)
+        return;
+
+    assert(qsm->num_shutdown_flush > 0);
+    qs->shutdown_flush = 0;
+    --qsm->num_shutdown_flush;
+}
+
 int ossl_quic_stream_map_notify_totally_acked(QUIC_STREAM_MAP *qsm,
                                               QUIC_STREAM *qs)
 {
@@ -411,6 +423,8 @@ int ossl_quic_stream_map_notify_totally_acked(QUIC_STREAM_MAP *qsm,
         /* We no longer need a QUIC_SSTREAM in this state. */
         ossl_quic_sstream_free(qs->sstream);
         qs->sstream = NULL;
+
+        shutdown_flush_done(qsm, qs);
         return 1;
     }
 }
@@ -462,6 +476,7 @@ int ossl_quic_stream_map_reset_stream_send_part(QUIC_STREAM_MAP *qsm,
         ossl_quic_sstream_free(qs->sstream);
         qs->sstream = NULL;
 
+        shutdown_flush_done(qsm, qs);
         ossl_quic_stream_map_update_state(qsm, qs);
         return 1;
 
@@ -746,6 +761,43 @@ void ossl_quic_stream_map_gc(QUIC_STREAM_MAP *qsm)
     }
 }
 
+static int eligible_for_shutdown_flush(QUIC_STREAM *qs)
+{
+    /*
+     * We only care about servicing the send part of a stream (if any) during
+     * shutdown flush. A stream needs to have a final size and that final size
+     * needs to be a result of normal conclusion of a stream via
+     * SSL_stream_conclude (as opposed to due to reset). If the application did
+     * not conclude a stream before deleting it we assume it does not care about
+     * data being flushed during connection termination.
+     */
+    return ossl_quic_stream_has_send_buffer(qs)
+        && ossl_quic_stream_send_get_final_size(qs, NULL);
+}
+
+static void begin_shutdown_flush_each(QUIC_STREAM *qs, void *arg)
+{
+    QUIC_STREAM_MAP *qsm = arg;
+
+    if (!eligible_for_shutdown_flush(qs) || qs->shutdown_flush)
+        return;
+
+    qs->shutdown_flush = 1;
+    ++qsm->num_shutdown_flush;
+}
+
+void ossl_quic_stream_map_begin_shutdown_flush(QUIC_STREAM_MAP *qsm)
+{
+    qsm->num_shutdown_flush = 0;
+
+    ossl_quic_stream_map_visit(qsm, begin_shutdown_flush_each, qsm);
+}
+
+int ossl_quic_stream_map_is_shutdown_flush_finished(QUIC_STREAM_MAP *qsm)
+{
+    return qsm->num_shutdown_flush == 0;
+}
+
 /*
  * QUIC Stream Iterator
  * ====================