From patchwork Thu Nov 30 12:15:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 17327 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp339616vqy; Thu, 30 Nov 2023 04:16:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IFBs6NGNwhlHVve4ywynSU3YE7CspTTUW/wOwaLQfZ8UfQl/N0b4KbigQMtrpdMEZg9T7CW X-Received: by 2002:a17:90a:1910:b0:281:d55:6fe8 with SMTP id 16-20020a17090a191000b002810d556fe8mr17674020pjg.24.1701346598748; Thu, 30 Nov 2023 04:16:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701346598; cv=none; d=google.com; s=arc-20160816; b=A9NjWRPczOH71b0buDAd4aCuxWIa+bvy/uX5qenEBjL6LHelJNW4BdOyQ+DmtdlGcJ GxcqbJOZ/2U4CoptoxC5K97/UTXHG03nfWeecexyfG05lIf04cqhLvriZIuYQtCIX09V ngb1tHRq4qNAfRpnUzUF/v8NezCvWJU+2hP5Gp0jSObwkqIXzyGEKDFIZyYo16VhwxX1 pJ7RYv9O9GamLV6IsbuOhSxJ5BrO/K7bn1UAzdzrioRA3RRVwKdU9kX/TxC3YLE04T7w iV1G2uFdMzWL9aNd925eaYPE2wD1AIonP0ie5aa5VkfEIqmNXtrMZghs+aK5u0g/Bo5s KulA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=itOKX57UJqrFbdhHaIZ8gkcIHcS74xwnxU4o/WgwciY=; fh=OcTdw4fJhlYswNJZP1iMCg3bOWfScYgFXU8uV8OuPWI=; b=GugjOdWRQvOKXQ0PI8LYjpTHAg5Fror/hYYOkAfqUJvEhM3ADngWuzBVCyrOlPRvJq k7RLrqZ7akV46cv8lyqykOBBqI2bCJdf1yTBOm7SsIMiDqKVCsYcp1v3n0DSqOD53KQq jEd9FCRjozF0tu0/e1FuBDMHVB8bUyO2gpJkUIcUAsMCJN41BQWEMn1Bkq3UUlcIA/CA 08pB4Wt3p2pFkB9PasuQ0TI/TAVbMYqvKUyji+oYoNl50NWYaMqHbZmhmlrmXiyesUzA vYsDWSOjlvr1JdiSc/buPdlTaEUf6ZKO2SUKiXATPk9P4lpP8khbZB1PkIz9lHw6/B+H EnAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UraiEC+0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id g8-20020a17090a9b8800b00285105c440esi1255876pjp.120.2023.11.30.04.16.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 04:16:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UraiEC+0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 3F7C280779BC; Thu, 30 Nov 2023 04:15:58 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231893AbjK3MPk (ORCPT + 99 others); Thu, 30 Nov 2023 07:15:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231784AbjK3MPj (ORCPT ); Thu, 30 Nov 2023 07:15:39 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02165D40 for ; Thu, 30 Nov 2023 04:15:45 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0995C433C7; Thu, 30 Nov 2023 12:15:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701346544; bh=1NPXRHfCmv3muigvSa8lBUFSABkyhpUQba/UEEWr/rM=; h=From:To:Cc:Subject:Date:From; b=UraiEC+0QfcuybZdyWf77r8dRXNuwqKPlsmovyA/HvHKNSE2PDXUCtfDBU8T68jqW zxEKr4hNGcnDOaPXu4C4xhfi7mP5vO+f09oHk4/lej/LLoB6WRdZw3jZvmrbiyF3u1 And2p+iR8RhiMbB1QbhwONyweWsjl/QRfK+uA51E2i/GyaDi7anOFcRdyHT2Z8sjmi mpGED66jC56FrIQO0aSqBzezxrvITqL5riM9hDjkARae3MWYZ1iS6j4z0sV2PqwXB9 ZvT5apIey29b7b8eA04UgAvV/wEH2ePnTo8UCSwxB0gq54z3vMhY3a58/T9VyzcKaO F9zd6U4HJufEw== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: Steven Rostedt , Masami Hiramatsu , Mark Rutland , Paul Walmsley , Palmer Dabbelt , Albert Ou , Song Shuai , Guo Ren , linux-riscv@lists.infradead.org Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, songshuaishuai@tinylab.org Subject: [PATCH v12 for-next 0/4] riscv: ftrace: Miscellaneous ftrace improvements Date: Thu, 30 Nov 2023 13:15:27 +0100 Message-Id: <20231130121531.1178502-1-bjorn@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 30 Nov 2023 04:15:58 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783991211292101527 X-GMAIL-MSGID: 1783991211292101527 From: Björn Töpel NB! Song told me that he would not have the time work on this series, so I picked it up. This series includes a three ftrace improvements for RISC-V: 1. Do not require to run recordmcount at build time (patch 1) 2. Simplification of the function graph functionality (patch 2) 3. Enable DYNAMIC_FTRACE_WITH_DIRECT_CALLS (patch 3 and 4) The series has been tested on Qemu/rv64 virt/Debian sid with the following test configs: CONFIG_FTRACE_SELFTEST=y CONFIG_FTRACE_STARTUP_TEST=y CONFIG_SAMPLE_FTRACE_DIRECT=m CONFIG_SAMPLE_FTRACE_DIRECT_MULTI=m CONFIG_SAMPLE_FTRACE_OPS=m All tests pass. Cheers, Björn Changes in v12: - Massaged the commit messages a bit. - Squashed the samples patches, so that the rv32 support is included from the start. - Minor whitespace changes in the mcount-dyn.S. - Minor style changes. Changes in v11: https://lore.kernel.org/linux-riscv/20230627111612.761164-1-suagrfillet@gmail.com/ - append a patch that makes the DIRECT_CALL samples support RV32I in this series fixing the rv32 build failure reported by Palmer - validated with ftrace boottime selftest and manual sample modules test in qemu-system for RV32I and RV64I Changes in v10: https://lore.kernel.org/all/20230511093234.3123181-1-suagrfillet@gmail.com/ - add Acked-by from Björn Töpel in patch 2 and patch 4 - replace `move` with `mv` in patch3 - prettify patch 2/4 with proper tabs Changes in v9: https://lore.kernel.org/linux-riscv/20230510101857.2953955-1-suagrfillet@gmail.com/ 1. add Acked-by from Björn Töpel in patch 1 2. rebase patch2/patch3 on Linux v6.4-rc1 - patch 2: to make the `SAVE_ABI_REGS` configurable, revert the modification of mcount-dyn.S from commit (45b32b946a97 "riscv: entry: Consolidate general regs saving/restoring") - patch 3: to pass the trace_selftest, add the implement of `ftrace_stub_direct_tramp` from commit (fee86a4ed536 "ftrace: selftest: remove broken trace_direct_tramp") ; and fixup the context conflict in Kconfig Changes in v8: https://lore.kernel.org/linux-riscv/20230324033342.3177979-1-suagrfillet@gmail.com/ - Fix incorrect address values in the 4nd patch - Rebased on v6.3-rc2 Changes in v7: https://lore.kernel.org/linux-riscv/20230112090603.1295340-1-guoren@kernel.org/ - Fixup RESTORE_ABI_REGS by remove PT_T0(sp) overwrite. - Add FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY [1] - Fixup kconfig with HAVE_SAMPLE_FTRACE_DIRECT & HAVE_SAMPLE_FTRACE_DIRECT_MULTI Changes in v6: https://lore.kernel.org/linux-riscv/20230107133549.4192639-1-guoren@kernel.org/ - Replace 8 with MCOUNT_INSN_SIZE - Replace "REG_L a1, PT_RA(sp)" with "mv a1, ra" - Add Evgenii Shatokhin comment Changes in v5: https://lore.kernel.org/linux-riscv/20221208091244.203407-1-guoren@kernel.org/ - Sort Kconfig entries in alphabetical order. Changes in v4: https://lore.kernel.org/linux-riscv/20221129033230.255947-1-guoren@kernel.org/ - Include [3] for maintenance. [Song Shuai] Changes in V3: https://lore.kernel.org/linux-riscv/20221123153950.2911981-1-guoren@kernel.org/ - Include [2] for maintenance. [Song Shuai] [1]: https://lore.kernel.org/linux-riscv/CAAYs2=j3Eak9vU6xbAw0zPuoh00rh8v5C2U3fePkokZFibWs2g@mail.gmail.com/T/#t [2]: https://lore.kernel.org/lkml/20221120084230.910152-1-suagrfillet@gmail.com/ [3]: https://lore.kernel.org/linux-riscv/20221123142025.1504030-1-suagrfillet@gmail.com/ Song Shuai (4): riscv: select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY riscv: ftrace: Make function graph use ftrace directly riscv: ftrace: Add DYNAMIC_FTRACE_WITH_DIRECT_CALLS support samples: ftrace: Add RISC-V support for SAMPLE_FTRACE_DIRECT[_MULTI] arch/riscv/Kconfig | 4 + arch/riscv/include/asm/ftrace.h | 18 +- arch/riscv/kernel/ftrace.c | 30 ++- arch/riscv/kernel/mcount-dyn.S | 198 ++++++++++++++++---- samples/ftrace/ftrace-direct-modify.c | 35 ++++ samples/ftrace/ftrace-direct-multi-modify.c | 41 ++++ samples/ftrace/ftrace-direct-multi.c | 25 +++ samples/ftrace/ftrace-direct-too.c | 28 +++ samples/ftrace/ftrace-direct.c | 24 +++ 9 files changed, 348 insertions(+), 55 deletions(-) base-commit: 3ca112b71f35dd5d99fc4571a56b5fc6f0c15814