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=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 E453FC47253 for ; Fri, 1 May 2020 12:38:00 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 B221020708 for ; Fri, 1 May 2020 12:38:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="C2xBW8Y6"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="eoTx6Vzt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B221020708 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.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=M/YFSi0IuwTw16q5I8TC1oUIoUY8JDH8PBziLY8sjkU=; b=C2xBW8Y6cRyErE zc8dYKbqN46MvUuoKls84X/fTVFx5oebDFTWaMGtkcojTq3nG0k6ZCMhBQBcAQuQQlP6CpsuO5/5M RHTe0aUQpX2B5MTJKk/7Np5gvKSnuYQRJq+qCmkzTH+E91F+oXiL7GOMwYgw8jIiOLPxklpSJwBH0 syche8dS4cx1mm7m/42ZZ1iVrCRnUbrNw6cxOWLpE6Zz3Sl7uqGoy3Sac/e957StlawwZTyrEAuxX DQEeKjGFyo1/vNR0xXiz8yOjPzl9bnXuSL5FqEZ+MnMI4li5nIWXPY++YON8/ZSLqpDX1suKtYii2 +mf8wkibnO+u9TSzkghQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jUUvX-0002yM-Tn; Fri, 01 May 2020 12:37:59 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jUUv1-0002Qq-92 for linux-arm-kernel@lists.infradead.org; Fri, 01 May 2020 12:37:28 +0000 Received: from localhost (fw-tnat.cambridge.arm.com [217.140.96.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 343EA2173E; Fri, 1 May 2020 12:37:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588336646; bh=iccpXYOvzjO2FzrL43wWAAHHMWDd7FCG3O98/HosRfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eoTx6VztnjsdtfFs7PzdHunMLAJ/k1U2UpMeTWlcNppPZhxMCFCw//gRsQ7XwUCP4 Jz+yg4kwbEJjX3IcZhEHXx9uX4GXvt0Lj7okVeuoul9lmL8poDDSBJQRWDCAGPEKCZ f9oEIlyySCqXNc9x0fQ8xvLWaLr+VNjvHHjL1I10= From: Mark Brown To: Catalin Marinas , Will Deacon Subject: [PATCH v3 3/3] arm64: insn: Report PAC and BTI instructions as NOPs Date: Fri, 1 May 2020 13:37:09 +0100 Message-Id: <20200501123709.6640-4-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200501123709.6640-1-broonie@kernel.org> References: <20200501123709.6640-1-broonie@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200501_053727_338048_DF86EA19 X-CRM114-Status: UNSURE ( 8.99 ) X-CRM114-Notice: Please train this message. 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 Brown , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to allow probing of PAC and BTI instructions without more specialized support recognize them as NOPs. Signed-off-by: Mark Brown Acked-by: Catalin Marinas --- arch/arm64/kernel/insn.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c index d458604a96a3..aa525975bf94 100644 --- a/arch/arm64/kernel/insn.c +++ b/arch/arm64/kernel/insn.c @@ -57,7 +57,30 @@ bool __kprobes aarch64_insn_is_nop(u32 insn) if (!aarch64_insn_is_hint(insn)) return false; + /* + * The PAC and BTI instructons are not strictly NOPs but until + * better support is added we can treat them as such and they + * are commonly placed in locations where it is useful to be + * able to probe. + */ switch (insn & 0xFE0) { + case AARCH64_INSN_HINT_XPACLRI: + case AARCH64_INSN_HINT_PACIA_1716: + case AARCH64_INSN_HINT_PACIB_1716: + case AARCH64_INSN_HINT_AUTIA_1716: + case AARCH64_INSN_HINT_AUTIB_1716: + case AARCH64_INSN_HINT_PACIAZ: + case AARCH64_INSN_HINT_PACIASP: + case AARCH64_INSN_HINT_PACIBZ: + case AARCH64_INSN_HINT_PACIBSP: + case AARCH64_INSN_HINT_AUTIAZ: + case AARCH64_INSN_HINT_AUTIASP: + case AARCH64_INSN_HINT_AUTIBZ: + case AARCH64_INSN_HINT_AUTIBSP: + case AARCH64_INSN_HINT_BTI: + case AARCH64_INSN_HINT_BTIC: + case AARCH64_INSN_HINT_BTIJ: + case AARCH64_INSN_HINT_BTIJC: case AARCH64_INSN_HINT_NOP: return true; default: -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel