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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 070EAC433EF for ; Thu, 24 Feb 2022 15:26:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236300AbiBXP0t (ORCPT ); Thu, 24 Feb 2022 10:26:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236241AbiBXPZ7 (ORCPT ); Thu, 24 Feb 2022 10:25:59 -0500 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5F1122EDEB for ; Thu, 24 Feb 2022 07:25:27 -0800 (PST) Received: by mail-ed1-x52a.google.com with SMTP id h15so3353609edv.7 for ; Thu, 24 Feb 2022 07:25:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Pg83usMw5uRQIx1/D/J156mChwwgfj7a6QBGSOjo5rI=; b=iFZIadtNxbwHIW9fHYTCppxMigghvTsOZRNML6dHUjyUjy4oLhptJgn8ccs4spGjgB yCvA9Ni3vnDhLaO43nFU3/ciGraWo4FFoZtgdpMDGsP9nA9wXHwEX3ufgDwMIxMkAYi9 6/oIvtib8AZ6kzkzcIBXYYZ+FfMA2q/pL/++3WmCZP1OvCoJBHQaijDYqG3obTSdDtDo 9cB1dqru6ytirRMj5YzyQFuP70K/yrnvOTTjnBdpinpGSoLFnx2WnQsPSkuR1h2vZfmM 7GtIU1UAH6IjZQ0d7f+WWwh+l2mCKzRgRAD/TWskng/2TJcF1kLeCp+hyZ/zNGowles7 FBvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Pg83usMw5uRQIx1/D/J156mChwwgfj7a6QBGSOjo5rI=; b=k0XC3nRgxiBPmHaV98MHbvJwDO/vutdC0Mmkd2uftyKMo75/sz34DYbALbiRYuaAf2 p0NiVFbZkygK/Fdx3nS2ZtCXY6Spn7pYAGqCTUBLhdMpVQcIKzvvaMAhpfYXpH7+ni+M QqAMImtKmdy508NqalyJhoKUzOIM2boMlm/8iWxRyhD7+UT5dPoO+YtZ3FlD0yuz+iWS U0Duoqvjs4vRJ8rlpa3TlxjFUxa7pCc0mlZuxI1gEzaJ7GDV45Q62jRgLt+rwevpH7X0 K4n3dfVth8s2FTlGHJJ/9riOVZxe39rEsDjyJxiOqqPENGzR6glrfPW0ivHUuJtG8wVy IsiQ== X-Gm-Message-State: AOAM532qSffz4OnbRMOXPUEW8l/+U6dKoCmgpxKBNAITxmWO01URLQaw bYHK7LoO4qrL3Bnzcg7ZKNI= X-Google-Smtp-Source: ABdhPJyIgk54xHRmo7jfYS9ym3DA+LZ7j94fiqCQC3NeW5TeueHYzp8dNzSBavEaZQbEyL///blaiw== X-Received: by 2002:a05:6402:144b:b0:410:b990:a68a with SMTP id d11-20020a056402144b00b00410b990a68amr2800791edx.25.1645716324506; Thu, 24 Feb 2022 07:25:24 -0800 (PST) Received: from stitch.. (80.71.140.73.ipv4.parknet.dk. [80.71.140.73]) by smtp.gmail.com with ESMTPSA id s11sm1509693edt.10.2022.02.24.07.25.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Feb 2022 07:25:24 -0800 (PST) Sender: Emil Renner Berthing From: Emil Renner Berthing To: linux-riscv@lists.infradead.org Cc: Emil Renner Berthing , Steven Rostedt , Ingo Molnar , Paul Walmsley , Palmer Dabbelt , Albert Ou , Peter Zijlstra , Josh Poimboeuf , Jason Baron , Ard Biesheuvel , Jisheng Zhang , Alexandre Ghiti , linux-kernel@vger.kernel.org Subject: [PATCH v3 8/8] riscv: Use asm/insn.h for dynamic ftrace Date: Thu, 24 Feb 2022 16:24:56 +0100 Message-Id: <20220224152456.493365-9-kernel@esmil.dk> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220224152456.493365-1-kernel@esmil.dk> References: <20220224152456.493365-1-kernel@esmil.dk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This converts kernel/ftrace.c to use asm/insn.h to generate the instructions for dynamic ftrace. This also converts the make_call macro into a regular static function. Signed-off-by: Emil Renner Berthing --- arch/riscv/kernel/ftrace.c | 69 ++++++++++++-------------------------- 1 file changed, 22 insertions(+), 47 deletions(-) diff --git a/arch/riscv/kernel/ftrace.c b/arch/riscv/kernel/ftrace.c index 2cc15dc45ce0..7dd3aafa17aa 100644 --- a/arch/riscv/kernel/ftrace.c +++ b/arch/riscv/kernel/ftrace.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #ifdef CONFIG_DYNAMIC_FTRACE @@ -21,31 +22,13 @@ * Dynamic ftrace generates probes to call sites, so we must deal with * both auipc and jalr at the same time. */ +static void make_call(unsigned long caller, unsigned long callee, unsigned int call[2]) +{ + u32 offset = callee - caller; -#define JALR_SIGN_MASK (0x00000800) -#define JALR_OFFSET_MASK (0x00000fff) -#define AUIPC_OFFSET_MASK (0xfffff000) -#define AUIPC_PAD (0x00001000) -#define JALR_SHIFT 20 -#define JALR_BASIC (0x000080e7) -#define AUIPC_BASIC (0x00000097) -#define NOP4 (0x00000013) - -#define make_call(caller, callee, call) \ -do { \ - call[0] = to_auipc_insn((unsigned int)((unsigned long)callee - \ - (unsigned long)caller)); \ - call[1] = to_jalr_insn((unsigned int)((unsigned long)callee - \ - (unsigned long)caller)); \ -} while (0) - -#define to_jalr_insn(offset) \ - (((offset & JALR_OFFSET_MASK) << JALR_SHIFT) | JALR_BASIC) - -#define to_auipc_insn(offset) \ - ((offset & JALR_SIGN_MASK) ? \ - (((offset & AUIPC_OFFSET_MASK) + AUIPC_PAD) | AUIPC_BASIC) : \ - ((offset & AUIPC_OFFSET_MASK) | AUIPC_BASIC)) + call[0] = RISCV_INSN_AUIPC | RISCV_INSN_RD_RA | riscv_insn_u_imm(offset + 0x800); + call[1] = RISCV_INSN_JALR | RISCV_INSN_RD_RA | RISCV_INSN_RS1_RA | riscv_insn_i_imm(offset); +} int ftrace_arch_code_modify_prepare(void) __acquires(&text_mutex) { @@ -63,7 +46,7 @@ static int ftrace_check_current_call(unsigned long hook_pos, unsigned int *expected) { unsigned int replaced[2]; - unsigned int nops[2] = {NOP4, NOP4}; + unsigned int nops[2] = { RISCV_INSN_NOP, RISCV_INSN_NOP }; /* we expect nops at the hook position */ if (!expected) @@ -95,7 +78,7 @@ static int __ftrace_modify_call(unsigned long hook_pos, unsigned long target, bool enable) { unsigned int call[2]; - unsigned int nops[2] = {NOP4, NOP4}; + unsigned int nops[2] = { RISCV_INSN_NOP, RISCV_INSN_NOP }; make_call(hook_pos, target, call); @@ -108,39 +91,31 @@ static int __ftrace_modify_call(unsigned long hook_pos, unsigned long target, } /* - * Put 5 instructions with 16 bytes at the front of function within + * Put 4 instructions with 16 bytes at the front of function within * patchable function entry nops' area. * * 0: REG_S ra, -SZREG(sp) - * 1: auipc ra, 0x? - * 2: jalr -?(ra) + * 1: auipc ra, ? + * 2: jalr ra, ra, ? * 3: REG_L ra, -SZREG(sp) - * - * So the opcodes is: - * 0: 0xfe113c23 (sd)/0xfe112e23 (sw) - * 1: 0x???????? -> auipc - * 2: 0x???????? -> jalr - * 3: 0xff813083 (ld)/0xffc12083 (lw) */ -#if __riscv_xlen == 64 -#define INSN0 0xfe113c23 -#define INSN3 0xff813083 -#elif __riscv_xlen == 32 -#define INSN0 0xfe112e23 -#define INSN3 0xffc12083 -#endif - #define FUNC_ENTRY_SIZE 16 #define FUNC_ENTRY_JMP 4 int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) { - unsigned int call[4] = {INSN0, 0, 0, INSN3}; + unsigned int call[4] = { + RISCV_INSN_REG_S | RISCV_INSN_RS2_RA | RISCV_INSN_RS1_SP | + riscv_insn_s_imm(-RISCV_INSN_SZREG), + 0, + 0, + RISCV_INSN_REG_L | RISCV_INSN_RD_RA | RISCV_INSN_RS1_SP | + riscv_insn_i_imm(-RISCV_INSN_SZREG), + }; unsigned long target = addr; unsigned long caller = rec->ip + FUNC_ENTRY_JMP; - call[1] = to_auipc_insn((unsigned int)(target - caller)); - call[2] = to_jalr_insn((unsigned int)(target - caller)); + make_call(caller, target, &call[1]); if (patch_text_nosync((void *)rec->ip, call, FUNC_ENTRY_SIZE)) return -EPERM; @@ -151,7 +126,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec, unsigned long addr) { - unsigned int nops[4] = {NOP4, NOP4, NOP4, NOP4}; + unsigned int nops[4] = { RISCV_INSN_NOP, RISCV_INSN_NOP, RISCV_INSN_NOP, RISCV_INSN_NOP }; if (patch_text_nosync((void *)rec->ip, nops, FUNC_ENTRY_SIZE)) return -EPERM; -- 2.35.1