On Wed, Jan 09, 2019 at 12:37:17PM +0300, Alexey Budankov wrote:
>
> Allocate and bind AIO user space buffers to the memory nodes
> that mmap kernel buffers are bound to.
>
> Signed-off-by: Alexey Budankov <alexey.budan...@linux.intel.com>
> ---
> Changes in v3:
> - corrected code style issues
> - adjusted __aio_alloc,__aio_bind,__aio_free() implementation
> Changes in v2:
> - implemented perf_mmap__aio_alloc, perf_mmap__aio_free, perf_mmap__aio_bind
> and put HAVE_LIBNUMA_SUPPORT #ifdefs in there
> ---
> tools/perf/util/mmap.c | 71 +++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 67 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
> index e68ba754a8e2..e5220790f1fb 100644
> --- a/tools/perf/util/mmap.c
> +++ b/tools/perf/util/mmap.c
> @@ -10,6 +10,9 @@
> #include <sys/mman.h>
> #include <inttypes.h>
> #include <asm/bug.h>
> +#ifdef HAVE_LIBNUMA_SUPPORT
> +#include <numaif.h>
> +#endif
> #include "debug.h"
> #include "event.h"
> #include "mmap.h"
> @@ -154,9 +157,68 @@ void __weak auxtrace_mmap_params__set_idx(struct
> auxtrace_mmap_params *mp __mayb
> }
>
> #ifdef HAVE_AIO_SUPPORT
> +
> +#ifdef HAVE_LIBNUMA_SUPPORT
> +static int perf_mmap__aio_alloc(struct perf_mmap *map, int index)
> +{
> + map->aio.data[index] = mmap(NULL, perf_mmap__mmap_len(map),
> PROT_READ|PROT_WRITE,
> + MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
> + if (map->aio.data[index] == MAP_FAILED) {
> + map->aio.data[index] = NULL;
> + return -1;
> + }
> +
> + return 0;
> +}
> +
> +static void perf_mmap__aio_free(struct perf_mmap *map, int index)
> +{
> + if (map->aio.data[index]) {
> + munmap(map->aio.data[index], perf_mmap__mmap_len(map));
> + map->aio.data[index] = NULL;
> + }
> +}
> +
> +static void perf_mmap__aio_bind(struct perf_mmap *map, int index, int cpu,
> int affinity)
> +{
> + void *data;
> + size_t mmap_len;
> + unsigned long node_mask;
> +
> + if (affinity != PERF_AFFINITY_SYS && cpu__max_node() > 1) {
> + data = map->aio.data[index];
> + mmap_len = perf_mmap__mmap_len(map);
> + node_mask = 1UL << cpu__get_node(cpu);
> + if (mbind(data, mmap_len, MPOL_BIND, &node_mask, 1, 0)) {
> + pr_warn("failed to bind [%p-%p] to node %d\n",
> + data, data + mmap_len, cpu__get_node(cpu));
> + }
getting compilation fail in here:
CC util/mmap.o
util/mmap.c: In function ‘perf_mmap__aio_bind’:
util/mmap.c:193:4: error: implicit declaration of function ‘pr_warn’; did you
mean ‘pr_warning’? [-Werror=implicit-function-declaration]
pr_warn("failed to bind [%p-%p] to node %d\n",
^~~~~~~
pr_warning
util/mmap.c:193:4: error: nested extern declaration of ‘pr_warn’
[-Werror=nested-externs]
cc1: all warnings being treated as errors
jirka
