Received: by 2002:ab2:69cc:0:b0:1f4:be93:e15a with SMTP id n12csp1418885lqp; Mon, 15 Apr 2024 06:13:38 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWmJKykl5SP1q3rLle37502SEyMLdVtU9SDLAoao38lfBDcE5bl0XZ/Y+dVv6e4BQFT+5vcumea7Q+LIwqIZMrasz6w8QhR63yB+dzzkA== X-Google-Smtp-Source: AGHT+IEooANIBTx58QOkWvMsf4N3uAl0kNL6zSzv6tFyk7W6smq8g9DWZa3lvvGBsMTx2zMJaDXK X-Received: by 2002:a17:906:3456:b0:a55:2e77:c718 with SMTP id d22-20020a170906345600b00a552e77c718mr743046ejb.54.1713186818607; Mon, 15 Apr 2024 06:13:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713186818; cv=pass; d=google.com; s=arc-20160816; b=Q4Kj9PwFbk0Qo5wm8j6umcPZNUed9ZQ9tTKqRfzUQqkTciskKt0Jc5H/mtmlRGRcEN puR1a7kUumxfY8XsUqDqqzSLRiJTzs8JGGzJ6VT+t8AusFgZkWI7EEFrj5D8b4L5qEjv u3UBFZ7RZXDjeorRTkvY84A3YcS8zLwtFhiIckAeyFMxalXXmPzknlH8ZWAwqf5NVJKF XWlZHX5vOxfjZkz8iGGLJ5VfnED8BvJ/B1H9UsNtFOpX/tJpxhhqD6UYyoF8fQJBuu29 tsZvBsgkA48Dwz9P4di+GaagOt0F47L9lCtQ0QReBhZjeR5D76d8WTPS27AviKt3jtmz gdtw== 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=taBSn7rLS1qcVryjK4sW1rsOI6Ow6wQB4li1qA9Gotw=; fh=SIgps5XdV0XNwjZfT2uAI7g3mrspDldK9Qs8qQAfoa4=; b=rnmMRqZTNVWNYGWVqZzIJjKDhWNmxeuYzeny+VQXxZoAcS+DcQxGZwudR8HXS9AJA9 1Z2WhVv636JsAfe4sgqOTf+PtCeDO9O2ecmXaxq8YCSanDdefj1Uo0whptHFkNg3zXZq KigsgY7ba/ick9+hKS4pwXsvTsj7RsEI2dYW1i2+5T9pyBzi+k5pnTDiKpIOwh7DTQ6z rdDs4E9LQXpWfqyIofRCPOWHiYPQSGPXYWin2c4cCuKaWPtHbuod4R2d2LPwyl0tgc5E 9+3Szwemu0camOW5MFI7Y5p103FaWu8LI1c5622bSd9gY0tgRz7kQoHPRYQiDiNbCbXO aNyw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=b2tl1BJz; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-145192-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-145192-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 lr20-20020a170906fb9400b00a5258055245si1821876ejb.704.2024.04.15.06.13.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 06:13:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-145192-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=b2tl1BJz; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-145192-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-145192-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 5902C1F219AE for ; Mon, 15 Apr 2024 13:13:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C60B013C3D4; Mon, 15 Apr 2024 12:54:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="b2tl1BJz" 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 E2E7F13BC36; Mon, 15 Apr 2024 12:54:12 +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=1713185653; cv=none; b=PBIJf5b/OY9FphnHf+MKmtZP3NVWneoQFqeb1SXQKKy+kpkzHiWqDrF1sEDt2v0EHnav0GJ74YeXxdBKtPaLDYvuxHYZt2uqh74zv6EsiEQebG/zIgZd3yAuogCp7u3DRi00+vW7uh6miRhMNN89XoiLii37njcAd9Upi8upUTg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713185653; c=relaxed/simple; bh=TFAFZorxjczl9MZT2HJZSFW3pkqLg4p2bz5N9Yr6eFA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=JsLfHgD3YwWihRfZ0I+VeDCce+ZnWVzkeQw1vYwYqt39AdlNLePU5mg6aBUj5GxSXHF+TMO/riMYnOxncCywoxW8gq/eQUk9inT3jaaB985aWHurNoqsjmmBVaPZoH6kC8qr2t1idBC64wHfE4/l/3Uv3mrOpq+CZP7jkbvvx8U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=b2tl1BJz; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id E987FC2BD11; Mon, 15 Apr 2024 12:54:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713185652; bh=TFAFZorxjczl9MZT2HJZSFW3pkqLg4p2bz5N9Yr6eFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b2tl1BJzG26OGX32bdeVJ5PyH6LcuGzWbB9riNqdV4fcAQwF5en06oPtfwVBpxsWe OAuoHz++8bpkNKVIR8N3Zalw2lMhF9ByvX9Mo5qlMiEArBX8gM+R1IPgKKhJDSYOiB O436fZzdqdEMPBictAXgNDJ2KFrb68MRcmYy6Hk4mFWUV56epuL+vxBKd87ppB8s9z i9+jm2K74QcYFZ+QOgM8YXjqa8MJh19Uhbbaw1pYesC4uBoTUjVLU1Kc0oXW3qhCI2 w1zSgZgmcjPeYHdPloeuBPABJC1MC9WgR4/VCrB6l4LwomvnHFd5M4g/EltlEtSkiK ubVwdj6FCIm9A== 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 v9 26/36] tracing: Add ftrace_partial_regs() for converting ftrace_regs to pt_regs Date: Mon, 15 Apr 2024 21:54:05 +0900 Message-Id: <171318564576.254850.4893184815305636715.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <171318533841.254850.15841395205784342850.stgit@devnote2> References: <171318533841.254850.15841395205784342850.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 2b35f7d851ca..9cf4c1b8b3f8 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.