Skip to content

[Cisco][bug fix] Fix ACL warmboot UDF reconciliation - #2019

Closed
selekkala wants to merge 2 commits into
meta:mainfrom
selekkala:reopen/pr-1737-acl-warmboot
Closed

selekkala wants to merge 2 commits into
meta:mainfrom
selekkala:reopen/pr-1737-acl-warmboot

Conversation

@selekkala

Copy link
Copy Markdown
Contributor

Pre-submission checklist

  • I've ran the linters locally and fixed lint errors related to the files I modified in this PR. You can install the linters by running pip install -r requirements-dev.txt && pre-commit install
  • pre-commit run

Summary

During ACL warmboot, FBOSS compares the ACL table attributes expected by FBOSS with the attributes read back from SAI/SDK.

When no UDF groups are configured, both sides mean “not configured,” but they use different values:

  • FBOSS uses std::nullopt.
  • Some SAI/SDK versions return optional(SAI_NULL_OBJECT_ID).

The direct comparison treats these values as different. FBOSS then unnecessarily tries to recreate the ACL table. During that recreation, recreateAclTable() dereferenced an expired SAI-store weak pointer without checking the result of lock(), causing the HW agent to terminate with SIGSEGV.

Fix

  • Treat optional(SAI_NULL_OBJECT_ID) as std::nullopt for the five ACL-table UDF attributes before comparing them.
  • Keep this logic behind the existing SAI/SDK feature guard, so unsupported ASIC/SDK builds are unaffected.
  • Check ACL table, ACL entry, and ACL table-group member handles before using them during recreation.
  • Keep valid, non-zero UDF object IDs unchanged.

This prevents a false ACL-table mismatch and makes the recreation path safe when warmboot handles are stale or unavailable.

Test Plan

  • git diff --check
  • Warmboot validation on Cisco GR2 with Tajo SDK 26.5.5210.5 completed as WARM_BOOT without an ACL attribute mismatch, ACL-table recreation, or HW-agent crash.

@selekkala
selekkala requested a review from a team as a code owner November 19, 2026 07:16
@meta-cla meta-cla Bot added the CLA Signed label Nov 19, 2026
@github-actions github-actions Bot added cisco project:bug fix FBOSS project: bug fix labels Nov 19, 2026
@selekkala selekkala closed this Nov 19, 2026
@selekkala
selekkala deleted the reopen/pr-1737-acl-warmboot branch November 19, 2026 07:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants