stratosphere: only hold sm sessions open when needed

stratosphere/ams_mitm/source/amsmitm_main.cpp

@@ -73,15 +73,12 @@ void __appInit(void) {
     
     SetFirmwareVersionForLibnx();
     
-    rc = smInitialize();
+    DoWithSmSession([&]() {
-    if (R_FAILED(rc)) {
-        fatalSimple(MAKERESULT(Module_Libnx, LibnxError_InitFail_SM));
-    }
-    
         rc = fsInitialize();
         if (R_FAILED(rc)) {
-        fatalSimple(MAKERESULT(Module_Libnx, LibnxError_InitFail_FS));
+            std::abort();
         }
+    });
     
     CheckAtmosphereVersion(CURRENT_ATMOSPHERE_VERSION);
 }
@@ -89,7 +86,6 @@ void __appInit(void) {
 void __appExit(void) {
     /* Cleanup services. */
     fsExit();
-    smExit();
 }
 
 int main(int argc, char **argv)
@@ -100,10 +96,10 @@ int main(int argc, char **argv)
     LaunchAllMitmModules();
 
     if (R_FAILED(initializer_thread.Initialize(&Utils::InitializeThreadFunc, NULL, 0x4000, 0x15))) {
-        /* TODO: Panic. */
+        std::abort();
     }
     if (R_FAILED(initializer_thread.Start())) {
-        /* TODO: Panic. */
+        std::abort();
     }
         
     /* Wait for all mitm modules to end. */

stratosphere/ams_mitm/source/ns_mitm/nsmitm_main.cpp

@@ -35,12 +35,12 @@ void NsMitmMain(void *arg) {
     Utils::WaitSdInitialized();
 
     /* Ensure we can talk to NS. */
-    {
+    DoWithSmSession([&]() {
         if (R_FAILED(nsInitialize())) {
             std::abort();
         }
         nsExit();
-    }
+    });
 
     /* Create server manager */
     auto server_manager = new WaitableManager(1);

stratosphere/ams_mitm/source/utils.cpp

@@ -78,6 +78,7 @@ static bool IsHexadecimal(const char *str) {
 
 void Utils::InitializeThreadFunc(void *args) {
     /* Get required services. */
+    DoWithSmSession([&]() {
         Handle tmp_hnd = 0;
         static const char * const required_active_services[] = {"pcv", "gpio", "pinmux", "psc:c"};
         for (unsigned int i = 0; i < sizeof(required_active_services) / sizeof(required_active_services[0]); i++) {
@@ -87,6 +88,7 @@ void Utils::InitializeThreadFunc(void *args) {
                 svcCloseHandle(tmp_hnd);   
             }
         }
+    });
     
     /* Mount SD. */
     while (R_FAILED(fsMountSdcard(&g_sd_filesystem))) {
@@ -197,7 +199,11 @@ void Utils::InitializeThreadFunc(void *args) {
     Utils::RefreshConfiguration();
     
     /* Initialize set:sys. */
-    setsysInitialize();
+    DoWithSmSession([&]() {
+        if (R_FAILED(setsysInitialize())) {
+            std::abort();
+        }
+    });
     
     /* Signal SD is initialized. */
     g_has_initialized = true;
@@ -209,13 +215,15 @@ void Utils::InitializeThreadFunc(void *args) {
     g_sd_signal.Signal();
     
     /* Initialize HID. */
-    {
+    while (!g_has_hid_session) {
-        
+        DoWithSmSession([&]() {
-        while (R_FAILED(hidInitialize())) {
+            if (R_SUCCEEDED(hidInitialize())) {
+                g_has_hid_session = true;
+            }
+        });
+        if (!g_has_hid_session) {
             svcSleepThread(1000000ULL);
         }
-        
-        g_has_hid_session = true;
     }
 }
 

stratosphere/boot/source/boot_main.cpp

@@ -80,11 +80,7 @@ void __appInit(void) {
     SetFirmwareVersionForLibnx();
 
     /* Initialize services we need (TODO: NCM) */
-    rc = smInitialize();
+    DoWithSmSession([&]() {
-    if (R_FAILED(rc)) {
-        std::abort();
-    }
-    
         rc = fsInitialize();
         if (R_FAILED(rc)) {
             std::abort();
@@ -104,6 +100,7 @@ void __appInit(void) {
         if (R_FAILED(rc)) {
             std::abort();
         }
+    });
     
     CheckAtmosphereVersion(CURRENT_ATMOSPHERE_VERSION);
 }
@@ -114,7 +111,6 @@ void __appExit(void) {
     pmshellExit(); 
     splExit();
     fsExit();
-    smExit();
 }
 
 typedef enum {

stratosphere/creport/source/creport_crash_report.cpp

@@ -240,19 +240,28 @@ bool CrashReport::GetCurrentTime(u64 *out) {
     
     /* Verify that pcv isn't dead. */
     {
+        bool has_time_service;
+        DoWithSmSession([&]() {
             Handle dummy;
             if (R_SUCCEEDED(smRegisterService(&dummy, "time:s", false, 0x20))) {
                 svcCloseHandle(dummy);
+                has_time_service = false;
+            } else {
+                has_time_service = true;
+            }
+        });
+        if (!has_time_service) {
             return false;
         }
     }
     
     /* Try to get the current time. */
-    bool success = false;
+    bool success = true;
-    if (R_SUCCEEDED(timeInitialize())) {
+    DoWithSmSession([&]() {
-        if (R_SUCCEEDED(timeGetCurrentTime(TimeType_LocalSystemClock, out))) {
+        success &= R_SUCCEEDED(timeInitialize());
-            success = true;
+    });
-        }
+    if (success) {
+        success &= R_SUCCEEDED(timeGetCurrentTime(TimeType_LocalSystemClock, out));
         timeExit();
     }
     return success;

stratosphere/creport/source/creport_main.cpp

@@ -69,15 +69,12 @@ void __appInit(void) {
     
     SetFirmwareVersionForLibnx();
     
-    rc = smInitialize();
+    DoWithSmSession([&]() {
-    if (R_FAILED(rc)) {
-        fatalSimple(MAKERESULT(Module_Libnx, LibnxError_InitFail_SM));
-    }
-    
         rc = fsInitialize();
         if (R_FAILED(rc)) {
             fatalSimple(MAKERESULT(Module_Libnx, LibnxError_InitFail_FS));
         }
+    });
     
     rc = fsdevMountSdmc();
     if (R_FAILED(rc)) {
@@ -89,7 +86,6 @@ void __appExit(void) {
     /* Cleanup services. */
     fsdevUnmountAll();
     fsExit();
-    smExit();
 }
 
 static u64 creport_parse_u64(char *s) {
@@ -127,10 +123,12 @@ int main(int argc, char **argv) {
     if (g_Creport.WasSuccessful()) {
         g_Creport.SaveReport();
         
+        DoWithSmSession([&]() {
             if (R_SUCCEEDED(nsdevInitialize())) {
                 nsdevTerminateProcess(crashed_pid);
                 nsdevExit();
             }
+        });
         
         /* Don't fatal if we have extra info. */
         if (kernelAbove500()) {

stratosphere/dmnt/source/dmnt_main.cpp

@@ -71,11 +71,7 @@ void __appInit(void) {
 
     SetFirmwareVersionForLibnx();
 
-    rc = smInitialize();
+    DoWithSmSession([&]() {
-    if (R_FAILED(rc)) {
-        fatalSimple(MAKERESULT(Module_Libnx, LibnxError_InitFail_SM));
-    }
-    
         rc = pmdmntInitialize();
         if (R_FAILED(rc)) {
             fatalSimple(rc);
@@ -120,6 +116,7 @@ void __appInit(void) {
         if (R_FAILED(rc)) {
             fatalSimple(rc);
         }
+    });
 
     rc = fsdevMountSdmc();
     if (R_FAILED(rc)) {
@@ -141,7 +138,6 @@ void __appExit(void) {
     roDmntExit();
     ldrDmntExit();
     pmdmntExit();
-    smExit();
 }
 
 int main(int argc, char **argv)

stratosphere/fatal/source/fatal_main.cpp

@@ -76,11 +76,7 @@ void __appInit(void) {
 
     SetFirmwareVersionForLibnx();
 
-    rc = smInitialize();
+    DoWithSmSession([&]() {
-    if (R_FAILED(rc)) {
-        std::abort();
-    }
-    
         rc = setInitialize();
         if (R_FAILED(rc)) {
             std::abort();
@@ -140,6 +136,7 @@ void __appInit(void) {
         if (R_FAILED(rc)) {
             std::abort();
         }
+    });
 
     rc = fsdevMountSdmc();
     if (R_FAILED(rc)) {
@@ -164,7 +161,6 @@ void __appExit(void) {
     pminfoExit();
     setsysExit();
     setExit();
-    smExit();
 }
 
 int main(int argc, char **argv)

stratosphere/fatal/source/fatal_task_error_report.cpp

@@ -38,19 +38,28 @@ bool ErrorReportTask::GetCurrentTime(u64 *out) {
     
     /* Verify that pcv isn't dead. */
     {
+        bool has_time_service;
+        DoWithSmSession([&]() {
             Handle dummy;
             if (R_SUCCEEDED(smRegisterService(&dummy, "time:s", false, 0x20))) {
                 svcCloseHandle(dummy);
+                has_time_service = false;
+            } else {
+                has_time_service = true;
+            }
+        });
+        if (!has_time_service) {
             return false;
         }
     }
     
     /* Try to get the current time. */
-    bool success = false;
+    bool success = true;
-    if (R_SUCCEEDED(timeInitialize())) {
+    DoWithSmSession([&]() {
-        if (R_SUCCEEDED(timeGetCurrentTime(TimeType_LocalSystemClock, out))) {
+        success &= R_SUCCEEDED(timeInitialize());
-            success = true;
+    });
-        }
+    if (success) {
+        success &= R_SUCCEEDED(timeGetCurrentTime(TimeType_LocalSystemClock, out));
         timeExit();
     }
     return success;

stratosphere/fatal/source/fatal_task_screen.cpp

@@ -95,7 +95,10 @@ Result ShowFatalTask::PrepareScreenForDrawing() {
     Result rc = ResultSuccess;
 
     /* Connect to vi. */
-    if (R_FAILED((rc = viInitialize(ViServiceType_Manager)))) {
+    DoWithSmSession([&]() {
+        rc = viInitialize(ViServiceType_Manager);
+    });
+    if (R_FAILED(rc)) {
         return rc;
     }
 

stratosphere/libstratosphere

@@ -1 +1 @@
-Subproject commit 880bce9092fbef0bcbf101b8ec2e3d2c5af3fb98
+Subproject commit 79bc9bf8d87dddcfc2d080626eb8c817c7339fd0

stratosphere/loader/source/ldr_content_management.cpp

@@ -94,19 +94,20 @@ Result ContentManagement::MountCode(u64 tid, FsStorageId sid) {
     }
 
     /* Always re-initialize fsp-ldr, in case it's closed */
-    if (R_FAILED(rc = fsldrInitialize())) {
+    DoWithSmSession([&]() {
+        rc = fsldrInitialize();
+    });
+    if (R_FAILED(rc)) {
         return rc;
     }
+    ON_SCOPE_EXIT { fsldrExit(); };
 
     if (R_FAILED(rc = fsldrOpenCodeFileSystem(tid, path, &g_CodeFileSystem))) {
-        fsldrExit();
         return rc;
     }
 
     fsdevMountDevice("code", g_CodeFileSystem);
     TryMountHblNspOnSd();
-
-    fsldrExit();
     return rc;
 }
 
@@ -372,17 +373,21 @@ void ContentManagement::RefreshConfigurationData() {
 void ContentManagement::TryMountSdCard() {
     /* Mount SD card, if psc, bus, and pcv have been created. */
     if (!g_has_initialized_fs_dev && HasCreatedTitle(TitleId_Psc) && HasCreatedTitle(TitleId_Bus) && HasCreatedTitle(TitleId_Pcv)) {
+        bool can_mount = true;
+        DoWithSmSession([&]() {
             Handle tmp_hnd = 0;
             static const char * const required_active_services[] = {"pcv", "gpio", "pinmux", "psc:c"};
             for (unsigned int i = 0; i < sizeof(required_active_services) / sizeof(required_active_services[0]); i++) {
                 if (R_FAILED(smGetServiceOriginal(&tmp_hnd, smEncodeName(required_active_services[i])))) {
-                return;
+                    can_mount = false;
+                    break;
                 } else {
                     svcCloseHandle(tmp_hnd);   
                 }
             }
+        });
 
-        if (R_SUCCEEDED(fsdevMountSdmc())) {
+        if (can_mount && R_SUCCEEDED(fsdevMountSdmc())) {
             g_has_initialized_fs_dev = true;
         }
     }

stratosphere/loader/source/ldr_hid.cpp

@@ -25,9 +25,15 @@ Result HidManagement::GetKeysHeld(u64 *keys) {
         return MAKERESULT(Module_Libnx, LibnxError_InitFail_HID);
     }
 
-    if (!serviceIsActive(hidGetSessionService()) && R_FAILED(hidInitialize())) {
+    if (!serviceIsActive(hidGetSessionService())) {
+        Result rc;
+        DoWithSmSession([&]() {
+            rc = hidInitialize();
+        });
+        if (R_FAILED(rc)) {
             return MAKERESULT(Module_Libnx, LibnxError_InitFail_HID);
         }
+    }
 
     hidScanInput();
     *keys = hidKeysHeld(CONTROLLER_P1_AUTO);

stratosphere/loader/source/ldr_main.cpp

@@ -72,11 +72,7 @@ void __appInit(void) {
     SetFirmwareVersionForLibnx();
 
     /* Initialize services we need (TODO: SPL) */
-    rc = smInitialize();
+    DoWithSmSession([&]() {
-    if (R_FAILED(rc)) {
-        std::abort();
-    }
-    
         rc = fsInitialize();
         if (R_FAILED(rc)) {
             std::abort();
@@ -91,6 +87,8 @@ void __appInit(void) {
         if (R_FAILED(rc))  {
             std::abort();
         }
+    });
+
 
     CheckAtmosphereVersion(CURRENT_ATMOSPHERE_VERSION);
 }
@@ -101,7 +99,6 @@ void __appExit(void) {
     fsldrExit();
     lrExit();
     fsExit();
-    smExit();
 }
 
 struct LoaderServerOptions {

stratosphere/pm/source/pm_boot2.cpp

@@ -105,7 +105,11 @@ static bool GetGpioPadLow(GpioPadName pad) {
 
 static bool IsMaintenanceMode() {
     /* Contact set:sys, retrieve boot!force_maintenance. */
-    if (R_SUCCEEDED(setsysInitialize())) {
+    Result rc;
+    DoWithSmSession([&]() {
+        rc = setsysInitialize();
+    });
+    if (R_SUCCEEDED(rc)) {
         ON_SCOPE_EXIT { setsysExit(); };
 
         u8 force_maintenance = 1;
@@ -116,7 +120,10 @@ static bool IsMaintenanceMode() {
     }
 
     /* Contact GPIO, read plus/minus buttons. */
-    if (R_SUCCEEDED(gpioInitialize())) {
+    DoWithSmSession([&]() {
+        rc = gpioInitialize();
+    });
+    if (R_SUCCEEDED(rc)) {
         ON_SCOPE_EXIT { gpioExit(); };
 
         return GetGpioPadLow(GpioPadName_ButtonVolUp) && GetGpioPadLow(GpioPadName_ButtonVolDown);
@@ -168,6 +175,7 @@ static const std::tuple<u64, bool> g_additional_launch_programs[] = {
 };
 
 static void MountSdCard() {
+    DoWithSmSession([&]() {
         Handle tmp_hnd = 0;
         static const char * const required_active_services[] = {"pcv", "gpio", "pinmux", "psc:c"};
         for (unsigned int i = 0; i < sizeof(required_active_services) / sizeof(required_active_services[0]); i++) {
@@ -177,22 +185,27 @@ static void MountSdCard() {
                 svcCloseHandle(tmp_hnd);
             }
         }
+    });
     fsdevMountSdmc();
 }
 
 static void WaitForMitm(const char *service) {
     bool mitm_installed = false;
 
-    Result rc = smManagerAmsInitialize();
+    Result rc;
-    if (R_FAILED(rc)) {
+    DoWithSmSession([&]() {
+        if (R_FAILED((rc = smManagerAmsInitialize()))) {
             std::abort();
         }
+    });
+
     while (R_FAILED((rc = smManagerAmsHasMitm(&mitm_installed, service))) || !mitm_installed) {
         if (R_FAILED(rc)) {
             std::abort();
         }
         svcSleepThread(1000000ull);
     }
+
     smManagerAmsExit();
 }
 

stratosphere/pm/source/pm_main.cpp

@@ -99,11 +99,7 @@ void __appInit(void) {
 
     SetFirmwareVersionForLibnx();
 
-    rc = smInitialize();
+    DoWithSmSession([&]() {
-    if (R_FAILED(rc)) {
-        std::abort();
-    }
-    
         rc = fsprInitialize();
         if (R_FAILED(rc))  {
             std::abort();
@@ -115,6 +111,7 @@ void __appInit(void) {
         rc = smManagerAmsInitialize();
         if (R_SUCCEEDED(rc)) {
             smManagerAmsEndInitialDefers();
+            smManagerAmsExit();
         } else {
             std::abort();
         }
@@ -143,6 +140,7 @@ void __appInit(void) {
         if (R_FAILED(rc)) {
             std::abort();
         }
+    });
 
     CheckAtmosphereVersion(CURRENT_ATMOSPHERE_VERSION);
 }
@@ -156,7 +154,6 @@ void __appExit(void) {
     fsprExit();
     lrExit();
     fsExit();
-    smExit();
 }
 
 int main(int argc, char **argv)