Skip to content

fix(CR-1285405): reload PL+AIE overlays safely - #10124

Merged
chvamshi-xilinx merged 1 commit into
Xilinx:masterfrom
ManojTakasi:fix/CR-1285405
Oct 19, 2026
Merged

chvamshi-xilinx merged 1 commit into
Xilinx:masterfrom
ManojTakasi:fix/CR-1285405

Conversation

@ManojTakasi

Copy link
Copy Markdown
Collaborator

Problem solved by the commit

https://jira.xilinx.com/browse/CR-1285405 Fix repeated execution of PL+AIE xclbins. The first run passed, but the next run could hang during DT overlay loading or hit an AIE-related kernel Oops.

Bug / issue (if any) fixed, which PR introduced the bug, how it was discovered

This was introduced by PR #10035. During overlay removal, zocl destroyed and recreated CU interrupt state while the DT nodes were being removed.

The existing same-UUID handling from PR #9696 also skipped reloading the xclbin even when the old AIE partition was already removed.

How problem was solved, alternative solutions (if any) and why they were rejected

During overlay pre-remove, zocl now only tears down the CU and interrupt-controller state. It recreates them after the new overlay is applied.

For slot 0, zocl clears its AIE bookkeeping without calling aie_partition_release(), because overlay removal already removes the AIE aperture and partition. Calling both paths caused double removal and a kernel Oops.

The same-UUID path now reloads the xclbin when AIE metadata is present but the AIE partition is gone.

The userspace overlay removal is also checked before applying another overlay.

Risks (if any) associated the changes in the commit

The slot-specific handling is preserved: slot 0 uses overlay-managed AIE cleanup, while other slots continue using the normal AIE release path.

What has been tested and how, request additional testing if necessary

The PL+AIE embedded_exec.sh test passed five consecutive runs without rebooting the board. No overlay hang, kernel Oops, or aie_part_mmap: size exceed error was seen.

Documentation impact (if any)

Co-authored-by: Cursor <cursoragent@cursor.com>

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-tidy made some suggestions

Comment thread src/runtime_src/core/edge/drm/zocl/include/zocl_drv.h
@github-actions

Copy link
Copy Markdown
Contributor

clang-tidy review says "All clean, LGTM! 👍"

@chvamshi-xilinx
chvamshi-xilinx merged commit 43305a1 into Xilinx:master Oct 19, 2026
33 of 51 checks passed
ManojTakasi added a commit to ManojTakasi/XRT that referenced this pull request Oct 19, 2026
Co-authored-by: Cursor <cursoragent@cursor.com>
(cherry picked from commit 43305a1)
chvamshi-xilinx pushed a commit that referenced this pull request Oct 19, 2026
(cherry picked from commit 43305a1)

Co-authored-by: Cursor <cursoragent@cursor.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants