test(unit): add P3 tests for ff_dpdk_kni + ff_in_pcbladdr (Stage-5)

unit-test-impl-leader · unit-test-impl-leader · commit 0f0472e7c3cb · 2026-06-10T11:14:57.000+08:00
Stage-5 P3 follow-ups (FU-S4-KNI / FU-S4-DPDK-IF-FULL): 7 new TCs.
- test_ff_dpdk_kni (+4 TC): ff_kni_enqueue ratelimit branches via real
  EAL --no-huge + mempool/ring.
- test_ff_dpdk_if (+3 TC): ff_in_pcbladdr 4-branch coverage.
FU-S4-PKTMBUF deferred to integration tests (needs hugepage mempool).
Total now 90 TC / 11 binaries / runtime ~5.2s, all PASS.

See docs/unit_test_spec/zh_cn/99-stage5-p3-review.md for details.
diff --git a/.gitignore b/.gitignore
@@ -79,3 +79,4 @@ tests/unit/test_ff_thread
 tests/unit/test_ff_init
 tests/unit/test_ff_dpdk_pcap
 tests/unit/test_ff_dpdk_if
+tests/unit/test_ff_dpdk_kni
diff --git a/docs/unit_test_spec/zh_cn/99-stage5-p3-review.md b/docs/unit_test_spec/zh_cn/99-stage5-p3-review.md
@@ -0,0 +1,105 @@
+# 99 — Stage-5 P3 Follow-ups Review
+
+> 文档版本：v0.1（2026-06-10 11:15 UTC+8）
+> Stage：Stage-5（P3 follow-up：FU-S4-KNI / FU-S4-DPDK-IF-FULL / FU-S4-PKTMBUF）
+> 上一阶段：Stage-4 P2（HEAD `46227a0e0`，PASS）
+
+---
+
+## 0. 总评：**PASS**（BOUNCE 0/4）
+
+| Gate | 检查 | 结果 |
+|---|---|---|
+| **G6d** | test_ff_dpdk_kni build & run（含 EAL `--no-huge` init） | ✅ 4/4 PASS |
+| **G6e** | test_ff_dpdk_if 增 3 TC（ff_in_pcbladdr） | ✅ 10/10 PASS（含 1 处 spec-vs-code 修正：EADDRNOTAVAIL=99 非 49）|
+| **G_FINAL** | 全套 `make test` 不退化 | ✅ **11 binaries / 90 TC / 5.19s 全 PASS** |
+
+---
+
+## 1. 三个 P3 Follow-up 处理结果
+
+| Follow-up | 决策 | 实施 |
+|---|---|---|
+| **FU-S4-PKTMBUF** | DEFER to integration tests | ff_dpdk_pktmbuf_free 调 inline rte_pktmbuf_free_seg → 必须真 mempool；mempool 必须 EAL init + hugepages → 不适合 unit test。改建议在 helloworld/nginx 集成测试覆盖 |
+| **FU-S4-KNI** | 实施（部分） | ff_kni_enqueue 限速逻辑 4 TC（ff_kni_init/alloc/process 仍 deferred 因需 KNI subsystem + virtio_user hotplug） |
+| **FU-S4-DPDK-IF-FULL** | 实施（小子集） | ff_in_pcbladdr 3 TC（4 分支：no callback / AF_INET / AF_INET6_FREEBSD remap / unknown family） |
+
+---
+
+## 2. Phase 落地
+
+### Phase 1 plan
+- `plan-stage5-p3-followups.md`（local-only via .gitignore plan-*.md）
+
+### Phase 2 — FU-S4-KNI（test_ff_dpdk_kni.c, 4 TC）
+- TC-01 `test_ff_kni_enqueue_no_ratelimit`：限速=0 → enqueue 通过，ring 含 1 entry
+- TC-02 `test_ff_kni_enqueue_console_ratelimit_over`：console_ratelimit=2 → 第 3 次 over → -1 + rx_dropped++
+- TC-03 `test_ff_kni_enqueue_general_ratelimit_over`：general 路径同
+- TC-04 `test_ff_kni_enqueue_filter_classification`：FILTER_ARP→console / FILTER_KNI→general 计数器分流
+
+**关键技术**：`rte_eal_init(--no-huge --no-pci --no-shconf -m 32 --file-prefix=ff_kni_test)` 一次性 init EAL；创建真实 mempool 64 buf + ring 16 slot；wire kni_rp[0] / kni_stat[0]。EAL init 失败兜底（`SKIP_IF_NO_EAL` 宏全 4 TC skip）。
+
+### Phase 3 — FU-S4-DPDK-IF-FULL（test_ff_dpdk_if.c +3 TC）
+- TC-08 `test_ff_in_pcbladdr_no_callback`：pcblddr_fun=NULL → 0
+- TC-09 `test_ff_in_pcbladdr_af_inet_dispatches`：family=AF_INET → callback 收到 (AF_INET, faddr, fport, laddr) 完全透传 + 返回值透传
+- TC-10 `test_ff_in_pcbladdr_af_inet6_freebsd_to_linux_remap`：AF_INET6_FREEBSD(28) remap 到 AF_INET6_LINUX(10) + unknown family → 返回 EADDRNOTAVAIL
+
+### Phase 4 — Review + commit（本阶段）
+
+---
+
+## 3. spec-vs-code 修正（DP-U-12）
+
+| # | 位置 | 期望（plan）| 实际（代码）| 修正 |
+|---|---|---|---|---|
+| 1 | TC-10 unknown family 返回值 | `ff_EADDRNOTAVAIL` (49) | POSIX `EADDRNOTAVAIL` (99 on Linux glibc) | TC 改用 `EADDRNOTAVAIL` 宏 |
+
+---
+
+## 4. 工作区合规
+
+- ✅ 0 直接 rm/kill/chmod
+- ✅ make clean / coverage_clean 走 `rm_tmp_file.sh`
+- ✅ 新 binary `test_ff_dpdk_kni` 已加 `.gitignore`
+
+---
+
+## 5. 累计 TC 数
+
+| Stage | TC 数 |
+|---|---|
+| Stage-2（spec 基线 + P0/P1） | 59 |
+| Stage-3（覆盖率 + 扩 5 TC） | 64 |
+| Stage-4（P2 +19） | 83 |
+| **Stage-5（P3 +7）** | **90** |
+
+11 个 binaries / 总耗时 5.19s（< NFR-U-5 30s 阈值）。
+
+---
+
+## 6. 剩余 follow-up
+
+| ID | 内容 | 优先级 | 建议 |
+|---|---|---|---|
+| **FU-S4-PKTMBUF** | ff_dpdk_pktmbuf_free（已 defer） | P4 | 集成测试覆盖 |
+| **FU-S4-KNI-INIT-ALLOC-PROCESS** | ff_kni_init / ff_kni_alloc / ff_kni_process 测试（需 virtio_user hotplug） | P4 | 集成测试覆盖 |
+| **FU-S4-DPDK-IF-OTHER** | ff_dpdk_if.c 其余 ~136 个 ff_* 函数（lcore_conf / rss_reta_size 全局依赖）| P4 | 集成测试覆盖 |
+| **FU-U-5** | CI 集成 | P2 | 下一 stage 候选 |
+| **FU-S2-1** | valgrind into make check | P3 | 下一 stage 候选 |
+| **FU-U-7** | 4 篇 spec 英文翻译 | P3 | 人工审计后 |
+
+---
+
+## 7. 交付物
+
+| 文件 | 行 | tracked |
+|---|---|---|
+| `tests/unit/test_ff_dpdk_kni.c` | 270 | ✅ new |
+| `tests/unit/test_ff_dpdk_if.c` (modified) | +95 | ✅ |
+| `tests/unit/Makefile` (modified) | +12 | ✅ |
+| `.gitignore` (modified) | +1 | ✅ |
+| `99-stage5-p3-review.md` (本文件) | ~120 | ✅ new |
+
+---
+
+**Stage-5 P3 follow-up PASS** — 进入 commit。
diff --git a/tests/unit/Makefile b/tests/unit/Makefile
@@ -24,9 +24,12 @@ $(error CMocka >= 1.1.7 required, found '$(CMOCKA_VER)')
 endif
 
 # Host-only build flags (R-U-2 / NFR-U-4)
+# DPDK_CFLAGS includes -march=native -mssse3 etc. needed because rte_memcpy
+# and other inline DPDK helpers expand into ISA-specific intrinsics.
 CFLAGS        := -O0 -g3 -Wall -Wextra -Wno-unused-parameter \
                  -I$(LIB_DIR) -I$(COMMON_DIR) \
                  $(CMOCKA_CFLAGS) \
+                 $(DPDK_CFLAGS) \
                  -DFF_UNIT_TEST=1
 
 # Fatal-function wraps applied globally (spec 04 §8.1):
@@ -46,7 +49,8 @@ SANITY_TESTS  := test_hello
 P0_TESTS      := test_ff_ini_parser test_ff_log
 P1_TESTS      := test_ff_host_interface test_ff_epoll test_ff_config
 P2_TESTS      := test_ff_thread test_ff_init test_ff_dpdk_pcap test_ff_dpdk_if
-ALL_TESTS     := $(SANITY_TESTS) $(P0_TESTS) $(P1_TESTS) $(P2_TESTS)
+P3_TESTS      := test_ff_dpdk_kni
+ALL_TESTS     := $(SANITY_TESTS) $(P0_TESTS) $(P1_TESTS) $(P2_TESTS) $(P3_TESTS)
 
 # Common stub objects
 COMMON_OBJS   := $(COMMON_DIR)/ff_log_stub.o $(COMMON_DIR)/rte_stub.o
@@ -90,6 +94,11 @@ test_p2: $(P2_TESTS)
 	  echo "==> running $$t"; $(RUN_ENV) ./$$t || exit 1; \
 	done
 
+test_p3: $(P3_TESTS)
+	@for t in $(P3_TESTS); do \
+	  echo "==> running $$t"; $(RUN_ENV) ./$$t || exit 1; \
+	done
+
 test: all
 	@for t in $(ALL_TESTS); do \
 	  echo "==> running $$t"; $(RUN_ENV) ./$$t || exit 1; \
@@ -166,6 +175,12 @@ WRAP_FF_DPDKIF := -Wl,--wrap=rte_get_tsc_hz
 test_ff_dpdk_if: test_ff_dpdk_if.o $(LIB_OBJS_DIR)/ff_dpdk_if.o $(COMMON_DIR)/rte_stub.o
 	$(CC) -o $@ $^ $(LDFLAGS_BASE) $(BASE_WRAPS) $(WRAP_FF_DPDKIF) $(DPDK_LIBS) -lrte_net_bond -Wl,-rpath=/usr/local/lib64 -lpthread -lcrypto -ldl -lm
 
+# P3 #1 ff_dpdk_kni (FU-S4-KNI subset: ff_kni_enqueue ratelimit branches;
+# requires real DPDK EAL --no-huge for mempool + ring; if EAL init fails
+# at runtime, all 4 TC are marked skip().)
+test_ff_dpdk_kni: test_ff_dpdk_kni.o $(LIB_OBJS_DIR)/ff_dpdk_kni.o $(COMMON_DIR)/rte_stub.o
+	$(CC) -o $@ $^ $(LDFLAGS_BASE) $(BASE_WRAPS) $(DPDK_LIBS) -lrte_net_bond -Wl,-rpath=/usr/local/lib64 -lpthread -lcrypto -ldl -lm
+
 # ----- clean (NFR-U-7: must use workspace wrapper, no direct rm) -----
 clean:
 	@find . -name '*.o' -type f -print 2>/dev/null | while read f; do \
diff --git a/tests/unit/test_ff_dpdk_if.c b/tests/unit/test_ff_dpdk_if.c
@@ -246,6 +246,105 @@ test_ff_get_tsc_ns_basic(void **state)
     assert_true(b >= a);
 }
 
+/* ------------------------------------------------------------------------ */
+/* TC-U-P3-DPDKIF-08: ff_in_pcbladdr returns 0 when no callback registered  */
+/* ------------------------------------------------------------------------ */
+#include <netinet/in.h>           /* AF_INET */
+
+static void
+test_ff_in_pcbladdr_no_callback(void **state)
+{
+    (void)state;
+    /* Reset to NULL via the public setter */
+    ff_regist_pcblddr_fun(NULL);
+
+    int rv = ff_in_pcbladdr(AF_INET, NULL, 0, NULL);
+    assert_int_equal(rv, 0);
+}
+
+/* ------------------------------------------------------------------------ */
+/* TC-U-P3-DPDKIF-09: AF_INET dispatches to callback with family=AF_INET    */
+/* ------------------------------------------------------------------------ */
+static struct {
+    int   invoked;
+    uint16_t family_seen;
+    void *faddr_seen;
+    uint16_t fport_seen;
+    void *laddr_seen;
+    int   ret_value;
+} g_pcblddr_capture;
+
+static int
+capturing_pcblddr(uint16_t family, void *faddr, uint16_t fport, void *laddr)
+{
+    g_pcblddr_capture.invoked++;
+    g_pcblddr_capture.family_seen = family;
+    g_pcblddr_capture.faddr_seen  = faddr;
+    g_pcblddr_capture.fport_seen  = fport;
+    g_pcblddr_capture.laddr_seen  = laddr;
+    return g_pcblddr_capture.ret_value;
+}
+
+static void
+test_ff_in_pcbladdr_af_inet_dispatches(void **state)
+{
+    (void)state;
+    memset(&g_pcblddr_capture, 0, sizeof(g_pcblddr_capture));
+    g_pcblddr_capture.ret_value = 7;          /* arbitrary marker */
+    ff_regist_pcblddr_fun(capturing_pcblddr);
+
+    int faddr = 0x12345678;
+    int laddr = 0x9ABCDEF0;
+    int rv = ff_in_pcbladdr(AF_INET, &faddr, 53, &laddr);
+
+    assert_int_equal(rv, 7);                  /* return value transparently */
+    assert_int_equal(g_pcblddr_capture.invoked, 1);
+    assert_int_equal((int)g_pcblddr_capture.family_seen, AF_INET);
+    assert_ptr_equal(g_pcblddr_capture.faddr_seen, &faddr);
+    assert_int_equal((int)g_pcblddr_capture.fport_seen, 53);
+    assert_ptr_equal(g_pcblddr_capture.laddr_seen, &laddr);
+
+    ff_regist_pcblddr_fun(NULL);              /* clean up */
+}
+
+/* ------------------------------------------------------------------------ */
+/* TC-U-P3-DPDKIF-10: AF_INET6_FREEBSD (28) is remapped to AF_INET6_LINUX   */
+/* (10) before dispatching; unknown family returns the host EADDRNOTAVAIL.  */
+/*                                                                          */
+/* IMPORTANT (DP-U-12 "代码为准"): ff_in_pcbladdr's else-branch returns the */
+/* POSIX errno macro `EADDRNOTAVAIL` (defined in <errno.h>, value=99 on    */
+/* Linux), NOT F-Stack's `ff_EADDRNOTAVAIL` (49). The spec/plan referenced  */
+/* the latter incorrectly; tests below use the actual Linux errno value.   */
+/* ------------------------------------------------------------------------ */
+#define AF_INET6_FREEBSD_VAL    28      /* per ff_api.h L50 */
+#define AF_INET6_LINUX_VAL      10      /* per ff_api.h L48 */
+
+#include <errno.h>                      /* host EADDRNOTAVAIL */
+
+static void
+test_ff_in_pcbladdr_af_inet6_freebsd_to_linux_remap(void **state)
+{
+    (void)state;
+    memset(&g_pcblddr_capture, 0, sizeof(g_pcblddr_capture));
+    g_pcblddr_capture.ret_value = 0;
+    ff_regist_pcblddr_fun(capturing_pcblddr);
+
+    int rv = ff_in_pcbladdr(AF_INET6_FREEBSD_VAL, NULL, 0, NULL);
+    assert_int_equal(rv, 0);
+    assert_int_equal(g_pcblddr_capture.invoked, 1);
+    /* Family must be remapped to AF_INET6_LINUX before reaching callback */
+    assert_int_equal((int)g_pcblddr_capture.family_seen, AF_INET6_LINUX_VAL);
+
+    /* Reset capture and try unknown family -> EADDRNOTAVAIL (host=99 on Linux),
+     * callback NOT called */
+    memset(&g_pcblddr_capture, 0, sizeof(g_pcblddr_capture));
+    rv = ff_in_pcbladdr(99 /* unknown */, NULL, 0, NULL);
+    assert_int_equal(rv, EADDRNOTAVAIL);    /* POSIX, =99 on Linux */
+    assert_int_equal(g_pcblddr_capture.invoked, 0);
+
+    ff_regist_pcblddr_fun(NULL);
+}
+
 /* ------------------------------------------------------------------------ */
 /* Main runner                                                              */
 /* ------------------------------------------------------------------------ */
@@ -260,6 +359,10 @@ main(void)
         cmocka_unit_test(test_ff_regist_packet_dispatcher_smoke),
         cmocka_unit_test(test_ff_regist_packet_dispatcher_context_smoke),
         cmocka_unit_test(test_ff_get_tsc_ns_basic),
+        /* Stage-5 FU-S4-DPDK-IF-FULL: ff_in_pcbladdr branches */
+        cmocka_unit_test(test_ff_in_pcbladdr_no_callback),
+        cmocka_unit_test(test_ff_in_pcbladdr_af_inet_dispatches),
+        cmocka_unit_test(test_ff_in_pcbladdr_af_inet6_freebsd_to_linux_remap),
     };
     return cmocka_run_group_tests(tests, NULL, NULL);
 }
diff --git a/tests/unit/test_ff_dpdk_kni.c b/tests/unit/test_ff_dpdk_kni.c
