Received: by 2002:a05:6358:111d:b0:dc:6189:e246 with SMTP id f29csp2172901rwi; Tue, 1 Nov 2022 04:53:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4GJ0Zr6n4qd3CDDbP/mgQG5cBfIi9bsVSJS3dSLiUdZhmh1C0nzFKIexVJ7k1MWKYPPXm+ X-Received: by 2002:a50:fc03:0:b0:461:5d8d:5811 with SMTP id i3-20020a50fc03000000b004615d8d5811mr18844410edr.351.1667303605362; Tue, 01 Nov 2022 04:53:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667303605; cv=none; d=google.com; s=arc-20160816; b=WJNel9+9YfZJpGWsx0zSvy7YK/AS93Vu08yn+xK6jPk6fgJMkmD+e1WiwGLGB2ryY6 3l3Gg6Hcpfsje3xPVe03GuIWiANBPg/UgeBIS6pTX7DqVbyDTe9c47A9iMraYGL9qVei 3XOR6ooYs0daN6AFRfcepY3BnxDWiVzUqT0BGeeh4m65Z5Bp/RRQWdJqb0Ug2KWgpJN7 0Am+NBkBbrISuqq3F/jfKjNd4mL8g+uB3HMG3zVTfaeyQO4NvE/xqc1y6qC5HYLEpNhc /qgphw7kRIsIJmx2cGZ7zRUYE0QfS2GtXNYO/r2KbarRUBtzV1A4FbqJ15mHKtIi71mu Z7rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:subject:user-agent:mime-version:date:message-id; bh=QJ1pJ2KeH8I0aBK8XHzqLLYJue4xVJE21EHsTxwNRb0=; b=yliSQS7Zwl8oRkadrByfsrHC5cKxC/9JRin/VOJhuxVPiNjSAgp1d3RGINq5RSmRwu 4vD6cSx7rvOXBOZfS5fv/nMznY+EaVJ1pHfTcZDRYPBgicVgNAEs5f1pn/PGibTJazla QF2IU3YS6WhP/5uNWFXcFdnqp8rTHVJ9KK1IaqbX1mrh3t0AfshfOCdAbtJQW5G6XRY7 ZQSQICjuk38sC6gtWbd5sFmqaCDh4D2/1ZYs9TgEPnED2KOY8b61k+Vf/DluHU3ABBpi QrjaEz5DQFzkNbjkevoNHSy2/7x2a0m6z12bFDwuoNGXhkc9w/5Nf8dqJJjA6p6XUwWu oUpw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e14-20020a17090658ce00b0077b4248b138si13051713ejs.127.2022.11.01.04.53.01; Tue, 01 Nov 2022 04:53:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230100AbiKALHu (ORCPT + 97 others); Tue, 1 Nov 2022 07:07:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229475AbiKALHs (ORCPT ); Tue, 1 Nov 2022 07:07:48 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7723EDE8C for ; Tue, 1 Nov 2022 04:07:47 -0700 (PDT) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N1nDT31sGzRnsc; Tue, 1 Nov 2022 19:02:49 +0800 (CST) Received: from [10.67.110.108] (10.67.110.108) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 1 Nov 2022 19:07:44 +0800 Message-ID: <1fe22055-7458-e052-4438-0338da9e369c@huawei.com> Date: Tue, 1 Nov 2022 19:07:44 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: [PATCH 1/8] riscv/kprobe: Prepare the skeleton to implement RISCV OPTPROBES feature To: Conor Dooley , Chen Guokai CC: , , , , , , , References: <20221030090141.2550837-1-chenguokai17@mails.ucas.ac.cn> <20221030090141.2550837-2-chenguokai17@mails.ucas.ac.cn> From: "liaochang (A)" In-Reply-To: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.67.110.108] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemi500012.china.huawei.com (7.221.188.12) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,NICE_REPLY_A, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi,Conor, 在 2022/11/1 3:42, Conor Dooley 写道: > Hey Chen Guokai, > > On Sun, Oct 30, 2022 at 05:01:34PM +0800, Chen Guokai wrote: >> From: Liao Chang >> >> Prepare skeleton to implement optimized kprobe on RISCV, it consists >> of Makfile, Kconfig and some architecture specific files: kprobe.h and >> opt.c opt.c includes some macro, type definition and functions required >> by kprobe framework, opt_trampoline.S provides a piece of assembly code >> template used to construct the detour buffer as the target of long jump >> instruction(s) for each optimzed kprobe. >> >> Since the jump range of PC-relative instruction JAL is +/-1M, that is >> too small to reach the detour buffer, hence the foudamental idea to >> address OPTPROBES on RISCV is to replace 'EBREAK' with 'AUIPC+JALR'. which >> means it needs to clobber one more instruction beside the kprobe >> instruction, furthermore, RISCV supports hybird RVI and RVC in single >> kernel binary, so in theory a pair of 'AUIPC/JALR' is about to clobber >> 10 bytes(3 RVC and 1 RVI, 2 bytes is padding for alignment) at worst >> case. The second hardsome problem is looking for one integer register as >> the destination of 'AUIPC/JALR' without any side-effect. >> >> More solution details will be introduced in the coming commits. > > nit: you can drop this reference to future commits. > >> >> Co-developed-by: Chen Guokai >> Signed-off-by: Chen Guokai >> Signed-off-by: Liao Chang > > FYI, your signoff should come last since you're sending the patches, so > this would become: > >> Signed-off-by: Liao Chang >> Co-developed-by: Chen Guokai >> Signed-off-by: Chen Guokai > > I noticed on some of the other patches that your SoB is missing there, > for example patch 2. Yes, i have sent patch 2 to mailing list long time ago, got some feedback from Palmer Debbelt. Because that patch is designed for riscv optprobe, so i bring it to this patchset. Thanks. > > Thanks, > Conor. > >> --- >> arch/riscv/Kconfig | 1 + >> arch/riscv/include/asm/kprobes.h | 32 ++++++++++++++ >> arch/riscv/kernel/probes/Makefile | 1 + >> arch/riscv/kernel/probes/opt.c | 51 +++++++++++++++++++++++ >> arch/riscv/kernel/probes/opt_trampoline.S | 12 ++++++ >> 5 files changed, 97 insertions(+) >> create mode 100644 arch/riscv/kernel/probes/opt.c >> create mode 100644 arch/riscv/kernel/probes/opt_trampoline.S >> >> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig >> index 6b48a3ae9843..ca29306c93e2 100644 >> --- a/arch/riscv/Kconfig >> +++ b/arch/riscv/Kconfig >> @@ -99,6 +99,7 @@ config RISCV >> select HAVE_KPROBES if !XIP_KERNEL >> select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL >> select HAVE_KRETPROBES if !XIP_KERNEL >> + select HAVE_OPTPROBES if !XIP_KERNEL >> select HAVE_MOVE_PMD >> select HAVE_MOVE_PUD >> select HAVE_PCI >> diff --git a/arch/riscv/include/asm/kprobes.h b/arch/riscv/include/asm/kprobes.h >> index 217ef89f22b9..22b73a2fd1fd 100644 >> --- a/arch/riscv/include/asm/kprobes.h >> +++ b/arch/riscv/include/asm/kprobes.h >> @@ -43,5 +43,37 @@ bool kprobe_single_step_handler(struct pt_regs *regs); >> void __kretprobe_trampoline(void); >> void __kprobes *trampoline_probe_handler(struct pt_regs *regs); >> >> +#ifdef CONFIG_OPTPROBES >> + >> +/* optinsn template addresses */ >> +extern __visible kprobe_opcode_t optprobe_template_entry[]; >> +extern __visible kprobe_opcode_t optprobe_template_end[]; >> + >> +#define MAX_OPTINSN_SIZE \ >> + ((unsigned long)optprobe_template_end - \ >> + (unsigned long)optprobe_template_entry) >> + >> +/* >> + * For RVI and RVC hybird encoding kernel, althought long jump just needs >> + * 2 RVI instructions(AUIPC+JALR), optimized instructions is 10 bytes long >> + * at most to ensure no RVI would be truncated actually, so it means four >> + * combinations: >> + * - 2 RVI >> + * - 4 RVC >> + * - 2 RVC + 1 RVI >> + * - 3 RVC + 1 RVI (truncated, need padding) >> + */ >> +#define MAX_COPIED_INSN 4 >> +#define MAX_OPTIMIZED_LENGTH 10 >> + >> +struct arch_optimized_insn { >> + kprobe_opcode_t copied_insn[MAX_COPIED_INSN]; >> + /* detour code buffer */ >> + kprobe_opcode_t *insn; >> + unsigned long length; >> + int rd; >> +}; >> + >> +#endif /* CONFIG_OPTPROBES */ >> #endif /* CONFIG_KPROBES */ >> #endif /* _ASM_RISCV_KPROBES_H */ >> diff --git a/arch/riscv/kernel/probes/Makefile b/arch/riscv/kernel/probes/Makefile >> index 7f0840dcc31b..6255b4600875 100644 >> --- a/arch/riscv/kernel/probes/Makefile >> +++ b/arch/riscv/kernel/probes/Makefile >> @@ -3,4 +3,5 @@ obj-$(CONFIG_KPROBES) += kprobes.o decode-insn.o simulate-insn.o >> obj-$(CONFIG_KPROBES) += kprobes_trampoline.o >> obj-$(CONFIG_KPROBES_ON_FTRACE) += ftrace.o >> obj-$(CONFIG_UPROBES) += uprobes.o decode-insn.o simulate-insn.o >> +obj-$(CONFIG_OPTPROBES) += opt.o opt_trampoline.o >> CFLAGS_REMOVE_simulate-insn.o = $(CC_FLAGS_FTRACE) >> diff --git a/arch/riscv/kernel/probes/opt.c b/arch/riscv/kernel/probes/opt.c >> new file mode 100644 >> index 000000000000..56c8a227c857 >> --- /dev/null >> +++ b/arch/riscv/kernel/probes/opt.c >> @@ -0,0 +1,51 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> +/* >> + * Kernel Probes Jump Optimization (Optprobes) >> + * >> + * Copyright (C) Guokai Chen, 2022 >> + * Author: Guokai Chen chenguokai17@mails.ucas.ac.cn >> + */ >> + >> +#define pr_fmt(fmt) "optprobe: " fmt >> + >> +#include >> +#include >> + >> +int arch_prepared_optinsn(struct arch_optimized_insn *optinsn) >> +{ >> + return 0; >> +} >> + >> +int arch_check_optimized_kprobe(struct optimized_kprobe *op) >> +{ >> + return 0; >> +} >> + >> +int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, >> + struct kprobe *orig) >> +{ >> + return 0; >> +} >> + >> +void arch_remove_optimized_kprobe(struct optimized_kprobe *op) >> +{ >> +} >> + >> +void arch_optimize_kprobes(struct list_head *oplist) >> +{ >> +} >> + >> +void arch_unoptimize_kprobes(struct list_head *oplist, >> + struct list_head *done_list) >> +{ >> +} >> + >> +void arch_unoptimize_kprobe(struct optimized_kprobe *op) >> +{ >> +} >> + >> +int arch_within_optimized_kprobe(struct optimized_kprobe *op, >> + kprobe_opcode_t *addr) >> +{ >> + return 0; >> +} >> diff --git a/arch/riscv/kernel/probes/opt_trampoline.S b/arch/riscv/kernel/probes/opt_trampoline.S >> new file mode 100644 >> index 000000000000..16160c4367ff >> --- /dev/null >> +++ b/arch/riscv/kernel/probes/opt_trampoline.S >> @@ -0,0 +1,12 @@ >> +/* SPDX-License-Identifier: GPL-2.0-only */ >> +/* >> + * Copyright (C) 2022 Guokai Chen >> + */ >> + >> +#include >> + >> +#incldue >> +#include >> + >> +SYM_ENTRY(optprobe_template_entry, SYM_L_GLOBAL, SYM_A_NONE) >> +SYM_ENTRY(optprobe_template_end, SYM_L_GLOBAL, SYM_A_NONE) >> -- >> 2.25.1 >> >> >> _______________________________________________ >> linux-riscv mailing list >> linux-riscv@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-riscv > . -- BR, Liao, Chang