118 lines
3.0 KiB
Diff
118 lines
3.0 KiB
Diff
From 21523297fcd72128c14b40ebefbf8ccf114fbede Mon Sep 17 00:00:00 2001
|
|
From: Jason Evans <jasone@canonware.com>
|
|
Date: Thu, 17 Sep 2015 15:27:28 -0700
|
|
Subject: [PATCH] Add mallocx() OOM tests.
|
|
|
|
---
|
|
src/jemalloc.c | 2 ++
|
|
test/integration/mallocx.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++
|
|
2 files changed, 72 insertions(+)
|
|
|
|
diff --git a/src/jemalloc.c b/src/jemalloc.c
|
|
index 49c5f2a..5a2d324 100644
|
|
--- a/src/jemalloc.c
|
|
+++ b/src/jemalloc.c
|
|
@@ -1923,6 +1923,7 @@ imallocx_flags_decode_hard(tsd_t *tsd, size_t size, int flags, size_t *usize,
|
|
*alignment = MALLOCX_ALIGN_GET_SPECIFIED(flags);
|
|
*usize = sa2u(size, *alignment);
|
|
}
|
|
+ assert(*usize != 0);
|
|
*zero = MALLOCX_ZERO_GET(flags);
|
|
if ((flags & MALLOCX_TCACHE_MASK) != 0) {
|
|
if ((flags & MALLOCX_TCACHE_MASK) == MALLOCX_TCACHE_NONE)
|
|
@@ -2267,6 +2268,7 @@ ixallocx_prof(tsd_t *tsd, void *ptr, size_t old_usize, size_t size,
|
|
*/
|
|
usize_max = (alignment == 0) ? s2u(size+extra) : sa2u(size+extra,
|
|
alignment);
|
|
+ assert(usize_max != 0);
|
|
tctx = prof_alloc_prep(tsd, usize_max, prof_active, false);
|
|
if (unlikely((uintptr_t)tctx != (uintptr_t)1U)) {
|
|
usize = ixallocx_prof_sample(ptr, old_usize, size, extra,
|
|
diff --git a/test/integration/mallocx.c b/test/integration/mallocx.c
|
|
index 4b0e33f..3973938 100644
|
|
--- a/test/integration/mallocx.c
|
|
+++ b/test/integration/mallocx.c
|
|
@@ -1,5 +1,74 @@
|
|
#include "test/jemalloc_test.h"
|
|
|
|
+static unsigned
|
|
+get_nsizes_impl(const char *cmd)
|
|
+{
|
|
+ unsigned ret;
|
|
+ size_t z;
|
|
+
|
|
+ z = sizeof(unsigned);
|
|
+ assert_d_eq(mallctl(cmd, &ret, &z, NULL, 0), 0,
|
|
+ "Unexpected mallctl(\"%s\", ...) failure", cmd);
|
|
+
|
|
+ return (ret);
|
|
+}
|
|
+
|
|
+static unsigned
|
|
+get_nhuge(void)
|
|
+{
|
|
+
|
|
+ return (get_nsizes_impl("arenas.nhchunks"));
|
|
+}
|
|
+
|
|
+static size_t
|
|
+get_size_impl(const char *cmd, size_t ind)
|
|
+{
|
|
+ size_t ret;
|
|
+ size_t z;
|
|
+ size_t mib[4];
|
|
+ size_t miblen = 4;
|
|
+
|
|
+ z = sizeof(size_t);
|
|
+ assert_d_eq(mallctlnametomib(cmd, mib, &miblen),
|
|
+ 0, "Unexpected mallctlnametomib(\"%s\", ...) failure", cmd);
|
|
+ mib[2] = ind;
|
|
+ z = sizeof(size_t);
|
|
+ assert_d_eq(mallctlbymib(mib, miblen, &ret, &z, NULL, 0),
|
|
+ 0, "Unexpected mallctlbymib([\"%s\", %zu], ...) failure", cmd, ind);
|
|
+
|
|
+ return (ret);
|
|
+}
|
|
+
|
|
+static size_t
|
|
+get_huge_size(size_t ind)
|
|
+{
|
|
+
|
|
+ return (get_size_impl("arenas.hchunk.0.size", ind));
|
|
+}
|
|
+
|
|
+TEST_BEGIN(test_oom)
|
|
+{
|
|
+ size_t hugemax, size, alignment;
|
|
+
|
|
+ hugemax = get_huge_size(get_nhuge()-1);
|
|
+
|
|
+ /* In practice hugemax is too large to be allocated. */
|
|
+ assert_ptr_null(mallocx(hugemax, 0),
|
|
+ "Expected OOM for mallocx(size=%#zx, 0)", hugemax);
|
|
+
|
|
+#if LG_SIZEOF_PTR == 3
|
|
+ size = ZU(0x8000000000000000);
|
|
+ alignment = ZU(0x8000000000000000);
|
|
+#else
|
|
+ size = ZU(0x80000000);
|
|
+ alignment = ZU(0x80000000);
|
|
+#endif
|
|
+ assert_ptr_null(mallocx(size, MALLOCX_ALIGN(alignment)),
|
|
+ "Expected OOM for mallocx(size=%#zx, MALLOCX_ALIGN(%#zx)", size,
|
|
+ alignment);
|
|
+}
|
|
+TEST_END
|
|
+
|
|
TEST_BEGIN(test_basic)
|
|
{
|
|
#define MAXSZ (((size_t)1) << 26)
|
|
@@ -96,6 +165,7 @@ main(void)
|
|
{
|
|
|
|
return (test(
|
|
+ test_oom,
|
|
test_basic,
|
|
test_alignment_and_size));
|
|
}
|