From patchwork Sun Sep 24 13:37:49 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: 144088 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp670167vqu; Sun, 24 Sep 2023 06:42:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFGAu10HZs/qLNuSFbeGft5TyPa3g9hFPBQUz88aKm6qI4e1FiO97vTmMu4JEfLwzJ3yrvG X-Received: by 2002:a17:902:bc47:b0:1c0:afda:540b with SMTP id t7-20020a170902bc4700b001c0afda540bmr2772022plz.8.1695562957006; Sun, 24 Sep 2023 06:42:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695562956; cv=none; d=google.com; s=arc-20160816; b=uwMxlSm7FXCkVK4KdD8G5lC5Jj4RE+N3tYTUYv4CwijIRJEJCyEhZQabb9SM+9BRSy HfOS/+vi4ZqEMhcBjZ3Ig6oa5dby89l6VQhRIYhJYG2fZtd3ST1w42Hb33Kd9F920B4Y Y8bXGuyvYAsapNtSgjIFTkJ4Qf0/TROYaAI0omtyoHZKenXkSuUVihBHe1qBRR/aERLF +YYpKMFubtcBE9UOCQ7BBpBtu7gZD1uPhshuiCYzOUKoZDJahLzqcVm5c0XNPbxfp1XZ r5NJY5EVKRnY6hqjuBpFSRFj6g5G5nZ5yXSwVKxGbx8ZTncT3LYUkbNRjhRJm10AL8lm td7g== 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:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RAic9iBGIlLTJhUTGHS5T8tVayLVfzas3EBPxmsTXu8=; fh=SIgps5XdV0XNwjZfT2uAI7g3mrspDldK9Qs8qQAfoa4=; b=Yrb/O642mlUq7ss3frq5bzqQf7Nv196PbSpQe0limcHaGNSpr4sTp5hvfRnl8Kfa45 ZxktpNvDdERcSwDOFncAfEIotQFESX1WT9czuPHdW/UmPj97SUah1Hn6q5BFR/MuOfU+ 33bNm2GNX51faZCRQLbSzvhJH03bGj1Jq/5YAky1ckZWqZOLJT50H+PEEYKuVpi6B/hh i4SMt7hIsYwKzPdEe8VRH1lP2Wdlv9tbkmoJWQMFKaUbL5WuXA5KTqp5B9imxMdT813I gRh3XCp04qSy9PcYh77Cky6d7mLmL/xrT86xk45o4SMUdtA1ep+Ho9SeVbYxkq7+nmOu zANw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NUhxY4N8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id a10-20020a170902ecca00b001bbe13e753esi2231520plh.310.2023.09.24.06.42.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 06:42:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NUhxY4N8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id BCF14807CED8; Sun, 24 Sep 2023 06:40:31 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231243AbjIXNih (ORCPT + 30 others); Sun, 24 Sep 2023 09:38:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231218AbjIXNiW (ORCPT ); Sun, 24 Sep 2023 09:38:22 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 736BE126 for ; Sun, 24 Sep 2023 06:37:56 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5909EC433C8; Sun, 24 Sep 2023 13:37:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695562676; bh=FEfGDz6clxZ9PLKtBAXOYmli6LSrFixQDspF7u/Z4KA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NUhxY4N8h3ShSDm2qYxveksvNl9zrO2XDzm2UaaVojXVnQrGNh+H6DYGuxn/NNlqj btDQMa8Lp6z5LAEwgsx1ooN6yll4I1549gag/udsMHgDxg8jVgLUELsvsRiwwaD8SZ d39JuIuxXZKH2zhdTwqlI7KRzuTedHAYT/fr9E5NsPCCHlDWTK01If8Dy6tW3UvD9b ecguWWebaF78uUGf3swAMjGj3Tm/7gKa4qZqCs6hPskHFYoJdF1UC/YekLBEUPUpr5 AadOSeUAGI673e+JmebPT3pq1IXStV6K/Jl8n4n38MvkEddiFZQKSX6geivcghXsbJ ntOcH7s15m+Gw== 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 , Guo Ren Subject: [PATCH v5 10/12] bpf: Enable kprobe_multi feature if CONFIG_FPROBE is enabled Date: Sun, 24 Sep 2023 22:37:49 +0900 Message-Id: <169556266942.146934.6508273802845934438.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <169556254640.146934.5654329452696494756.stgit@devnote2> References: <169556254640.146934.5654329452696494756.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email 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 (pete.vger.email [0.0.0.0]); Sun, 24 Sep 2023 06:40:31 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777926623434716011 X-GMAIL-MSGID: 1777926623434716011 From: Masami Hiramatsu (Google) Enable kprobe_multi feature if CONFIG_FPROBE is enabled. The pt_regs is converted from ftrace_regs by ftrace_partial_regs(), thus some registers may always returns 0. But it should be enough for function entry (access arguments) and exit (access return value). Signed-off-by: Masami Hiramatsu (Google) Acked-by: Florent Revest --- kernel/trace/bpf_trace.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 8bb003ce7bb2..808acd56e432 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2501,7 +2501,7 @@ static int __init bpf_event_init(void) fs_initcall(bpf_event_init); #endif /* CONFIG_MODULES */ -#if defined(CONFIG_FPROBE) && defined(CONFIG_DYNAMIC_FTRACE_WITH_REGS) +#ifdef CONFIG_FPROBE struct bpf_kprobe_multi_link { struct bpf_link link; struct fprobe fp; @@ -2524,6 +2524,8 @@ struct user_syms { char *buf; }; +static DEFINE_PER_CPU(struct pt_regs, bpf_kprobe_multi_pt_regs); + static int copy_user_syms(struct user_syms *us, unsigned long __user *usyms, u32 cnt) { unsigned long __user usymbol; @@ -2700,13 +2702,14 @@ static u64 bpf_kprobe_multi_entry_ip(struct bpf_run_ctx *ctx) static int kprobe_multi_link_prog_run(struct bpf_kprobe_multi_link *link, - unsigned long entry_ip, struct pt_regs *regs) + unsigned long entry_ip, struct ftrace_regs *fregs) { struct bpf_kprobe_multi_run_ctx run_ctx = { .link = link, .entry_ip = entry_ip, }; struct bpf_run_ctx *old_run_ctx; + struct pt_regs *regs; int err; if (unlikely(__this_cpu_inc_return(bpf_prog_active) != 1)) { @@ -2716,6 +2719,7 @@ kprobe_multi_link_prog_run(struct bpf_kprobe_multi_link *link, migrate_disable(); rcu_read_lock(); + regs = ftrace_partial_regs(fregs, this_cpu_ptr(&bpf_kprobe_multi_pt_regs)); old_run_ctx = bpf_set_run_ctx(&run_ctx.run_ctx); err = bpf_prog_run(link->link.prog, regs); bpf_reset_run_ctx(old_run_ctx); @@ -2733,13 +2737,9 @@ kprobe_multi_link_handler(struct fprobe *fp, unsigned long fentry_ip, void *data) { struct bpf_kprobe_multi_link *link; - struct pt_regs *regs = ftrace_get_regs(fregs); - - if (!regs) - return 0; link = container_of(fp, struct bpf_kprobe_multi_link, fp); - kprobe_multi_link_prog_run(link, get_entry_ip(fentry_ip), regs); + kprobe_multi_link_prog_run(link, get_entry_ip(fentry_ip), fregs); return 0; } @@ -2749,13 +2749,9 @@ kprobe_multi_link_exit_handler(struct fprobe *fp, unsigned long fentry_ip, void *data) { struct bpf_kprobe_multi_link *link; - struct pt_regs *regs = ftrace_get_regs(fregs); - - if (!regs) - return; link = container_of(fp, struct bpf_kprobe_multi_link, fp); - kprobe_multi_link_prog_run(link, get_entry_ip(fentry_ip), regs); + kprobe_multi_link_prog_run(link, get_entry_ip(fentry_ip), fregs); } static int symbols_cmp_r(const void *a, const void *b, const void *priv) @@ -2996,7 +2992,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr kvfree(cookies); return err; } -#else /* !CONFIG_FPROBE || !CONFIG_DYNAMIC_FTRACE_WITH_REGS */ +#else /* !CONFIG_FPROBE */ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *prog) { return -EOPNOTSUPP;