Page MenuHomeFreeBSD
Files F149186678

D48638.1789645130.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D48638.1789645130.diff
View Options

diff --git a/sys/vm/vm_phys.h b/sys/vm/vm_phys.h
--- a/sys/vm/vm_phys.h
+++ b/sys/vm/vm_phys.h
@@ -82,11 +82,12 @@
int vm_phys_mem_affinity(int f, int t);
void vm_phys_early_add_seg(vm_paddr_t start, vm_paddr_t end);
-#define VM_PHYS_EAF_ALLOW_FAILURE (1 << 0)
-#define VM_PHYS_EAF_DISCARD_ON_ALIGN (1 << 1)
-#define VM_PHYS_EAF_ADDR_BOUNDARIES (1 << 2)
-#define VM_PHYS_EAF_CHUNK_START (1 << 3)
-#define VM_PHYS_EAF_CHUNK_END (1 << 4)
+#define VM_PHYS_EAF_ALLOW_FAILURE (1 << 0)
+#define VM_PHYS_EAF_DISCARD_ON_ALIGN (1 << 1)
+#define VM_PHYS_EAF_ADDR_BOUNDARIES (1 << 2)
+#define VM_PHYS_EAF_ADDR_BOUNDARIES_FIRST (1 << 3)
+#define VM_PHYS_EAF_CHUNK_START (1 << 4)
+#define VM_PHYS_EAF_CHUNK_END (1 << 5)
void vm_phys_early_alloc_ex(size_t alloc_size, vm_paddr_t alignment,
int chunk_start_idx, int domain, u_int flags, vm_paddr_t *ppa);
int __result_use_check vm_phys_early_alloc_ex_err(size_t alloc_size,
diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c
--- a/sys/vm/vm_phys.c
+++ b/sys/vm/vm_phys.c
@@ -2176,6 +2176,10 @@
* - VM_PHYS_EAF_ADDR_BOUNDARIES: Allocate memory either at start of the first
* chunk (lowest addresses) or at end of the last chunk (highest addresses).
* Incompatible with 'chunk_start_idx' not being -1.
+ * - VM_PHYS_EAF_ADDR_BOUNDARIES_FIRST: Proceed first as if
+ * VM_PHYS_EAF_ADDR_BOUNDARIES had been specified and ignoring incompatible
+ * arguments and flags, and if that fails, falls back to the best fit
+ * algorithm. Incompatible with VM_PHYS_EAF_ADDR_BOUNDARIES.
* - VM_PHYS_EAF_CHUNK_START: Once a chunk has been selected (or was
* explicitly requested), always allocate the requested memory from its
* start. Incompatible with VM_PHYS_EAF_ADDR_BOUNDARIES.
@@ -2217,9 +2221,13 @@
panic("%s: Invalid 'domain' (%d; vm_ndomains: %d).", __func__,
domain, vm_ndomains);
if ((flags & ~(VM_PHYS_EAF_ALLOW_FAILURE | VM_PHYS_EAF_DISCARD_ON_ALIGN |
- VM_PHYS_EAF_ADDR_BOUNDARIES | VM_PHYS_EAF_CHUNK_START |
- VM_PHYS_EAF_CHUNK_END)) != 0)
+ VM_PHYS_EAF_ADDR_BOUNDARIES | VM_PHYS_EAF_ADDR_BOUNDARIES_FIRST |
+ VM_PHYS_EAF_CHUNK_START | VM_PHYS_EAF_CHUNK_END)) != 0)
panic("%s: Invalid 'flags' (%#x).", __func__, flags);
+ if ((flags & VM_PHYS_EAF_ADDR_BOUNDARIES) != 0 &&
+ (flags & VM_PHYS_EAF_ADDR_BOUNDARIES_FIRST) != 0)
+ panic("%s: Incompatible flags VM_PHYS_EAF_ADDR_BOUNDARIES and "
+ "VM_PHYS_EAF_ADDR_BOUNDARIES_FIRST", __func__);
if ((flags & VM_PHYS_EAF_ADDR_BOUNDARIES) != 0 && chunk_start_idx != -1)
panic("%s: Cannot both request a specific chunk (%d) and "
"pass VM_PHYS_EAF_ADDR_BOUNDARIES.", __func__,
@@ -2231,12 +2239,29 @@
alloc_size = round_page(alloc_size);
if (alignment < PAGE_SIZE)
alignment = PAGE_SIZE;
- if ((flags & VM_PHYS_EAF_ADDR_BOUNDARIES) != 0)
- flags |= VM_PHYS_EAF_DISCARD_ON_ALIGN;
/*
* Determine the chunk to allocate from.
*/
+ if ((flags & VM_PHYS_EAF_ADDR_BOUNDARIES_FIRST) != 0) {
+ u_int tmp_flags = (flags & ~(VM_PHYS_EAF_CHUNK_START |
+ VM_PHYS_EAF_CHUNK_END)) | VM_PHYS_EAF_ADDR_BOUNDARIES;
+ int tmp_idx = -1;
+
+ error = vm_phys_early_find_chunk_at_boundaries(alloc_size,
+ alignment, &tmp_idx, domain, &tmp_flags, &pa);
+ if (error == 0) {
+ flags = tmp_flags;
+ chunk_start_idx = tmp_idx;
+ goto alloc_in_chunk;
+ }
+ /*
+ * Allocation at boundaries didn't work. Continue as if
+ * VM_PHYS_EAF_ADDR_BOUNDARIES_FIRST had not been present. We
+ * don't need to clear this flag as no code except the
+ * surrounding 'if' tests for it.
+ */
+ }
if (chunk_start_idx != -1)
/*
* Check that the requested chunk is compatible with 'domain',
@@ -2253,6 +2278,7 @@
if (error != 0)
goto fail;
+alloc_in_chunk:
/* Sub-routines above must ensure that one of these is set. */
MPASS((flags & (VM_PHYS_EAF_CHUNK_START | VM_PHYS_EAF_CHUNK_END)) != 0);
/*

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 17, 11:38 AM (15 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29728524
Default Alt Text
D48638.1789645130.diff (3 KB)

Event Timeline