Skip to content

Commit

Permalink
[Media Common] [VP] Fix OCA R2R crash issue for common dll separation
Browse files Browse the repository at this point in the history 
Move buf handle map from common dll to DDI dll
  • Loading branch information
@LhGu @intel-mediadev
LhGu authored and intel-mediadev committed Aug 30, 2023
1 parent 77c20c4 commit 5444c83
Show file tree
Hide file tree
Showing 5 changed files with 148 additions and 47 deletions.
29 changes: 29 additions & 0 deletions media_common/agnostic/common/os/mos_oca_interface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,35 @@ class MosOcaInterface
return nullptr;
}

//!
//! \brief Insert OCA buffer handle into m_hOcaMap
//! \param [in] key
//! The key of m_hOcaMap.
//! \param [in] handle
//! Oca buffer handle.
//! \return MOS_STATUS
//! Return MOS_STATUS_SUCCESS if insert successfully, otherwise insert failed.
//!
virtual MOS_STATUS InsertOcaBufHandleMap(uint32_t *key, MOS_OCA_BUFFER_HANDLE handle) = 0;

//!
//! \brief Remove OCA buffer handle from m_hOcaMap
//! \param [in] key
//! The key of m_hOcaMap.
//! \return MOS_STATUS
//! Return MOS_STATUS_SUCCESS if erase successfully, otherwise erase failed.
//!
virtual MOS_STATUS RemoveOcaBufHandleFromMap(uint32_t *key) = 0;

//!
//! \brief Get OCA buffer handle from m_hOcaMap
//! \param [in] key
//! The key of m_hOcaMap.
//! \return MOS_OCA_BUFFER_HANDLE
//! Return oca buffer handle.
//!
virtual MOS_OCA_BUFFER_HANDLE GetOcaBufHandleFromMap(uint32_t *key) = 0;

//!
//! \brief Get OCA status.
//! \return MOS_STATUS
Expand Down
3 changes: 0 additions & 3 deletions media_softlet/agnostic/common/renderhal/hal_oca_interface_next.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,6 @@ class HalOcaInterfaceNext
HalOcaInterfaceNext(HalOcaInterfaceNext &);
HalOcaInterfaceNext& operator= (HalOcaInterfaceNext &);

protected:
static std::map<uint32_t*, MOS_OCA_BUFFER_HANDLE> s_hOcaMap; //!< Oca buffer handle map to current command

MEDIA_CLASS_DEFINE_END(HalOcaInterfaceNext)
};

Expand Down
31 changes: 31 additions & 0 deletions media_softlet/linux/common/os/mos_oca_interface_specific.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,35 @@ class MosOcaInterfaceSpecific : public MosOcaInterface
return m_ocaMutex;
}

//!
//! \brief Insert OCA buffer handle into m_hOcaMap
//! \param [in] key
//! The key of m_hOcaMap.
//! \param [in] handle
//! Oca buffer handle.
//! \return MOS_STATUS
//! Return MOS_STATUS_SUCCESS if insert successfully, otherwise insert failed.
//!
virtual MOS_STATUS InsertOcaBufHandleMap(uint32_t *key, MOS_OCA_BUFFER_HANDLE handle);

//!
//! \brief Remove OCA buffer handle from m_hOcaMap
//! \param [in] key
//! The key of m_hOcaMap.
//! \return MOS_STATUS
//! Return MOS_STATUS_SUCCESS if erase successfully, otherwise erase failed.
//!
virtual MOS_STATUS RemoveOcaBufHandleFromMap(uint32_t *key);

//!
//! \brief Get OCA buffer handle from m_hOcaMap
//! \param [in] key
//! The key of m_hOcaMap.
//! \return MOS_OCA_BUFFER_HANDLE
//! Return oca buffer handle.
//!
virtual MOS_OCA_BUFFER_HANDLE GetOcaBufHandleFromMap(uint32_t *key);

//!
//! \brief Get OCA status
//! \return MOS_STATUS
Expand Down Expand Up @@ -368,6 +397,8 @@ class MosOcaInterfaceSpecific : public MosOcaInterface
PMOS_MUTEX m_ocaMutex = nullptr;
PMOS_MUTEX m_mutexForOcaBufPool = nullptr;

std::map<uint32_t*, MOS_OCA_BUFFER_HANDLE> m_hOcaMap; //!< Oca buffer handle map

bool m_isOcaEnabled = false;
bool m_isInitialized = false;
MOS_OCA_RESOURCE_INFO *m_resInfoPool = nullptr;
Expand Down
82 changes: 82 additions & 0 deletions media_softlet/linux/common/os/mos_oca_specific.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,13 @@ bool MosOcaInterfaceSpecific::s_isDestroyed = false;
//!
MOS_OCA_BUFFER_HANDLE MosOcaInterfaceSpecific::LockOcaBufAvailable(PMOS_CONTEXT pMosContext, uint32_t CurrentGpuContextHandle)
{
if (nullptr == m_ocaMutex)
{
MosOcaInterfaceSpecific::OnOcaError(pMosContext, MOS_STATUS_NULL_POINTER, __FUNCTION__, __LINE__);
return MOS_OCA_INVALID_BUFFER_HANDLE;
}

MosOcaAutoLock autoLock(m_ocaMutex);
for (int i = m_indexOfNextOcaBufContext; i < MAX_NUM_OF_OCA_BUF_CONTEXT; ++i)
{
if (m_ocaBufContextList[i].inUse)
Expand Down Expand Up @@ -826,6 +833,7 @@ void MosOcaInterfaceSpecific::Uninitialize()
m_ocaBufContextList[i].logSection.resInfo.resInfoList = nullptr;
}
}
m_hOcaMap.clear();
m_isInitialized = false;
s_bOcaStatusExistInReg = false;
s_isDestroyed = false;
Expand Down Expand Up @@ -862,3 +870,77 @@ void MosOcaInterfaceSpecific::UninitInterface()
return;
}

//!
//! \brief Insert OCA buffer handle into m_hOcaMap
//! \param [in] key
//! The key of m_hOcaMap.
//! \param [in] handle
//! Oca buffer handle.
//! \return MOS_STATUS
//! Return MOS_STATUS_SUCCESS if insert successfully, otherwise insert failed.
//!
MOS_STATUS MosOcaInterfaceSpecific::InsertOcaBufHandleMap(uint32_t *key, MOS_OCA_BUFFER_HANDLE handle)
{
MOS_OS_CHK_NULL_RETURN(m_ocaMutex);
MOS_OS_CHK_NULL_RETURN(key);

MosOcaAutoLock autoLock(m_ocaMutex);
auto success = m_hOcaMap.insert(std::make_pair(key, handle));
if (!success.second)
{
// Should never come to here.
MOS_OS_ASSERTMESSAGE("OcaBufHandle has already been assigned to current cmdBuffer!");
return MOS_STATUS_UNKNOWN;
}
return MOS_STATUS_SUCCESS;
}

//!
//! \brief Remove OCA buffer handle from m_hOcaMap
//! \param [in] key
//! The key of m_hOcaMap.
//! \return MOS_STATUS
//! Return MOS_STATUS_SUCCESS if erase successfully, otherwise erase failed.
//!
MOS_STATUS MosOcaInterfaceSpecific::RemoveOcaBufHandleFromMap(uint32_t *key)
{
MOS_OS_CHK_NULL_RETURN(m_ocaMutex);

MosOcaAutoLock autoLock(m_ocaMutex);
auto it = m_hOcaMap.find(key);
if (it != m_hOcaMap.end())
{
m_hOcaMap.erase(it);
}
return MOS_STATUS_SUCCESS;
}

//!
//! \brief Get OCA buffer handle from m_hOcaMap
//! \param [in] key
//! The key of m_hOcaMap.
//! \return MOS_OCA_BUFFER_HANDLE
//! Return oca buffer handle.
//!
MOS_OCA_BUFFER_HANDLE MosOcaInterfaceSpecific::GetOcaBufHandleFromMap(uint32_t *key)
{
if (nullptr == m_ocaMutex)
{
MOS_OS_ASSERTMESSAGE("m_ocaMutex is nullptr.");
return MOS_OCA_INVALID_BUFFER_HANDLE;
}
MosOcaAutoLock autoLock(m_ocaMutex);
auto it = m_hOcaMap.find(key);
if (it == m_hOcaMap.end())
{
// May come here for workloads not enabling UMD_OCA.
return MOS_OCA_INVALID_BUFFER_HANDLE;
}
if (it->second >= MAX_NUM_OF_OCA_BUF_CONTEXT || it->second < 0)
{
MOS_OS_ASSERTMESSAGE("Get invalid OcaBufHandle: %d!", it->second);
return MOS_OCA_INVALID_BUFFER_HANDLE;
}

return it->second;
}
50 changes: 6 additions & 44 deletions media_softlet/linux/common/shared/hal_oca_interface_next.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@

namespace mhw { namespace mi { class Itf; } }

std::map<uint32_t*, MOS_OCA_BUFFER_HANDLE> HalOcaInterfaceNext::s_hOcaMap;

/****************************************************************************************************/
/* HalOcaInterfaceNextNext */
/****************************************************************************************************/
Expand Down Expand Up @@ -603,24 +601,8 @@ MOS_OCA_BUFFER_HANDLE HalOcaInterfaceNext::GetOcaBufferHandle(MOS_COMMAND_BUFFER
OnOcaError(mosContext, MOS_STATUS_NULL_POINTER, __FUNCTION__, __LINE__);
return MOS_OCA_INVALID_BUFFER_HANDLE;
}
PMOS_MUTEX mutex = pOcaInterface->GetMutex();
if (mutex == nullptr)
{
return MOS_OCA_INVALID_BUFFER_HANDLE;
}
MosOcaAutoLock autoLock(mutex);
std::map<uint32_t*, MOS_OCA_BUFFER_HANDLE>::iterator it = s_hOcaMap.find(cmdBuffer.pCmdBase);
if (it == s_hOcaMap.end())
{
// May come here for workloads not enabling UMD_OCA.
return MOS_OCA_INVALID_BUFFER_HANDLE;
}
if (it->second >= MAX_NUM_OF_OCA_BUF_CONTEXT || it->second < 0)
{
OnOcaError(mosContext, MOS_STATUS_NULL_POINTER, __FUNCTION__, __LINE__);
return MOS_OCA_INVALID_BUFFER_HANDLE;
}
return it->second;

return pOcaInterface->GetOcaBufHandleFromMap(cmdBuffer.pCmdBase);
}

void HalOcaInterfaceNext::RemoveOcaBufferHandle(MOS_COMMAND_BUFFER &cmdBuffer, MOS_CONTEXT &mosContext)
Expand All @@ -631,19 +613,7 @@ void HalOcaInterfaceNext::RemoveOcaBufferHandle(MOS_COMMAND_BUFFER &cmdBuffer, M
OnOcaError(&mosContext, MOS_STATUS_NULL_POINTER, __FUNCTION__, __LINE__);
return;
}
PMOS_MUTEX mutex = pOcaInterface->GetMutex();
if (mutex == nullptr)
{
OnOcaError(&mosContext, MOS_STATUS_INVALID_PARAMETER, __FUNCTION__, __LINE__);
return;
}
MosOcaAutoLock autoLock(mutex);
std::map<uint32_t*, MOS_OCA_BUFFER_HANDLE>::iterator it = s_hOcaMap.find(cmdBuffer.pCmdBase);
if (it == s_hOcaMap.end())
{
return;
}
s_hOcaMap.erase(it);
pOcaInterface->RemoveOcaBufHandleFromMap(cmdBuffer.pCmdBase);
}

//!
Expand All @@ -670,12 +640,7 @@ void HalOcaInterfaceNext::On1stLevelBBStart(MOS_COMMAND_BUFFER &cmdBuffer, MOS_C
{
return;
}
PMOS_MUTEX mutex = pOcaInterface->GetMutex();
if (mutex == nullptr)
{
OnOcaError(&mosContext, MOS_STATUS_NULL_POINTER, __FUNCTION__, __LINE__);
return;
}

ocaBufHandle = GetOcaBufferHandle(cmdBuffer, (MOS_CONTEXT_HANDLE)&mosContext);
if (ocaBufHandle != MOS_OCA_INVALID_BUFFER_HANDLE)
{
Expand All @@ -685,18 +650,15 @@ void HalOcaInterfaceNext::On1stLevelBBStart(MOS_COMMAND_BUFFER &cmdBuffer, MOS_C
}
else
{
MosOcaAutoLock autoLock(mutex);
ocaBufHandle = pOcaInterface->LockOcaBufAvailable(&mosContext, gpuContextHandle);

if (MOS_OCA_INVALID_BUFFER_HANDLE == ocaBufHandle)
{
OnOcaError(&mosContext, MOS_STATUS_INVALID_HANDLE, __FUNCTION__, __LINE__);
return;
}
auto success = s_hOcaMap.insert(std::make_pair(cmdBuffer.pCmdBase, ocaBufHandle));
if (!success.second)
if (MOS_FAILED(pOcaInterface->InsertOcaBufHandleMap(cmdBuffer.pCmdBase, ocaBufHandle)))
{
// Should never come to here.
MOS_OS_ASSERTMESSAGE("ocaBufHandle has already been assigned to current cmdBuffer!");
OnOcaError(&mosContext, MOS_STATUS_INVALID_HANDLE, __FUNCTION__, __LINE__);
return;
}
Expand Down

0 comments on commit 5444c83

Please sign in to comment.