From a46a1ad097419aeea7350987dd95230f50d90392 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Fri, 15 Nov 2024 08:53:41 +0000
Subject: [PATCH] 固定GMAC1 网卡名为 eth3
---
kernel/include/linux/preempt.h | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/kernel/include/linux/preempt.h b/kernel/include/linux/preempt.h
index 7d9c1c0..58c21bc 100644
--- a/kernel/include/linux/preempt.h
+++ b/kernel/include/linux/preempt.h
@@ -27,17 +27,23 @@
* SOFTIRQ_MASK: 0x0000ff00
* HARDIRQ_MASK: 0x000f0000
* NMI_MASK: 0x00f00000
+ * PIPELINE_MASK: 0x01000000
+ * STAGE_MASK: 0x02000000
* PREEMPT_NEED_RESCHED: 0x80000000
*/
#define PREEMPT_BITS 8
#define SOFTIRQ_BITS 8
#define HARDIRQ_BITS 4
#define NMI_BITS 4
+#define PIPELINE_BITS 1
+#define STAGE_BITS 1
#define PREEMPT_SHIFT 0
#define SOFTIRQ_SHIFT (PREEMPT_SHIFT + PREEMPT_BITS)
#define HARDIRQ_SHIFT (SOFTIRQ_SHIFT + SOFTIRQ_BITS)
#define NMI_SHIFT (HARDIRQ_SHIFT + HARDIRQ_BITS)
+#define PIPELINE_SHIFT (NMI_SHIFT + NMI_BITS)
+#define STAGE_SHIFT (PIPELINE_SHIFT + PIPELINE_BITS)
#define __IRQ_MASK(x) ((1UL << (x))-1)
@@ -45,11 +51,15 @@
#define SOFTIRQ_MASK (__IRQ_MASK(SOFTIRQ_BITS) << SOFTIRQ_SHIFT)
#define HARDIRQ_MASK (__IRQ_MASK(HARDIRQ_BITS) << HARDIRQ_SHIFT)
#define NMI_MASK (__IRQ_MASK(NMI_BITS) << NMI_SHIFT)
+#define PIPELINE_MASK (__IRQ_MASK(PIPELINE_BITS) << PIPELINE_SHIFT)
+#define STAGE_MASK (__IRQ_MASK(STAGE_BITS) << STAGE_SHIFT)
#define PREEMPT_OFFSET (1UL << PREEMPT_SHIFT)
#define SOFTIRQ_OFFSET (1UL << SOFTIRQ_SHIFT)
#define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT)
#define NMI_OFFSET (1UL << NMI_SHIFT)
+#define PIPELINE_OFFSET (1UL << PIPELINE_SHIFT)
+#define STAGE_OFFSET (1UL << STAGE_SHIFT)
#define SOFTIRQ_DISABLE_OFFSET (2 * SOFTIRQ_OFFSET)
@@ -82,6 +92,9 @@
#define irq_count() (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK \
| NMI_MASK))
+/* The current IRQ stage level: 0=inband, 1=oob */
+#define stage_level() ((preempt_count() & STAGE_MASK) >> STAGE_SHIFT)
+
/*
* Are we doing bottom half or hardware interrupt processing?
*
@@ -91,6 +104,7 @@
* in_serving_softirq() - We're in softirq context
* in_nmi() - We're in NMI context
* in_task() - We're in task context
+ * in_pipeline() - We're on pipeline entry
*
* Note: due to the BH disabled confusion: in_softirq(),in_interrupt() really
* should not be used in new code.
@@ -102,6 +116,7 @@
#define in_nmi() (preempt_count() & NMI_MASK)
#define in_task() (!(preempt_count() & \
(NMI_MASK | HARDIRQ_MASK | SOFTIRQ_OFFSET)))
+#define in_pipeline() (preempt_count() & PIPELINE_MASK)
/*
* The preempt_count offset after preempt_disable();
@@ -180,7 +195,8 @@
#define preempt_enable_no_resched() sched_preempt_enable_no_resched()
-#define preemptible() (preempt_count() == 0 && !irqs_disabled())
+#define preemptible() (preempt_count() == 0 && \
+ !hard_irqs_disabled() && !irqs_disabled())
#ifdef CONFIG_PREEMPTION
#define preempt_enable() \
@@ -352,4 +368,43 @@
preempt_enable();
}
+#ifdef CONFIG_IRQ_PIPELINE
+
+static __always_inline bool running_inband(void)
+{
+ return stage_level() == 0;
+}
+
+static __always_inline bool running_oob(void)
+{
+ return !running_inband();
+}
+
+unsigned long hard_preempt_disable(void);
+void hard_preempt_enable(unsigned long flags);
+
+#else
+
+static __always_inline bool running_inband(void)
+{
+ return true;
+}
+
+static __always_inline bool running_oob(void)
+{
+ return false;
+}
+
+#define hard_preempt_disable() \
+({ \
+ preempt_disable(); \
+ 0; \
+})
+#define hard_preempt_enable(__flags) \
+ do { \
+ preempt_enable(); \
+ (void)(__flags); \
+ } while (0)
+#endif
+
#endif /* __LINUX_PREEMPT_H */
--
Gitblit v1.6.2