Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3671339pxv; Mon, 5 Jul 2021 03:05:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4h7sg2WBcUhPdP6HQeRMRFhSTbG9HujLjlqCUuG7VcuzYfX6p1Ov8NiYwcDa7W+QlGNmk X-Received: by 2002:a05:6402:1d25:: with SMTP id dh5mr15492227edb.355.1625479536804; Mon, 05 Jul 2021 03:05:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625479536; cv=none; d=google.com; s=arc-20160816; b=wQpGyWJFXhlCNGnedSCnZdWNyIsEo13SslaiGJPU23aBJLVNDAGmwbOlSduSqC7r7L nyBHTxpGnAz8VS0ROesjQMTf4k2ugFBl78/OIKNMq93pgj/Vf4ZtU8LwxC6H/Zd/XesA WTpEyUKZmydoXS1TB6x+cgSjhMT8b61Puz+6K8lF3MpcvJdiQ/aVj5wIRNzbVJpGntz3 9ejCyQ5qSGnPTq2ht+MEK8kHwtpHqBgbUFtKEuwe5UjbeKGbz34tn+Wtd9bjGhBqLnbf 6jrqMv07lHwpte19jJXCESD9VfT5jIFR7vI6g+qFx46tMXi42ESp9UAHU8qPF9pWoXyT isHw== 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 :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=5t8wcMRQd1efAwh3l0x62lDddFQ6g0FfXaKygXmbyPo=; b=wYDjRAPboC0Ocv96zka6bBLrVWntXwFbozBUy2MA5DEFHFa7ANdVfzdyankwfOVLtH rZF/pnjBG/olpokR0B5POXk8Cqq0ZV7s3TUblStO6UyxTXRgR2Mun+546YVo1dFF1kvm OCrx1ARN0YxR2MFzHIhu+i42kmB5GjFWL8tzvz3EUFgb4nh84du36O/csY6idWls53hh cFwYMTLejvBLm5lJ0YmTxIKy1mG9yRgNnSbcQ3oCbmHb+uq0Mv9zI4c0woPD5ACTkMEP SjkyhvCquaHaXBjDh9HmgrJ9NB6G20o0MSHBkP3ggGR8vZkOX50/q5yVlTX9pR5r+U7p YUGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XVf7rhMl; 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 bm24si10664398ejb.577.2021.07.05.03.05.13; Mon, 05 Jul 2021 03:05:36 -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=XVf7rhMl; 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 S230482AbhGEKGL (ORCPT + 99 others); Mon, 5 Jul 2021 06:06:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:38060 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230476AbhGEKGK (ORCPT ); Mon, 5 Jul 2021 06:06:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CE968613C8; Mon, 5 Jul 2021 10:03:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625479414; bh=Q8/L2LRHglK2rXQ7PV40+1czQBiJ/w+Kx+K0KseNmao=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=XVf7rhMls18J9mYaKp4sO/vU7UNqO27Sea2F2RLPt6xM22kkJlLVMKD0NPBSdCzqw Ey/aI6wwkszdnn6rA/wC1ltyHxN0h+EY6dduRVFqDg9wqqo+CE7nb4doc/j3w6UQv4 HLDnq16sZ3HLpRqccxQ8XPHzPlTBhPDkYHv+q1/L1otOHzgye1yO7mNZjbo96iF0YH PdsJI0dunM2qwyyhZljvTfXZ+SmMDUhs0lkC2lw0V11llGuXcmZs5lzMKnVBrGkmAY I7Qxt5vwMRb0LAdEGEr0z7sHvzNa7iHUKy/PfUT4Y9dpuk2ISXFjetSouZ64vLASs0 XTG3BLYVVehbw== Date: Mon, 5 Jul 2021 19:03:28 +0900 From: Masami Hiramatsu To: Ingo Molnar Cc: Steven Rostedt , Josh Poimboeuf , X86 ML , 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: Re: [PATCH -tip v8 03/13] kprobes: treewide: Remove trampoline_address from kretprobe_trampoline_handler() Message-Id: <20210705190328.8cf3fb4397500f2dafb761f0@kernel.org> In-Reply-To: References: <162399992186.506599.8457763707951687195.stgit@devnote2> <162399994996.506599.17672270294950096639.stgit@devnote2> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Ingo, On Mon, 5 Jul 2021 09:03:19 +0200 Ingo Molnar wrote: > > * Masami Hiramatsu wrote: > > > --- a/include/linux/kprobes.h > > +++ b/include/linux/kprobes.h > > @@ -197,15 +197,23 @@ extern void arch_prepare_kretprobe(struct kretprobe_instance *ri, > > struct pt_regs *regs); > > extern int arch_trampoline_kprobe(struct kprobe *p); > > > > +void kretprobe_trampoline(void); > > +/* > > + * Since some architecture uses structured function pointer, > > + * use dereference_function_descriptor() to get real function address. > > + */ > > +static nokprobe_inline void *kretprobe_trampoline_addr(void) > > +{ > > + return dereference_kernel_function_descriptor(kretprobe_trampoline); > > +} > > Could we please also make 'kretprobe_trampoline' harder to use > accidentally, such by naming it appropriately? > > __kretprobe_trampoline would be a good first step I guess. Good idea! Let me update it. Thank you, -- Masami Hiramatsu