| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1213916250.27983.35.camel@promb-2n-dhcp368.eng.vmware.com>
Date: Thu, 19 Jun 2008 15:57:30 -0700
From: Alok Kataria <akataria@...are.com>
To: "Brown, Len" <len.brown@...el.com>,
Andrew Morton <akpm@...ux-foundation.org>
Cc: linux-acpi@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH 1/2] cleanup e820_setup_gap
This is a preparatory patch for the next patch in series.
Moves some code from e820_setup_gap to a new function e820_search_gap.
This function will be used by the next patch in the series.
Signed-off-by: Alok N Kataria <akataria@...are.com>
Index: linux-2.6/arch/x86/kernel/e820_64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/e820_64.c 2008-06-12 10:42:22.000000000 -0700
+++ linux-2.6/arch/x86/kernel/e820_64.c 2008-06-13 14:05:18.000000000 -0700
@@ -872,26 +872,20 @@
EXPORT_SYMBOL(pci_mem_start);
/*
- * Search for the biggest gap in the low 32 bits of the e820
- * memory space. We pass this space to PCI to assign MMIO resources
- * for hotplug or unconfigured devices in.
- * Hopefully the BIOS let enough space left.
+ * Search for a gap in the e820 memory space from start_addr to 2^32.
*/
-__init void e820_setup_gap(void)
+__init void e820_search_gap(unsigned long *gapstart, unsigned long *gapsize,
+ unsigned long start_addr)
{
- unsigned long gapstart, gapsize, round;
- unsigned long last;
- int i;
- int found = 0;
+ unsigned long last = 0x100000000ull;
+ int i = e820.nr_map;
- last = 0x100000000ull;
- gapstart = 0x10000000;
- gapsize = 0x400000;
- i = e820.nr_map;
while (--i >= 0) {
unsigned long long start = e820.map[i].addr;
unsigned long long end = start + e820.map[i].size;
+ if (end < start_addr)
+ continue;
/*
* Since "last" is at most 4GB, we know we'll
* fit in 32 bits if this condition is true
@@ -899,17 +893,32 @@
if (last > end) {
unsigned long gap = last - end;
- if (gap > gapsize) {
- gapsize = gap;
- gapstart = end;
- found = 1;
+ if (gap >= *gapsize) {
+ *gapsize = gap;
+ *gapstart = end;
}
}
if (start < last)
last = start;
}
+}
+
+/*
+ * Search for the biggest gap in the low 32 bits of the e820
+ * memory space. We pass this space to PCI to assign MMIO resources
+ * for hotplug or unconfigured devices in.
+ * Hopefully the BIOS let enough space left.
+ */
+__init void e820_setup_gap(void)
+{
+ unsigned long gapstart, gapsize, round;
+
+ gapstart = 0;
+ gapsize = 0x400000;
+
+ e820_search_gap(&gapstart, &gapsize, 0);
- if (!found) {
+ if (!gapstart) {
gapstart = (end_pfn << PAGE_SHIFT) + 1024*1024;
printk(KERN_ERR "PCI: Warning: Cannot find a gap in the 32bit "
"address range\n"
Index: linux-2.6/include/asm-x86/e820_64.h
===================================================================
--- linux-2.6.orig/include/asm-x86/e820_64.h 2008-06-12 10:42:22.000000000 -0700
+++ linux-2.6/include/asm-x86/e820_64.h 2008-06-12 10:55:09.000000000 -0700
@@ -39,6 +39,7 @@
extern unsigned long e820_hole_size(unsigned long start, unsigned long end);
extern void e820_setup_gap(void);
+extern void e820_search_gap(unsigned long *, unsigned long *, unsigned long);
extern void e820_register_active_regions(int nid, unsigned long start_pfn,
unsigned long end_pfn);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists