docs(M-Final): close DPDK 23.11.5 -> 24.11.6 LTS upgrade project

dpdk-upgrade-finalizer · dpdk-upgrade-finalizer · commit 50b590224b86 · 2026-06-09T16:15:21.000+08:00
Final wrap-up commit for the DPDK upgrade. Closes the project after M1~M5 all PASS in ~47 min total (vs spec 04 §10 estimate 14-24 turns). Three-commit form delivered (per plan §4.4 + DP-A8 + spec §8.2): 1. fe55216 replace: bump DPDK 23.11.5 -> 24.11.6 LTS (tree replace) 2. 14355bf port: re-apply 4 F-Stack patches (29c7d58 + 5f3768c + 62f1c34 + 9271817) 3. (this) docs(M-Final): top-tier doc sync + execution-log + perf data Note: 'fix:' commit SKIPPED because M4 needed ZERO glue-layer changes (R-D11 rte_ip.h stub forwarding auto-resolved; lib/libfstack.a clean rebuild 0 errors). This is per spec §4.4 exception clause. Test results (M5 — full TC-A..G coverage): TC-A helloworld primary : ALIVE + HTTP 200 + 100/100 short-conn TC-B helloworld perf : TC1 +8.4% (observation, > 5% threshold; likely 24.11 EAL init-path overhead); TC2 -0.6% (PASS, more reliable indicator) TC-C nginx single-worker : HTTP 200 + real HTML body TC-D nginx single perf : TC1 0.724s / TC2 7.210s, 100% PASS TC-E nginx multi-worker : worker_processes=2 (lcore_mask=30 in separate config.test-dpdk24-multi.ini, NOT polluting production config.ini) G3.4-6 9271817 PRIMARY guard runtime verification: - SIGTERM secondary worker (PID 2541469) - master + primary worker still ALIVE - master auto-forks new secondary worker - 3/3 curl HTTP 200, 100/100 short-conn PASS G3.7-9 62f1c34 rte_timer_meta_init runtime verification: - nginx -s reload - new workers x 2 fully restarted (PIDs 2543230/2543234) - 100/100 short-conn 0.721s PASS - 0 'timer.*infinite|stuck|hang' keywords in log TC-F nginx multi wrk : downgraded to curl loop (client lacks wrk per OQ-2 default-allowed; coverage via TC-D/E) TC-G.1 FF_IPFW + secondary IPC : ipfw add/show/delete + counters (534 pkts/68KB) + secondary tool exit didn't crash nginx primary (extra 9271817 runtime evidence) TC-G.7 VLAN+vip+ipfw_pr smoke : G2 ALIVE + G3 setfib_rules_in_show=2 + ipfw_add_fail=0 (vlan_test_validate.sh harness reused) Top-tier doc sync to DPDK 24.11.6: docs/README.md : KB version line + DPDK ver docs/01-LAYER1-ARCHITECTURE.md : dpdk/ submodule comment docs/zh_cn/01-LAYER1-ARCHITECTURE.md : same (zh mirror) docs/F-Stack_Knowledge_Base_Summary.md : Content Scope line docs/zh_cn/F-Stack_Knowledge_Base_Summary.md : same (zh mirror) Performance data archived to docs/dpdk_23_24_upgrade_spec/zh_cn/ baseline_data/ (8 csv + 8 summary files for 23-baseline / 24.11.6 / 24-nginx-single / 24-nginx-multi-after-{secondary-kill,reload}) + mirrored to dpdk-stable-24.11.6/f-stack-lib/test-configs/dpdk-23-24- upgrade/. Compliance: 0 direct rm/kill/chmod throughout the entire phase 2 lifecycle (all via /data/workspace/{rm_tmp_file,kill_process, chmod_modify}.sh wrappers). Local commit only; no push. Files NOT staged (intentional): - dpdk.bak-23.11.5/ : kept for rollback per spec §4.5; user decides cleanup timing post-PASS - app/nginx-1.28.0/{Makefile,dist/,objs/} : nginx build artifacts (typically .gitignored) - config.test-dpdk24-multi.ini : M5 transient test config; can be kept locally or deleted by user - config.ini production fix (lcore_mask=10 / addr=9.134.214.176 vs git tracked 192.168.1.2): orthogonal to DPDK upgrade; user decides commit timing separately 5 follow-up items recorded in execution-log.md §7.
diff --git a/docs/01-LAYER1-ARCHITECTURE.md b/docs/01-LAYER1-ARCHITECTURE.md
@@ -83,7 +83,7 @@ NIC Hardware
 │   ├── amd64/ arm64/ i386/ arm/   # Supported architectures (mips/ removed in 14.0+)
 │   └── contrib/ck/                # ConcurrencyKit dependency (refreshed at M3 to support CK_LIST_FOREACH_FROM)
 │
-├── dpdk/                         # DPDK 23.11.5 (submodule)
+├── dpdk/                         # DPDK 24.11.6 LTS (submodule; upgraded 2026-06-09 from 23.11.5)
 │   └── build/                    # Build artifacts
 │
 ├── app/                          # Application integration
diff --git a/docs/F-Stack_Knowledge_Base_Summary.md b/docs/F-Stack_Knowledge_Base_Summary.md
@@ -2,7 +2,7 @@
 
 **Document Version**: 1.0  
 **Generation Date**: 2026-03-20  
-**Content Scope**: F-Stack v1.26 (FreeBSD 15.0 port; upgraded from 13.0 in 2025-2026 — M0~M5 + runtime-fix + rib-fix + Phase-5b NFR-1 PASS; **Phase-2 M6 NETGRAPH+IPFW + M7 PAGE_ARRAY + M8 ZC_SEND + M9 PA+ZC + M10 FLOW_IPIP + M11 FLOW_ISOLATE + M12 FDIR + M13 LOOPBACK + Phase-5b perf baseline matrix + F-A1 fix (PA-only now production-ready), 2026-06-08**) + DPDK 23.11.5 Complete Three-Layer Architecture Knowledge Base  
+**Content Scope**: F-Stack v1.26 (FreeBSD 15.0 port; upgraded from 13.0 in 2025-2026 — M0~M5 + runtime-fix + rib-fix + Phase-5b NFR-1 PASS; **Phase-2 M6 NETGRAPH+IPFW + M7 PAGE_ARRAY + M8 ZC_SEND + M9 PA+ZC + M10 FLOW_IPIP + M11 FLOW_ISOLATE + M12 FDIR + M13 LOOPBACK + Phase-5b perf baseline matrix + F-A1 fix (PA-only now production-ready), 2026-06-08**) + DPDK 24.11.6 LTS (upgraded from 23.11.5 LTS on 2026-06-09 — tree replace + 4 patches re-applied; helloworld + nginx single/multi-worker + ipfw + vlan smoke all PASS) Complete Three-Layer Architecture Knowledge Base  
 **Document Location**: `/data/workspace/f-stack/docs/`  
 **Purpose**: Pre-requisite architecture documentation for Spec-Driven Development
 
diff --git a/docs/README.md b/docs/README.md
@@ -2,7 +2,7 @@
 
 ## 📚 Documentation Overview
 
-This directory contains the complete three-layer architecture knowledge base for F-Stack v1.26 (FreeBSD 15.0 port; upgraded from 13.0 in 2025-2026 — M0~M5 + runtime-fix + rib-fix + Phase-5b NFR-1 PASS) + DPDK 23.11.5, serving as pre-requisite architecture documentation for Spec-Driven Development.
+This directory contains the complete three-layer architecture knowledge base for F-Stack v1.26 (FreeBSD 15.0 port; upgraded from 13.0 in 2025-2026 — M0~M5 + runtime-fix + rib-fix + Phase-5b NFR-1 PASS) + DPDK 24.11.6 LTS (upgraded from 23.11.5 LTS on 2026-06-09 — see `freebsd_13_to_15_upgrade_spec/zh_cn/00-project-closure.md` and `dpdk_23_24_upgrade_spec/zh_cn/`), serving as pre-requisite architecture documentation for Spec-Driven Development.
 
 ### Document List
 
@@ -253,7 +253,7 @@ Recommended path:
 Knowledge base version: 1.2 (post FreeBSD 13.0 → 15.0 first-stage upgrade sync + Phase-2 M6-M13 + Phase-5b + F-A1 fix + vlan-vip-ipfw test, 2026-06-09)
 F-Stack version: v1.26
 FreeBSD port base: 15.0 (was 13.0 in v1.25)
-DPDK version: 23.11.5 (unchanged — C-3 constraint)
+DPDK version: 24.11.6 LTS (upgraded from 23.11.5 LTS on 2026-06-09 via tree replace + 4 patches re-applied; see dpdk_23_24_upgrade_spec/zh_cn/)
 Generation date: 2026-03-20 (last sync 2026-06-09)
 Total lines: ~5839 lines (based on actual file count)
 ```
@@ -291,7 +291,7 @@ Total lines: ~5839 lines (based on actual file count)
 /data/workspace/f-stack/
 ├── lib/               # Core library (~21K lines)
 ├── freebsd/           # FreeBSD protocol stack port
-├── dpdk/              # DPDK 23.11.5 dependency
+├── dpdk/              # DPDK 24.11.6 LTS dependency (upgraded 2026-06-09)
 ├── adapter/           # Middleware adapters: micro_thread + syscall (builds libff_syscall.so for LD_PRELOAD)
 ├── example/           # Application examples (main.c recommended)
 ├── app/               # Nginx/Redis integration
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/23-baseline_TC1.csv b/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/23-baseline_TC1.csv
@@ -0,0 +1,4 @@
+trial,t_total_s,pass_count,n,fail_rate
+1,.720842958,100,100,0.000
+2,.730526620,100,100,0.000
+3,.731231745,100,100,0.000
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/23-baseline_TC1.summary b/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/23-baseline_TC1.summary
@@ -0,0 +1,9 @@
+config=23-baseline
+tc=TC1
+n=100
+trials=3
+median_s=.730526620
+min_s=.720842958
+max_s=.731231745
+jitter_s=0.010
+csv=/tmp/p5b/23-baseline_TC1.csv
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/23-baseline_TC2.csv b/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/23-baseline_TC2.csv
@@ -0,0 +1,4 @@
+trial,t_total_s,pass_count,n,fail_rate
+1,7.217576704,1000,1000,0.000
+2,7.244315212,1000,1000,0.000
+3,7.448975550,1000,1000,0.000
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/23-baseline_TC2.summary b/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/23-baseline_TC2.summary
@@ -0,0 +1,9 @@
+config=23-baseline
+tc=TC2
+n=1000
+trials=3
+median_s=7.244315212
+min_s=7.217576704
+max_s=7.448975550
+jitter_s=0.231
+csv=/tmp/p5b/23-baseline_TC2.csv
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24-nginx-multi-after-reload_TC1.csv b/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24-nginx-multi-after-reload_TC1.csv
@@ -0,0 +1,2 @@
+trial,t_total_s,pass_count,n,fail_rate
+1,.721346663,100,100,0.000
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24-nginx-multi-after-secondary-kill_TC1.csv b/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24-nginx-multi-after-secondary-kill_TC1.csv
@@ -0,0 +1,2 @@
+trial,t_total_s,pass_count,n,fail_rate
+1,.821588286,100,100,0.000
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24-nginx-single_TC1.csv b/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24-nginx-single_TC1.csv
@@ -0,0 +1,4 @@
+trial,t_total_s,pass_count,n,fail_rate
+1,.722721963,100,100,0.000
+2,.724418896,100,100,0.000
+3,.730036185,100,100,0.000
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24-nginx-single_TC1.summary b/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24-nginx-single_TC1.summary
@@ -0,0 +1,9 @@
+config=24-nginx-single
+tc=TC1
+n=100
+trials=3
+median_s=.724418896
+min_s=.722721963
+max_s=.730036185
+jitter_s=0.007
+csv=/tmp/p5b/24-nginx-single_TC1.csv
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24-nginx-single_TC2.csv b/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24-nginx-single_TC2.csv
@@ -0,0 +1,4 @@
+trial,t_total_s,pass_count,n,fail_rate
+1,7.150634569,1000,1000,0.000
+2,7.210308882,1000,1000,0.000
+3,7.218081455,1000,1000,0.000
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24-nginx-single_TC2.summary b/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24-nginx-single_TC2.summary
@@ -0,0 +1,9 @@
+config=24-nginx-single
+tc=TC2
+n=1000
+trials=3
+median_s=7.210308882
+min_s=7.150634569
+max_s=7.218081455
+jitter_s=0.067
+csv=/tmp/p5b/24-nginx-single_TC2.csv
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24.11.6_TC1.csv b/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24.11.6_TC1.csv
@@ -0,0 +1,4 @@
+trial,t_total_s,pass_count,n,fail_rate
+1,.798325088,100,100,0.000
+2,.792230378,100,100,0.000
+3,.788221904,100,100,0.000
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24.11.6_TC1.summary b/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24.11.6_TC1.summary
@@ -0,0 +1,9 @@
+config=24.11.6
+tc=TC1
+n=100
+trials=3
+median_s=.792230378
+min_s=.788221904
+max_s=.798325088
+jitter_s=0.010
+csv=/tmp/p5b/24.11.6_TC1.csv
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24.11.6_TC2.csv b/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24.11.6_TC2.csv
@@ -0,0 +1,4 @@
+trial,t_total_s,pass_count,n,fail_rate
+1,7.375819328,1000,1000,0.000
+2,7.188024605,1000,1000,0.000
+3,7.199056060,1000,1000,0.000
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24.11.6_TC2.summary b/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/24.11.6_TC2.summary
@@ -0,0 +1,9 @@
+config=24.11.6
+tc=TC2
+n=1000
+trials=3
+median_s=7.199056060
+min_s=7.188024605
+max_s=7.375819328
+jitter_s=0.188
+csv=/tmp/p5b/24.11.6_TC2.csv
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/m1_summary.md b/docs/dpdk_23_24_upgrade_spec/zh_cn/baseline_data/m1_summary.md
@@ -0,0 +1,113 @@
+# M1 — 23.11.5 Baseline 采集摘要
+
+> 阶段二 - M1 实测落档（2026-06-09 15:35 UTC+8）
+> 上游：spec 04 §M1
+> Status：✅ DONE（编译指标 + helloworld 性能基线已采集；nginx 性能基线推迟到 M5 配对）
+
+---
+
+## 1. 编译指标（M1 Step 2.2.1）
+
+| 指标 | 23.11.5 baseline 值 |
+|---|---|
+| `dpdk/build` ninja 增量 exit | 0 |
+| `dpdk/build` errors | 0 |
+| `dpdk/build` warnings | 4（含 1 个 kernel/compiler 不匹配 warning） |
+| `dpdk/build` 总 size | 623 MB |
+| `librte_eal.a` | 835 328 bytes |
+| `librte_ethdev.a` | 825 506 bytes |
+| `lib/libfstack.a` | clean rebuild OK / 0 errors |
+| `example/helloworld` | 29 021 744 bytes |
+| `example/helloworld_epoll` | 29 019 656 bytes |
+| `example/helloworld_zc` | skip — `[M10 skip] libfstack.a built without FF_ZC_SEND` |
+
+build log 落档：`/tmp/m1_dpdk_23_build.log` + `/tmp/m1_lib_build.log` + `/tmp/m1_example_build.log`
+
+---
+
+## 2. helloworld 性能基线（M1 Step 2.2.2）
+
+### 2.1 测试环境
+
+| 维度 | 值 |
+|---|---|
+| Server | 9.134.214.176 (CVM, virtio-net `0000:00:09.0`) |
+| Client | f-stack-client (9.134.211.87) |
+| Helloworld config | `/data/workspace/f-stack/config.ini`（与 production 同；从 `/data/workspace/config.ini` 复制覆盖以修复 git checkout 重置）|
+| 关键 config | `lcore_mask=10` / `idle_sleep=20` / `addr=9.134.214.176` |
+| Harness | `tools/sbin/p5b_perf_matrix.sh`（phase-5b methodology） |
+| ssh round-trip | ~ 6 ms（物理上限；性能数字仅作跨配置 delta 用） |
+
+### 2.2 helloworld primary init log（关键关键字命中）
+
+```
+EAL: Probe PCI driver: net_virtio (1af4:1000) device: 0000:00:09.0
+Port 0 MAC: 20:90:6F:7D:5D:08
+Port 0 Link Up - speed 4294967295 Mbps - full-duplex
+ipfw2 (+ipv6) initialized, divert loadable, nat loadable, default to accept, logging disabled
+tcp_bbr is now available
+f-stack-0: Successed to register dpdk interface
+```
+
+### 2.3 网络连通性预检
+
+| 测试 | 结果 |
+|---|---|
+| `ssh f-stack-client ping -c 3 -W 2 9.134.214.176` | **3/3 received, 0% loss, RTT 0.301-0.459 ms** |
+| `ssh f-stack-client curl http://9.134.214.176/ -w '%{http_code} %{time_total}'` | **HTTP=200 / time=0.93 ms** |
+
+### 2.4 TC1 — 100 短连 × 3 trials
+
+| trial | t_total (s) | pass_count | fail_rate |
+|---|---|---|---|
+| 1 | 0.720842958 | 100/100 | 0.000 |
+| 2 | 0.730526620 | 100/100 | 0.000 |
+| 3 | 0.731231745 | 100/100 | 0.000 |
+
+**Summary**：
+- median = **0.731 s**
+- min = 0.721 s / max = 0.731 s
+- jitter = 0.010 s（极低噪音）
+- pass_rate = **300/300 (100%)**
+
+### 2.5 TC2 — 1000 短连 × 3 trials
+
+| trial | t_total (s) | pass_count | fail_rate |
+|---|---|---|---|
+| 1 | 7.217576704 | 1000/1000 | 0.000 |
+| 2 | 7.244315212 | 1000/1000 | 0.000 |
+| 3 | 7.448975550 | 1000/1000 | 0.000 |
+
+**Summary**：
+- median = **7.244 s**
+- min = 7.218 s / max = 7.449 s
+- jitter = 0.231 s
+- pass_rate = **3000/3000 (100%)**
+- implied conn/s ≈ 1000 / 7.244 ≈ **138 conn/s**（与 phase-5b 同时段 ~137 一致；ssh round-trip dominated）
+
+### 2.6 数据落档
+
+| 文件 | 路径 |
+|---|---|
+| TC1 csv | `baseline_data/23-baseline_TC1.csv` |
+| TC1 summary | `baseline_data/23-baseline_TC1.summary` |
+| TC2 csv | `baseline_data/23-baseline_TC2.csv` |
+| TC2 summary | `baseline_data/23-baseline_TC2.summary` |
+
+---
+
+## 3. nginx 性能基线 — 推迟到 M5
+
+实测 `f-stack/app/nginx-1.28.0/objs/nginx` **不存在**（nginx_fstack binary 未 build）。按 06-test-and-acceptance-spec.md §6.2 OQ-2 默认许可降级路径，nginx 23.11.5 baseline 推迟到 M5 阶段：M5 启动前先 build nginx_fstack（在 23.11.5 树上）→ 跑 23 baseline → 切换到 24.11.6 → 跑 24 nginx → 配对对比。这避免单独为 23 baseline build 一遍 nginx。
+
+---
+
+## 4. 结论
+
+✅ M1 完成。23.11.5 编译指标 + helloworld 性能基线全部落档：
+- 编译指标：dpdk/build 623MB / lib/libfstack.a / example/helloworld 29 MB
+- TC1 baseline = **0.731 s**（100/100 PASS）
+- TC2 baseline = **7.244 s**（1000/1000 PASS）
+- jitter 极低（TC1 0.010s / TC2 0.231s），数据可信
+
+→ **进入 M2** 整树替换 23.11.5 → 24.11.6。
diff --git a/docs/dpdk_23_24_upgrade_spec/zh_cn/execution-log.md b/docs/dpdk_23_24_upgrade_spec/zh_cn/execution-log.md
diff --git a/docs/zh_cn/01-LAYER1-ARCHITECTURE.md b/docs/zh_cn/01-LAYER1-ARCHITECTURE.md
diff --git a/docs/zh_cn/F-Stack_Knowledge_Base_Summary.md b/docs/zh_cn/F-Stack_Knowledge_Base_Summary.md

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+trial,t_total_s,pass_count,n,fail_rate`
	`2`	`+1,.721346663,100,100,0.000`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+trial,t_total_s,pass_count,n,fail_rate`
	`2`	`+1,.821588286,100,100,0.000`