sf: properly support preservation of inline context

libraries/libstratosphere/include/stratosphere/sf.hpp

@@ -22,6 +22,9 @@
 #include <stratosphere/sf/sf_service_object.hpp>
 #include <stratosphere/sf/hipc/sf_hipc_server_session_manager.hpp>
 
+#include <stratosphere/sf/cmif/sf_cmif_inline_context.hpp>
+#include <stratosphere/sf/sf_fs_inline_context.hpp>
+
 #include <stratosphere/sf/sf_out.hpp>
 #include <stratosphere/sf/sf_buffers.hpp>
 #include <stratosphere/sf/impl/sf_impl_command_serialization.hpp>

libraries/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_inline_context.hpp

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018-2020 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include <stratosphere/sf/sf_common.hpp>
+
+namespace ams::sf::cmif {
+
+    using InlineContext = u32;
+
+    InlineContext GetInlineContext();
+    InlineContext SetInlineContext(InlineContext ctx);
+
+    class ScopedInlineContextChanger {
+        private:
+            InlineContext prev_ctx;
+        public:
+            ALWAYS_INLINE explicit ScopedInlineContextChanger(InlineContext new_ctx) : prev_ctx(SetInlineContext(new_ctx)) { /* ... */ }
+            ~ScopedInlineContextChanger() { SetInlineContext(this->prev_ctx); }
+    };
+
+}

libraries/libstratosphere/include/stratosphere/sf/sf_fs_inline_context.hpp

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2018-2020 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include <stratosphere/sf/sf_common.hpp>
+
+namespace ams::sf {
+
+    u8 GetFsInlineContext();
+    u8 SetFsInlineContext(u8 ctx);
+
+}

libraries/libstratosphere/source/sf/cmif/sf_cmif_inline_context.cpp

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2018-2020 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <stratosphere.hpp>
+
+namespace ams::sf {
+
+    namespace cmif {
+
+        namespace {
+
+            thread_local InlineContext g_inline_context;
+
+            ALWAYS_INLINE void OnSetInlineContext() {
+                /* Ensure that libnx receives the priority value. */
+                ::fsSetPriority(static_cast<::FsPriority>(::ams::sf::GetFsInlineContext()));
+            }
+
+        }
+
+        InlineContext GetInlineContext() {
+            InlineContext ctx;
+            std::memcpy(std::addressof(ctx), std::addressof(::ams::sf::cmif::g_inline_context), sizeof(ctx));
+            return ctx;
+        }
+
+        InlineContext SetInlineContext(InlineContext ctx) {
+            ON_SCOPE_EXIT { OnSetInlineContext(); };
+            static_assert(sizeof(ctx) <= sizeof(g_inline_context));
+
+            InlineContext old_ctx;
+            std::memcpy(std::addressof(old_ctx), std::addressof(g_inline_context), sizeof(old_ctx));
+            std::memcpy(std::addressof(g_inline_context), std::addressof(ctx), sizeof(ctx));
+            return old_ctx;
+        }
+
+    }
+
+    u8 GetFsInlineContext() {
+        u8 ctx;
+        std::memcpy(std::addressof(ctx), std::addressof(cmif::g_inline_context), sizeof(ctx));
+        return ctx;
+    }
+
+    u8 SetFsInlineContext(u8 ctx) {
+        ON_SCOPE_EXIT { cmif::OnSetInlineContext(); };
+        static_assert(sizeof(ctx) <= sizeof(cmif::g_inline_context));
+
+        u8 old_ctx;
+        std::memcpy(std::addressof(old_ctx), std::addressof(cmif::g_inline_context), sizeof(old_ctx));
+        std::memcpy(std::addressof(cmif::g_inline_context), std::addressof(ctx), sizeof(ctx));
+        return old_ctx;
+    }
+
+}

libraries/libstratosphere/source/sf/hipc/sf_hipc_server_session_manager.cpp

@@ -239,6 +239,24 @@ namespace ams::sf::hipc {
     Result ServerSessionManager::ProcessRequestImpl(ServerSession *session, const cmif::PointerAndSize &in_message, const cmif::PointerAndSize &out_message) {
         /* TODO: Inline context support, retrieve from raw data + 0xC. */
         const auto cmif_command_type = GetCmifCommandType(in_message);
+
+        const auto GetInlineContext = [&]() -> cmif::InlineContext {
+            cmif::InlineContext ret  = {};
+            switch (cmif_command_type) {
+                case CmifCommandType_RequestWithContext:
+                case CmifCommandType_ControlWithContext:
+                    if (in_message.GetSize() >= 0x10) {
+                        static_assert(sizeof(cmif::InlineContext) == 4);
+                        std::memcpy(std::addressof(ret), static_cast<u8 *>(in_message.GetPointer()) + 0xC, sizeof(ret));
+                    }
+                    break;
+                default:
+                    break;
+            }
+            return ret;
+        };
+
+        cmif::ScopedInlineContextChanger sicc(GetInlineContext());
         switch (cmif_command_type) {
             case CmifCommandType_Request:
             case CmifCommandType_RequestWithContext: