Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1212813pxj; Fri, 18 Jun 2021 02:02:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZyJLrY4BWXYOT3xf+OaThSQEKdtpey+EfIHlZ3sAf5FJtZ87pk5A+w7+rGZo9nwHNROqz X-Received: by 2002:a17:906:acf:: with SMTP id z15mr10147344ejf.140.1624006954342; Fri, 18 Jun 2021 02:02:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624006954; cv=none; d=google.com; s=arc-20160816; b=y14NziBJp7jBmj67g/WcFjMLqj1u0cXhG+jSlyt/d9NZK0aHHEAmnEwggr59i3E3KD H28SP7FTz0bbGEYIIhd78z1iB0e9p9aKhpzSbWFLV+1TPIIqn7wrsT0IPBD7+d3IIsYC iwXuWYJtoL5PqBWTl7ITkeCO26QspGOHPhlALw0PKTh3HWfOhfpFpFlz7Dalr3nOOp6K CwEfMGOHYjVRwlo/jOcAIsyhC20G8hVrbtQcRjEjcsz8wXE60V+aCQh6GfvTjUCzz08A lqllej78Nmjnb3RCk99H6W6pO7LO1lMzS6vs5vZSEFwfKy9XsnUY6vgtwY5OdIlPqZq4 nx1w== 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=YWNnC2CC4rQlM4E4udAIcbnPiUnSoqiU+rdTZlgWOHY=; b=nV1EHZkGLVaypZOUaSjDOAeL2V5McOZu06p7RQAbrrlbEVz/4lVtWWHcxqgwCt8dnl CPLM9UP5G8tMg/HWYEIciYgyhLPYQ78Tzq0ALIXVWC0gjQAB+vfRpok4o1esuqvUmuuw 3SdBkWXk49XqQ/3xqzuKdzdk71voV0SPKXXaDhkI1KCUogH5hpNceTFdYzfkGAHVJkbo Lwi+13hJyb1Rt6wad3Z+wEGfkHXKW6rHJLwHT5PT7AG0/bEOMyyriYEc9k2uPGQ5272z 7OsRuBSeluojv/8cH4g7ZsXOZwi5f6O1VTiX/Q8MLlHypHSA5Tl37ibkHwwv3g1H4omC 9wSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GG9itzgG; 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 j20si2643525edw.53.2021.06.18.02.02.11; Fri, 18 Jun 2021 02:02:34 -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=GG9itzgG; 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 S232841AbhFRHI3 (ORCPT + 99 others); Fri, 18 Jun 2021 03:08:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:45192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232836AbhFRHIW (ORCPT ); Fri, 18 Jun 2021 03:08:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 26A3D60BBB; Fri, 18 Jun 2021 07:06:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623999973; bh=kWMKhX+8lnYTT15vS+jnsaOhyRchIadTBOj6qvo8m0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GG9itzgGfeB4cXjwhNFGh13kIK3ZpFfMfXewLAzknqgg7Jkp2NgbalBL7/xLe/FhT NksSTvg2em9F192mkuDbWK8RESBFgdZlmhplvhMaZblB9Wl1XMUZ8JBlNvHAZOkHvY qeopCemYEPeF8Qr6JmW2+Vym/CodfjM6xW+UrsSUhFcVOpEjRJ4Uluibmfd5zomNC+ 0ACKYZYWwlkcDHDCWv+lelkG0H5teALjCBaXQl+wQTWiMpC3KwDoBxUnsN16XsFYR2 k0iuMPEN+s/K/91dRfgEiGRfMg2pJAm4ub3RLQbgp8QuxB88beSJcqKsCgEWnA1Fnn A4VZUsmwa2ZqQ== 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 05/13] x86/kprobes: Add UNWIND_HINT_FUNC on kretprobe_trampoline code Date: Fri, 18 Jun 2021 16:06:09 +0900 Message-Id: <162399996966.506599.810050095040575221.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 From: Josh Poimboeuf Add UNWIND_HINT_FUNC on kretporbe_trampoline code so that ORC information is generated on the kretprobe_trampoline correctly. Note that when the CONFIG_FRAME_POINTER=y, since the kretprobe_trampoline skips updating frame pointer, the stack frame of the kretprobe_trampoline seems non-standard. So this marks it is STACK_FRAME_NON_STANDARD() and undefine UNWIND_HINT_FUNC. Anyway, with the frame pointer, FP unwinder can unwind the stack frame correctly without that hint. Signed-off-by: Josh Poimboeuf Signed-off-by: Masami Hiramatsu Tested-by: Andrii Nakryik --- Changes in v4: - Apply UNWIND_HINT_FUNC only if CONFIG_FRAME_POINTER=n. --- arch/x86/include/asm/unwind_hints.h | 5 +++++ arch/x86/kernel/kprobes/core.c | 17 +++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/unwind_hints.h b/arch/x86/include/asm/unwind_hints.h index 8e574c0afef8..8b33674288ea 100644 --- a/arch/x86/include/asm/unwind_hints.h +++ b/arch/x86/include/asm/unwind_hints.h @@ -52,6 +52,11 @@ UNWIND_HINT sp_reg=ORC_REG_SP sp_offset=8 type=UNWIND_HINT_TYPE_FUNC .endm +#else + +#define UNWIND_HINT_FUNC \ + UNWIND_HINT(ORC_REG_SP, 8, UNWIND_HINT_TYPE_FUNC, 0) + #endif /* __ASSEMBLY__ */ #endif /* _ASM_X86_UNWIND_HINTS_H */ diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index 2dccb4347453..74f049b6e77f 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -1019,6 +1019,19 @@ int kprobe_int3_handler(struct pt_regs *regs) } NOKPROBE_SYMBOL(kprobe_int3_handler); +#ifdef CONFIG_FRAME_POINTER +/* + * kretprobe_trampoline skips updating frame pointer. The frame pointer + * saved in trampoline_handler points to the real caller function's + * frame pointer. Thus the kretprobe_trampoline doesn't seems to have a + * standard stack frame with CONFIG_FRAME_POINTER=y. + * Let's mark it non-standard function. Anyway, FP unwinder can correctly + * unwind without the hint. + */ +STACK_FRAME_NON_STANDARD(kretprobe_trampoline); +#undef UNWIND_HINT_FUNC +#define UNWIND_HINT_FUNC +#endif /* * When a retprobed function returns, this code saves registers and * calls trampoline_handler() runs, which calls the kretprobe's handler. @@ -1031,6 +1044,7 @@ asm( /* We don't bother saving the ss register */ #ifdef CONFIG_X86_64 " pushq %rsp\n" + UNWIND_HINT_FUNC " pushfq\n" SAVE_REGS_STRING " movq %rsp, %rdi\n" @@ -1041,6 +1055,7 @@ asm( " popfq\n" #else " pushl %esp\n" + UNWIND_HINT_FUNC " pushfl\n" SAVE_REGS_STRING " movl %esp, %eax\n" @@ -1054,8 +1069,6 @@ asm( ".size kretprobe_trampoline, .-kretprobe_trampoline\n" ); NOKPROBE_SYMBOL(kretprobe_trampoline); -STACK_FRAME_NON_STANDARD(kretprobe_trampoline); - /* * Called from kretprobe_trampoline