Softirq refactor #138

AlbertSanoe · 2023-01-05T14:51:36Z

No description provided.

fslongjin · 2023-01-06T06:15:43Z

kernel/src/driver/timers/rtc/rtc.rs

@@ -1,4 +1,4 @@
-pub struct rtc_time_t {
+pub struct RtcTimeT {


fslongjin · 2023-01-06T06:15:52Z

kernel/src/driver/timers/rtc/rtc.rs

-    T_DAY = 0x07,
-    T_MONTH = 0x08,
-    T_YEAR = 0x09,
+    TSecond = 0x00,


fslongjin · 2023-01-06T06:16:54Z

kernel/src/driver/timers/rtc/rtc.rs

@@ -22,45 +22,45 @@ fn read_cmos(addr: u8) -> u8 {
 }

 enum CMOSTimeSelector {


加#[repr(u8)]然后下面的as u8的就不用了

fslongjin · 2023-01-06T06:17:46Z

kernel/src/exception/mod.rs

@@ -0,0 +1 @@
+pub mod softirq;


文件末尾加空行

fslongjin · 2023-01-06T06:19:08Z

kernel/src/exception/softirq.rs

+    }
+}
+
+pub struct SoftirqHandlerT {


名字改为Softirq

fslongjin · 2023-01-06T06:22:13Z

kernel/src/exception/softirq.rs

+    }
+
+    pub fn unregister_softirq(&mut self, irq_num: u32) {
+        self.softirq_vector[irq_num as usize].action = None;


忘了加锁

fslongjin · 2023-01-06T06:22:38Z

kernel/src/exception/softirq.rs

+        let mut index: u32 = 0;
+        while (index as u64) < MAX_SOFTIRQ_NUM && self.softirq_pending != 0 {
+            if (self.softirq_pending & (1 << index)) != 0
+                && self.softirq_vector[index as usize].action != None


!=None改成调用.is_some()

fslongjin · 2023-01-06T06:23:13Z

kernel/src/exception/softirq.rs

+        while (index as u64) < MAX_SOFTIRQ_NUM && self.softirq_pending != 0 {
+            if (self.softirq_pending & (1 << index)) != 0
+                && self.softirq_vector[index as usize].action != None
+                && (!(self.get_softirq_running() & (1 << index))) != 0


这个不要双重!,否则代码可读性下降很多

fslongjin · 2023-01-06T06:23:51Z

kernel/src/exception/softirq.rs

+        cli();
+    }
+
+    pub fn clear_softirq_pending(&mut self, irq_num: u32) {


函数移动到上面去

fslongjin · 2023-01-06T06:24:28Z

kernel/src/main.c

@@ -171,7 +174,8 @@ void system_initialize()
    HPET_enable();

    io_mfence();
-    // 系统初始化到此结束，剩下的初始化功能应当放在初始内核线程中执行
+    // 系统初始化kdebug("io_mfence_finished");到此结束，剩下的初始化功能应当放在初始内核线程中执行


这个注释改回原来那样的

fslongjin · 2023-01-07T03:31:51Z

kernel/src/exception/softirq.h

-void do_softirq();
+// /**
+//  * @brief 卸载软中断
+//  *


原来的那些代码删掉即可

fslongjin · 2023-01-07T03:32:55Z

kernel/src/exception/softirq.rs

+const MAX_SOFTIRQ_NUM: u64 = 64;
+const MAX_UNREGISTER_TRIAL_TIME: u64 = 50;
+
+/// not used until softirq.h is removed


这个注释的不对。哪怕softirq.h删掉了，也需要这个结构体的。
直接注释写他的用途即可
结构体改为SoftirqNum

fslongjin · 2023-01-07T03:34:05Z

kernel/src/exception/softirq.rs

+}
+
+pub struct Softirq {
+    softirq_modify_lock: RawSpinlock,


softirq_前缀删掉

fslongjin · 2023-01-07T03:34:43Z

kernel/src/exception/softirq.rs

+#[allow(dead_code)]
+/// @brief 提供给c的接口函数,用于初始化静态指针
+pub extern "C" fn softirq_init() {
+    unsafe {


这里的unsafe块太大了，参考cfs.rs初始化的地方，缩小它

fslongjin · 2023-01-07T03:39:42Z

kernel/src/exception/softirq.rs

+        return 0;
+    }
+
+    pub fn unregister_softirq(&mut self, irq_num: u32) -> i32 {


这个函数对锁的处理有问题，try_lock成功之后，下面就肯定是is_locked了。
要在try_lock里面检查running位。如果还在running,那就放锁，否则跳出循环，到下面的代码。

还有就是，循环的部分，是左闭右开的，不需要-1

fslongjin · 2023-01-07T03:41:03Z

kernel/src/exception/softirq.rs

+                && !self.read_softirq_running(softirq_index)
+            {
+                if self.softirq_modify_lock.try_lock() {
+                    self.clear_softirq_pending(softirq_index);


lock之后需要再次确认上面的条件是否满足，我们不能信任未lock的部分的数据是完全准确的

fslongjin · 2023-01-07T03:41:35Z

kernel/src/exception/softirq.rs

+    /// @brief 判断对应running标志位是否为0
+    /// @return true: 标志位为1; false: 标志位为0
+    #[inline]
+    pub fn read_softirq_running(&mut self, softirq_num: u32) -> bool {


函数名改为is_running更合适

fslongjin · 2023-01-07T03:41:42Z

kernel/src/exception/softirq.rs

+    /// @brief 判断对应pending标志位是否为0
+    /// @return true: 标志位为1; false: 标志位为0
+    #[inline]
+    pub fn read_softirq_pending(&mut self, softirq_num: u32) -> bool {


fslongjin · 2023-01-07T03:42:57Z

kernel/src/exception/softirq.rs

+    softirq_table: [SoftirqVector; MAX_SOFTIRQ_NUM as usize],
+}
+
+pub static mut SOFTIRQ_HANDLER_PTR: *mut Softirq = null_mut();


全局变量放到文件顶部

fslongjin · 2023-01-07T03:49:05Z

kernel/src/exception/softirq.rs

+        return (self.softirq_pending & (1 << softirq_num)).ne(&0);
+    }
+
+    pub fn register_softirq(


…agonOS into softirq-refractor

AlbertSanoe and others added 6 commits January 4, 2023 22:57

test

5aeec38

使能通过编译

3b27ab4

Merge branch 'master' into softirq-refractor

f5b36df

通过编译

8f247ea

softirq module refactor

e7bb14e

softirq module refactor

4d5a9d1

fslongjin requested changes Jan 6, 2023

View reviewed changes

AlbertSanoe added 3 commits January 6, 2023 23:36

softriq

48d3cd6

softirq-updated

b739d37

softirq-updated

613ea32

fslongjin requested changes Jan 7, 2023

View reviewed changes

AlbertSanoe and others added 11 commits January 7, 2023 12:24

softirq-updated

0b2a246

softirq-updated

9d6ae43

softirq-updated

ad2409e

softirq-updated

9b02e5a

Merge branch 'master' into sujintao-softirq-refractor

0af8190

更新use的格式，改为树状结构

f3f820b

softirq

c6d24b8

Merge branch 'softirq-refractor' of https://github.com/AlbertSanoe/Dr…

12e85df

…agonOS into softirq-refractor

time-keep

6c3ce87

time-keep

967f486

更正Result的使用方法

f8900c0

fslongjin approved these changes Jan 7, 2023

View reviewed changes

fslongjin merged commit 62e4613 into DragonOS-Community:master Jan 7, 2023

AlbertSanoe deleted the softirq-refractor branch January 8, 2023 08:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Softirq refactor #138

Softirq refactor #138

AlbertSanoe commented Jan 5, 2023

fslongjin Jan 6, 2023

fslongjin Jan 6, 2023

fslongjin Jan 6, 2023

fslongjin Jan 6, 2023

fslongjin Jan 6, 2023

fslongjin Jan 6, 2023

fslongjin Jan 6, 2023

fslongjin Jan 6, 2023

fslongjin Jan 6, 2023

fslongjin Jan 6, 2023

fslongjin Jan 7, 2023

fslongjin Jan 7, 2023

fslongjin Jan 7, 2023

fslongjin Jan 7, 2023

fslongjin Jan 7, 2023

fslongjin Jan 7, 2023

fslongjin Jan 7, 2023

fslongjin Jan 7, 2023

fslongjin Jan 7, 2023

fslongjin Jan 7, 2023

		@@ -22,45 +22,45 @@ fn read_cmos(addr: u8) -> u8 {
		}

		enum CMOSTimeSelector {

Softirq refactor #138

Softirq refactor #138

Conversation

AlbertSanoe commented Jan 5, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment