Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1272846pxj; Fri, 18 Jun 2021 03:33:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBTsOnH8l3KFRyxwEP6Z1iDPvkQmq5ZwdzEixYx5WClHenU9t9IA5BHxaeSLOlUKxZ11zy X-Received: by 2002:a17:906:dbc4:: with SMTP id yc4mr10469021ejb.119.1624012406935; Fri, 18 Jun 2021 03:33:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624012406; cv=none; d=google.com; s=arc-20160816; b=LdzjX12VVTIjAwrX4Tr6LzzMStLchgWPfVC/qdqdFxVqapkLjt7hH+6+QwA+US/C8w 1JBa8FTcVzNVdR9K9RUwzigKfVab5+Obac9QdqsMaQhqtTJQiNzLHUuVYP6jtEb6cv06 VzAau0NxfKqqCu+AK7cDk8LBRSEeZNEk3YRqF4xv+IP/2XbdD3XdoRj4YvUJ5Cl//8q+ EZEZKuHKEazZhKl7Ll8XeVKjv1Ky7GqZIY9XMMQpZsORlgEixcvc3b5eaImTvEPHpNIl 6fIfDwVWxJ5xZlN3Aar1hkpMg7RZFjQ9HA0X6QD586MkHEJgJRGiHrT+Cbcazv/xPaXB L3+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:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Fz0m1BoOi/NFWGDB/4I5ed6LImxh4IoYtNaZfKpLbPE=; b=tQQOG2hsie67O6WuHh04N9BohXlSJtObLUVykQMBk/mVaaArzLn064HCBiOxTbWJVA NwQT4A7LbS6I990fbsZY1LjTrAYeNhhqhOS2w1IY5aZrEpBCzh9FlAZ4aGBn2l0yULvL ASCQHYQw2xCqNa/SuK1vq+P17CNYn71zdBbBUiVKTS+bKnUkefI5xnQWPJr03y+MGmcV VAxy4PxoqgqpBMHLvqrFomcxtPk4j+GIDwMoQzslSCemUG8mrOlxkfD6KAJ2zgeANeDp udyKPsEVSWJaIZWkbmaDCgHn5xfez2yKtSD5YSXsAJl6zbQq1fiJAWjgCi1T/TauCCZ/ FmQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YYZtQqdo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dg12si8406415edb.166.2021.06.18.03.33.03; Fri, 18 Jun 2021 03:33:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YYZtQqdo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S232970AbhFRHJA (ORCPT + 99 others); Fri, 18 Jun 2021 03:09:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:45708 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232927AbhFRHJA (ORCPT ); Fri, 18 Jun 2021 03:09:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A4D4460FF0; Fri, 18 Jun 2021 07:06:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624000011; bh=eLCimkEr/J/o+KbLoEoS4uAKhWtQiwGcopMFmWAEMUE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YYZtQqdo99z7lWRgReN9YVZTzeyJG56BXb8WJJqzpQ9yLbAZzfQCWVmf+BxWY6wJB SmdFXOoYJa/Bxd9brzVxjgZHM5DB++C75tCeZaoyXmZhGHdzLD5xv0gpVF66DmdoFy GNR9ZU24kYOEHE4k394YcswDRN4yUvAi3jRXLhK9vS9Sc4ErLOnWqyDbDBdsVnnU7Q t+3/pEAr7EhwRgyowCFcqubeXZWvxaBpvWu3+agHopktEWst4RImq8+vycH42HKEGd BVpzMwslbGoAR/c1KCalD/HgPg48X/EQ3oaX3JqotDfrd5CvZ2RTd4MAbhuNxWaFYc Dv1MJBkDALdiQ== From: Masami Hiramatsu To: Steven Rostedt , Josh Poimboeuf , Ingo Molnar Cc: X86 ML , Masami Hiramatsu , Daniel Xu , linux-kernel@vger.kernel.org, bpf@vger.kernel.org, kuba@kernel.org, mingo@redhat.com, ast@kernel.org, Thomas Gleixner , Borislav Petkov , Peter Zijlstra , kernel-team@fb.com, yhs@fb.com, linux-ia64@vger.kernel.org, Abhishek Sagar , Andrii Nakryiko Subject: [PATCH -tip v8 09/13] kprobes: Enable stacktrace from pt_regs in kretprobe handler Date: Fri, 18 Jun 2021 16:06:46 +0900 Message-Id: <162400000592.506599.4695807810528866713.stgit@devnote2> X-Mailer: git-send-email 2.25.1 In-Reply-To: <162399992186.506599.8457763707951687195.stgit@devnote2> References: <162399992186.506599.8457763707951687195.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since the ORC unwinder from pt_regs requires setting up regs->ip correctly, set the correct return address to the regs->ip before calling user kretprobe handler. This allows the kretrprobe handler to trace stack from the kretprobe's pt_regs by stack_trace_save_regs() (eBPF will do this), instead of stack tracing from the handler context by stack_trace_save() (ftrace will do this). Suggested-by: Josh Poimboeuf Signed-off-by: Masami Hiramatsu Tested-by: Andrii Nakryik --- Changes in v8: - Update comment to clarify why this is needed. Changes in v3: - Cast the correct_ret_addr to unsigned long. --- kernel/kprobes.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 650cbe738666..ba729ed05cb3 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1896,6 +1896,9 @@ unsigned long __kretprobe_trampoline_handler(struct pt_regs *regs, BUG_ON(1); } + /* Set the instruction pointer to the correct address */ + instruction_pointer_set(regs, (unsigned long)correct_ret_addr); + /* Run them. */ first = current->kretprobe_instances.first; while (first) {