lkml.org 
[lkml]   [2008]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 3/4] x86: corruption check: run the corruption checks from a work queue

From: Arjan van de Ven <arjan@linux.intel.com>
Date: Mon, 22 Sep 2008 13:42:15 -0700
Subject: [PATCH] x86: corruption check: run the corruption checks from a work queue

the periodic corruption checks are better off run from a work queue; there's
nothing time critical about them and this way the amount of
interrupt-context work is reduced.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
---
arch/x86/kernel/check.c | 27 +++++++++++++++++----------
arch/x86/mm/init_32.c | 2 --
arch/x86/mm/init_64.c | 2 --
include/linux/kernel.h | 5 -----
4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/arch/x86/kernel/check.c b/arch/x86/kernel/check.c
index 5056703..55eed17 100644
--- a/arch/x86/kernel/check.c
+++ b/arch/x86/kernel/check.c
@@ -1,6 +1,7 @@
#include <linux/module.h>
#include <linux/sched.h>
-
+#include <linux/kthread.h>
+#include <linux/workqueue.h>
#include <asm/e820.h>
#include <asm/proto.h>

@@ -108,13 +109,14 @@ void __init setup_bios_corruption_check(void)
update_e820();
}

-static struct timer_list periodic_check_timer;

void check_for_bios_corruption(void)
{
int i;
int corruption = 0;

+ printk("dot\n");
+
if (!memory_corruption_check)
return;

@@ -135,24 +137,29 @@ void check_for_bios_corruption(void)
WARN(corruption, KERN_ERR "Memory corruption detected in low memory\n");
}

-static void periodic_check_for_corruption(unsigned long data)
+static void check_corruption(struct work_struct *dummy);
+static DECLARE_DELAYED_WORK(bios_check_work, check_corruption);
+
+static void check_corruption(struct work_struct *dummy)
{
check_for_bios_corruption();
- mod_timer(&periodic_check_timer,
- round_jiffies(jiffies + corruption_check_period*HZ));
+ schedule_delayed_work(&bios_check_work,
+ round_jiffies_relative(corruption_check_period*HZ));
}

-void start_periodic_check_for_corruption(void)
+static int start_periodic_check_for_corruption(void)
{
if (!memory_corruption_check || corruption_check_period == 0)
- return;
+ return 0;

printk(KERN_INFO "Scanning for low memory corruption every %d seconds\n",
corruption_check_period);

- init_timer(&periodic_check_timer);
- periodic_check_timer.function = &periodic_check_for_corruption;
- periodic_check_for_corruption(0);
+ /* First time we run the checks right away */
+ schedule_delayed_work(&bios_check_work, 0);
+ return 0;
}
+
+module_init(start_periodic_check_for_corruption);
#endif

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index b646e5b..63b71d3 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -970,8 +970,6 @@ void __init mem_init(void)
int codesize, reservedpages, datasize, initsize;
int tmp;

- start_periodic_check_for_corruption();
-
#ifdef CONFIG_FLATMEM
BUG_ON(!mem_map);
#endif
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index a624017..747f6c9 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -905,8 +905,6 @@ void __init mem_init(void)
{
long codesize, reservedpages, datasize, initsize;

- start_periodic_check_for_corruption();
-
pci_iommu_alloc();

/* clear_bss() already clear the empty_zero_page */
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index a5afee2..b39c7ef 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -260,15 +260,10 @@ extern int root_mountflags;
* able to scatter it around anywhere in the kernel.
*/
void check_for_bios_corruption(void);
-void start_periodic_check_for_corruption(void);
#else
static inline void check_for_bios_corruption(void)
{
}
-
-static inline void start_periodic_check_for_corruption(void)
-{
-}
#endif

/* Values used for system_state */
--
1.5.5.1


--
Arjan van de Ven Intel Open Source Technology Centre
For development, discussion and tips for power savings,
visit http://www.lesswatts.org


\
 
 \ /
  Last update: 2008-10-05 21:13    [W:0.049 / U:1.776 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site