Merge 2593e72fc914c63252cbab70f31ad509dac8ff70 into ed4be649623435ebb04f5e93f859bf46d977daa4

This commit is contained in:
Mike Qiu 2024-08-22 15:05:04 -04:00 committed by GitHub
commit a7cf536cd5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -966,6 +966,7 @@ gpuFindClientInfoWithPidIterator_IMPL
Heap *pHeap = GPU_GET_HEAP(pGpu);
NvU32 computeInstanceId = PARTITIONID_INVALID;
NvU32 gpuInstanceId = PARTITIONID_INVALID;
NvU32 nspid;
NV_ASSERT_OR_RETURN(RMCFG_FEATURE_KERNEL_RM, NV_ERR_NOT_SUPPORTED);
NV_ASSERT_OR_RETURN((pid != 0), NV_ERR_INVALID_ARGUMENT);
@ -979,8 +980,11 @@ gpuFindClientInfoWithPidIterator_IMPL
pClient = *ppClient;
pRsClient = staticCast(pClient, RsClient);
if (((subPid == 0) && (pClient->ProcID == pid)) ||
((subPid != 0) && (pClient->ProcID == pid) && (pClient->SubProcessID == subPid)))
if(_gpuConvertPid(pClient, &nspid) != NV_OK)
nspid = pClient->ProcID;
if (((subPid == 0) && (nspid == pid)) ||
((subPid != 0) && (nspid == pid) && (pClient->SubProcessID == subPid)))
{
RS_PRIV_LEVEL privLevel = rmclientGetCachedPrivilege(pClient);
RS_ITERATOR it;