[multicast] Narrow admin-scoped to admin-local only (ff04::/16) #162
+10,776
−515
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This PR is a precursor to a follow-up PR that leverages updated code in `omicron-common`. This gets dendrite in line with Omicron `main`, capturing an upstream type change that we needed to accomodate.
zeeshanlakhani
commented
Dec 1, 2025
| oximeter-producer = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } | ||
| oximeter-instruments = { git = "https://github.com/oxidecomputer/omicron", branch = "main", default-features = false, features = ["kstat"] } | ||
| oxnet = { version = "0.1.3", default-features = false, features = ["schemars", "serde"] } | ||
| omicron-common = { git = "https://github.com/oxidecomputer/omicron", branch= "zl/mcast-implicit-lifecycle" } |
Contributor
Author
There was a problem hiding this comment.
These are temporary until oxidecomputer/omicron#9450 is merged in.
4 tasks
Previously, internal multicast groups accepted admin-scoped addresses
including admin-local (ff04), site-local (ff05), and org-local (ff08).
This narrows the scope to only admin-local (ff04::/16), which is what
Omicron *now* dictates.
- [ ] This should be merged after
oxidecomputer/omicron#9450 is reviewed
and merged into Omicron. We now make Dendrite/Dpd match Omicron
consistently for validation.
Key changes:
- Remove IPV6_SITE_LOCAL_PATTERN and IPV6_ORG_SCOPE_PATTERN from P4
- Update P4 table entries to only match admin-local (size 4→2)
- Add ADMIN_LOCAL_PREFIX const to dpd-types with RFC doc links
- Update validation to use `is_admin_local_multicast()` from oxnet v0.1.4
- Bump to API version 2 for doc changes (only)
- Update README with OpenAPI generation instructions
- Use new multicast subnet constants from `omicron-common` for validation
zeeshanlakhani
force-pushed
the
zl/admin-scope-oxnet
branch
from
6f00b19 to
94e91ca
Compare
zeeshanlakhani
requested review from
FelixMcFelix,
Nieuwejaar and
rcgoodfellow
Contributor
Author
|
@rcgoodfellow updated for your review. |
Contributor
FelixMcFelix
left a comment
FelixMcFelix
left a comment
There was a problem hiding this comment.
Thanks Zeeshan, the updates to the allowed IP families all make sense. Just some questions on the expanded comments on the decapsualtion bitmaps in the dataplane.
Contributor
Author
Yep. No questions, just my bad in context. Fixed. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, internal/underlay multicast groups accepted admin-configured addresses including admin-local (ff04), site-local (ff05), and org-local (ff08). This narrows the scope to only admin-local (ff04::/16), which is what Omicron now dictates.
Related PRs:
mainrelated deps to 64b40cb #161, making clear the minor change from Omicronmainbefore these changes.Key changes:
IPV6_SITE_LOCAL_PATTERNandIPV6_ORG_SCOPE_PATTERNfrom P4ADMIN_LOCAL_PREFIXconst to dpd-types with RFC doc linksis_admin_local_multicast()from oxnet v0.1.4omicron-commonfor validation