From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 657F0C433E2 for ; Mon, 14 Sep 2020 17:17:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 25D42206B7 for ; Mon, 14 Sep 2020 17:17:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="cMvoL7wf"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="+czFiAFK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726011AbgINRRI (ORCPT ); Mon, 14 Sep 2020 13:17:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726168AbgINRQY (ORCPT ); Mon, 14 Sep 2020 13:16:24 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CDBEC06178A; Mon, 14 Sep 2020 10:16:17 -0700 (PDT) Date: Mon, 14 Sep 2020 17:16:15 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1600103775; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xnC0BBRdLpDkoDJDIHbRO7vMU4/ABMUnokc3JMyDZjU=; b=cMvoL7wfqfbbnukra0gcViZdMoQy8tVcdFGOWlJajx4XzbcRwsQV1f+cYsWsF+Wq0X2RFw N7BybqGnbvthVV6btHNOPxxpH8bpTTYYnBPW1HyYtK6uFrhsj31hb+39vOuDvDOu+7RoIV WOw0YxHWLBeHXPQblTvhI4ZbGrQE60KrvOqzO/gG/PuEYlXgfRosFKDspaUeb05qtGem+I XplzT4Mj4iG79xJhDnON0Fq0xnw7We3WMXkJCkicEfzD3MOR/ETWn8wBlNqMAY+u+pNbQB Q2BoITwPJ74WnvcyCbNzRYHoCG5lH/GgzQ/hlYiohvKalaXCArZ3/wErBrmbvw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1600103775; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xnC0BBRdLpDkoDJDIHbRO7vMU4/ABMUnokc3JMyDZjU=; b=+czFiAFKm6+unWsDAdFHvqQPt+SLuTzE4nPH6HTaqvVXSDGWG7bydHYx2x1YuI6IFW6PBZ dML1spW/bdPd7jCA== From: "tip-bot2 for Masami Hiramatsu" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/kprobes] sparc: kprobes: Use generic kretprobe trampoline handler Cc: Masami Hiramatsu , Ingo Molnar , x86 , LKML In-Reply-To: <159870614572.1229682.2273450776108579676.stgit@devnote2> References: <159870614572.1229682.2273450776108579676.stgit@devnote2> MIME-Version: 1.0 Message-ID: <160010377523.15536.175221749531504584.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the perf/kprobes branch of tip: Commit-ID: 5e96ce8ae5b1428e6f4953be5fb1daf0a6d18426 Gitweb: https://git.kernel.org/tip/5e96ce8ae5b1428e6f4953be5fb1daf0a6d18426 Author: Masami Hiramatsu AuthorDate: Sat, 29 Aug 2020 22:02:25 +09:00 Committer: Ingo Molnar CommitterDate: Tue, 08 Sep 2020 11:52:35 +02:00 sparc: kprobes: Use generic kretprobe trampoline handler Use the generic kretprobe trampoline handler. Don't use framepointer verification. Signed-off-by: Masami Hiramatsu Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/159870614572.1229682.2273450776108579676.stgit@devnote2 --- arch/sparc/kernel/kprobes.c | 51 ++---------------------------------- 1 file changed, 3 insertions(+), 48 deletions(-) diff --git a/arch/sparc/kernel/kprobes.c b/arch/sparc/kernel/kprobes.c index dfbca24..217c21a 100644 --- a/arch/sparc/kernel/kprobes.c +++ b/arch/sparc/kernel/kprobes.c @@ -453,6 +453,7 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, struct pt_regs *regs) { ri->ret_addr = (kprobe_opcode_t *)(regs->u_regs[UREG_RETPC] + 8); + ri->fp = NULL; /* Replace the return addr with trampoline addr */ regs->u_regs[UREG_RETPC] = @@ -465,58 +466,12 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, static int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) { - struct kretprobe_instance *ri = NULL; - struct hlist_head *head, empty_rp; - struct hlist_node *tmp; - unsigned long flags, orig_ret_address = 0; - unsigned long trampoline_address =(unsigned long)&kretprobe_trampoline; + unsigned long orig_ret_address = 0; - INIT_HLIST_HEAD(&empty_rp); - kretprobe_hash_lock(current, &head, &flags); - - /* - * It is possible to have multiple instances associated with a given - * task either because an multiple functions in the call path - * have a return probe installed on them, and/or more than one return - * return probe was registered for a target function. - * - * We can handle this because: - * - instances are always inserted at the head of the list - * - when multiple return probes are registered for the same - * function, the first instance's ret_addr will point to the - * real return address, and all the rest will point to - * kretprobe_trampoline - */ - hlist_for_each_entry_safe(ri, tmp, head, hlist) { - if (ri->task != current) - /* another task is sharing our hash bucket */ - continue; - - if (ri->rp && ri->rp->handler) - ri->rp->handler(ri, regs); - - orig_ret_address = (unsigned long)ri->ret_addr; - recycle_rp_inst(ri, &empty_rp); - - if (orig_ret_address != trampoline_address) - /* - * This is the real return address. Any other - * instances associated with this task are for - * other calls deeper on the call stack - */ - break; - } - - kretprobe_assert(ri, orig_ret_address, trampoline_address); + orig_ret_address = __kretprobe_trampoline_handler(regs, &kretprobe_trampoline, NULL); regs->tpc = orig_ret_address; regs->tnpc = orig_ret_address + 4; - kretprobe_hash_unlock(current, &flags); - - hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) { - hlist_del(&ri->hlist); - kfree(ri); - } /* * By returning a non-zero value, we are telling * kprobe_handler() that we don't want the post_handler