Fixed an user mode argv/argc bug

Fixed blocking I/O wait in ide_dma.cpp
And pbly a lot of other things

Author: Stellaris-code

initrd/test.txt

@@ -1,3 +1,4 @@
 data
 2222
 éé
+bonjour ceci est un gros filler

kern/cpu/stack.hpp

@@ -0,0 +1,31 @@
+/*
+stack.hpp
+
+Copyright (c) 06 Yann BOUCHER (yann)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+*/
+#ifndef STACK_HPP
+#define STACK_HPP
+
+// returns previous stack pointer value
+extern "C" void* switch_stacks(void* new_stack);
+
+#endif // STACK_HPP

kern/drivers/storage/disk.cpp

@@ -179,7 +179,8 @@ kpp::expected<kpp::dummy_t, DiskError> Disk::enable_caching(bool val)
     if (!val && m_caching)
     {
         auto result = flush_cache();
-        if (!result) return result;
+        warn("Error flushing cache on disk '%s' : %s\n", drive_name().c_str(), result.error().to_string());
+        return {};
     }
 
     // TODO : investigate why enabling caching destroys performance !

kern/drivers/storage/ide/ide_dma.cpp

@@ -116,25 +116,32 @@ void Controller::init()
         ide::dma::Disk::create_disk(*this, (BusPort)pair.first, (DriveType)pair.second);
         log(Debug, "Created ATA DMA disk on 0x%x 0x%x\n", io_base((BusPort)pair.first), pair.second);
     }
+
+    memset((void*)raised_ints, 0, sizeof(raised_ints));
 }
 
 bool Controller::common_handler(const ata_device& dev)
 {
     auto status = status_byte(dev.port);
 
-    //log(Debug, "Received PCI ATA IRQ on port 0x%x, status 0x%x\n", dev.port, status);
+    if (status & (1<<0))
+    {
+        log_serial("Received PCI ATA IRQ on port 0x%x, status 0x%x\n", dev.port, status);
+    }
 
     if (status & (1<<2))
     {
         bool slave = drive_register(dev) & (1<<4);
 
-        if ((status & (1<<0)) == 0) // last PRDT used up
+        if ((status & (1<<0)) == 0 || true) // TODO : investigate why sometimes it hangs when there are PRD pending
         {
             auto* process = waiting_processes[dev.port==BusPort::Primary][slave];
-            //            assert(process);
-            //            assert(process->is_blocked());
             raised_ints[dev.port==BusPort::Primary][slave] = true;
-            if (process) process->unblock();
+
+            if (process)
+            {
+                process->status = Process::Active;
+            }
 
             send_command_byte(dev.port, 0); // clear start/stop bit
 
@@ -148,8 +155,8 @@ bool Controller::common_handler(const ata_device& dev)
             {
                 drive_status[dev.port==BusPort::Primary][slave] = status_ok;
             }
-        }
 
+        }
         bit_clear(status, 0); bit_clear(status, 1); // clear error and interrupt bits
         send_status_byte(dev.port, status);
     }
@@ -323,19 +330,21 @@ kpp::expected<kpp::dummy_t, DiskError> Disk::do_read_write(size_t sector, gsl::s
 
     (void)ide::status_register(m_dev); // read status port to reset drive
 
+    Process::current().status = Process::IOWait;
     m_cont.send_command(m_dev, ata_read_dma_ex, action == RWAction::Read,
                         sector, count, data);
 
-//    if (!int_status)
-//    {
-//        Process::current().block();
-//        tasking::kernel_yield();
-//    }
-
-            if (!Timer::sleep_until([&int_status]{return int_status;}))
-            {
-                return kpp::make_unexpected(DiskError{DiskError::TimeOut});
-            }
+#if 1
+    if (!int_status)
+    {
+        tasking::kernel_yield();
+    }
+#else
+    if (!Timer::sleep_until([&int_status]{return int_status;}, 1000))
+    {
+        return kpp::make_unexpected(DiskError{DiskError::TimeOut});
+    }
+#endif
 
     int_status = false;
 

kern/fs/procfs/procfs.cpp

@@ -90,7 +90,7 @@ struct procfs_root : public vfs::node
         children.emplace_back(std::make_shared<string_node>("cmdline", kernel_cmdline));
         children.emplace_back(std::make_shared<string_node>("uptime",  []{ return kpp::to_string(Time::uptime()); }));
         children.emplace_back(std::make_shared<string_node>("version", get_version_str()));
-        if (Process::enabled()) children.emplace_back(std::make_shared<vfs::symlink>(kpp::to_string(Process::current().pid), "self"));
+        children.emplace_back(std::make_shared<vfs::symlink>(kpp::to_string(Process::current().pid), "self"));
 
         children.emplace_back(std::make_shared<interface_test>("interface_test"));
 

kern/global_init.cpp

@@ -106,6 +106,8 @@ SOFTWARE.
 // : faire une boucle de traitement de callbacks d'interruption
 // : implémenter /dev/input
 // : implémenter expanding stack
+// : fix caching
+// : PRIORITAIRE : pour les read disk, ne pas retourner une structure allouée mais prendre un ptr en argument
 
 /**********************************/
 // BUGS
@@ -126,34 +128,8 @@ SOFTWARE.
 // * don't forget about fpu state
 /**********************************/
 
-void test1()
-{
-    int esp;
-    uint8_t val = 0;
-    while (true)
-    {
-        asm volatile ("movl %%esp, %0":"=m"(esp):);
-        kprintf("Hi ! %d (esp : 0x%x)\n", val, esp);
-        ++val;
-        tasking::kernel_yield();
-    }
-}
-void test2()
-{
-    int esp;
-    uint8_t val = 0;
-    while (true)
-    {
-        asm volatile ("movl %%esp, %0":"=m"(esp):);
-        kprintf("Hello 2! %d (esp : 0x%x)\n", val, esp);
-        ++val;
-        tasking::kernel_yield();
-    }
-}
-
 void global_init()
 {
-
     beep(200);
 
     power::init_power_management();
@@ -252,10 +228,6 @@ void global_init()
     MemBuffer buf(512*16);
     MemoryDisk::create_disk(buf.data(), buf.size(), "scratch");
 
-    //    auto task1 = Process::create_kernel_task(test1);
-    //    auto task2 = Process::create_kernel_task(test2);
-    //    task1->switch_to();
-
     Shell sh;
     sh.params.prompt = ESC_BG(13,132,203) "  LudOS " ESC_POP_COLOR ESC_BG(78,154,6) ESC_FG(13,132,203) "▶" ESC_POP_COLOR " :{path}> " ESC_POP_COLOR
             ESC_FG(78,154,6) "▶" ESC_POP_COLOR " ";
@@ -266,9 +238,6 @@ void global_init()
     install_net_commands(sh);
     install_task_commands(sh);
 
-    sh.command("run /initrd/init.sh");
-    sh.run();
-
 #if 0
     Timer::register_callback(100, []
     {
@@ -286,4 +255,7 @@ void global_init()
         }
     }, false);
 #endif
+
+    sh.command("run /initrd/init.sh");
+    sh.run();
 }

kern/i686/cpu/stack.asm

@@ -0,0 +1,8 @@
+global switch_stacks
+switch_stacks:
+    lea eax, [esp+0x8] ; load former esp value (minus the return address and the parameter) to eax
+    mov ecx, [esp] ; put the return address in ecx
+
+    mov esp, [esp+0x4] ; load the new esp value
+
+    jmp [ecx] ; jump to the return address

kern/i686/pc/init.cpp

@@ -309,8 +309,8 @@ void init(uint32_t magic, const multiboot_info_t* mbd_info)
     {
         while (true)
         {
-            wait_for_interrupts();
             tasking::schedule();
+            wait_for_interrupts();
         }
     });
     (void)idle_task;

kern/i686/tasking/process.cpp

@@ -79,6 +79,8 @@ void Process::wake_up(pid_t child, int err_code)
 
     data->waiting_pid.reset();
 
+    status = Active;
+
     arch_context->regs.eax = child; // set waitpid return value
 }
 
@@ -113,8 +115,7 @@ void Process::execute_sighandler(int signal, pid_t returning_pid, const siginfo_
     push_onto_stack(info);
 
     set_instruction_pointer(signal_trampoline_page);
-    if (m_current_process)
-        Process::current().unswitch();
+    Process::current().unswitch();
     switch_to();
 }
 
@@ -236,14 +237,13 @@ void Process::set_instruction_pointer(unsigned int value)
 void Process::switch_to()
 {
     {
+        //assert(status == Active); TODO : check if in sighandler too
         if (m_current_process &&
                 (m_current_process->arch_context->regs.cs & 0x3) == 0) // if previous task was in ring 0
         {
             m_current_process->data->kernel_stack_ptr = m_current_process->arch_context->regs.esp;
         }
 
-        assert(!is_waiting());
-
         map_address_space();
         map_shm();
 
@@ -309,7 +309,7 @@ Process *Process::clone(Process &proc, uint32_t flags)
 
 void Process::unmap_address_space()
 {
-#if 1
+#if 0
     Paging::unmap_user_space(); // reloading all the page tables is really costly, not the right solution
 #else
     for (const auto& pair : data->mappings)

kern/shell/commands/fs/fscommands.cpp

@@ -183,8 +183,8 @@ void install_fs_commands(Shell &sh)
      {
          for (Disk& disk : Disk::disks())
          {
-             kprintf("%s : %s (%s)\n", disk.drive_name().c_str(), human_readable_size(disk.disk_size()).c_str(),
-             disk.read_only() ? "ro" : "rw");
+             kprintf("%s : %s (%s) (%s)\n", disk.drive_name().c_str(), human_readable_size(disk.disk_size()).c_str(),
+             disk.read_only() ? "ro" : "rw", disk.caching_enabled() ? "cached" : "uncached");
          }
          return 0;
      }});