From nobody Mon Feb 9 00:20:52 2026 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 86D8B35EDCB for ; Fri, 9 Jan 2026 13:00:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767963644; cv=none; b=YfJQvqi/388JhOSfnTbSsJO6soHCn5mtdGDGGt+XdydFPTxS0fCKdtFwc7NcyxGv0lPc4uyjZVk+lOzrh3FpN88yGLWMXXQMLLxb5iet4GBj111esQB/Vmce6T3cZjSCTJyJBvLVYKhXI51DW/dYwJTenOqtLu+yzOVvDgdeZJ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767963644; c=relaxed/simple; bh=y+RkYpOAQ7uM/0ey3EZvsKbFdv6jknz7JJQBhw+sV0s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kayPgpH9+5/syRgC54p5hNUsFbbR6RF4j2n0+3G46IU30GrGtlIQiGRmniTaUw+V5oR1vKq99hLHiojHACLb4Ks+B3sqnybQmYMSGxOXceEYFSV/hTy3i9nH5HjK3L8KrOos0gra+BAweGz1qEXJ9MLRcsJ+UOAwsT2i8zwSTak= 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=dWUj5ZEl; arc=none smtp.client-ip=209.85.214.170 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="dWUj5ZEl" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2a0d6f647e2so44719095ad.1 for ; Fri, 09 Jan 2026 05:00:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767963643; x=1768568443; 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=MO7278nlQYTAPfu3eaWy0xSK9M5O/y06GriyWS2ce/U=; b=dWUj5ZElExOKPKl7s7CV1ni/De8q/UmB/wwa/o3C53egK803aB42F9qDyDhQJ+Zdkh Vjr7ra2S8N+I11AlBPTND3Q5GX8pRP/tD0GhGGWlz0QJBglZC6IAnPBQGzuA1cUk9Zg/ W+7o6LotVXVQcfmUiPBk13OEELPvtJPmH3FpUqkG88Rc7kZMzEBeRI9kPzD2VxivJFqH OFJ6joWU9rroLOIwV7C9AytYqhWFySgc7JmoC1+MCtbzTVxv9IM6wWo2QMVLlvQdWOcr cKMWQsffzhlRwtKDqf+OY7XJF9thTe84TAcbsmU7nDNPyQTSTp6fgEQ8fZ66+r4QDRkL QcDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767963643; x=1768568443; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=MO7278nlQYTAPfu3eaWy0xSK9M5O/y06GriyWS2ce/U=; b=Nk5mUp9/aRq5LXlw3VjC+PqsFqYA8YW7+dcqnVyuBobaTEMcC8KtdDAYd52mkVujXn VS6JirnRtXJ1SI6teguoao1xx7Fq0hgMcTa208IHEAiYadjkEGMH1E6boFGqHVLRnDVa 2o2zqU4sjXj5H1NmR/HUTe4WcAdNf2qk+CpGCRECedkVa/DbUVCd4b9jFb4KMIGYMN4o hfd58lt0qS50wzV2OBk1nAaRpH6TXPzwpUnIcp9hZYC/2mY7OWfLiDPzZrts2vLsYWZo gzOBo5ci2DaHvuIesYaaADW2K6dDBab9Aad4Az9r/P2CEij8qiaocwpsE6Bb3IG3f0ul 0oYg== X-Forwarded-Encrypted: i=1; AJvYcCV2NSJGRzaxmshNl67+V2LnTtoVHRUIePLhfaW0kTZsjOScE6v1iRYGcmUFCergmdJnkaqV00nuC/+PPpA=@vger.kernel.org X-Gm-Message-State: AOJu0YzdDzzFV8zSXMBwZE3TRfIFBW/QGCQy0F0BV8iZa+DKnGOhpZQ2 nnHz0DxGnlzCKtLfbPx0A/AY01i/SAMvCjapT5S+EqvHbdzAVDN3OKo3 X-Gm-Gg: AY/fxX5OluRVuP5iIrSrh270wjRLtj8M0E9eyLZ3InYPMflVhrawPUK6GbfkPHfgmQh VQZG0dmgGidlZm5EE2gmMgT2G/WxAM55SeGJ+7BF6GJ5K858l1/YFNgHUO1gzBbVr+V0IdI4CY7 Fj1XcIz95G3u7HwznmICX/nwgrWK2cbMjCJARmHq2cfXPdRNIQ14tqwNmJY/Qq2BurrhidvLwyZ rc507diFxVVK4oNVtvR1Di86uGRQl+0M7nHW3CDxKslFTcDSQHG52sIEz3A/dNOTgfgl0Ss2crm DJkHt4xv59SQBnYn+hOM2UjHYQABtyp9dPZSZOrm/seyySvxShG01yb6VhaZ+Au/kgBk2RRSfPD tiRqgH4pxlNmj7ShVx+nxX9TBp5IAYQEEeSyS5s3HIEVIoJguzF0CB48/u7kAWrCPJwHYnEe65C +JLNR3py7syfMHlOGr3uc20ppGy+I= X-Google-Smtp-Source: AGHT+IG5Cqo3+38kG8ESzhWrBgdKbUFhdU0k029rjUkM6vXAH4vvVwZEbE/pXDENcUb+VYMnZzwlCQ== X-Received: by 2002:a17:903:1cd:b0:2a0:b02b:2114 with SMTP id d9443c01a7336-2a3ee413b9cmr100817785ad.11.1767963642383; Fri, 09 Jan 2026 05:00:42 -0800 (PST) Received: from pengdl-pc.mioffice.cn ([43.224.245.249]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3c3a328sm104927325ad.4.2026.01.09.05.00.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jan 2026 05:00:41 -0800 (PST) From: Donglin Peng To: ast@kernel.org, andrii.nakryiko@gmail.com, eddyz87@gmail.com Cc: zhangxiaoqin@xiaomi.com, ihor.solodrai@linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Donglin Peng , Alan Maguire Subject: [PATCH bpf-next v12 11/11] btf: Refactor the code by calling str_is_empty Date: Fri, 9 Jan 2026 21:00:03 +0800 Message-Id: <20260109130003.3313716-12-dolinux.peng@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260109130003.3313716-1-dolinux.peng@gmail.com> References: <20260109130003.3313716-1-dolinux.peng@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Donglin Peng Calling the str_is_empty function to clarify the code and no functional changes are introduced. Cc: Eduard Zingerman Cc: Alexei Starovoitov Cc: Andrii Nakryiko Cc: Alan Maguire Cc: Ihor Solodrai Cc: Xiaoqin Zhang Signed-off-by: Donglin Peng Acked-by: Eduard Zingerman --- tools/lib/bpf/btf.c | 34 +++++++++++++++++----------------- tools/lib/bpf/libbpf.c | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index 918d9fa6ec36..66e4a57896b3 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -2128,7 +2128,7 @@ int btf__add_int(struct btf *btf, const char *name, s= ize_t byte_sz, int encoding int sz, name_off; =20 /* non-empty name */ - if (!name || !name[0]) + if (str_is_empty(name)) return libbpf_err(-EINVAL); /* byte_sz must be power of 2 */ if (!byte_sz || (byte_sz & (byte_sz - 1)) || byte_sz > 16) @@ -2176,7 +2176,7 @@ int btf__add_float(struct btf *btf, const char *name,= size_t byte_sz) int sz, name_off; =20 /* non-empty name */ - if (!name || !name[0]) + if (str_is_empty(name)) return libbpf_err(-EINVAL); =20 /* byte_sz must be one of the explicitly allowed values */ @@ -2231,7 +2231,7 @@ static int btf_add_ref_kind(struct btf *btf, int kind= , const char *name, int ref if (!t) return libbpf_err(-ENOMEM); =20 - if (name && name[0]) { + if (!str_is_empty(name)) { name_off =3D btf__add_str(btf, name); if (name_off < 0) return name_off; @@ -2308,7 +2308,7 @@ static int btf_add_composite(struct btf *btf, int kin= d, const char *name, __u32 if (!t) return libbpf_err(-ENOMEM); =20 - if (name && name[0]) { + if (!str_is_empty(name)) { name_off =3D btf__add_str(btf, name); if (name_off < 0) return name_off; @@ -2409,7 +2409,7 @@ int btf__add_field(struct btf *btf, const char *name,= int type_id, if (!m) return libbpf_err(-ENOMEM); =20 - if (name && name[0]) { + if (!str_is_empty(name)) { name_off =3D btf__add_str(btf, name); if (name_off < 0) return name_off; @@ -2447,7 +2447,7 @@ static int btf_add_enum_common(struct btf *btf, const= char *name, __u32 byte_sz, if (!t) return libbpf_err(-ENOMEM); =20 - if (name && name[0]) { + if (!str_is_empty(name)) { name_off =3D btf__add_str(btf, name); if (name_off < 0) return name_off; @@ -2505,7 +2505,7 @@ int btf__add_enum_value(struct btf *btf, const char *= name, __s64 value) return libbpf_err(-EINVAL); =20 /* non-empty name */ - if (!name || !name[0]) + if (str_is_empty(name)) return libbpf_err(-EINVAL); if (value < INT_MIN || value > UINT_MAX) return libbpf_err(-E2BIG); @@ -2582,7 +2582,7 @@ int btf__add_enum64_value(struct btf *btf, const char= *name, __u64 value) return libbpf_err(-EINVAL); =20 /* non-empty name */ - if (!name || !name[0]) + if (str_is_empty(name)) return libbpf_err(-EINVAL); =20 /* decompose and invalidate raw data */ @@ -2622,7 +2622,7 @@ int btf__add_enum64_value(struct btf *btf, const char= *name, __u64 value) */ int btf__add_fwd(struct btf *btf, const char *name, enum btf_fwd_kind fwd_= kind) { - if (!name || !name[0]) + if (str_is_empty(name)) return libbpf_err(-EINVAL); =20 switch (fwd_kind) { @@ -2658,7 +2658,7 @@ int btf__add_fwd(struct btf *btf, const char *name, e= num btf_fwd_kind fwd_kind) */ int btf__add_typedef(struct btf *btf, const char *name, int ref_type_id) { - if (!name || !name[0]) + if (str_is_empty(name)) return libbpf_err(-EINVAL); =20 return btf_add_ref_kind(btf, BTF_KIND_TYPEDEF, name, ref_type_id, 0); @@ -2710,7 +2710,7 @@ int btf__add_restrict(struct btf *btf, int ref_type_i= d) */ int btf__add_type_tag(struct btf *btf, const char *value, int ref_type_id) { - if (!value || !value[0]) + if (str_is_empty(value)) return libbpf_err(-EINVAL); =20 return btf_add_ref_kind(btf, BTF_KIND_TYPE_TAG, value, ref_type_id, 0); @@ -2727,7 +2727,7 @@ int btf__add_type_tag(struct btf *btf, const char *va= lue, int ref_type_id) */ int btf__add_type_attr(struct btf *btf, const char *value, int ref_type_id) { - if (!value || !value[0]) + if (str_is_empty(value)) return libbpf_err(-EINVAL); =20 return btf_add_ref_kind(btf, BTF_KIND_TYPE_TAG, value, ref_type_id, 1); @@ -2746,7 +2746,7 @@ int btf__add_func(struct btf *btf, const char *name, { int id; =20 - if (!name || !name[0]) + if (str_is_empty(name)) return libbpf_err(-EINVAL); if (linkage !=3D BTF_FUNC_STATIC && linkage !=3D BTF_FUNC_GLOBAL && linkage !=3D BTF_FUNC_EXTERN) @@ -2832,7 +2832,7 @@ int btf__add_func_param(struct btf *btf, const char *= name, int type_id) if (!p) return libbpf_err(-ENOMEM); =20 - if (name && name[0]) { + if (!str_is_empty(name)) { name_off =3D btf__add_str(btf, name); if (name_off < 0) return name_off; @@ -2867,7 +2867,7 @@ int btf__add_var(struct btf *btf, const char *name, i= nt linkage, int type_id) int sz, name_off; =20 /* non-empty name */ - if (!name || !name[0]) + if (str_is_empty(name)) return libbpf_err(-EINVAL); if (linkage !=3D BTF_VAR_STATIC && linkage !=3D BTF_VAR_GLOBAL_ALLOCATED = && linkage !=3D BTF_VAR_GLOBAL_EXTERN) @@ -2916,7 +2916,7 @@ int btf__add_datasec(struct btf *btf, const char *nam= e, __u32 byte_sz) int sz, name_off; =20 /* non-empty name */ - if (!name || !name[0]) + if (str_is_empty(name)) return libbpf_err(-EINVAL); =20 if (btf_ensure_modifiable(btf)) @@ -2993,7 +2993,7 @@ static int btf_add_decl_tag(struct btf *btf, const ch= ar *value, int ref_type_id, struct btf_type *t; int sz, value_off; =20 - if (!value || !value[0] || component_idx < -1) + if (str_is_empty(value) || component_idx < -1) return libbpf_err(-EINVAL); =20 if (validate_type_id(ref_type_id)) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 6ea81701e274..bbcfd72b07d5 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -2904,7 +2904,7 @@ static int bpf_object__init_user_btf_map(struct bpf_o= bject *obj, var_extra =3D btf_var(var); map_name =3D btf__name_by_offset(obj->btf, var->name_off); =20 - if (map_name =3D=3D NULL || map_name[0] =3D=3D '\0') { + if (str_is_empty(map_name)) { pr_warn("map #%d: empty name.\n", var_idx); return -EINVAL; } @@ -4281,7 +4281,7 @@ static int bpf_object__collect_externs(struct bpf_obj= ect *obj) if (!sym_is_extern(sym)) continue; ext_name =3D elf_sym_str(obj, sym->st_name); - if (!ext_name || !ext_name[0]) + if (str_is_empty(ext_name)) continue; =20 ext =3D obj->externs; --=20 2.34.1