From patchwork Sun Feb 25 15:20:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 206070 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1622576dyb; Sun, 25 Feb 2024 07:23:08 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX64V2yxRxDYrhxQdUAvljncvz9Xh24OJNlNuTxMtZsNI51i93LrDwC2wIRW+M5R3fhyQzSwb9Mrf0p//n4kg0suY2z8Q== X-Google-Smtp-Source: AGHT+IEDR67b4Rs/XfaFxUM05SLBPcdPnGxhCamEsYhnO4si7vEr9tXtWmWf+TilTGrnOHBXENso X-Received: by 2002:a17:902:da8c:b0:1dc:8508:8e4b with SMTP id j12-20020a170902da8c00b001dc85088e4bmr4540173plx.20.1708874587925; Sun, 25 Feb 2024 07:23:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708874587; cv=pass; d=google.com; s=arc-20160816; b=wqH1xdmZKOIDcHkDOCWasia86ILZ6hJ0bHyka6jOAMjjBk2D1QBGFv8yopQJCyuyC6 EIvEc6ld6mHaG9MtxNBTYn6KJD6dV4xELG0t/Z601B0+6MQGxnqZRFKpNqk/QWridM6v ZHchWTBrDdYogQgzxDqsqbl5bqLlJYxjcYEqYNxjJ0Srm6ZvtjmqkqDr0wfqWVT2yg87 5YxnDiOlIYAH7HUHvEzudPL/WdOJX1mVXqTEo6S7Qo4mt5GVVGJymBJK35FzfWbtjUHs 8HLWnY638D7szi+raTQGLs4DuMvmoQGWBQVVeSJSsDgRSOMElFOezyP2GzuNngmHmdbD jOYQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:user-agent:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=RgldrXg20BQRXBgt27vuOVDsx+75i2iXTYL5CbDce7Y=; fh=SIgps5XdV0XNwjZfT2uAI7g3mrspDldK9Qs8qQAfoa4=; b=iRVUkBJ1qdrk2Ke9HlqQ2JDeVkz9tkjZi3QXVXqH6XlZjWY/oEUx8sTYwiD7d4Rf0+ WoAEJEv8MX7Z4MBxrS8ghuu5KIp9WW6+mgtCLPzi21vYD4v1IJz0hGuGRdeVY7L0qrGm 5A5I2hjP5E4u1R57N6/S2a8NqhtyLPHOxyiFv/vSoRecUjFDxC+h4N/X1Ul8qeyKsTHQ 62aK7kKj4CNeVhGcuGM8MtG1diNvZO/csEQE+mnRDP8zfyWuAcLe4yCQRb5crrDg+VeA ESE48iC9+5+7xYnICDdiXz/9PQmho/ThJwtBiF/3Jx/t9OeYczV+kf4IyyMTMVJ4U4ID Fmkg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GIQXpAbN; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80157-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80157-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id mf7-20020a170902fc8700b001db98ad6ec2si2219499plb.609.2024.02.25.07.23.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 07:23:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80157-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GIQXpAbN; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80157-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80157-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id BA1E928157D for ; Sun, 25 Feb 2024 15:23:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 606D91CA84; Sun, 25 Feb 2024 15:20:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GIQXpAbN" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 94D5A1C6B6; Sun, 25 Feb 2024 15:20:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708874427; cv=none; b=PNHDyxO70goBzBCWma6co/hxBgtFmAiVLg9Nd5H3Z8p8JuzRXM1UJ/LliDViFPVCBXrmzxdBwl7zcNXTzppR10HtF6Moa9bE6lmZGd2MV/n8OSrsnlaARYklZAlKIQqWiRIdqy8YONLcNLJOEuPnvYMKuPikR8Id4s4ucCHgfHc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708874427; c=relaxed/simple; bh=zgVjHsibf80Ba7/uhgykpeSact93x0IdExGXz3s/bRQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=ojFXKCnm97iU0Br4wE5Y8HXAg3ljR/e+Pr+Gfv7sKboac3oMrkzcis9Cx9p/QYwXCLg/2ebftBpLCZ7GmYjZOfFrafDBNp+9WU6S427AhizVGF72B2mkXANMLMgJd+kHAMCNtJs/Tv0Ajh/qft/hKyGIQFWzqvYtH+vmhsnpc98= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GIQXpAbN; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A4ABC433C7; Sun, 25 Feb 2024 15:20:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708874427; bh=zgVjHsibf80Ba7/uhgykpeSact93x0IdExGXz3s/bRQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GIQXpAbNBTuJ1BE6BpP8wasiZF0rp5mKFmy0lS4QQLFagfmdWgNp+BZGbQsY7yRe4 LtFdbDuyxw8BdvzcnuaMxRm5FRMuxEaRlbzzDkMdMPTYn8C/lIk5IUzY8P1m7BvuMd GLbJaTWimD5le2GN96z91E6G8C8Pk22Kr9LpD9MbcNaiZJP08TGVGbc1jis7pmepyD Xgy1rJ13vIBd64dJ/yxkhTOdZEd3aj8CQsoBviN2XV89uUAkBQSuKBi6BWc7K/fiF6 hrurjcfnn1UbsHWU1CPQM/nGZJvg6udr1L8giOY/YsESb9bTOL9aG/7kg0nW4u/WaS +8LmPAe4riSvQ== 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 v8 29/35] bpf: Enable kprobe_multi feature if CONFIG_FPROBE is enabled Date: Mon, 26 Feb 2024 00:20:22 +0900 Message-Id: <170887442191.564249.9875836997924229220.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <170887410337.564249.6360118840946697039.stgit@devnote2> References: <170887410337.564249.6360118840946697039.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791884880074669801 X-GMAIL-MSGID: 1791884880074669801 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 --- Changes from previous series: NOTHING, Update against the new series. --- 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 115c4166ac00..5ad3c32b1c40 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2577,7 +2577,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; @@ -2600,6 +2600,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; @@ -2777,13 +2779,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)) { @@ -2794,6 +2797,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); @@ -2811,13 +2815,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; } @@ -2827,13 +2827,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) @@ -3092,7 +3088,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;