From 372042a082347dd4c036f5cfeff3853d5eac4b91 Mon Sep 17 00:00:00 2001
From: David Goldblatt <davidgoldblatt@fb.com>
Date: Fri, 13 Dec 2019 11:16:58 -0800
Subject: [PATCH] Remove merge dependence on the arena.

---
 include/jemalloc/internal/extent2.h |  4 ++--
 src/extent2.c                       | 24 +++++++++++-------------
 src/large.c                         |  3 ++-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/include/jemalloc/internal/extent2.h b/include/jemalloc/internal/extent2.h
index d74e2323..d6854554 100644
--- a/include/jemalloc/internal/extent2.h
+++ b/include/jemalloc/internal/extent2.h
@@ -56,8 +56,8 @@ bool extent_purge_forced_wrapper(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks,
 edata_t *extent_split_wrapper(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks,
     edata_t *edata, size_t size_a, szind_t szind_a, bool slab_a,
     size_t size_b, szind_t szind_b, bool slab_b);
-bool extent_merge_wrapper(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks,
-    edata_t *a, edata_t *b);
+bool extent_merge_wrapper(tsdn_t *tsdn, ehooks_t *ehooks,
+    edata_cache_t *edata_cache, edata_t *a, edata_t *b);
 
 bool extent_boot(void);
 
diff --git a/src/extent2.c b/src/extent2.c
index 0c816bcc..1b70f202 100644
--- a/src/extent2.c
+++ b/src/extent2.c
@@ -30,8 +30,8 @@ static edata_t *extent_split_impl(tsdn_t *tsdn, arena_t *arena,
     ehooks_t *ehooks, edata_t *edata, size_t size_a, szind_t szind_a,
     bool slab_a, size_t size_b, szind_t szind_b, bool slab_b,
     bool growing_retained);
-static bool extent_merge_impl(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks,
-    edata_t *a, edata_t *b, bool growing_retained);
+static bool extent_merge_impl(tsdn_t *tsdn, ehooks_t *ehooks,
+    edata_cache_t *edata_cache, edata_t *a, edata_t *b, bool growing_retained);
 
 /* Used exclusively for gdump triggering. */
 static atomic_zu_t curpages;
@@ -1087,7 +1087,7 @@ extent_coalesce(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks,
 	extent_activate_locked(tsdn, arena, ecache, outer);
 
 	malloc_mutex_unlock(tsdn, &ecache->mtx);
-	bool err = extent_merge_impl(tsdn, arena, ehooks,
+	bool err = extent_merge_impl(tsdn, ehooks, &arena->edata_cache,
 	    forward ? inner : outer, forward ? outer : inner, growing_retained);
 	malloc_mutex_lock(tsdn, &ecache->mtx);
 
@@ -1495,12 +1495,15 @@ extent_split_wrapper(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks,
 }
 
 static bool
-extent_merge_impl(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks, edata_t *a,
-    edata_t *b, bool growing_retained) {
+extent_merge_impl(tsdn_t *tsdn, ehooks_t *ehooks, edata_cache_t *edata_cache,
+    edata_t *a, edata_t *b, bool growing_retained) {
 	witness_assert_depth_to_rank(tsdn_witness_tsdp_get(tsdn),
 	    WITNESS_RANK_CORE, growing_retained ? 1 : 0);
 	assert(edata_base_get(a) < edata_base_get(b));
 
+	assert(edata_arena_ind_get(a) == edata_arena_ind_get(b));
+	assert(edata_arena_ind_get(a) == ehooks_ind_get(ehooks));
+
 	bool err = ehooks_merge(tsdn, ehooks, edata_base_get(a),
 	    edata_size_get(a), edata_is_head_get(a), edata_base_get(b),
 	    edata_size_get(b), edata_is_head_get(b), edata_committed_get(a));
@@ -1546,20 +1549,15 @@ extent_merge_impl(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks, edata_t *a,
 
 	extent_unlock_edata2(tsdn, a, b);
 
-	/*
-	 * If we got here, we merged the extents; so they must be from the same
-	 * arena (i.e. this one).
-	 */
-	assert(edata_arena_ind_get(b) == arena_ind_get(arena));
-	edata_cache_put(tsdn, &arena->edata_cache, b);
+	edata_cache_put(tsdn, edata_cache, b);
 
 	return false;
 }
 
 bool
-extent_merge_wrapper(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks,
+extent_merge_wrapper(tsdn_t *tsdn, ehooks_t *ehooks, edata_cache_t *edata_cache,
     edata_t *a, edata_t *b) {
-	return extent_merge_impl(tsdn, arena, ehooks, a, b, false);
+	return extent_merge_impl(tsdn, ehooks, edata_cache, a, b, false);
 }
 
 bool
diff --git a/src/large.c b/src/large.c
index 4a3ad853..4af586db 100644
--- a/src/large.c
+++ b/src/large.c
@@ -170,7 +170,8 @@ large_ralloc_no_move_expand(tsdn_t *tsdn, edata_t *edata, size_t usize,
 		}
 	}
 
-	if (extent_merge_wrapper(tsdn, arena, ehooks, edata, trail)) {
+	if (extent_merge_wrapper(tsdn, ehooks, &arena->edata_cache, edata,
+	    trail)) {
 		extent_dalloc_wrapper(tsdn, arena, ehooks, trail);
 		return true;
 	}