raptor 0.22.3 → 0.24.0

data/ext/raptor_bpf/reuseport_select.bpf.c

@@ -2,13 +2,16 @@
 #include <bpf/bpf_helpers.h>
 
 #define MAX_WORKERS 64
+#define MAX_LISTENERS 16
+#define UNAVAILABLE_LOAD 0xffffffff
 
-// Per-worker listening sockets, keyed by worker index.
+// Per-worker listening sockets, keyed by listener index * MAX_WORKERS +
+// worker index so each bound address has its own row of worker slots.
 struct {
   __uint(type, BPF_MAP_TYPE_REUSEPORT_SOCKARRAY);
   __type(key, __u32);
   __type(value, __u64);
-  __uint(max_entries, MAX_WORKERS);
+  __uint(max_entries, MAX_WORKERS * MAX_LISTENERS);
 } socks SEC(".maps");
 
 // Worker count at slot 0, per-worker backlog at slots 1..N.
@@ -19,10 +22,8 @@ struct {
   __uint(max_entries, MAX_WORKERS + 1);
 } loads SEC(".maps");
 
-// Uses the power-of-two-choices strategy and reserves the selected worker's
-// slot before returning. Sampling two hash-selected workers avoids
-// concentrating variable-cost requests, while the reservation prevents a
-// burst from repeatedly selecting the same reported load.
+// Account for routed connections before the worker reports its new backlog,
+// so bursts do not keep selecting against stale load.
 SEC("sk_reuseport")
 int select_less_loaded(struct sk_reuseport_md *ctx) {
   __u32 count_key = 0;
@@ -48,11 +49,19 @@ int select_less_loaded(struct sk_reuseport_md *ctx) {
     }
   }
 
-  if (chosen_load) {
-    __sync_fetch_and_add(chosen_load, 1);
+  // Every bound address shares this program, and the kernel only accepts a
+  // socket from the reuseport group the connection arrived on, so try the
+  // chosen worker's socket for each address until one belongs to the group.
+  for (__u32 listener = 0; listener < MAX_LISTENERS; listener++) {
+    __u32 sock_key = listener * MAX_WORKERS + chosen_idx;
+    if (bpf_sk_select_reuseport(ctx, &socks, &sock_key, 0) == 0) {
+      if (chosen_load && *chosen_load != UNAVAILABLE_LOAD) {
+        __sync_fetch_and_add(chosen_load, 1);
+      }
+      break;
+    }
   }
 
-  bpf_sk_select_reuseport(ctx, &socks, &chosen_idx, 0);
   return SK_PASS;
 }
 

data/ext/raptor_http/extconf.rb

@@ -2,6 +2,8 @@
 
 require "mkmf"
 
+# The Ragel-generated parser compares `char` values against 0, which GCC flags
+# as always true where `char` is unsigned (e.g. aarch64 Linux).
 append_cflags(["-fvisibility=hidden", "-Wno-type-limits"])
 
 create_makefile("raptor/raptor_http")