viogpusc: Fix the timeout issue when stopping viogpusc service

When the user stops the viogpusc service either through SCM or
console command line, a timeout error is thrown out as the
following,

From the console,
The service did not respond to the start or control request
in a timely fashion.

From SCM
A timeout was reached while waiting for a transaction response
from the viogpusc service.

This error is due to the incomplete initialization of the
Session creating viogpuap process. This initialization is
blocked until the process is terminated. When SCM or console
command tries to stop the service, it always fails because the
Session is waiting for the process to be terminated. Actually,
the process is waiting for the service to trigger an event to
terminate itself. This is a dead loop.

To fix this issue, the Session initialization should be completed,
and the Session Manager should monitor the termination of the
process and release the resources after the process is terminated.

Signed-off-by: Annie Li <[email protected]>

Author: annie-li

viogpu/viogpusc/Session.cpp

@@ -32,7 +32,10 @@
 #include "pipe.h"
 
 
-CSession::CSession(ULONG Id) : m_PipeServer(NULL)
+CSession::CSession(ULONG Id) :
+    m_PipeServer(NULL),
+    m_hToken(NULL),
+    m_lpvEnv(NULL)
 {
     PrintMessage(L"%ws Id = %d\n", __FUNCTIONW__, Id);
 
@@ -71,6 +74,30 @@ void CSession::Close(void)
         delete m_PipeServer;
         m_PipeServer = NULL;
     }
+
+    if (m_hToken)
+    {
+        CloseHandle(m_hToken);
+        m_hToken = NULL;
+    }
+
+    if (m_lpvEnv)
+    {
+        DestroyEnvironmentBlock(m_lpvEnv);
+        m_lpvEnv = NULL;
+    }
+
+    if (m_ProcessInfo.hProcess)
+    {
+        CloseHandle(m_ProcessInfo.hProcess);
+        m_ProcessInfo.hProcess = NULL;
+    }
+
+    if (m_ProcessInfo.hThread)
+    {
+        CloseHandle(m_ProcessInfo.hThread);
+        m_ProcessInfo.hThread = NULL;
+    }
 }
 
 void CSession::Pause(void)
@@ -83,13 +110,10 @@ void CSession::Resume(void)
 
 bool CSession::CreateProcessInSession(const std::wstring & commandLine)
 {
-    HANDLE hToken = NULL;
     STARTUPINFO si = { sizeof(si) };
-    LPVOID lpvEnv = NULL;
     DWORD dwError = ERROR_SUCCESS;
     wchar_t szUserProfileDir[MAX_PATH];
     DWORD cchUserProfileDir = ARRAYSIZE(szUserProfileDir);
-    DWORD ExitCode;
     DWORD dwWaitResult;
 
     PrintMessage(L"%ws\n", __FUNCTIONW__);
@@ -101,7 +125,7 @@ bool CSession::CreateProcessInSession(const std::wstring & commandLine)
             break;
         }
 
-        if (!WTSQueryUserToken(m_SessionInfo.SessionId, &hToken))
+        if (!WTSQueryUserToken(m_SessionInfo.SessionId, &m_hToken))
         {
             dwError = GetLastError();
             PrintMessage(L"WTSQueryUserToken failed with error 0x%x\n", dwError);
@@ -111,23 +135,23 @@ bool CSession::CreateProcessInSession(const std::wstring & commandLine)
         TOKEN_LINKED_TOKEN admin = {};
         HANDLE hAdmToken = 0;
         DWORD dw = 0;
-        if (GetTokenInformation(hToken, (TOKEN_INFORMATION_CLASS)TokenLinkedToken, &admin, sizeof(TOKEN_LINKED_TOKEN), &dw))
+        if (GetTokenInformation(m_hToken, (TOKEN_INFORMATION_CLASS)TokenLinkedToken, &admin, sizeof(TOKEN_LINKED_TOKEN), &dw))
         {
             hAdmToken = admin.LinkedToken;
         }
         else
         {
-            DuplicateTokenEx(hToken, MAXIMUM_ALLOWED, NULL, SecurityIdentification, TokenPrimary, &hAdmToken);
+            DuplicateTokenEx(m_hToken, MAXIMUM_ALLOWED, NULL, SecurityIdentification, TokenPrimary, &hAdmToken);
         }
 
-        if (!CreateEnvironmentBlock(&lpvEnv, hToken, TRUE))
+        if (!CreateEnvironmentBlock(&m_lpvEnv, m_hToken, TRUE))
         {
             dwError = GetLastError();
             PrintMessage(L"CreateEnvironmentBlock failed with error 0x%x\n", dwError);
             break;
         }
 
-        if (!GetUserProfileDirectory(hToken, szUserProfileDir,
+        if (!GetUserProfileDirectory(m_hToken, szUserProfileDir,
             &cchUserProfileDir))
         {
             dwError = GetLastError();
@@ -138,43 +162,14 @@ bool CSession::CreateProcessInSession(const std::wstring & commandLine)
         si.lpDesktop = TEXT("winsta0\\default");
 
         if (!CreateProcessAsUser(hAdmToken, NULL, const_cast<wchar_t *>(commandLine.c_str()), NULL, NULL, FALSE,
-            CREATE_UNICODE_ENVIRONMENT | CREATE_NO_WINDOW, lpvEnv, szUserProfileDir, &si, &m_ProcessInfo))
+            CREATE_UNICODE_ENVIRONMENT | CREATE_NO_WINDOW, m_lpvEnv, szUserProfileDir, &si, &m_ProcessInfo))
         {
             dwError = GetLastError();
             PrintMessage(L"CreateProcessAsUser failed with error 0x%x\n", dwError);
             break;
         }
-
-        WaitForSingleObject(m_ProcessInfo.hProcess, INFINITE);
-        GetExitCodeProcess(m_ProcessInfo.hProcess, &ExitCode);
-        PrintMessage(L"Process finished with code 0x%x\n", ExitCode);
-
     } while (0);
 
-    if (hToken)
-    {
-        CloseHandle(hToken);
-        hToken = NULL;
-    }
-
-    if (lpvEnv)
-    {
-        DestroyEnvironmentBlock(lpvEnv);
-        lpvEnv = NULL;
-    }
-
-    if (m_ProcessInfo.hProcess)
-    {
-        CloseHandle(m_ProcessInfo.hProcess);
-        m_ProcessInfo.hProcess = NULL;
-    }
-
-    if (m_ProcessInfo.hThread)
-    {
-        CloseHandle(m_ProcessInfo.hThread);
-        m_ProcessInfo.hThread = NULL;
-    }
-
     if (dwError != ERROR_SUCCESS)
     {
         SetLastError(dwError);

viogpu/viogpusc/Session.h

@@ -48,6 +48,7 @@ class CSession
     HANDLE GetProcess(void) { return m_SessionInfo.hProcess; }
     void SetProcess(HANDLE Handle) { m_SessionInfo.hProcess = Handle; }
     ULONG GetId(void) { return m_SessionInfo.SessionId; }
+    HANDLE GetCreateProcess(void) { return m_ProcessInfo.hProcess; }
 private:
     bool PipeServerActive(void) { return (m_PipeServer != NULL); }
     bool CreateProcessInSession(const std::wstring & commandLine);
@@ -56,5 +57,7 @@ class CSession
     PipeServer* m_PipeServer;
     SESSION_INFORMATION m_SessionInfo;
     PROCESS_INFORMATION m_ProcessInfo;
+    HANDLE m_hToken;
+    LPVOID m_lpvEnv;
 };
 

viogpu/viogpusc/SessionMgr.cpp

@@ -43,7 +43,18 @@ CSessionMgr::~CSessionMgr()
 
 DWORD WINAPI CSessionMgr::ServiceThread(CSessionMgr* prt)
 {
+    HANDLE hProcessHandle;
+    DWORD ExitCode;
+
     prt->Run();
+    for (Iterator it = prt->Sessions.begin(); it != prt->Sessions.end(); it++)
+    {
+        hProcessHandle = prt->GetSessioinCreateProcess((*it)->GetId());
+        WaitForSingleObject(hProcessHandle, INFINITE);
+        GetExitCodeProcess(hProcessHandle, &ExitCode);
+        PrintMessage(L"Process finished with code 0x%x\n", ExitCode);
+    }
+
     return 0;
 }
 
@@ -106,6 +117,7 @@ void CSessionMgr::Close()
 
     for (Iterator it = Sessions.begin(); it != Sessions.end(); it++)
     {
+        (*it)->Close();
         delete *it;
     }
 
@@ -135,6 +147,18 @@ void CSessionMgr::SetSessionStatus(UINT Indx, SESSION_STATUS status)
     }
 }
 
+HANDLE CSessionMgr::GetSessioinCreateProcess(UINT Indx)
+{
+    PrintMessage(L"%ws\n", __FUNCTIONW__);
+
+    CSession* ptr = FindSession(Indx);
+    if (ptr) {
+        return (ptr)->GetCreateProcess();
+    }
+
+    return (HANDLE)NULL;
+}
+
 HANDLE CSessionMgr::GetSessioinProcess(UINT Indx)
 { 
     PrintMessage(L"%ws\n", __FUNCTIONW__);

viogpu/viogpusc/SessionMgr.h

@@ -44,6 +44,7 @@ class CSessionMgr
     void SetSessionStatus(UINT Indx, SESSION_STATUS status);
     HANDLE GetSessioinProcess(UINT Indx);
     void SetSessionProcess(UINT Indx, HANDLE Handle);
+    HANDLE GetSessioinCreateProcess(UINT Indx);
 private:
     CSession* FindSession(ULONG Indx, bool bCreate = false);
     void AddSession(CSession* session);