[vpp] add ipinip tunnel encap/decap support by lolyu · Pull Request #1860 · sonic-net/sonic-sairedis

lolyu · 2026-04-19T12:54:14Z

Add VPP ipinip tunnel encap/decap support.
Please refer to HLD to design details: sonic-net/sonic-platform-vpp#222.

 tests/decap/test_decap.py::test_decap ✓                                                                                                                                                                         100%

Signed-off-by: Longxiang Lyu lolv@microsoft.com

mssonicbld · 2026-04-19T12:54:23Z

/azp run

azure-pipelines · 2026-04-19T12:54:34Z

Azure Pipelines successfully started running 1 pipeline(s).

lolyu

✅ Review — Solid IPinIP Implementation

Matches the HLD (PR #222) exactly. Both decap (P2MP/P2P via tunnel term) and encap (P2P via tunnel nexthop) paths implemented with shared create_ipip_vpp_tunnel / remove_ipip_vpp_tunnel helpers. Clean error handling with partial-failure cleanup, VRF-aware with resolve_vrf_id / resolve_vrf_from_rif, proper get_tunnel_if fallthrough from VxLAN to IPIP.

Minor: verify that encap outer dst IP comes from tunnel object's ENCAP_DST_IP (not nexthop's SAI_NEXT_HOP_ATTR_IP) — the nexthop IP is the inner destination for MuxOrch.

LGTM 🚀

mssonicbld · 2026-04-20T11:42:38Z

/azp run

azure-pipelines · 2026-04-20T11:42:50Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-04-21T13:01:34Z

/azp run

azure-pipelines · 2026-04-21T13:01:46Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-04-21T13:33:49Z

/azp run

azure-pipelines · 2026-04-21T13:34:01Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-04-22T13:00:35Z

/azp run

azure-pipelines · 2026-04-22T13:00:48Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-04-22T13:32:13Z

/azp run

azure-pipelines · 2026-04-22T13:32:26Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-04-23T11:47:11Z

/azp run

azure-pipelines · 2026-04-23T11:47:23Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-04-26T08:22:01Z

/azp run

azure-pipelines · 2026-04-26T08:22:12Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-04-26T08:42:58Z

/azp run

azure-pipelines · 2026-04-26T08:43:09Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-05-01T10:11:52Z

/azp run

azure-pipelines · 2026-05-01T10:11:58Z

Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

mssonicbld · 2026-05-01T10:41:59Z

/azp run

azure-pipelines · 2026-05-01T10:42:10Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-05-01T10:43:08Z

/azp run

lolyu · 2026-05-19T22:06:49Z

/azp run

azure-pipelines · 2026-05-19T22:07:03Z

Azure Pipelines successfully started running 1 pipeline(s).

lolyu · 2026-05-19T22:10:32Z

Please run sonic-mgmt with sonic-buildimage PR to make sure it is not breaking t1-lag sanity. Here is an example PR: sonic-net/sonic-buildimage#27039

the t1-lag vpp test is passing: sonic-net/sonic-buildimage#27446

lolyu · 2026-05-20T12:39:47Z

/azp run

azure-pipelines · 2026-05-20T12:40:00Z

Azure Pipelines successfully started running 1 pipeline(s).

lolyu · 2026-05-26T05:49:01Z

/azp run

azure-pipelines · 2026-05-26T05:49:12Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-05-26T11:21:37Z

/azp run

azure-pipelines · 2026-05-26T11:21:49Z

Azure Pipelines successfully started running 1 pipeline(s).

lolyu · 2026-05-27T07:13:24Z

/azp run

azure-pipelines · 2026-05-27T07:13:37Z

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

mssonicbld · 2026-05-27T10:41:07Z

/azp run

azure-pipelines · 2026-05-27T10:41:19Z

Azure Pipelines successfully started running 1 pipeline(s).

lolyu · 2026-05-28T00:04:42Z

VPP test sonic-buildimage PR: sonic-net/sonic-buildimage#27555, all vpp tests pass.

lolyu mentioned this pull request Apr 19, 2026

Add SONiC VPP IPinIP tunnel HLD sonic-net/sonic-platform-vpp#222

Merged

lolyu commented Apr 20, 2026

View reviewed changes

lolyu force-pushed the add_vpp_ipinip branch from 3b2baa7 to 9f01604 Compare April 21, 2026 13:01

lolyu force-pushed the add_vpp_ipinip branch from ea94d0c to 0bf87e7 Compare April 26, 2026 08:42

lolyu changed the title ~~[WIP][vpp] add ipinip tunnel encap/decap support~~ [vpp] add ipinip tunnel encap/decap support Apr 28, 2026

lolyu force-pushed the add_vpp_ipinip branch from cb3a5cc to c716ce0 Compare May 1, 2026 10:41

lolyu force-pushed the add_vpp_ipinip branch from c716ce0 to 073d6d8 Compare May 1, 2026 10:43

yejianquan mentioned this pull request May 19, 2026

[doc]: Add HLD for inner-aware flow hash on VPP dataplane sonic-net/sonic-platform-vpp#235

Merged

lolyu mentioned this pull request May 21, 2026

Add pr vs triage agent to analyze pr vstest failures #1903

Open

5 tasks

This was referenced May 25, 2026

[vslib/vpp] Fix sub-port and LAG sub-port datapath on SONiC-VPP platform #1907

Open

[vpp] Fix LAG subinterface hwif name resolution #1883

Open

lolyu added 11 commits May 27, 2026 10:40

[vpp] add ipinip tunnel encap/decap support

be20ff4

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Fix pr checker

81f8dc9

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

improve code

e19fb6b

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

fix pr checker

4fb9a25

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

add ref count logic to dedup

811f301

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Fix the hash func

f86cd9c

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

fix pr checker

f092e5f

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Fix the vpp ipip tunnel creation failure due to rif is not ready

af0d48d

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Map SAI P2MP to VPP MP2P ipip tunnel

dfb8a3c

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

fix comments

0069c3d

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Fix comment

485d3e9

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

lolyu force-pushed the add_vpp_ipinip branch from 03019cf to 485d3e9 Compare May 27, 2026 10:41

Conversation

lolyu commented Apr 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mssonicbld commented Apr 19, 2026

Uh oh!

azure-pipelines Bot commented Apr 19, 2026

Uh oh!

lolyu left a comment

Choose a reason for hiding this comment

✅ Review — Solid IPinIP Implementation

Uh oh!

mssonicbld commented Apr 20, 2026

Uh oh!

azure-pipelines Bot commented Apr 20, 2026

Uh oh!

mssonicbld commented Apr 21, 2026

Uh oh!

azure-pipelines Bot commented Apr 21, 2026

Uh oh!

mssonicbld commented Apr 21, 2026

Uh oh!

azure-pipelines Bot commented Apr 21, 2026

Uh oh!

mssonicbld commented Apr 22, 2026

Uh oh!

azure-pipelines Bot commented Apr 22, 2026

Uh oh!

mssonicbld commented Apr 22, 2026

Uh oh!

azure-pipelines Bot commented Apr 22, 2026

Uh oh!

mssonicbld commented Apr 23, 2026

Uh oh!

azure-pipelines Bot commented Apr 23, 2026

Uh oh!

mssonicbld commented Apr 26, 2026

Uh oh!

azure-pipelines Bot commented Apr 26, 2026

Uh oh!

mssonicbld commented Apr 26, 2026

Uh oh!

azure-pipelines Bot commented Apr 26, 2026

Uh oh!

mssonicbld commented May 1, 2026

Uh oh!

azure-pipelines Bot commented May 1, 2026

Uh oh!

mssonicbld commented May 1, 2026

Uh oh!

azure-pipelines Bot commented May 1, 2026

Uh oh!

mssonicbld commented May 1, 2026

Uh oh!

lolyu commented May 19, 2026

Uh oh!

azure-pipelines Bot commented May 19, 2026

Uh oh!

lolyu commented May 19, 2026

Uh oh!

lolyu commented May 20, 2026

Uh oh!

azure-pipelines Bot commented May 20, 2026

Uh oh!

lolyu commented May 26, 2026

Uh oh!

azure-pipelines Bot commented May 26, 2026

Uh oh!

mssonicbld commented May 26, 2026

Uh oh!

azure-pipelines Bot commented May 26, 2026

Uh oh!

lolyu commented May 27, 2026

Uh oh!

azure-pipelines Bot commented May 27, 2026

Uh oh!

mssonicbld commented May 27, 2026

Uh oh!

azure-pipelines Bot commented May 27, 2026

Uh oh!

lolyu commented Apr 19, 2026 •

edited

Loading