From aaf724e9f06ac6013f97bb967aae6c4510b0a1da Mon Sep 17 00:00:00 2001 From: Jay Azurin Date: Fri, 28 Aug 2015 12:53:22 -0500 Subject: Workaround for fapiMalloc fragmentation issue Added a macro that returns the next highest power of 2 number of pages for a given buffer. Implemented fapiPlatMalloc() so that it calls the macro for buffers larger than 1 page size. This can prevent excessive fragmentation when allocating very large buffers. CQ:SW317751 Change-Id: I8eaef95ba4381026377a1eab0fe620b2954c8230 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20255 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: William H. Schwartz Reviewed-by: Michael Baiocchi Reviewed-by: A. Patrick Williams III --- src/include/usr/hwpf/plat/fapiPlatUtil.H | 2 +- src/include/util/align.H | 14 ++++++++++++++ src/usr/hwpf/hwp/mvpd_accessors/mvpdRingFuncs.C | 2 +- src/usr/hwpf/plat/fapiPlatUtil.C | 15 ++++++++++++++- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/include/usr/hwpf/plat/fapiPlatUtil.H b/src/include/usr/hwpf/plat/fapiPlatUtil.H index ff1464693..2d2d5fbb7 100644 --- a/src/include/usr/hwpf/plat/fapiPlatUtil.H +++ b/src/include/usr/hwpf/plat/fapiPlatUtil.H @@ -72,7 +72,7 @@ template <> inline uint32_t fapiPlatGenHash #define FAPI_PLAT_HTOBE64(x) htobe64(x) #define FAPI_PLAT_HTOLE64(x) htole64(x) -#define fapiPlatMalloc(s) malloc(s) +void* fapiPlatMalloc(size_t); #define fapiPlatFree(p) free(p) #endif // FAPIPLATUTIL_H_ diff --git a/src/include/util/align.H b/src/include/util/align.H index 0ffec92d1..e0132b2b7 100644 --- a/src/include/util/align.H +++ b/src/include/util/align.H @@ -51,4 +51,18 @@ #define ALIGN_MEGABYTE(u) (ALIGN_X(u,MEGABYTE)) #define ALIGN_MEGABYTE_DOWN(u) (ALIGN_DOWN_X(u,MEGABYTE)) +// Returns a number that is aligned to the next highest power of 2 number of +// pages for the given buffer. +#define ALIGN_TO_NEXT_POWER_OF_TWO_PAGES(b) ({\ + unsigned int v = ALIGN_PAGE(b)/PAGE_SIZE;\ + v--;\ + v |= v >> 1;\ + v |= v >> 2;\ + v |= v >> 4;\ + v |= v >> 8;\ + v |= v >> 16;\ + v++;\ + v * PAGE_SIZE;\ + }) + #endif diff --git a/src/usr/hwpf/hwp/mvpd_accessors/mvpdRingFuncs.C b/src/usr/hwpf/hwp/mvpd_accessors/mvpdRingFuncs.C index e54b0f602..3a532a1dc 100644 --- a/src/usr/hwpf/hwp/mvpd_accessors/mvpdRingFuncs.C +++ b/src/usr/hwpf/hwp/mvpd_accessors/mvpdRingFuncs.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2015 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/hwpf/plat/fapiPlatUtil.C b/src/usr/hwpf/plat/fapiPlatUtil.C index 64df4d33a..d03b6705b 100644 --- a/src/usr/hwpf/plat/fapiPlatUtil.C +++ b/src/usr/hwpf/plat/fapiPlatUtil.C @@ -40,7 +40,8 @@ #include #include #include - +#include +#include #ifdef __HOSTBOOT_RUNTIME #include @@ -325,3 +326,15 @@ fapi::ReturnCode fapiSpecialWakeup(const fapi::Target & i_target, } } + +//****************************************************************************** +// fapiPlatMalloc +//****************************************************************************** +void* fapiPlatMalloc(size_t s) +{ + if (s > PAGE_SIZE) + { + s = ALIGN_TO_NEXT_POWER_OF_TWO_PAGES(s); + } + return malloc(s); +} -- cgit v1.2.3