Skip to content

ce: fix CeUtils scheduling left paused on error paths in kceTopLevelPceLceMappingsUpdate #1210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rawrmonster17 wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −4
Open

ce: fix CeUtils scheduling left paused on error paths in kceTopLevelPceLceMappingsUpdate #1210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/nvidia/src/kernel/gpu/ce/kernel_ce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,9 +805,10 @@ NV_STATUS kceTopLevelPceLceMappingsUpdate_IMPL(OBJGPU *pGpu, KernelCE *pKCe)
params.exposeCeMask = exposeCeMask;
params.bUpdateNvlinkPceLce = bUpdateNvlinkPceLce;

NV_ASSERT_OK_OR_RETURN(
rmapiControlCacheFreeForControl(gpuGetInstance(pGpu),
NV2080_CTRL_CMD_CE_GET_CE_PCE_MASK));
status = rmapiControlCacheFreeForControl(gpuGetInstance(pGpu),
NV2080_CTRL_CMD_CE_GET_CE_PCE_MASK);
if (status != NV_OK)
goto cleanup;

// For GSP clients, the update needs to be routed through ctrl call
params.shimInstance = pKCe->shimInstance;
Expand All @@ -822,7 +823,7 @@ NV_STATUS kceTopLevelPceLceMappingsUpdate_IMPL(OBJGPU *pGpu, KernelCE *pKCe)
{
NV_PRINTF(LEVEL_ERROR,
"Failed to update PCE-LCE mappings. Return\n");
return status;
goto cleanup;
}

//
Expand All @@ -833,6 +834,7 @@ NV_STATUS kceTopLevelPceLceMappingsUpdate_IMPL(OBJGPU *pGpu, KernelCE *pKCe)
//
status = kceUpdateClassDB_HAL(pGpu, pKCe);

cleanup:
ceResumeCeUtilsScheduling(pGpu);

return status;
Expand Down