From patchwork Wed Jan 20 17:37:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Thierry X-Patchwork-Id: 12033095 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 719BDC433E0 for ; Wed, 20 Jan 2021 17:46:46 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E741B221ED for ; Wed, 20 Jan 2021 17:46:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E741B221ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=AlS2Djf/z14dzxCdo5rYq7cmya+jA3WtHK0J/FqaLig=; b=eTnISj366As4U3yoVtDrbvaG2 BErZZuQ00tYzLhGg+TKoiX2a/TD9GNcV8xWUbgiQMewwdXu9gXdU5waNIT2hjAlYaKMsV3r52leME j9ObTDYa3bS9JQnEezYLKS/Dxyj6/s48PsS5x/lVKpY4y9NZMubxHmOQbRTsdviUQV9TKLTD6Enn+ tbMysasxMa55z1+r+PYnN3ZOipzEFRFny5Db+qHQQ6MA0nPgb0YjfB/yUzSs70y2Y41zhIWmTXkHl IiwmHJGnHQyJcsW8UgFVcCu7Nm9eF73Xy2Bm6mU3TtabdOWNlfcz7YBkc1qG+rJAgBY8iaMzwWpcZ nCWKTfx8A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2HXI-0006JL-2Z; Wed, 20 Jan 2021 17:44:52 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2HRM-000309-Cb for linux-arm-kernel@lists.infradead.org; Wed, 20 Jan 2021 17:38:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611164320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ItOqFi7Hkwlfc8KmljIH1mggd+0HU8t9o2eCKjOp56I=; b=MaUpZocZSkHfyXSzBcUVOTNCpmjcLsh9rsJP1wPOPDhhqi5o01JVuFTRgHxeUgxtF5a34R 3jFtNxbvFSZrnrKV1NYFnwXIgX5Bu+hc3Acnmm46ev8IMvelPjDJVj1GFUilS67PQ8WmU6 OhXlWrRI4GazuyPBrEFUatanpEAo4aw= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-471-9s5xZCv6O8ydM45eTEhsNQ-1; Wed, 20 Jan 2021 12:38:39 -0500 X-MC-Unique: 9s5xZCv6O8ydM45eTEhsNQ-1 Received: by mail-wr1-f70.google.com with SMTP id g17so11931489wrr.11 for ; Wed, 20 Jan 2021 09:38:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ItOqFi7Hkwlfc8KmljIH1mggd+0HU8t9o2eCKjOp56I=; b=b/ncvcgJRNsw8Gyra3+1lRf/xjCe+AfT8SO0ipFkmEk6PjBSy7oHkxgfidM0k6id/c BJTnBPUB9Vvx4GXjIzICkpmXKI6HQF0pwXM31VR/ckQRpXdDAAvJGWKewtkVYljCFD+a tjChM3UoN7ogCXE3KiF1alLI3sRJbQd2JPhJNuHKIC+cNncFRWf85dgVhIVS8gJvcokY YzcfVYaGEDMdHgyi9X5TojO77WaxlJ/EwG3lHm1jTn6kT+mXoiODYUgSWsgeGrw2+AvE GZMf+EWMlUbZ8JbI3OdPba2ZFVsAK/0hsXHJ3NN0HufvwVO8BqtAkIYrFN0Yy9FtAsoN b+hg== X-Gm-Message-State: AOAM533CWfZSkCoBVZmJwCoCbBhiSUtqJH/cm66xGVnx6kbeDUjDN7im W237UD6GUonEfpmwtcs+nzofx4hvTs2WvjzTdTFgIzUCFpR1Wsh4L9sKnhRMqCTsV41n6wIe9VX N9mvgM80GX2gwICz0VQqkFFDK9dWmgMUKR1U= X-Received: by 2002:adf:e705:: with SMTP id c5mr10165911wrm.303.1611164318294; Wed, 20 Jan 2021 09:38:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJyI7z1jfE1krdbjitvV3YQPLDza0TWB9nv2zK4QcJTxmxyvfDnFk8J4YJ4dvyZr3q+eSQSNsg== X-Received: by 2002:adf:e705:: with SMTP id c5mr10165894wrm.303.1611164318164; Wed, 20 Jan 2021 09:38:38 -0800 (PST) Received: from redfedo.redhat.com ([2a01:cb14:499:3d00:cd47:f651:9d80:157a]) by smtp.gmail.com with ESMTPSA id x11sm4948325wmi.4.2021.01.20.09.38.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jan 2021 09:38:37 -0800 (PST) From: Julien Thierry To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 13/17] objtool: arm64: Implement functions to add switch tables alternatives Date: Wed, 20 Jan 2021 18:37:56 +0100 Message-Id: <20210120173800.1660730-14-jthierry@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20210120173800.1660730-1-jthierry@redhat.com> References: <20210120173800.1660730-1-jthierry@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jthierry@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210120_123844_592745_204A4CA9 X-CRM114-Status: GOOD ( 20.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, linux-efi@vger.kernel.org, michal.lkml@markovi.net, keescook@chromium.org, peterz@infradead.org, catalin.marinas@arm.com, masahiroy@kernel.org, Raphael Gault , broonie@kernel.org, linux-hardening@vger.kernel.org, jpoimboe@redhat.com, will@kernel.org, ardb@kernel.org, Julien Thierry Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This patch implements the functions required to identify and add as alternatives all the possible destinations of the switch table. This implementation relies on the new plugin introduced previously which records information about the switch-table in a .discard.switch_table_information section. Signed-off-by: Raphael Gault [J.T.: Update arch implementation to new prototypes, Update switch table information section name, Do some clean up, Use the offset sign information, Use the newly added rela to find the corresponding jump instruction] Signed-off-by: Julien Thierry --- .../objtool/arch/arm64/include/arch/special.h | 2 + tools/objtool/arch/arm64/special.c | 85 +++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/tools/objtool/arch/arm64/include/arch/special.h b/tools/objtool/arch/arm64/include/arch/special.h index a82a9b3e51df..b96bcee308cf 100644 --- a/tools/objtool/arch/arm64/include/arch/special.h +++ b/tools/objtool/arch/arm64/include/arch/special.h @@ -3,6 +3,8 @@ #ifndef _ARM64_ARCH_SPECIAL_H #define _ARM64_ARCH_SPECIAL_H +#include + #define EX_ENTRY_SIZE 8 #define EX_ORIG_OFFSET 0 #define EX_NEW_OFFSET 4 diff --git a/tools/objtool/arch/arm64/special.c b/tools/objtool/arch/arm64/special.c index 45f283283091..396b9c5feebd 100644 --- a/tools/objtool/arch/arm64/special.c +++ b/tools/objtool/arch/arm64/special.c @@ -1,6 +1,26 @@ // SPDX-License-Identifier: GPL-2.0-or-later +#include +#include + +#include + #include +#include +#include + +/* + * The arm64_switch_table_detection_plugin generate an array of elements + * described by the following structure. + * Each jump table found in the compilation unit is associated with one of + * entries of the array. + */ +struct switch_table_info { + u64 padding; + u64 jump_ref; + u64 nb_entries; + u64 dest_relocations[]; +} __attribute__((__packed__)); void arch_handle_alternative(unsigned short feature, struct special_alt *alt) { @@ -14,8 +34,73 @@ bool arch_support_alt_relocation(struct special_alt *special_alt, } +/* + * Aarch64 jump tables are just arrays of offsets (of varying size/signess) + * representing the potential destination from a base address loaded by an adr + * instruction. + * + * Sadly, extracting the actual offset might require to consider multiple + * instructions and decoding them to understand what they do. To make life + * easier, the gcc plugin will generate a list of relocation entries for + * each jump table target, conforming to the format expected by + * add_jump_table(). + * + * Aarch64 branches to jump tables are composed of multiple instructions: + * + * ldr x_offset, [x_offsets_table, x_index, ...] + * adr x_dest_base, + * add x_dest, x_target_base, x_offset, ... + * br x_dest + * + * The arm64_switch_table_detection_plugin will make the connection between + * the instruction setting x_offsets_table (jump_ref) and the list of + * relocations. + */ struct reloc *arch_find_switch_table(struct objtool_file *file, struct instruction *insn) { + struct switch_table_info *sti; + struct section *table_info_sec; + void *sti_sec_start; + struct reloc *text_reloc; + + table_info_sec = find_section_by_name(file->elf, + ".discard.switch_table_info"); + if (!table_info_sec) + goto try_c_jmptbl; + + sti_sec_start = table_info_sec->data->d_buf; + sti = sti_sec_start; + + while ((char *)sti - (char *)sti_sec_start < table_info_sec->len) { + struct reloc *target_reloc = find_reloc_by_dest(file->elf, + table_info_sec, + (char *)&sti->jump_ref - (char *)sti_sec_start); + + if (!target_reloc) { + WARN("Malformed switch table entry"); + return NULL; + } + + if (target_reloc->sym->sec == insn->sec && + target_reloc->addend == insn->offset) + return find_reloc_by_dest(file->elf, table_info_sec, + (char *)&sti->dest_relocations[0] - (char *)sti_sec_start); + + /* Get next jump table entry */ + sti = (struct switch_table_info *) (&sti->dest_relocations[0] + sti->nb_entries); + } + +try_c_jmptbl: + text_reloc = find_reloc_by_dest(file->elf, insn->sec, insn->offset); + if (!text_reloc || text_reloc->sym->type != STT_SECTION || + !text_reloc->sym->sec->rodata) + return NULL; + + /* Handle C jump tables */ + if (!strcmp(text_reloc->sym->sec->name, C_JUMP_TABLE_SECTION)) + return find_reloc_by_dest(file->elf, text_reloc->sym->sec, + text_reloc->addend); + return NULL; }