From patchwork Wed Aug 28 11:11:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Ambardar X-Patchwork-Id: 823312 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D31113D53D; Wed, 28 Aug 2024 11:12:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724843540; cv=none; b=hWOhplaWxG6qgI3rYffmA2uPPm9Eevj9r6ZmryGlQiOZfF9aJxOQN3xHhy9c+7ZREMlQpl+zKPs817YflqqfNNukOhI4RoLnasnotbX5Mo1OKzi0B3H5FzqeJinz3uRnauQ4kar5XSrIYUqWWokzX8tIsamaiksbwZTF3zAHeB0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724843540; c=relaxed/simple; bh=OfS31y7CMGl383UND8A8tV3VaDssrFQuOg4dCa5VMIA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hrC42WEp3ta62zDwegQ32KxcRZ+5ML8Rz4Ds313OXhIRyLCEt9M01tfAHMnFdzhdf2ck88GcQx8PL28YvjJ0UPK2yj7ArMEZYm2RC3JoZMuu1yscHwaPvK2Ou57/HSZWmMD9fobeIK7jjRV/tW8OMmUQ/rILQO9YZsGwr7Lz6QY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hKDuZah+; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hKDuZah+" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-202508cb8ebso44508365ad.3; Wed, 28 Aug 2024 04:12:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724843538; x=1725448338; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W8R8TPIxkmmj3JhM7dtAmgzbws1KXgQVijrPpPFtSJ8=; b=hKDuZah+/vyy/5f40G2OypSzwBZvBHNAzRsLD7JWIhhpnCnQrHn+xc79Tb0x7mHx9g fSSXCY1XZr1IR3VU9nlLQWmr1Teur9ereqCOnPK+urZVEdM0XZIwN95AjirU2z5ejJFL 5JIHSLlvexXP+qasDF+jRR8vaeLIGYMI4QgKkMY768w/IXUUI19H6IjwW7TeI+Sg2lAP afKBruWU8C38jDnq9fczjmlFJCZKA7Ns6ebScJDDZ75C+ZuoOWdNpU0gCEJ0OEc7qve0 ThXsD7/1pbKp8/2Tpc2I6oU3vi9wWQ6vRP52oPeCO7Nv9WnVRTz5p8r4G60I7Ees/P+Z tN4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724843538; x=1725448338; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W8R8TPIxkmmj3JhM7dtAmgzbws1KXgQVijrPpPFtSJ8=; b=hSYkCrwwOXqmiosIPbjj/gQEP2fy0EffddMk2HbA5jKwo3DR2UCSS09zWzzxghdWxb LG++7EHD/wa2YadsVF2eDKJEMLad1dMOTdGuPUB25CEZHlUwLOAboFnRta17R1QIxOWm jfjYOweHOaiUEPPKxw8yvjnxuZAEdnw6BV+XJlU25HWWTPv2AjK+nQ2tEEVvwZV04W3o DWZiVhYEV3Vul0eAchHQ+5FJVRiFF+Df0OUMO52sv2i5/EycXFNpTyhZ+hU5ce9RUDTK S6S8Xyx4Ulxq7Ns590TlFfwQG1HdEO+TnocJ8iaSTGsWDS+xS5MMVsjwBNzNAnwtZp1t /+Vw== X-Forwarded-Encrypted: i=1; AJvYcCWArAmoSrXDPKqdwpV95utUGy6CQtwKNy1oXEOhGweFTM7KZp+VM7iGpz9scoaU8Zdao/zl+Y7Wr0OE/QN/lHs=@vger.kernel.org X-Gm-Message-State: AOJu0YwRzvAha3uaTMs6VZcRYJk7tbHqXs7Vf3gPiN/uwzxTg5KcxH0j k1XeYuNHic8sikt4QNhqiuTbD/4lHKYSnY88bCqUWAxQ3JHh0twmZ2TOrWrW X-Google-Smtp-Source: AGHT+IEGD2jtEO1F50nUJoFkERrZoWNWXIqXEOTLbpEoqXoaFjDpiH6U+XEqrnShjDrnGvY05cekbA== X-Received: by 2002:a17:902:da88:b0:204:e578:1b32 with SMTP id d9443c01a7336-204f9c50d04mr19389565ad.53.1724843538050; Wed, 28 Aug 2024 04:12:18 -0700 (PDT) Received: from localhost.localdomain (69-172-146-21.cable.teksavvy.com. [69.172.146.21]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-203855678f9sm97369395ad.1.2024.08.28.04.12.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2024 04:12:17 -0700 (PDT) From: Tony Ambardar To: bpf@vger.kernel.org Cc: Tony Ambardar , linux-kselftest@vger.kernel.org, Andrii Nakryiko , Eduard Zingerman , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , Ilya Leoshkevich , Quentin Monnet Subject: [PATCH bpf-next v3 1/8] libbpf: Improve log message formatting Date: Wed, 28 Aug 2024 04:11:51 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Fix missing newlines and extraneous terminal spaces in messages. Signed-off-by: Tony Ambardar --- tools/lib/bpf/btf.c | 6 +++--- tools/lib/bpf/btf_dump.c | 2 +- tools/lib/bpf/btf_relocate.c | 2 +- tools/lib/bpf/libbpf.c | 4 ++-- tools/lib/bpf/relo_core.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index 32c00db3b91b..f5081de86ee0 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -2940,7 +2940,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; } @@ -3028,7 +3028,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; } @@ -3290,7 +3290,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); } diff --git a/tools/lib/bpf/btf_dump.c b/tools/lib/bpf/btf_dump.c index 894860111ddb..18cbcf342f2b 100644 --- a/tools/lib/bpf/btf_dump.c +++ b/tools/lib/bpf/btf_dump.c @@ -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; } diff --git a/tools/lib/bpf/btf_relocate.c b/tools/lib/bpf/btf_relocate.c index 4f7399d85eab..b72f83e15156 100644 --- a/tools/lib/bpf/btf_relocate.c +++ b/tools/lib/bpf/btf_relocate.c @@ -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; } diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index e55353887439..8a0a0c1e37e1 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -12753,7 +12753,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); } @@ -13843,7 +13843,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); diff --git a/tools/lib/bpf/relo_core.c b/tools/lib/bpf/relo_core.c index 63a4d5ad12d1..7632e9d41827 100644 --- a/tools/lib/bpf/relo_core.c +++ b/tools/lib/bpf/relo_core.c @@ -1339,7 +1339,7 @@ int bpf_core_calc_relo_insn(const char *prog_name, cands->cands[i].id, cand_spec); if (err < 0) { bpf_core_format_spec(spec_buf, sizeof(spec_buf), cand_spec); - pr_warn("prog '%s': relo #%d: error matching candidate #%d %s: %d\n ", + pr_warn("prog '%s': relo #%d: error matching candidate #%d %s: %d\n", prog_name, relo_idx, i, spec_buf, err); return err; }