Changeset 92460 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Nov 16, 2021 2:04:29 PM (3 years ago)

Author:

vboxsync

Message:

IPRT/thread-r0drv-linux.c: Must test more config options for propertly detection kernel preemption. bugref:10145

File:

• trunk/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c (modified) (5 diffs)

trunk/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c

@@ -43 +43 @@
 
 /*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
+#if  defined(CONFIG_PREEMPT_COUNT) /* since 3.1 */ \
+  || defined(CONFIG_PREEMPTION)    /* since 5.3 */ \
+  || defined(CONFIG_PREEMPT)       /* since 2.6.13 - preemption model choice; before that arch specific choice back to 2.5.45. */
+# define IPRT_LNX_HAVE_PREEMPTION
+#endif
+
+
+/*********************************************************************************************************************************
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-#ifndef CONFIG_PREEMPT
+#ifndef IPRT_LNX_HAVE_PREEMPTION
 /** Per-cpu preemption counters. */
 static int32_t volatile g_acPreemptDisabled[NR_CPUS];
@@ -104 +114 @@
 RTDECL(bool) RTThreadPreemptIsEnabled(RTTHREAD hThread)
 {
-#ifdef CONFIG_PREEMPT
+#ifdef IPRT_LNX_HAVE_PREEMPTION
     Assert(hThread == NIL_RTTHREAD); RT_NOREF_PV(hThread);
 # ifdef preemptible
@@ -165 +175 @@
 RTDECL(bool) RTThreadPreemptIsPossible(void)
 {
-#ifdef CONFIG_PREEMPT
+#ifdef IPRT_LNX_HAVE_PREEMPTION
     return true;    /* Yes, kernel preemption is possible. */
 #else
-    return false;   /* No kernel preemption (or CONFIG_PREEMPT_VOLUNTARY). */
+    return false;   /* No kernel preemption (or just CONFIG_PREEMPT_VOLUNTARY). */
 #endif
 }
@@ -176 +186 @@
 RTDECL(void) RTThreadPreemptDisable(PRTTHREADPREEMPTSTATE pState)
 {
-#ifdef CONFIG_PREEMPT
+#ifdef IPRT_LNX_HAVE_PREEMPTION
     AssertPtr(pState);
     Assert(pState->u32Reserved == 0);
     pState->u32Reserved = 42;
-    /* This ASSUMES that CONFIG_PREEMPT_COUNT is always defined with CONFIG_PREEMPT. */
     preempt_disable();
     RT_ASSERT_PREEMPT_CPUID_DISABLE(pState);
 
-#else /* !CONFIG_PREEMPT */
+#else /* !IPRT_LNX_HAVE_PREEMPTION */
     int32_t c;
     AssertPtr(pState);
@@ -201 +210 @@
 RTDECL(void) RTThreadPreemptRestore(PRTTHREADPREEMPTSTATE pState)
 {
-#ifdef CONFIG_PREEMPT
+#ifdef IPRT_LNX_HAVE_PREEMPTION
     IPRT_LINUX_SAVE_EFL_AC(); /* paranoia */
     AssertPtr(pState);