Commit e8957c0d authored by Tony Ambardar's avatar Tony Ambardar Committed by Alexei Starovoitov
Browse files

libbpf: Improve log message formatting 



Fix missing newlines and extraneous terminal spaces in messages.

Signed-off-by: default avatarTony Ambardar <tony.ambardar@gmail.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/086884b7cbf87e524d584f9bf87f7a580e378b2b.1726475448.git.tony.ambardar@gmail.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent c27d8235

tools/lib/bpf/btf.c

+3 −3
Original line number Diff line number Diff line
@@ -2941,7 +2941,7 @@ static int btf_ext_setup_info(struct btf_ext *btf_ext, 


	/* If no records, return failure now so .BTF.ext won't be used. */

	if (!info_left) {

		pr_debug("%s section in .BTF.ext has no records", ext_sec->desc);

		pr_debug("%s section in .BTF.ext has no records\n", ext_sec->desc);

		return -EINVAL;

	}
@@ -3029,7 +3029,7 @@ static int btf_ext_parse_hdr(__u8 *data, __u32 data_size) 


	if (data_size < offsetofend(struct btf_ext_header, hdr_len) ||

	    data_size < hdr->hdr_len) {

		pr_debug("BTF.ext header not found");

		pr_debug("BTF.ext header not found\n");

		return -EINVAL;

	}
@@ -3291,7 +3291,7 @@ int btf__dedup(struct btf *btf, const struct btf_dedup_opts *opts) 


	d = btf_dedup_new(btf, opts);

	if (IS_ERR(d)) {

		pr_debug("btf_dedup_new failed: %ld", PTR_ERR(d));

		pr_debug("btf_dedup_new failed: %ld\n", PTR_ERR(d));

		return libbpf_err(-EINVAL);

	}

tools/lib/bpf/btf_dump.c

+1 −1
Original line number Diff line number Diff line
@@ -1304,7 +1304,7 @@ static void btf_dump_emit_type_decl(struct btf_dump *d, __u32 id, 
			 * chain, restore stack, emit warning, and try to

			 * proceed nevertheless

			 */

			pr_warn("not enough memory for decl stack:%d", err);

			pr_warn("not enough memory for decl stack: %d\n", err);

			d->decl_stack_cnt = stack_start;

			return;

		}

tools/lib/bpf/btf_relocate.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static int btf_relocate_rewrite_strs(struct btf_relocate *r, __u32 i) 
		} else {

			off = r->str_map[*str_off];

			if (!off) {

				pr_warn("string '%s' [offset %u] is not mapped to base BTF",

				pr_warn("string '%s' [offset %u] is not mapped to base BTF\n",

					btf__str_by_offset(r->btf, off), *str_off);

				return -ENOENT;

			}

tools/lib/bpf/libbpf.c

+2 −2
Original line number Diff line number Diff line
@@ -12765,7 +12765,7 @@ struct bpf_link *bpf_program__attach_freplace(const struct bpf_program *prog, 
	}



	if (prog->type != BPF_PROG_TYPE_EXT) {

		pr_warn("prog '%s': only BPF_PROG_TYPE_EXT can attach as freplace",

		pr_warn("prog '%s': only BPF_PROG_TYPE_EXT can attach as freplace\n",

			prog->name);

		return libbpf_err_ptr(-EINVAL);

	}
@@ -13839,7 +13839,7 @@ int bpf_object__open_subskeleton(struct bpf_object_subskeleton *s) 
		map_type = btf__type_by_id(btf, map_type_id);



		if (!btf_is_datasec(map_type)) {

			pr_warn("type for map '%1$s' is not a datasec: %2$s",

			pr_warn("type for map '%1$s' is not a datasec: %2$s\n",

				bpf_map__name(map),

				__btf_kind_str(btf_kind(map_type)));

			return libbpf_err(-EINVAL);

tools/lib/bpf/relo_core.c

+1 −1

File changed.

Contains only whitespace changes.