Skip to content

TS-4957: Make the use of madvise() with MADV_DONTDUMP configurable. #1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PSUdaemon merged 1 commit into from
Nov 2, 2016
Merged

TS-4957: Make the use of madvise() with MADV_DONTDUMP configurable. #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions doc/admin-guide/files/records.config.en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3332,6 +3332,12 @@ Sockets
For more information on the implications of enabling huge pages, see
`Wikipedia <http://en.wikipedia.org/wiki/Page_%28computer_memory%29#Page_size_trade-off>_`.

.. ts:cv:: CONFIG proxy.config.allocator.dontdump_iobuffers INT 1

Enable (1) the exclusion of IO buffers from core files when ATS crashes on supported
platforms. (Currently only linux). IO buffers are allocated with the MADV_DONTDUMP
with madvise() on linux platforms that support MADV_DONTDUMP. Enabled by default.

.. ts:cv:: CONFIG proxy.config.http.enabled INT 1

Turn on or off support for HTTP proxying. This is rarely used, the one
Expand Down
16 changes: 14 additions & 2 deletions iocore/eventsystem/EventSystem.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,21 @@ ink_event_system_init(ModuleVersion v)
REC_ReadConfigInteger(config_max_iobuffer_size, "proxy.config.io.max_buffer_size");

max_iobuffer_size = buffer_size_to_index(config_max_iobuffer_size, DEFAULT_BUFFER_SIZES - 1);
if (default_small_iobuffer_size > max_iobuffer_size)
if (default_small_iobuffer_size > max_iobuffer_size) {
default_small_iobuffer_size = max_iobuffer_size;
if (default_large_iobuffer_size > max_iobuffer_size)
}
if (default_large_iobuffer_size > max_iobuffer_size) {
default_large_iobuffer_size = max_iobuffer_size;
}

#ifdef MADV_DONTDUMP // This should only exist on Linux 3.4 and higher.
RecBool dont_dump_enabled = true;
RecGetRecordBool("proxy.config.allocator.dontdump_iobuffers", &dont_dump_enabled, false);

if (dont_dump_enabled) {
iobuffer_advice |= MADV_DONTDUMP;
}
#endif

init_buffer_allocators();
}
8 changes: 2 additions & 6 deletions iocore/eventsystem/IOBuffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ inkcoreapi ClassAllocator<IOBufferBlock> ioBlockAllocator("ioBlockAllocator", DE
int64_t default_large_iobuffer_size = DEFAULT_LARGE_BUFFER_SIZE;
int64_t default_small_iobuffer_size = DEFAULT_SMALL_BUFFER_SIZE;
int64_t max_iobuffer_size = DEFAULT_BUFFER_SIZES - 1;
int iobuffer_advice = 0;

//
// Initialization
Expand All @@ -46,11 +47,6 @@ void
init_buffer_allocators()
{
char *name;
int advice = 0;

#ifdef MADV_DONTDUMP // This should only exist on Linux 3.4 and higher.
advice = MADV_DONTDUMP;
#endif

for (int i = 0; i < DEFAULT_BUFFER_SIZES; i++) {
int64_t s = DEFAULT_BUFFER_BASE_SIZE * (((int64_t)1) << i);
Expand All @@ -61,7 +57,7 @@ init_buffer_allocators()

name = new char[64];
snprintf(name, 64, "ioBufAllocator[%d]", i);
ioBufAllocator[i].re_init(name, s, n, a, advice);
ioBufAllocator[i].re_init(name, s, n, a, iobuffer_advice);
}
}

Expand Down
1 change: 1 addition & 0 deletions iocore/eventsystem/I_IOBuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class VIO;
inkcoreapi extern int64_t max_iobuffer_size;
extern int64_t default_small_iobuffer_size;
extern int64_t default_large_iobuffer_size; // matched to size of OS buffers
extern int iobuffer_advice;

#if !defined(TRACK_BUFFER_USER)
#define TRACK_BUFFER_USER 1
Expand Down
2 changes: 2 additions & 0 deletions mgmt/RecordsConfig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2029,6 +2029,8 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.allocator.hugepages", RECD_INT, "0", RECU_RESTART_TS, RR_NULL, RECC_NULL, "[0-1]", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.allocator.dontdump_iobuffers", RECD_INT, "1", RECU_RESTART_TS, RR_NULL, RECC_NULL, "[0-1]", RECA_NULL}
,

//############
//#
Expand Down