From mboxrd@z Thu Jan 1 00:00:00 1970 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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, 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 46D52C4361A for ; Wed, 3 Mar 2021 19:29:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0402264ED0 for ; Wed, 3 Mar 2021 19:29:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1580739AbhCCSew (ORCPT ); Wed, 3 Mar 2021 13:34:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:27659 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235711AbhCCRLf (ORCPT ); Wed, 3 Mar 2021 12:11:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614791390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SWF0orywTk6sSBoNe4C5h01Io2O6mFpLcN5QACAx9O0=; b=XWn+EpDM0geDnsXo9g95SGI+uqaagDiK04BpCW55XQnnlIep0YWIwiOg5CqzwPl2Ny8UHm HHCjND90ZgFKHnwGbmV7mDzRjZ8MZ1QWsG3ZPphaBy+d4UnwxckuqhB8sMOES1R3dEny3o SH9Wj23i0rHRwzynPbU05E5mVgaoan8= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-65-LIAlUBGuOZq6lK2JyBnkwg-1; Wed, 03 Mar 2021 12:09:48 -0500 X-MC-Unique: LIAlUBGuOZq6lK2JyBnkwg-1 Received: by mail-wm1-f71.google.com with SMTP id r21so2065055wmq.7 for ; Wed, 03 Mar 2021 09:09:47 -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=SWF0orywTk6sSBoNe4C5h01Io2O6mFpLcN5QACAx9O0=; b=bR8kmHS7vuYfnArzyZH+/Ww+aCm7q+3EMgR39CS3tTjvXhNLy0Ab1OCXYcegl3iAxI UT3hshGlg6mekX4NuTWcmV0v8x3ERWcdHLS72Sg3J53JdeGaYVkxUhSNnZvZBsUzI8yG A4vXlkW9EkbpkAZjrV5KIlMxB272i2vSlrHlWPoAOgeHFYDqs3ICsFKZaGCfQ8J7V4fW N/Hp877Q9q/MhjF4KQQhqqGusqzWHb+8SCvLwNKeuqgRMrACPsfL5YdCuv7FzMYUx1uB MkJe40T9X2DmkEOzVsRYTBBOIZ0O9KG1piMMs4YCAM3QXogmrx4m0oNTKeEIx3cTmrrX Vu/A== X-Gm-Message-State: AOAM530thBOZ1RNJKyp3GcVmzW0xeXTj23WalgH5N3OwJo5kG3rMv3xe ATELqe96gAyC5r1puRoPlOSVAzsF98KstmHJaFBn5kUcLU/zr/F5GSg0h2j6+t1jY/PR7XICYr0 YZ7evzW8WJPKdILwZ3clyed2UN0t8C5yQAL5dwdPB/0wVQS7rqbMsP/FVaNYNi/3CqdB25ql+TC fA X-Received: by 2002:adf:ed87:: with SMTP id c7mr13641912wro.9.1614791386821; Wed, 03 Mar 2021 09:09:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJx05Vi/zvlG4OeONWEvWUC22x1iawnyv19GdtCJkQapzFaCPnD19uv8JIlhkCuYgvPrAdXX8A== X-Received: by 2002:adf:ed87:: with SMTP id c7mr13641882wro.9.1614791386562; Wed, 03 Mar 2021 09:09:46 -0800 (PST) Received: from redfedo.redhat.com ([2a01:cb14:499:3d00:cd47:f651:9d80:157a]) by smtp.gmail.com with ESMTPSA id r7sm33066226wre.25.2021.03.03.09.09.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 09:09:46 -0800 (PST) From: Julien Thierry To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, will@kernel.org, mark.rutland@arm.com, ardb@kernel.org, masahiroy@kernel.org, jpoimboe@redhat.com, peterz@infradead.org, ycote@redhat.com, Julien Thierry Subject: [RFC PATCH v2 06/13] objtool: arm64: Decode jump and call related instructions Date: Wed, 3 Mar 2021 18:09:25 +0100 Message-Id: <20210303170932.1838634-7-jthierry@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20210303170932.1838634-1-jthierry@redhat.com> References: <20210303170932.1838634-1-jthierry@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Decode branch, branch and link (aarch64's call) and return instructions. Signed-off-by: Julien Thierry --- tools/objtool/arch/arm64/decode.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tools/objtool/arch/arm64/decode.c b/tools/objtool/arch/arm64/decode.c index 54eeb8704a42..983f16b8b2af 100644 --- a/tools/objtool/arch/arm64/decode.c +++ b/tools/objtool/arch/arm64/decode.c @@ -215,6 +215,28 @@ int arch_decode_instruction(const struct elf *elf, const struct section *sec, } *type = INSN_OTHER; break; + case AARCH64_INSN_CLS_BR_SYS: + if (aarch64_insn_is_ret(insn) && + aarch64_insn_decode_register(AARCH64_INSN_REGTYPE_RN, insn) == AARCH64_INSN_REG_LR) { + *type = INSN_RETURN; + } else if (aarch64_insn_is_bl(insn)) { + *type = INSN_CALL; + *immediate = aarch64_get_branch_offset(insn); + } else if (aarch64_insn_is_blr(insn)) { + *type = INSN_CALL_DYNAMIC; + } else if (aarch64_insn_is_b(insn)) { + *type = INSN_JUMP_UNCONDITIONAL; + *immediate = aarch64_get_branch_offset(insn); + } else if (aarch64_insn_is_br(insn)) { + *type = INSN_JUMP_DYNAMIC; + } else if (aarch64_insn_is_branch_imm(insn)) { + /* Remaining branch opcodes are conditional */ + *type = INSN_JUMP_CONDITIONAL; + *immediate = aarch64_get_branch_offset(insn); + } else { + *type = INSN_OTHER; + } + break; default: *type = INSN_OTHER; break; -- 2.25.4 From mboxrd@z Thu Jan 1 00:00:00 1970 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.8 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 00E31C433DB for ; Wed, 3 Mar 2021 23:50:22 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 8291264F1E for ; Wed, 3 Mar 2021 23:50:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8291264F1E 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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=utu8JWEcS8aMS/z+Jq/4mfkDkfy68FmSMmF/KArQklA=; b=lWcuqxXX00cQVESMgpcrof7Zc 4ZS3M0GAOCtQBMDNX8MJ9iaA8VGUAD8z2H+FoE+ElZs5waTwAMonsRj9/iK8NRuZgHYcbTpH7pfjF 9SZzsEXboZhnL7h3aroc8lqIm1qSenuB/o3Cy5hDYcQPYpyz9zmLX1m6EP9yo3PqoVoEAG4+MIh6b LoEC2M72G6a5yETQQBUTRggWSPzNcgfCqYdZjKXizUTiq9CohSEtvfAOLNPz81czHSMUXRRexscmi yDJ/WJObVUHAxa6msR8SDS8Msk0WHBI06inYiLRwUR8OEr0PJKaMCw27Abf1QN9xU3bTvgq8dgnVP MBQYy9XqQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHbDC-0071BY-M9; Wed, 03 Mar 2021 23:47:26 +0000 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHV0R-005jsS-E7 for linux-arm-kernel@lists.infradead.org; Wed, 03 Mar 2021 17:09:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614791390; 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=SWF0orywTk6sSBoNe4C5h01Io2O6mFpLcN5QACAx9O0=; b=HLMq/MbHs/hkQfl0ZIew0r6YsWuKT4cJfiGNj4ontEreIrIZAsqJz6eGsQ7bW4jb25Y16E 31hxJaZjYCjSgaoC2+zICPB8gr/XmSr7ggrXraeGfGnFui5RzaK42MM5bH20chfvQKAOyu 3mR5CdvJyD5ADWVpY4z/o8sjovw2GD0= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-326-TSpVTFuxMiael1ApQB5y2g-1; Wed, 03 Mar 2021 12:09:47 -0500 X-MC-Unique: TSpVTFuxMiael1ApQB5y2g-1 Received: by mail-wm1-f70.google.com with SMTP id y9so2069936wma.4 for ; Wed, 03 Mar 2021 09:09:47 -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=SWF0orywTk6sSBoNe4C5h01Io2O6mFpLcN5QACAx9O0=; b=aO1k1X7/5avSCsoh9BETY+iecIoPWhp6dHq145ef7DK3e4XsgpSVdGwdcKWYJ0AQfn 1MrkqWBcWKf0Z1hIUR6Us+FsHcjkXRE7gB2SReXW59KjYXbYT8D1TO8igTQvnLw0X+8Q HZHohGsyh2U8zuwhZmguIJxBhra2GV66t2R3HtYp6M6XyBIthvY65MeU+4rUrHJ4EHSR E2r+46UsGIp9njEB8gXN9q60XgHMkBjGpAWIfejfDw3iF66AYlEwxz+iguYYQ8BksXyE g2QQ2Wic+uwh60Qytd7d5B2BFtUEqR5IGfx4pX98o+ZcKb1SrsB3oZS2EVN1Qp/5D0FC iLcA== X-Gm-Message-State: AOAM533SRKSUM9p7/p8ivoRjN2HMRYjGi/BxRtWcm7LQo/VWglDTqwgr dOHskYPl/7CkhKqyk2OpfsQlOzoG/g3CzVhWWfPFfL5hOVkYy1d8GFbE9Xcoxx6Z4r5NN9Q/PZt J2km03s7NNMxHrl/JfBtRzB7E4i5mNcG3klA= X-Received: by 2002:adf:ed87:: with SMTP id c7mr13641903wro.9.1614791386745; Wed, 03 Mar 2021 09:09:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJx05Vi/zvlG4OeONWEvWUC22x1iawnyv19GdtCJkQapzFaCPnD19uv8JIlhkCuYgvPrAdXX8A== X-Received: by 2002:adf:ed87:: with SMTP id c7mr13641882wro.9.1614791386562; Wed, 03 Mar 2021 09:09:46 -0800 (PST) Received: from redfedo.redhat.com ([2a01:cb14:499:3d00:cd47:f651:9d80:157a]) by smtp.gmail.com with ESMTPSA id r7sm33066226wre.25.2021.03.03.09.09.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 09:09:46 -0800 (PST) From: Julien Thierry To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, will@kernel.org, mark.rutland@arm.com, ardb@kernel.org, masahiroy@kernel.org, jpoimboe@redhat.com, peterz@infradead.org, ycote@redhat.com, Julien Thierry Subject: [RFC PATCH v2 06/13] objtool: arm64: Decode jump and call related instructions Date: Wed, 3 Mar 2021 18:09:25 +0100 Message-Id: <20210303170932.1838634-7-jthierry@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20210303170932.1838634-1-jthierry@redhat.com> References: <20210303170932.1838634-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-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Decode branch, branch and link (aarch64's call) and return instructions. Signed-off-by: Julien Thierry --- tools/objtool/arch/arm64/decode.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tools/objtool/arch/arm64/decode.c b/tools/objtool/arch/arm64/decode.c index 54eeb8704a42..983f16b8b2af 100644 --- a/tools/objtool/arch/arm64/decode.c +++ b/tools/objtool/arch/arm64/decode.c @@ -215,6 +215,28 @@ int arch_decode_instruction(const struct elf *elf, const struct section *sec, } *type = INSN_OTHER; break; + case AARCH64_INSN_CLS_BR_SYS: + if (aarch64_insn_is_ret(insn) && + aarch64_insn_decode_register(AARCH64_INSN_REGTYPE_RN, insn) == AARCH64_INSN_REG_LR) { + *type = INSN_RETURN; + } else if (aarch64_insn_is_bl(insn)) { + *type = INSN_CALL; + *immediate = aarch64_get_branch_offset(insn); + } else if (aarch64_insn_is_blr(insn)) { + *type = INSN_CALL_DYNAMIC; + } else if (aarch64_insn_is_b(insn)) { + *type = INSN_JUMP_UNCONDITIONAL; + *immediate = aarch64_get_branch_offset(insn); + } else if (aarch64_insn_is_br(insn)) { + *type = INSN_JUMP_DYNAMIC; + } else if (aarch64_insn_is_branch_imm(insn)) { + /* Remaining branch opcodes are conditional */ + *type = INSN_JUMP_CONDITIONAL; + *immediate = aarch64_get_branch_offset(insn); + } else { + *type = INSN_OTHER; + } + break; default: *type = INSN_OTHER; break; -- 2.25.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel