Fix ASAN build clobbering packages after build on the same system by croos12 · Pull Request #13 · croos12/sonic-buildimage

croos12 · 2026-03-04T02:38:27Z

Depends on:
croos12/sonic-sairedis#10
croos12/sonic-swss#6

Why I did it

ASAN-instrumented deb packages and Docker images had the same filenames as regular builds, making it impossible to build ASAN on top of a regular build without clobbering and reusing artifacts, such as swss deb and syncd deb that need to be rebuilt for ASAN. Additionally, ENABLE_ASAN was not exported during Docker image builds, so ASAN_OPTIONS were never set in supervisord.conf at runtime.

How I did it

Renamed ASAN deb targets with -asan suffix (e.g., swss-asan_1.0.0_amd64.deb) using a new _DPKG_DEB_NAME property to map dpkg output names to renamed Make targets in slave.mk.
Renamed ASAN Docker images with -asan suffix (e.g., docker-orchagent-asan.gz, docker-syncd-mlnx-asan.gz).
Added debug symbol packages (LIBSWSSCOMMON_DBG, LIBSAIREDIS_DBG, LIBSAIMETADATA_DBG) to ASAN Docker image dependencies for complete stack traces.
Removed redundant $(ENABLE_ASAN) from _DEP_FLAGS since distinct filenames now create separate cache entries.
Exported ENABLE_ASAN in the Docker image build recipe so Dockerfile.j2 can pass it through to docker-init.sh and supervisord.conf.

How to verify it

Build regular then ASAN: both artifacts coexist in target/ (docker-orchagent.gz and docker-orchagent-asan.gz).
On device inside swss container:

docker exec -it swss bash
ldd /usr/bin/orchagent | grep asan
	libasan.so.8 => /lib/x86_64-linux-gnu/libasan.so.8 (0x00007efca6d19000)
grep ASAN /usr/bin/docker-init.sh
     -a "{\"ENABLE_ASAN\":\"y\"}" \
sonic-cfggen -y /etc/sonic/sonic_version.yml -v asan
yes

Verify ASAN is active at runtime:

export ASAN_OPTIONS="detect_leaks=1:log_path=/var/log/asan/test:verbosity=2"
supervisorctl stop orchagent
/usr/bin/orchagent.sh &
sleep 5
kill -TERM $(pidof orchagent)
ls -la /var/log/asan/
test.log.5095

Tested branch (Please provide the tested image version)

Description for the changelog

Fix ASAN build clobbering packages after build on the same system

Signed-off-by: Connor Roos <croos@nvidia.com>

Copilot

Pull request overview

This PR updates the SONiC build system to better support AddressSanitizer (ASAN) builds alongside regular builds by introducing ASAN-suffixed artifact naming and adjusting how debs/docker images are produced and cached.

Changes:

Rename key deb/docker outputs for ASAN builds (e.g., swss-asan, syncd-asan, docker-orchagent-asan, docker-syncd-*-asan) to avoid collisions with regular build artifacts.
Teach the dpkg deb move step to support renaming via *_DPKG_DEB_NAME, enabling “target name != dpkg output filename”.
Update several *_DEP_FLAGS definitions to drop $(ENABLE_ASAN) so dependency/cache keys align with the new artifact naming approach.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
`slave.mk`	Adds deb renaming support via `*_DPKG_DEB_NAME` during artifact move; exports `ENABLE_ASAN` for docker Jinja rendering.
`rules/sysmgr.dep`	Removes `$(ENABLE_ASAN)` from sysmgr dep flags.
`rules/syncd.mk`	Introduces ASAN-suffixed syncd deb names and dpkg output name mapping.
`rules/syncd.dep`	Removes `$(ENABLE_ASAN)` from syncd dep flags.
`rules/swss.mk`	Introduces ASAN-suffixed swss deb names and dpkg output name mapping.
`rules/swss.dep`	Removes `$(ENABLE_ASAN)` from swss dep flags.
`rules/docker-orchagent.mk`	Adds ASAN-suffixed orchagent docker image name and extra deps when ASAN enabled.
`rules/docker-orchagent.dep`	Removes `$(ENABLE_ASAN)` from orchagent docker dep flags.
`platform/template/docker-syncd-bookworm.mk`	Adds ASAN-suffixed syncd docker base image naming.
`platform/mellanox/docker-syncd-mlnx.mk`	Adds extra dbg deps for ASAN syncd docker image.
`platform/mellanox/docker-syncd-mlnx.dep`	Removes `$(ENABLE_ASAN)` from Mellanox syncd docker dep flags.

rules/docker-orchagent.mk

platform/template/docker-syncd-bookworm.mk

slave.mk

rules/syncd.mk

vivekrnv · 2026-03-05T05:52:42Z

I suppose this also must be changed, we need to add extra package here swss-asan, syncd-asan target

https://github.com/sonic-net/sonic-swss/blob/master/debian/control

https://github.com/sonic-net/sonic-sairedis/blob/master/debian/control

croos12 · 2026-03-05T19:24:24Z

@copilot make the change vivek asked for

Signed-off-by: Connor Roos <croos@nvidia.com>

Copilot

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 3 comments.

rules/swss.mk

rules/syncd.mk

rules/swss.mk

Signed-off-by: Connor Roos <croos@nvidia.com>

Copilot

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated no new comments.

Signed-off-by: Connor Roos <croos@nvidia.com>

vivekrnv · 2026-03-14T01:51:07Z

LGTM, do you have sonic-swss and sonic-sairedis PR's?

croos12 · 2026-03-14T17:44:16Z

LGTM, do you have sonic-swss and sonic-sairedis PR's?

Added them to the description

…net#25643) * [build] Add build timing report and dependency analysis tools Add three scripts for build performance instrumentation: - scripts/build-timing-report.sh: Parse per-package timing from build logs (HEADER/FOOTER timestamps), generate sorted duration table, phase breakdown, parallelism timeline, and CSV export. - scripts/build-dep-graph.py: Parse rules/*.mk dependency graph, compute critical path, fan-out/fan-in bottleneck analysis, and generate DOT/JSON output for visualization. - scripts/build-resource-monitor.sh: Sample CPU, memory, disk I/O, and Docker container count during builds for resource utilization analysis. Add "make build-report" target to slave.mk that runs the timing report and dependency analysis after a build completes. Example output from a VS build on 24-core/30GB machine: - 210 packages built in 53m wall time (173m CPU) - Max concurrency: 5 (with SONIC_CONFIG_BUILD_JOBS=4) - Critical path: 14 packages deep (libnl -> libswsscommon -> utilities) - Top bottleneck: LIBSWSSCOMMON with 48 downstream dependents Signed-off-by: Rustiqly <rustiqly@users.noreply.github.com> * Address Copilot review: fix 17 bugs in build analysis scripts - Use free -m with division instead of free -g to avoid rounding (#1) - Add = and ?= to Makefile dependency regex patterns (#2, #7) - CPU calculation now uses /proc/stat delta (two reads) (#3, sonic-net#14) - Fix misleading 'critical path estimate' comment (#4) - Fix parallelism timeline comment (60s not 10s) (#5) - Include after-relationship packages in fan stats (#6) - Guard disk I/O division by zero when INTERVAL<=1 (#8) - Remove unused elapsed_line variable (#9) - Remove redundant LIBSWSSCOMMON_DBG check (#10) - Remove active_make_jobs from CSV header comment (#11) - Wire up _RDEPENDS parsing to build reverse deps (#12) - Remove unnecessary 'if v' filter on rdeps JSON (#13) - Remove unused REPORT_FORMAT parameter (sonic-net#15) - Add cycle detection to critical path algorithm (sonic-net#16) - Add execute permission check for companion scripts (sonic-net#17) Signed-off-by: Rustiqly <rustiqly@users.noreply.github.com> --------- Signed-off-by: Rustiqly <rustiqly@users.noreply.github.com> Co-authored-by: Rustiqly <rustiqly@users.noreply.github.com>

Set ASAN build to work on top of regular build

6a5b8fa

Signed-off-by: Connor Roos <croos@nvidia.com>

croos12 requested a review from Copilot March 4, 2026 03:35

Copilot started reviewing on behalf of croos12 March 4, 2026 03:36 View session

Copilot AI reviewed Mar 4, 2026

View reviewed changes

rules/docker-orchagent.mk Outdated Show resolved Hide resolved

platform/template/docker-syncd-bookworm.mk Outdated Show resolved Hide resolved

slave.mk Show resolved Hide resolved

rules/syncd.mk Show resolved Hide resolved

croos12 changed the title ~~Set ASAN build to work on top of regular build~~ Fix ASAN clobbering after build on the same system Mar 4, 2026

croos12 changed the title ~~Fix ASAN clobbering after build on the same system~~ Fix ASAN build clobbering packages after build on the same system Mar 4, 2026

Address comments

35db3ab

Signed-off-by: Connor Roos <croos@nvidia.com>

croos12 marked this pull request as ready for review March 6, 2026 17:38

croos12 added 2 commits March 6, 2026 18:04

Update header

531edd4

Signed-off-by: Connor Roos <croos@nvidia.com>

Use capital ENABLE_ASAN

268b420

Signed-off-by: Connor Roos <croos@nvidia.com>

croos12 requested a review from Copilot March 7, 2026 21:41

Copilot started reviewing on behalf of croos12 March 7, 2026 21:42 View session

Copilot AI reviewed Mar 7, 2026

View reviewed changes

rules/swss.mk Show resolved Hide resolved

rules/syncd.mk Show resolved Hide resolved

rules/swss.mk Show resolved Hide resolved

Address package name comments

6ee4ff5

Signed-off-by: Connor Roos <croos@nvidia.com>

croos12 requested a review from Copilot March 9, 2026 22:53

Copilot started reviewing on behalf of croos12 March 9, 2026 22:53 View session

Copilot AI reviewed Mar 9, 2026

View reviewed changes

croos12 added 2 commits March 10, 2026 17:56

Remove DPKG_DEB_NAME change

3b42208

Signed-off-by: Connor Roos <croos@nvidia.com>

Revert ASAN debug package name

e62785d

Signed-off-by: Connor Roos <croos@nvidia.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix ASAN build clobbering packages after build on the same system#13

Fix ASAN build clobbering packages after build on the same system#13
croos12 wants to merge 7 commits intomasterfrom
croos-asan-build

croos12 commented Mar 4, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vivekrnv commented Mar 5, 2026

Uh oh!

croos12 commented Mar 5, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

vivekrnv commented Mar 14, 2026

Uh oh!

croos12 commented Mar 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

croos12 commented Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Why I did it

How I did it

How to verify it

Tested branch (Please provide the tested image version)

Description for the changelog

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vivekrnv commented Mar 5, 2026

Uh oh!

croos12 commented Mar 5, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

vivekrnv commented Mar 14, 2026

Uh oh!

croos12 commented Mar 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

croos12 commented Mar 4, 2026 •

edited

Loading