From nobody Sun Feb 8 03:57:17 2026 Received: from mail-dy1-f196.google.com (mail-dy1-f196.google.com [74.125.82.196]) (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 21AF034FF6D for ; Thu, 22 Jan 2026 14:44:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769093055; cv=none; b=ZqVHX8+xpuLbEw9V/f9Owk49e4R1+xExZIdVQcnRooWD8zp5kz0L1S8sUdjRjrVhF+wAFyVMtH2261V+m0cqpbItmx6EacgIurmvhZ5Za5/DpmadS6x1IKrQEwQhPWiTtP5IQpS/bE8eKtJXw5lAcpscXMK+xmRCaH9iJQr476k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769093055; c=relaxed/simple; bh=ph9raQzgeMpsPx+4//UZP809yGey7vmG/PHGSkUTteA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=un93CuMxP+279mjkRjnfq/bRETO/raR4i5afQ+gWbZ7Ux/iru/1aqbVGloHOBR441arAojeNANQCLHOr6D3AlgTqysBrEPv0WYO3nKjHaFoIKHcOBFNyIVv5Rib5OE5xj1D2bH4Fnj/pV/C6D3ibVrcYd/+NPJHJBz4T/RpX9RU= 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=OelvVglQ; arc=none smtp.client-ip=74.125.82.196 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="OelvVglQ" Received: by mail-dy1-f196.google.com with SMTP id 5a478bee46e88-2b7070acfdcso1065201eec.0 for ; Thu, 22 Jan 2026 06:44:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769093052; x=1769697852; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=OhL8N13OqoDyHI+YLrGAJPLCudHj9ksX7uBVonjMYbM=; b=OelvVglQyYMFZTdrQrrcKXXoUklL71ZsbqBPFFc2WBTssG96rOdz/a1YPrSUf203Lc SdM8+KiHbpHDkpe05JvQUwrm4zsKZrfRlF+2e6rNE4lbmrPhf0NrvugzKfUgIGiKKxda sIAcyi+vTXzKjoyBbIpCl0yNzqN0cnxVhmHQ8XbjagwRW5HARostbUhB+yvtMZsViFh9 fvTHMffDi3+jJKy41cNiFWJV86F24nyzbB2V6kflTJmo18JqevobWdzmU1vriB2BZERr 24B69z6/F0malG6A1sP6Zc5s+SxHWvJdQFFHzjs2VJSafZFEQUFriU0kYRBpKvbKoTG6 nNHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769093052; x=1769697852; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=OhL8N13OqoDyHI+YLrGAJPLCudHj9ksX7uBVonjMYbM=; b=xSDBSzApFwfr11nHLlc2hC2E71XUdPQuLgO+iTETQJmPawsaI2E8TKS7bHdQuqcLag povvNWRvLihGZWQYN0eVkAE8wI2h59fJ+opqpIVcNXP+cvNdmLIpATjyH1wUuOokwZjH k1Z29yr5xdFdzG3W8m+d1pdHrlpu+aubSr+B1MgKkoKG09gGybKQ8BRT3O630fXiFT3/ yqW3EoNajQfqJpmMW7Ok3dbO+5hIqABMmLzrI6RTHtGjVfLs1+u/N5f5gomqpUk7Q+Em TQ4VNXjcZuVBEqGHxsaWHGaphyTt92EhImkLRtHxluk1XxBimZbfptvmF7EMYQPgiw7s CrMQ== X-Gm-Message-State: AOJu0YzckxA/QOLw7ogIx9AvW8M0Gmkzxa0kJnnc8p9jAt14vUzfp8Ge mWsHJXon0cbH/jf2REdr35IwTTsORYR3aBzembeswsfZ6qjYmBmL0ES/ X-Gm-Gg: AZuq6aLKOXQYGtdWWmkkNFNmnmCsSuhJJhMI+On8O2+ZkL6Wuz88cC3OHQ+RXSQ+J6w 6bIU1O0WdbE4GR1cJ/DKSyY45SLVv1IfiCAVHMb8x4NsVCNL07Q1UcfryhkD0tAGf6cudwNOer+ 1ICDp2j/mp1tVsJN+i3F02GGVrAzTc1OxN8LdH6VlTPjDDe3Z7+BbT7kKO9g3Txfln+HvH5oaCT +nYSIfHV5yvY5krqPN98UNUfXrbiwEr0q0i1fnjnzf6hafC73+m2y2oklzovhnF2n0ozdy5EOtk WRfC7+avUIXBo4gthVb1Su7eSoRL59ZeNupRM3mXJq7cMdwQ799bQnhbRSwwglytTiyR3FwfzZy r36Yr3yQcecNbmJ2Hi9l7swJuZNA9DCnAuKpKY1y188n1tkLT4m2v2ML7VldXMi7sORet6YYigT qd3eLZjvlrGzDZAlHvSFutdnJiTIEoZySU1cKT X-Received: by 2002:a05:7300:3c15:b0:2b7:33a6:b270 with SMTP id 5a478bee46e88-2b733a6b3f8mr529801eec.19.1769093051818; Thu, 22 Jan 2026 06:44:11 -0800 (PST) Received: from 9fdcf7ea0ed5.localdomain ([142.171.172.108]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2b71d3d2da2sm5140603eec.6.2026.01.22.06.44.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jan 2026 06:44:11 -0800 (PST) From: Wentong Tian To: jpoimboe@kernel.org, peterz@infradead.org Cc: linux-kernel@vger.kernel.org, Wentong Tian Subject: [PATCH] objtool: Use section/symbol type helpers Date: Thu, 22 Jan 2026 22:44:04 +0800 Message-Id: <20260122144404.40602-1-tianwentong2000@gmail.com> X-Mailer: git-send-email 2.34.1 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" Commit 25eac74b6bdb ("objtool: Add section/symbol type helpers") introduced several helper macros to improve code readability. Update the remaining open-coded checks in check.c, disas.c, elf.c, and klp-diff.c to use these new helpers. Signed-off-by: Wentong Tian --- tools/objtool/check.c | 4 ++-- tools/objtool/disas.c | 6 +++--- tools/objtool/elf.c | 6 +++--- tools/objtool/klp-diff.c | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 3f7999317f4d..c1ea72c28974 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -4251,8 +4251,8 @@ static int validate_retpoline(struct objtool_file *fi= le) list_for_each_entry(insn, &file->retpoline_call_list, call_node) { struct symbol *sym =3D insn->sym; =20 - if (sym && (sym->type =3D=3D STT_NOTYPE || - sym->type =3D=3D STT_FUNC) && !sym->nocfi) { + if (sym && (is_notype_sym(sym) || + is_func_sym(sym)) && !sym->nocfi) { struct instruction *prev =3D prev_insn_same_sym(file, insn); =20 diff --git a/tools/objtool/disas.c b/tools/objtool/disas.c index 2b5059f55e40..d8f477e3190a 100644 --- a/tools/objtool/disas.c +++ b/tools/objtool/disas.c @@ -262,7 +262,7 @@ static void disas_print_addr_reloc(bfd_vma addr, struct= disassemble_info *dinfo) * If the relocation symbol is a section name (for example ".bss") * then we try to further resolve the name. */ - if (reloc->sym->type =3D=3D STT_SECTION) { + if (is_sec_sym(reloc->sym)) { str =3D offstr(reloc->sym->sec, reloc->sym->offset + offset); DINFO_FPRINTF(dinfo, "0x%lx <%s>", addr, str); free(str); @@ -578,7 +578,7 @@ static size_t disas_insn_common(struct disas_context *d= ctx, */ dinfo->buffer =3D insn->sec->data->d_buf; dinfo->buffer_vma =3D 0; - dinfo->buffer_length =3D insn->sec->sh.sh_size; + dinfo->buffer_length =3D sec_size(insn->sec); =20 return disasm(insn->offset, &dctx->info); } @@ -1229,7 +1229,7 @@ void disas_funcs(struct disas_context *dctx) =20 for_each_sec(dctx->file->elf, sec) { =20 - if (!(sec->sh.sh_flags & SHF_EXECINSTR)) + if (!is_text_sec(sec)) continue; =20 sec_for_each_sym(sec, sym) { diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c index 6a8ed9c62323..439653bc26ab 100644 --- a/tools/objtool/elf.c +++ b/tools/objtool/elf.c @@ -615,7 +615,7 @@ static int read_symbols(struct elf *elf) if (elf_add_symbol(elf, sym)) return -1; =20 - if (sym->type =3D=3D STT_FILE) + if (is_file_sym(sym)) file =3D sym; else if (sym->bind =3D=3D STB_LOCAL) sym->file =3D file; @@ -1336,7 +1336,7 @@ unsigned int elf_add_string(struct elf *elf, struct s= ection *strtab, const char return -1; } =20 - offset =3D ALIGN_UP(strtab->sh.sh_size, strtab->sh.sh_addralign); + offset =3D ALIGN_UP(sec_size(strtab), strtab->sh.sh_addralign); =20 if (!elf_add_data(elf, strtab, str, strlen(str) + 1)) return -1; @@ -1378,7 +1378,7 @@ void *elf_add_data(struct elf *elf, struct section *s= ec, const void *data, size_ sec->data->d_size =3D size; sec->data->d_align =3D 1; =20 - offset =3D ALIGN_UP(sec->sh.sh_size, sec->sh.sh_addralign); + offset =3D ALIGN_UP(sec_size(sec), sec->sh.sh_addralign); sec->sh.sh_size =3D offset + size; =20 mark_sec_changed(elf, sec, true); diff --git a/tools/objtool/klp-diff.c b/tools/objtool/klp-diff.c index 4d1f9e9977eb..80bd79e0c560 100644 --- a/tools/objtool/klp-diff.c +++ b/tools/objtool/klp-diff.c @@ -271,7 +271,7 @@ static bool is_uncorrelated_static_local(struct symbol = *sym) */ static bool is_clang_tmp_label(struct symbol *sym) { - return sym->type =3D=3D STT_NOTYPE && + return is_notype_sym(sym) && is_text_sec(sym->sec) && strstarts(sym->name, ".Ltmp") && isdigit(sym->name[5]); @@ -451,7 +451,7 @@ static unsigned long find_sympos(struct elf *elf, struc= t symbol *sym) if (sym->bind !=3D STB_LOCAL) return 0; =20 - if (vmlinux && sym->type =3D=3D STT_FUNC) { + if (vmlinux && is_func_sym(sym)) { /* * HACK: Unfortunately, symbol ordering can differ between * vmlinux.o and vmlinux due to the linker script emitting @@ -1017,8 +1017,8 @@ static int clone_reloc_klp(struct elfs *e, struct rel= oc *patched_reloc, sec->name, offset, patched_sym->name, \ addend >=3D 0 ? "+" : "-", labs(addend), \ sym_type(patched_sym), \ - patched_sym->type =3D=3D STT_SECTION ? "" : " ", \ - patched_sym->type =3D=3D STT_SECTION ? "" : sym_bind(patched_sym), \ + is_sec_sym(patched_sym) ? "" : " ", \ + is_sec_sym(patched_sym) ? "" : sym_bind(patched_sym), \ is_undef_sym(patched_sym) ? " UNDEF" : "", \ export ? " EXPORTED" : "", \ klp ? " KLP" : "") --=20 2.34.1