From patchwork Sat Aug 5 14:57:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 13192 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp521194vqr; Sat, 5 Aug 2023 08:51:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG2fzDH+1cZc7n5kS+Gp802yVLnwH848m9Pf5qW1WOPZZW0+O8R9ZhmQbPXww5meZmjxxRw X-Received: by 2002:a17:903:1d1:b0:1bb:ed65:5e0d with SMTP id e17-20020a17090301d100b001bbed655e0dmr6038190plh.56.1691250669126; Sat, 05 Aug 2023 08:51:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691250669; cv=none; d=google.com; s=arc-20160816; b=Tw/jEQrlU2wjvAtyhj+bfOPveyqV9jfCGEemsvOMirJPDg/tMQwsPqtlBCZisKtquI unTBm/9SQYpx9RwQ0dwtsqQYv+83i99fP2jF/ut43olx3fzSXBcJV7Jk3PmD/ny8K7Fn 7EhpzWXfjfo1tRGB2huXkwZNfI9ozm6rBfblRiMetAFxH0d+6c4u164g4iT1yhU8+xdc 8/aGnwy/DVSAhneyf00ZYIjpCJvzdPx//TPL05vu5ZZfTd8KU9/NKMk7R5pI3lB6NNkA 0CkbkoMEC/Hp59wpuc3eNqdqUmL4DOrgYbNNFp5FjVRYCXlD7MzTfSU0lVphh3DhxgNS Ak/g== 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 :user-agent:message-id:date:subject:cc:to:from:dkim-signature; bh=VRjX8QWtIbR6X6XTcVZp95X9SlXHdWSZJQz+74nNMas=; fh=nNLeqPmm07c4DrdDej5z+HdJpmx5SqFFnpeka2nrMVM=; b=Y29/REZ/46y7neFTh8isOmej1GbMJ5z+WM126mrx7h0I2xbRpUtJrnC0FBypsYhkJN iqDhh0VISyHJ1rZhboTlwajacwtOrFru0yEtKu27L2vwUPlFGthtDaR17oEzulsD4/7h lpPxeEjpiYfEu6tHNjRC4/PrQYPGy77x1pe3KuQZsjETiAe0DbfGR9IwHoldIoRQ0rsA fA0dkPr4/J72YdD7Ak8gDEA+Q5OGnEc6taA/RqCuDV3rdRRlS+OeSIDyubiYfAuarrAI dbJRSj4aVUpVOcwSANvSqns+b/hCPz2VmmDtC8JcwjuEIk2qCF7JwRpWcrewnHvnTdgj 5wIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oVI0qUR9; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ja4-20020a170902efc400b001bbd586d29esi3231359plb.34.2023.08.05.08.50.54; Sat, 05 Aug 2023 08:51:09 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oVI0qUR9; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229832AbjHEO56 (ORCPT + 99 others); Sat, 5 Aug 2023 10:57:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229494AbjHEO54 (ORCPT ); Sat, 5 Aug 2023 10:57:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 767DEEB; Sat, 5 Aug 2023 07:57:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D876360AFD; Sat, 5 Aug 2023 14:57:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93288C433C7; Sat, 5 Aug 2023 14:57:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691247474; bh=QPz0WJ8gkkpNP4jYse4D55wibDJnHIsbjKLA3YfAOig=; h=From:To:Cc:Subject:Date:From; b=oVI0qUR9BhKMYGTuSivMfL/WkxXNliEtSuekiFj0+r6GdIy6inD/B/lEFwhoDWJLw 6NHswGCCWYJRRCRIKm/3V213UZvtN+/62LlAMeekPcEpTNPPXVwnzpbxGn1EvlmbVr qzUKMr8Q41QZ++e3Q9olfJBjCmlrAeFmVbixVoGQWS8X5ZmvPbEwmug71RxtzbHUb0 fP5mAfhUfLVlAdeW+3bhyRgETpnvsEM9Voa1i2Twxn3zwLJ3Vqt60MYi3lnW7nigOI cy3uplaerAzu9B4KuASbLCZCdAqmG3lVs/ahOASyYQcbSJ/cvqzjeNuiETmQgM9h9G rgB8P3XqXR60g== From: "Masami Hiramatsu (Google)" To: Alexei Starovoitov , Steven Rostedt , Florent Revest Cc: linux-trace-kernel@vger.kernel.org, LKML , Martin KaFai Lau , bpf , Sven Schnelle , Alexei Starovoitov , Jiri Olsa , Arnaldo Carvalho de Melo , Daniel Borkmann , Alan Maguire , Mark Rutland , Peter Zijlstra , Thomas Gleixner Subject: [RFC PATCH 0/5] bpf: fprobe: rethook: Use ftrace_regs instead of pt_regs Date: Sat, 5 Aug 2023 23:57:47 +0900 Message-Id: <169124746774.186149.2326708176801468806.stgit@devnote2> X-Mailer: git-send-email 2.34.1 User-Agent: StGit/0.19 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 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773404861562639346 X-GMAIL-MSGID: 1773404861562639346 Hi, Here is RFC series to use ftrace_regs instead of pt_regs. But this includes the generic part and minimum modifications of arch dependent code. (e.g. not including rethook for arm64.) This series is based on the discussion at https://lore.kernel.org/all/20230801112036.0d4ee60d@gandalf.local.home/ This has 5 patches, - Simply replace pt_regs in fprobe_entry_handler with ftrace_regs. - Replace pt_regs in rethook and fprobe_exit_handler with ftrace_regs. This introduce a new HAVE_PT_REGS_COMPAT_FTRACE_REGS which means ftrace_regs is just a wrapper of pt_regs (except for arm64, other architectures do this) - Update fprobe-events to use ftrace_regs natively. - Introduce ftrace_partial_regs(). (This changes ARM64 which needs a custom implementation) - Update bpf multi-kprobe handler use ftrace_partial_regs(). Florent, feel free to add your rethook for arm64, but please do not remove kretprobe trampoline yet. It is another discussion point. We may be possible to use ftrace_regs for kretprobe by ftrace_partial_regs() but kretprobe allows nest probe. (maybe we can skip that case?) Thank you, --- Masami Hiramatsu (Google) (5): fprobe: Use fprobe_regs in fprobe entry handler fprobe: rethook: Use fprobe_regs in fprobe exit handler and rethook tracing/fprobe: Enable fprobe events with CONFIG_DYNAMIC_FTRACE_WITH_ARGS ftrace: Add ftrace_partial_regs() for converting ftrace_regs to pt_regs bpf: Enable kprobe_multi feature if CONFIG_FPROBE is enabled arch/Kconfig | 1 + arch/arm64/include/asm/ftrace.h | 11 ++++++ arch/loongarch/Kconfig | 1 + arch/s390/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/kernel/rethook.c | 9 +++-- include/linux/fprobe.h | 4 +- include/linux/ftrace.h | 11 ++++++ include/linux/rethook.h | 11 +++--- kernel/kprobes.c | 9 ++++- kernel/trace/Kconfig | 9 ++++- kernel/trace/bpf_trace.c | 14 +++++-- kernel/trace/fprobe.c | 8 ++-- kernel/trace/rethook.c | 16 ++++---- kernel/trace/trace_fprobe.c | 76 ++++++++++++++++++++++++--------------- kernel/trace/trace_probe_tmpl.h | 2 + lib/test_fprobe.c | 10 +++-- samples/fprobe/fprobe_example.c | 4 +- 18 files changed, 130 insertions(+), 68 deletions(-) -- Masami Hiramatsu (Google)