From nobody Mon Feb 9 05:55:09 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 59C2214D2B2 for ; Fri, 12 Jul 2024 09:15:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720775713; cv=none; b=ILuvY+luZHCOblf959jZpLd1xEJPgk/M9nJHB+kDiJiYSfUeE/RVWIS8DBsnkPO5k1pDR8Cr64RZN4z9+6T1AJJ+Pa8gp6uuKA0rK/JTvhAPSLw7HrumND29ab1/bid3DD/u7BLEUCDyWCMWkm/TD4s7XzM3MA7HOjrqpTpDHNc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720775713; c=relaxed/simple; bh=pTBOduqieGq9s/8OWilaP+QEaZ4/vgNeRufCaWxcyDE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fFwbcz59na87ljthnL+H6MSWwDsFKFCPoGNiuxrkjFl/lSXn1YV3l9eme4VnmbTen8iZ/YqkFlYcyg/sQPg7H4syn15WChwKgzx7wE/s4DoyP6Iufpnel0MgN0UeJoEUbm5i/b2YXfCEV4yJ2GLRkoytgXvpOUcrbbVgERM2PQY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8AxG_Ac9JBmJ6EDAA--.10443S3; Fri, 12 Jul 2024 17:15:08 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8BxXcca9JBmW65FAA--.28188S3; Fri, 12 Jul 2024 17:15:08 +0800 (CST) From: Tiezhu Yang To: Josh Poimboeuf , Peter Zijlstra , Huacai Chen Cc: Xi Ruoyao , loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [RFC PATCH 1/4] objtool: Check local label in find_jump_table() Date: Fri, 12 Jul 2024 17:15:03 +0800 Message-ID: <20240712091506.28140-2-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240712091506.28140-1-yangtiezhu@loongson.cn> References: <20240712091506.28140-1-yangtiezhu@loongson.cn> 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 X-CM-TRANSID: AQAAf8BxXcca9JBmW65FAA--.28188S3 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj93XoW7AF4UtFy7GryDtF43tr17twc_yoW8GF18pF sxG345Kr1YgryxWwnrtFy0gF9xGw4kWrnrXrs7Gr4SvwnrZryFqFWakryay3WDXw4Fva17 Jry5KryUuF48AabCm3ZEXasCq-sJn29KB7ZKAUJUUUUr529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUU9Yb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2kKe7AKxVWUXVWUAwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07 AIYIkI8VC2zVCFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU AVWUtwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMxCIbckI1I0E14v2 6r1Y6r17MI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17 CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF 0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIx AIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIev Ja73UjIFyTuYvjxUc0eHDUUUU Content-Type: text/plain; charset="utf-8" Signed-off-by: Tiezhu Yang --- tools/objtool/check.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 0a33d9195b7a..c89c0d8c35d7 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -2085,6 +2085,7 @@ static struct reloc *find_jump_table(struct objtool_f= ile *file, { struct reloc *table_reloc; struct instruction *dest_insn, *orig_insn =3D insn; + unsigned long offset; =20 /* * Backward search using the @first_jump_src links, these help avoid @@ -2108,7 +2109,18 @@ static struct reloc *find_jump_table(struct objtool_= file *file, table_reloc =3D arch_find_switch_table(file, insn); if (!table_reloc) continue; - dest_insn =3D find_insn(file, table_reloc->sym->sec, reloc_addend(table_= reloc)); + + if (table_reloc->sym->type =3D=3D STT_SECTION) { + offset =3D reloc_addend(table_reloc); + } else if (table_reloc->sym->local_label) { + offset =3D table_reloc->sym->offset; + } else { + WARN("unexpected relocation symbol type in %s: %d", + table_reloc->sec->name, table_reloc->sym->type); + return NULL; + } + + dest_insn =3D find_insn(file, table_reloc->sym->sec, offset); if (!dest_insn || !insn_func(dest_insn) || insn_func(dest_insn)->pfunc != =3D func) continue; =20 --=20 2.42.0 From nobody Mon Feb 9 05:55:09 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CE8551474D8 for ; Fri, 12 Jul 2024 09:15:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720775712; cv=none; b=aR80SGRDOcs6ibw+Mo/3DpswlefQWtR+ZSw0R0oSFeBrzk0wkYHYChJtoSROoHdRYoPFvLAU453CTk1XCf/zbsyUsQqtfnTjzA9FwKMrj6UCeRnURk8/eBUJMWmJEZy4uh+M/P/c/KLF6oz8BveqWCIIU/7+MJEUATzVfRalhUM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720775712; c=relaxed/simple; bh=9wyGsUvhpp3BzmrvpcjXeXePCvmZCL6LjpIIvAlGvGY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sFToO4JPGIWpVQgwY6ZlPzxywFMLCNBnYbGR2kT0pHhJESqEGsiuMnAS/kFnLUyqLEOzUE//6aFJGG+iG45fdTn869jMl9nWf6QRAG/PN+4qZYqtfPpTJCEzt9Ouhy5Fp6V+KVsLZjtl29TZ+UFbSmRrNqH+P/b9mSPQKwL4x/k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8Bx7vAd9JBmLKEDAA--.10893S3; Fri, 12 Jul 2024 17:15:09 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8BxXcca9JBmW65FAA--.28188S4; Fri, 12 Jul 2024 17:15:08 +0800 (CST) From: Tiezhu Yang To: Josh Poimboeuf , Peter Zijlstra , Huacai Chen Cc: Xi Ruoyao , loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [RFC PATCH 2/4] objtool: Check various types in add_jump_table() Date: Fri, 12 Jul 2024 17:15:04 +0800 Message-ID: <20240712091506.28140-3-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240712091506.28140-1-yangtiezhu@loongson.cn> References: <20240712091506.28140-1-yangtiezhu@loongson.cn> 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 X-CM-TRANSID: AQAAf8BxXcca9JBmW65FAA--.28188S4 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj93XoW7try3AryfXFWkWrW7XFyfKrX_yoW8AryUpF sxG345Kr4avr17WanxtF1kWF98Kwn7WFnrJrsrKF4FvryIyr45KFy2kw13C3WDJr12vw47 Xr45try7WF4UA3gCm3ZEXasCq-sJn29KB7ZKAUJUUUUr529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUU9Fb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2kKe7AKxVWUXVWUAwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07 AIYIkI8VC2zVCFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU tVWrXwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMxCIbckI1I0E14v2 6r1Y6r17MI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17 CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF 0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIx AIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2 KfnxnUUI43ZEXa7IU8EeHDUUUUU== Content-Type: text/plain; charset="utf-8" Signed-off-by: Tiezhu Yang --- tools/objtool/check.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index c89c0d8c35d7..6fa4100206d0 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -2027,6 +2027,7 @@ static int add_jump_table(struct objtool_file *file, = struct instruction *insn, unsigned int prev_offset =3D 0; struct reloc *reloc =3D table; struct alternative *alt; + unsigned long offset; =20 /* * Each @reloc is a switch table relocation which points to the target @@ -2042,12 +2043,27 @@ static int add_jump_table(struct objtool_file *file= , struct instruction *insn, if (prev_offset && reloc_offset(reloc) !=3D prev_offset + 8) break; =20 + if (reloc->sym->type =3D=3D STT_SECTION) { + offset =3D reloc_addend(reloc); + } else if (reloc->sym->local_label) { + offset =3D reloc->sym->offset; + } else if (reloc->sym->type =3D=3D STT_FUNC) { + offset =3D reloc->sym->offset; + } else if (reloc->sym->type =3D=3D STT_OBJECT) { + offset =3D reloc->sym->offset; + } else if (reloc->sym->type =3D=3D STT_NOTYPE) { + offset =3D reloc->sym->offset; + } else { + WARN("unexpected relocation symbol type in %s: %d", + table->sec->name, reloc->sym->type); + return -1; + } + /* Detect function pointers from contiguous objects: */ - if (reloc->sym->sec =3D=3D pfunc->sec && - reloc_addend(reloc) =3D=3D pfunc->offset) + if (reloc->sym->sec =3D=3D pfunc->sec && offset =3D=3D pfunc->offset) break; =20 - dest_insn =3D find_insn(file, reloc->sym->sec, reloc_addend(reloc)); + dest_insn =3D find_insn(file, reloc->sym->sec, offset); if (!dest_insn) break; =20 --=20 2.42.0 From nobody Mon Feb 9 05:55:09 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CE953148841 for ; Fri, 12 Jul 2024 09:15:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720775712; cv=none; b=ttWUq+tKw4F8x15qzbr5gxz/n77Dl+lRBPq9NMNT7AQxv7bfZb/GtRP55NCdCHB9Q/Rg8zwI2NtYy4WcKucS8KnHrXgtGPnPAUJphJCymkSWzRPwZ0pyJ/I20oXw/N4UvCs96bhuhplBinjdOHwzELQiEZYvidplzWyGeRfkOkQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720775712; c=relaxed/simple; bh=Lp5ngsEVb0UGlrqte4rNQSyKQc/dO2qWXOfgKEa02Dk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E9AfvaixRLES8rLubPghJemOVDYZMhEhqc7BE6AtAiw9D+rFJ5cVJ4RwvM/EvBC3HlJV6a9gBuHVIj/OKJ0Jz1WMjkYJqDbLPZib2CwbsRZ9sV1yAoG1EhE9MhiTP8TjqLtywWMvDNzDLxkOOhX9lfUfZt190tJgTufcrEoDiVo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8BxK_Ad9JBmMaEDAA--.10429S3; Fri, 12 Jul 2024 17:15:09 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8BxXcca9JBmW65FAA--.28188S5; Fri, 12 Jul 2024 17:15:09 +0800 (CST) From: Tiezhu Yang To: Josh Poimboeuf , Peter Zijlstra , Huacai Chen Cc: Xi Ruoyao , loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [RFC PATCH 3/4] objtool/LoongArch: Add support for jump table Date: Fri, 12 Jul 2024 17:15:05 +0800 Message-ID: <20240712091506.28140-4-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240712091506.28140-1-yangtiezhu@loongson.cn> References: <20240712091506.28140-1-yangtiezhu@loongson.cn> 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 X-CM-TRANSID: AQAAf8BxXcca9JBmW65FAA--.28188S5 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj93XoW7Cr4rKr1fAFy5uw1xGw13WrX_yoW8uw1UpF 47C345Wr45WryfWw13tF4rur9Igw4IgFy7Xr9xKr93Zw47tFyrtFs7AF1qyF1rXrsYkr4x XayfKr4UuF4UAwcCm3ZEXasCq-sJn29KB7ZKAUJUUUUr529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUU9Fb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r126r13M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2kKe7AKxVWUXVWUAwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07 AIYIkI8VC2zVCFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU tVWrXwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMxCIbckI1I0E14v2 6r1Y6r17MI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17 CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF 0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIx AIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2 KfnxnUUI43ZEXa7IU8XyCJUUUUU== Content-Type: text/plain; charset="utf-8" Signed-off-by: Tiezhu Yang --- tools/objtool/arch/loongarch/special.c | 54 +++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/tools/objtool/arch/loongarch/special.c b/tools/objtool/arch/lo= ongarch/special.c index 9bba1e9318e0..3e08ad3a507c 100644 --- a/tools/objtool/arch/loongarch/special.c +++ b/tools/objtool/arch/loongarch/special.c @@ -1,5 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later +#include + #include +#include =20 bool arch_support_alt_relocation(struct special_alt *special_alt, struct instruction *insn, @@ -8,8 +11,57 @@ bool arch_support_alt_relocation(struct special_alt *spec= ial_alt, return false; } =20 +static struct reloc *find_reloc_by_tablejump_annotate(struct objtool_file = *file, + struct instruction *insn) +{ + struct section *rsec; + struct reloc *reloc; + unsigned long offset; + + rsec =3D find_section_by_name(file->elf, ".rela.discard.tablejump_annotat= e"); + if (!rsec) + return NULL; + + for_each_reloc(rsec, reloc) { + if (reloc->sym->sec->rodata) + continue; + + if (strcmp(insn->sec->name, reloc->sym->sec->name)) + continue; + + offset =3D reloc->sym->offset; + if (insn->offset =3D=3D offset) { + reloc++; + return reloc; + } + } + + return NULL; +} + struct reloc *arch_find_switch_table(struct objtool_file *file, struct instruction *insn) { - return NULL; + struct reloc *annotate_reloc; + struct reloc *rodata_reloc; + struct section *table_sec; + unsigned long table_offset; + + annotate_reloc =3D find_reloc_by_tablejump_annotate(file, insn); + if (!annotate_reloc) + return NULL; + + table_sec =3D annotate_reloc->sym->sec; + table_offset =3D annotate_reloc->sym->offset; + + /* + * Each table entry has a rela associated with it. The rela + * should reference text in the same function as the original + * instruction. + */ + rodata_reloc =3D find_reloc_by_dest(file->elf, table_sec, table_offset); + if (!rodata_reloc) + return NULL; + + return rodata_reloc; } --=20 2.42.0 From nobody Mon Feb 9 05:55:09 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2CE96146D7D for ; Fri, 12 Jul 2024 09:15:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720775713; cv=none; b=M1++3NTkMWkgWkAuHWc/WI6fb/lOEqdbSRqmBXkrRseCpDxJWqu7YbW82V+qFPaT9LQO4cYCn2wNEKQf270eVMOUb5D7vIl03sWQP7El/6uxk42bTVJ+qj4LglnjjPwtO62VB+ieVxVGbWW87fYlmHVb3OPfWJMMGzb3RGWunBI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720775713; c=relaxed/simple; bh=BhMPK+2UGZnPdZ5DBECPNjhuoOBDB1q6Y91Peipk5aE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MMgDGiEObDClJWOaPtFP0kFCpe2BbBqLccJY6yoZRWn0S0TYLkSGgOUt0kf3PEhpbjdKxWVo2vgUC1LQcl4Cn/L0FIeQxOER2AhcwHeZsCdu3aYUi0WouyvfUf/4oNvxhbONE8+zD8rpW6VDYZhT/+IypQb2/OuqrvC57UALJHc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8BxrfAd9JBmNqEDAA--.10364S3; Fri, 12 Jul 2024 17:15:09 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8BxXcca9JBmW65FAA--.28188S6; Fri, 12 Jul 2024 17:15:09 +0800 (CST) From: Tiezhu Yang To: Josh Poimboeuf , Peter Zijlstra , Huacai Chen Cc: Xi Ruoyao , loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [RFC PATCH 4/4] LoongArch: Remove -fno-jump-tables for objtool Date: Fri, 12 Jul 2024 17:15:06 +0800 Message-ID: <20240712091506.28140-5-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240712091506.28140-1-yangtiezhu@loongson.cn> References: <20240712091506.28140-1-yangtiezhu@loongson.cn> 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 X-CM-TRANSID: AQAAf8BxXcca9JBmW65FAA--.28188S6 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj93XoW7ur1fAryDXF45AF17ury7XFc_yoW8tr1fpr Z7Zr1kKw4kXF4vvry7J3yFgws8ArnrtF4aqF4xWFs5CrW2q34avw48AF4DGa48A3yDJ34I gFyfKa4aqa17CwbCm3ZEXasCq-sJn29KB7ZKAUJUUUUr529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUU9Fb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2kKe7AKxVWUXVWUAwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07 AIYIkI8VC2zVCFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU tVWrXwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMxCIbckI1I0E14v2 6r1Y6r17MI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17 CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26ryj6F1UMIIF 0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIx AIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2 KfnxnUUI43ZEXa7IU8EeHDUUUUU== Content-Type: text/plain; charset="utf-8" Signed-off-by: Tiezhu Yang --- arch/loongarch/Kconfig | 8 +++++++- arch/loongarch/Makefile | 6 ++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index ddc042895d01..57f28450a2ed 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -143,7 +143,7 @@ config LOONGARCH select HAVE_LIVEPATCH select HAVE_MOD_ARCH_SPECIFIC select HAVE_NMI - select HAVE_OBJTOOL if AS_HAS_EXPLICIT_RELOCS && AS_HAS_THIN_ADD_SUB && != CC_IS_CLANG + select HAVE_OBJTOOL if TOOLCHAIN_SUPPORTS_OBJTOOL && !CC_IS_CLANG select HAVE_PCI select HAVE_PERF_EVENTS select HAVE_PERF_REGS @@ -276,6 +276,12 @@ config AS_HAS_LBT_EXTENSION config AS_HAS_LVZ_EXTENSION def_bool $(as-instr,hvcl 0) =20 +config CC_HAS_ANNOTATE_TABLEJUMP + def_bool $(cc-option,-mannotate-tablejump) + +config TOOLCHAIN_SUPPORTS_OBJTOOL + def_bool AS_HAS_EXPLICIT_RELOCS && AS_HAS_THIN_ADD_SUB && CC_HAS_ANNOTATE= _TABLEJUMP + menu "Kernel type and options" =20 source "kernel/Kconfig.hz" diff --git a/arch/loongarch/Makefile b/arch/loongarch/Makefile index 8674e7e24c4a..186c75c80daa 100644 --- a/arch/loongarch/Makefile +++ b/arch/loongarch/Makefile @@ -99,10 +99,8 @@ KBUILD_AFLAGS +=3D $(call cc-option,-mno-relax) $(call= cc-option,-Wa$(comma)-mno KBUILD_CFLAGS +=3D $(call cc-option,-mno-relax) $(call cc-option,-Wa$(co= mma)-mno-relax) KBUILD_AFLAGS +=3D $(call cc-option,-mthin-add-sub) $(call cc-option,-Wa= $(comma)-mthin-add-sub) KBUILD_CFLAGS +=3D $(call cc-option,-mthin-add-sub) $(call cc-option,-Wa= $(comma)-mthin-add-sub) - -ifdef CONFIG_OBJTOOL -KBUILD_CFLAGS +=3D -fno-jump-tables -endif +KBUILD_AFLAGS +=3D $(call cc-option,-mannotate-tablejump) $(call cc-opti= on,-Wa$(comma)-mannotate-tablejump) +KBUILD_CFLAGS +=3D $(call cc-option,-mannotate-tablejump) $(call cc-opti= on,-Wa$(comma)-mannotate-tablejump) =20 KBUILD_RUSTFLAGS +=3D --target=3Dloongarch64-unknown-none-softfloat KBUILD_RUSTFLAGS_MODULE +=3D -Crelocation-model=3Dpic --=20 2.42.0