Commit Graph

446 Commits

Author SHA1 Message Date
Paul Liétar
7e22d302ad Don't use our own loop to find clang-format
find_program can do that for us. Additionally that loop was resetting
the CLANG_FORMAT every time ninja was run, making it impossible to
pass a specific -DCLANG_FORMAT=... to cmake.

I've tried version 6 to 8 and formatting remains stable. clang 9 is
when it breaks down because of AfterCaseLabel.
2020-01-31 08:04:36 +00:00
Matthew Parkinson
0affc069cf Make snmalloc build on Windows with Clang
Fixes a few places where Clang complains about Windows specific code,
and also uses macros supported by Clang on Windows.  A few places
separating platform and compiler specific code, as MSVC and WIN32 were
used interchangably previously.
2020-01-26 19:46:18 +00:00
Theo Butler
eaeb2aa53d clang-format: Add break after case label 2020-01-24 15:30:46 +00:00
SchrodingerZhu
8304dedd17 add rust support (#113)
* add rust support

* move aligned_size to sizeclass.h

* add static qualifier

* adjust CMakeLists.txt, may broke CI tests

* fix msvc's complaining on c++17

* use SNMALLOC_FAST_PATH as the decorator of aligned_size

* adapt new alignment algorithm and add related test

Co-authored-by: mjp41 <mattpark@microsoft.com>

* fix test cases for msvc

* add extra test for size == 0

* treat memory block of same sizeclass as the same

* fix formatting problem

* remove extra declarations

Co-authored-by: Matthew Parkinson <mjp41@users.noreply.github.com>
2020-01-23 07:08:18 +00:00
Matthew Parkinson
4212ac8e4e Improve codegen for sized free. (#115)
For languages like Verona or Rust, the deallocation calls know the
size of the object originally requested.  This change optimises that
code path to create a much better fast path.
2020-01-22 17:41:08 +00:00
Matthew Parkinson
dbfb645732 Merge pull request #112 from microsoft/plietar-patch-1
Remove upper case letter from middle of sentence
2020-01-14 07:06:13 +00:00
Paul Liétar
bb33406fe2 Remove upper case letter from middle of sentence 2020-01-14 02:23:23 +00:00
Matthew Parkinson
49667c9893 Merge pull request #111 from microsoft/align
Small refactoring of code for finding a sizeclass for an alignment
2020-01-10 07:11:08 +00:00
Matthew Parkinson
5786ecc3cf Made aligned_alloc produce aligned values.
Previous implementation of aligned_alloc met the specification, but was
not particularly useful.  This uses the same implementation for
alligned_alloc and memalign.
2020-01-09 16:54:50 +00:00
Matthew Parkinson
1fd4ddd23e Factor alignment code, so it can be reused. 2020-01-09 16:54:50 +00:00
Matthew Parkinson
e8e0f60ccf Fix GCC 9 error. 2020-01-07 11:06:12 +00:00
Matthew Parkinson
19e8518bbe Merge pull request #107 from CTSRD-CHERI/upstream-aal-features
Introduce AAL feature flags
2019-12-07 08:24:36 +00:00
Nathaniel Filardo
2fa60c719f POISON only integer pointers
For architectures that can't manipulate pointers like integers, don't
try XORing them like this.  It's not ideal -- perhaps we should have
"else" branches to these tests.
2019-12-05 11:19:48 +00:00
Nathaniel Filardo
0d6f708166 AAL: feature flags 2019-12-05 11:19:48 +00:00
Nathaniel Filardo
ef40f1cf1d Replace "AAL" type with "Aal" to parallel "Pal" 2019-12-04 16:56:28 +00:00
Nathaniel Filardo
4d6759aca4 Make "pal_supports" not a function
But rather a template vardecl, as per C++14
2019-12-04 16:54:41 +00:00
Matthew Parkinson
2567e8e4f3 Merge pull request #106 from devnexen/atomic_swap_16_build_fix
atomic swap 16 flag missing fix.
2019-11-28 10:28:46 +00:00
David Carlier
9da3261a22 atomic swap 16 flag missing fix.
In some platforms, it is rather amd64 than the more common x86_64,
thus missing to rightfully set this flag.
2019-11-28 09:30:43 +00:00
Matthew Parkinson
7f465f9a5d Merge pull request #104 from CTSRD-CHERI/for-upstream-cheri-prep
Further CHERI prep
2019-11-27 13:52:46 +00:00
Nathaniel Filardo
7afc6da566 pagemap: cast to size_t then do bit manip
Makes the CHERI compiler happier
2019-11-27 10:17:31 +00:00
Nathaniel Filardo
5ae8ecedee metaslab: further use of pointer align funcs 2019-11-27 10:17:31 +00:00
Nathaniel Filardo
f8115a81b1 pagemap: cast uintptr_t to size_t before bit math
Not strictly necessary, but makes the CHERI compiler happier to see that
we're using a decidedly integral type rather than a possibly tagged
quantity.
2019-11-27 10:17:31 +00:00
Nathaniel Filardo
d13d810b66 Explicitly compute the size of two pointers
Don't use bits::is64() when setting MIN_ALLOC_BITS
2019-11-27 10:17:31 +00:00
Matthew Parkinson
f70191fb1e Merge pull request #103 from CTSRD-CHERI/for-upstream-cheri-prep-tidy
CHERI prep work that's just tidying
2019-11-26 16:42:03 +00:00
Nathaniel Filardo
997ebc5065 ds/aba: rename ::load to ::ptr
`load` does not load (`read` and `compare_exchange` do) so give it a
different name.  For the cases where `ptr` was previously the pointer we
were guarding, rename it to `raw`.
2019-11-26 15:50:22 +00:00
Nathaniel Filardo
c7d509e418 test/func/malloc: align check as size_t
If the test happens as uintptr_t on CHERI, then we attempt to construct
a capability and use a capability-based test rather than an
integer-based one, and things go south.
2019-11-26 15:50:22 +00:00
Nathaniel Filardo
0b47145526 test/func/malloc: posix_memalign vs. size_t
posix_memalign requires that the alignment parameter be a multiple of
sizeof(uintptr_t), but the test begins with alignments as small as
sizeof(size_t).  While those are very likely the same value out in the
wild right now, they're not on CHERI.

Begin the test loop at sizeof(uintptr_t) and add a test that a request
for a reasonable amount of memory but with an alignment of
sizeof(uintptr_t)/2 fails with EINVAL.
2019-11-26 15:50:22 +00:00
Nathaniel Filardo
44f80c00fc pal_open_enclave: use pointers, not uintptr_t 2019-11-26 15:50:22 +00:00
Nathaniel Filardo
263d735d0c ds/address: add dynamic pointer_align_up 2019-11-26 15:50:22 +00:00
Nathaniel Filardo
df2a2dc228 metaslab: rephrase assertion in terms of pointer_diff 2019-11-26 15:50:22 +00:00
Nathaniel Filardo
4dd77d35ab largealloc: rephrase pointer comparison 2019-11-26 15:50:22 +00:00
Nathaniel Filardo
f7c131e4ac largealloc: use pointer, not address_t, for cursor 2019-11-26 15:50:22 +00:00
Nathaniel Filardo
83c467eb92 ds/address: add pointer diff function
And use it rather than open-coding subtraction of two address_cast-s.
2019-11-26 15:50:22 +00:00
Nathaniel Filardo
eb2d8890de Additional provenance preservation 2019-11-26 15:37:52 +00:00
Nathaniel Filardo
ef7985510c address.h: add pointer alignment functions
More explicit than address_cast and bitwise and
2019-11-26 15:37:52 +00:00
Nathaniel Filardo
20e804728b Move bits::is_aligned_block to address.h
And chase consequences
2019-11-26 15:33:09 +00:00
Nathaniel Filardo
261249d9cb Preserve provenance through pointer offsetting 2019-11-26 14:59:54 +00:00
Nathaniel Filardo
00268fc2ad -Wundef 2019-11-26 14:59:54 +00:00
Nathaniel Filardo
9cdac05e4d portability: platform compiler flags
-mcx16 and -march=native are platform specific.  Leave them out if we
aren't targeting chips that need it.
2019-11-26 14:59:54 +00:00
Nathaniel Filardo
ad96ba05c1 largealloc: don't zero memory twice
If the decommit strategy is DecommitSuperLazy, then both the constexpr
if and the ordinary if would fire; add an else so we only fall into one.
2019-11-26 14:59:54 +00:00
Nathaniel Filardo
6f8623b5d7 Remove spurious store to pagemap
The same operation was just done one the other side of the loop above
and the loop does not modify this location in the map.
2019-11-26 14:59:54 +00:00
Nathaniel Filardo
2af4c64698 Improve commentary 2019-11-26 14:58:47 +00:00
Nathaniel Filardo
7251022e24 superslab: reorder initialization
Setting kind and then immediately testing it seems wrong.
2019-11-26 14:58:08 +00:00
Nathaniel Filardo
cbeeba004b test/externalpointer: ifdef NDEBUG, not if
Reported by Alex Richardson
2019-11-26 14:58:08 +00:00
Nathaniel Filardo
10475f3432 Set linker-language C; prevents linking c++ stdlib
Thanks to Alex Richardson for the suggestion
2019-11-26 14:58:08 +00:00
Nathaniel Filardo
528215e45e clangformat 8 2019-11-26 14:58:08 +00:00
Matthew Parkinson
11923154e8 Merge pull request #100 from CTSRD-CHERI/for-upstream-static-pagemap-slabmap
Deconflate "pagemap"
2019-11-25 16:26:55 +00:00
Nathaniel Filardo
e870960655 Some minor chunkmap commentary 2019-11-25 15:22:53 +00:00
Nathaniel Filardo
7ed80e7244 Report error on pagemap ABI mismatch 2019-11-25 15:22:53 +00:00
Nathaniel Filardo
d5b478ecb3 Deconflate "Pagemap" objects
There are two things calling themselves pagemaps:

- the src/mem/pagemap.h objects of that name

- the SuperslabMap object gets called a PageMap inside the Allocator

Rename the latter to chunkmap, with appropriate case and snake,
everywhere, and pull it out to its own file (chunkmap.h).

The default implementation of a chunkmap is a purely static object, but
we nevertheless instantiate it per allocator, so that other
implementations can use stateful instances when interposing on the
mutation methods.  Note that the "get" method, however, must remain
static to support the interface required by Allocator objects.
2019-11-21 15:35:56 +00:00