Received: by 2002:a05:7208:9594:b0:7e:5202:c8b4 with SMTP id gs20csp863060rbb; Sun, 25 Feb 2024 07:22:12 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXHIj80qCFpWODDhbNChgW/haQPrP9zMhOvMv+GKQiYfla2tlaxlSEf1fjKOH/IrCayFeBuUvxgYBvxy/5ziK2GTs5bwE1cDerz5wLPnw== X-Google-Smtp-Source: AGHT+IFCKcEkmBTBC9P9wpDbqsTB22EonaF64X25CEZB2i1/AY3FqDqbVT9qYcF8cJtfmkQjWycn X-Received: by 2002:a05:6512:2116:b0:512:fa79:d4d9 with SMTP id q22-20020a056512211600b00512fa79d4d9mr731477lfr.55.1708874532454; Sun, 25 Feb 2024 07:22:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708874532; cv=pass; d=google.com; s=arc-20160816; b=MDnAGzznRxO6MvLGm65u/+QnUH3BkXB+R85mEGSbDXugWQl1oiW5u0DugMzfTEnEnC wXEdbNMJL2K7vXZjtgRL0FnYSR2olmGz2z068XqmRxE3KyChaETaqXOZIWH1IfLZSwi9 y1z38nMo7pzpYgFC/cG0cZnQ64c8P5F98j5xCTSYZp3yUxddUtX44RqIy5D5bhFdQtyr fc7lRGM2bMV9mDw/OZ9JSf7pwJaZBW9twlaQjN2TAGBDhviWQQBM2SWxL8HaQiIazEMx 6faDyfSFzZO2SnBhmV4tVLjeyZIaXAa2fhZiCKcq9TzOfvWDDITKo0qapkTi5Q2PLJOU gbsA== 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=L/3vmktiJ5immjvjEr3ZKWwg3gfXrf+IYat6vB9rrjA=; fh=SIgps5XdV0XNwjZfT2uAI7g3mrspDldK9Qs8qQAfoa4=; b=dgXwnu+JQVx+LKfhD0Sldc4MElPPO8fbmFEnfGePoiT6DpWyvpoULSCzr3zPfwiy0s GJOLjJ0mUhJR23oFk/JA2ktW0bbgmWS2KO7AicwL9RSoaA8w5jeuGfQXaklL0u73f4/x AE7MlILQ72sfx4MxS5Oc8G3MgbNRr1ZLRmgQMQUVe2yyar8NoWzC/mjTmRRXMVEHd9MZ m2bNHeo0lvgSsTdyhp1U99BxpYOAcYu1SDJh6fDO14uLmiBhK9Z0PzyoOiwWIWVMkRF2 V2fxO0p1ubBTzalJa2PFXRcz3oU9Gz2ek9rOvxuKZfki9y5FEw8goduNcpxkPiJhZ25h QVpg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hkIacatk; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80154-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80154-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id jg6-20020a170907970600b00a43239c4427si571494ejc.967.2024.02.25.07.22.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 07:22:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80154-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hkIacatk; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80154-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80154-linux.lists.archive=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 am.mirrors.kernel.org (Postfix) with ESMTPS id 0511E1F21456 for ; Sun, 25 Feb 2024 15:22:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D6C09182B5; Sun, 25 Feb 2024 15:19:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hkIacatk" 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 F2F6A1C294; Sun, 25 Feb 2024 15:19:52 +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=1708874393; cv=none; b=Q1GpnqDFRcDC4LA+lFCvDbGmmSP5Kss/hm5+xliOHqjHdg8Ye/QB1+EHPov8BYeA9iefFB8fGmFBOU3gDXQYB5ypHWRoUmTDalvtBK6SOqGy/YYhbQrt5sCNXiVrF4SPabkgtPNlpgAAqGev1LiD16CujjwsuQv3T6kuh2A87eA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708874393; c=relaxed/simple; bh=DAhfTYYCwMlco9j3X7H6xpyvA8eyC+lbQXihy58k8L8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=nndcvFR4ZkJNp7SNNw3p22+TVVRZxI3/xLcbHBhs2frln+rTnUfnCQNm0W8RkjZdNiDhCMmWuWX/iSFT4dJ84nFZMfvUfj5rKyv9HMBKesYUzG1Ef3F61xZJY6B0ffh1qnNB3OowlW9QFVUTWlbLlD3BStdr2IQfA83yJ7tFdjU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hkIacatk; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3826EC433C7; Sun, 25 Feb 2024 15:19:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708874392; bh=DAhfTYYCwMlco9j3X7H6xpyvA8eyC+lbQXihy58k8L8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hkIacatkn5NNHkRtiAAQyeetapR5MNyPCFPnKqWx8GHeeYQuTNMflKTgc+8EA4u2B Mutd20iNXsLM6VhAXJFL0k5FmRm/e2et9Uz0lFZx4dGhA0Yg42jd/o7TyKYYqGoGB/ +jPIU1B0URahorPuy8RquCfLNLxiGdixb0S/MgyfBoz3AcyRxuhUCjWu0r89NWf6sB eAFHap0TLDbp2GFGuJ+xtaJhMUsgfLLlQVf7NXk0R0BO/AmF6VGQXl0oGPANVhOjWu SQZwRQFvehQXbUfBqPG2W0QxX2M0Pzv5rA3mig5xSINLReCiaJ5vlECT7J7P4jszFF igPwSklSjBfDg== 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 26/35] tracing: Add ftrace_partial_regs() for converting ftrace_regs to pt_regs Date: Mon, 26 Feb 2024 00:19:47 +0900 Message-Id: <170887438692.564249.16633386340353007149.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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit From: Masami Hiramatsu (Google) Add ftrace_partial_regs() which converts the ftrace_regs to pt_regs. This is for the eBPF which needs this to keep the same pt_regs interface to access registers. Thus when replacing the pt_regs with ftrace_regs in fprobes (which is used by kprobe_multi eBPF event), this will be used. If the architecture defines its own ftrace_regs, this copies partial registers to pt_regs and returns it. If not, ftrace_regs is the same as pt_regs and ftrace_partial_regs() will return ftrace_regs::regs. Signed-off-by: Masami Hiramatsu (Google) Acked-by: Florent Revest --- Changes in v8: - Add the reason why this required in changelog. Changes from previous series: NOTHING, just forward ported. --- arch/arm64/include/asm/ftrace.h | 11 +++++++++++ include/linux/ftrace.h | 17 +++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/arch/arm64/include/asm/ftrace.h b/arch/arm64/include/asm/ftrace.h index ac82dc43a57d..aab2b7a0f78c 100644 --- a/arch/arm64/include/asm/ftrace.h +++ b/arch/arm64/include/asm/ftrace.h @@ -143,6 +143,17 @@ ftrace_regs_get_frame_pointer(const struct ftrace_regs *fregs) return fregs->fp; } +static __always_inline struct pt_regs * +ftrace_partial_regs(const struct ftrace_regs *fregs, struct pt_regs *regs) +{ + memcpy(regs->regs, fregs->regs, sizeof(u64) * 9); + regs->sp = fregs->sp; + regs->pc = fregs->pc; + regs->regs[29] = fregs->fp; + regs->regs[30] = fregs->lr; + return regs; +} + int ftrace_regs_query_register_offset(const char *name); int ftrace_init_nop(struct module *mod, struct dyn_ftrace *rec); diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index f6b729808ae2..8827f024cbbc 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -177,6 +177,23 @@ static __always_inline struct pt_regs *ftrace_get_regs(struct ftrace_regs *fregs return arch_ftrace_get_regs(fregs); } +#if !defined(CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS) || \ + defined(CONFIG_HAVE_PT_REGS_TO_FTRACE_REGS_CAST) + +static __always_inline struct pt_regs * +ftrace_partial_regs(struct ftrace_regs *fregs, struct pt_regs *regs) +{ + /* + * If CONFIG_HAVE_PT_REGS_TO_FTRACE_REGS_CAST=y, ftrace_regs memory + * layout is the same as pt_regs. So always returns that address. + * Since arch_ftrace_get_regs() will check some members and may return + * NULL, we can not use it. + */ + return &fregs->regs; +} + +#endif /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS || CONFIG_HAVE_PT_REGS_TO_FTRACE_REGS_CAST */ + /* * When true, the ftrace_regs_{get,set}_*() functions may be used on fregs. * Note: this can be true even when ftrace_get_regs() cannot provide a pt_regs.