Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d05dfd1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-4.19-20180918' of... 

Merge tag 'perf-urgent-for-mingo-4.19-20180918' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

 - Fix the build on !_GNU_SOURCE libc systems such as Alpine Linux/musl
   libc due to usage of strerror_r glibc variant on libbpf (Arnaldo Carvalho de Melo)

 - Fix out-of-tree asciidoctor man page generation (Ben Hutchings)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents f21f7fa2 169e366c

tools/lib/bpf/Build

+1 −1
Original line number Diff line number Diff line 
libbpf-y := libbpf.o bpf.o nlattr.o btf.o libbpf_errno.o
 
libbpf-y := libbpf.o bpf.o nlattr.o btf.o libbpf_errno.o str_error.o

tools/lib/bpf/libbpf.c

+10 −10
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include "libbpf.h"

#include "bpf.h"

#include "btf.h"

#include "str_error.h"



#ifndef EM_BPF

#define EM_BPF 247
@@ -469,7 +470,7 @@ static int bpf_object__elf_init(struct bpf_object *obj) 
		obj->efile.fd = open(obj->path, O_RDONLY);

		if (obj->efile.fd < 0) {

			char errmsg[STRERR_BUFSIZE];

			char *cp = strerror_r(errno, errmsg, sizeof(errmsg));

			char *cp = str_error(errno, errmsg, sizeof(errmsg));



			pr_warning("failed to open %s: %s\n", obj->path, cp);

			return -errno;
@@ -810,8 +811,7 @@ static int bpf_object__elf_collect(struct bpf_object *obj) 
						      data->d_size, name, idx);

			if (err) {

				char errmsg[STRERR_BUFSIZE];

				char *cp = strerror_r(-err, errmsg,

						      sizeof(errmsg));

				char *cp = str_error(-err, errmsg, sizeof(errmsg));



				pr_warning("failed to alloc program %s (%s): %s",

					   name, obj->path, cp);
@@ -1140,7 +1140,7 @@ bpf_object__create_maps(struct bpf_object *obj) 


		*pfd = bpf_create_map_xattr(&create_attr);

		if (*pfd < 0 && create_attr.btf_key_type_id) {

			cp = strerror_r(errno, errmsg, sizeof(errmsg));

			cp = str_error(errno, errmsg, sizeof(errmsg));

			pr_warning("Error in bpf_create_map_xattr(%s):%s(%d). Retrying without BTF.\n",

				   map->name, cp, errno);

			create_attr.btf_fd = 0;
@@ -1155,7 +1155,7 @@ bpf_object__create_maps(struct bpf_object *obj) 
			size_t j;



			err = *pfd;

			cp = strerror_r(errno, errmsg, sizeof(errmsg));

			cp = str_error(errno, errmsg, sizeof(errmsg));

			pr_warning("failed to create map (name: '%s'): %s\n",

				   map->name, cp);

			for (j = 0; j < i; j++)
@@ -1339,7 +1339,7 @@ load_program(enum bpf_prog_type type, enum bpf_attach_type expected_attach_type, 
	}



	ret = -LIBBPF_ERRNO__LOAD;

	cp = strerror_r(errno, errmsg, sizeof(errmsg));

	cp = str_error(errno, errmsg, sizeof(errmsg));

	pr_warning("load bpf program failed: %s\n", cp);



	if (log_buf && log_buf[0] != '\0') {
@@ -1654,7 +1654,7 @@ static int check_path(const char *path) 


	dir = dirname(dname);

	if (statfs(dir, &st_fs)) {

		cp = strerror_r(errno, errmsg, sizeof(errmsg));

		cp = str_error(errno, errmsg, sizeof(errmsg));

		pr_warning("failed to statfs %s: %s\n", dir, cp);

		err = -errno;

	}
@@ -1690,7 +1690,7 @@ int bpf_program__pin_instance(struct bpf_program *prog, const char *path, 
	}



	if (bpf_obj_pin(prog->instances.fds[instance], path)) {

		cp = strerror_r(errno, errmsg, sizeof(errmsg));

		cp = str_error(errno, errmsg, sizeof(errmsg));

		pr_warning("failed to pin program: %s\n", cp);

		return -errno;

	}
@@ -1708,7 +1708,7 @@ static int make_dir(const char *path) 
		err = -errno;



	if (err) {

		cp = strerror_r(-err, errmsg, sizeof(errmsg));

		cp = str_error(-err, errmsg, sizeof(errmsg));

		pr_warning("failed to mkdir %s: %s\n", path, cp);

	}

	return err;
@@ -1770,7 +1770,7 @@ int bpf_map__pin(struct bpf_map *map, const char *path) 
	}



	if (bpf_obj_pin(map->fd, path)) {

		cp = strerror_r(errno, errmsg, sizeof(errmsg));

		cp = str_error(errno, errmsg, sizeof(errmsg));

		pr_warning("failed to pin map: %s\n", cp);

		return -errno;

	}

tools/lib/bpf/str_error.c

0 → 100644
+18 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: LGPL-2.1

#undef _GNU_SOURCE

#include <string.h>

#include <stdio.h>

#include "str_error.h"



/*

 * Wrapper to allow for building in non-GNU systems such as Alpine Linux's musl

 * libc, while checking strerror_r() return to avoid having to check this in

 * all places calling it.

 */

char *str_error(int err, char *dst, int len)

{

	int ret = strerror_r(err, dst, len);

	if (ret)

		snprintf(dst, len, "ERROR: strerror_r(%d)=%d", err, ret);

	return dst;

}

tools/lib/bpf/str_error.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: LGPL-2.1

#ifndef BPF_STR_ERROR

#define BPF_STR_ERROR



char *str_error(int err, char *dst, int len);

#endif // BPF_STR_ERROR

tools/perf/Documentation/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ $(MAN_HTML): $(OUTPUT)%.html : %.txt 
	mv $@+ $@



ifdef USE_ASCIIDOCTOR

$(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : $(OUTPUT)%.txt

$(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : %.txt

	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \

	$(ASCIIDOC) -b manpage -d manpage \

		$(ASCIIDOC_EXTRA) -aperf_version=$(PERF_VERSION) -o $@+ $< && \