From patchwork Thu Feb 20 20:20:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 13984480 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 3CC1E2641CA; Thu, 20 Feb 2025 20:20:27 +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=1740082828; cv=none; b=r5D3kzqsauYvFX45aRh4KXDuVokbhAoWJZB6xsMwTMNKeIt8MDLo5PhPpuWAu77EJjiOlkVfGySVmLdwxQEK0hnNNsQm29cdtXHYlMGiL8KYcrbg/vxHadf11kNHaxxslKtrmEkvOGUi5ac+xaTKjUH673CQ1whk2nvcghfR7lU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740082828; c=relaxed/simple; bh=3TxeHajqIRRLf4BpVKsFMhoLnS8Gt0g1pMkDOu4lWUA=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=R0t0UBZ5NlkXpSW4OS3MMKo+wzTXxbU/3mlmexwtARWe8kG/kFRz5iyNjRTQf8NeegCZe4aOR/ndnhDeAAqhbTulh5iXzQmaau+FGpIE5sEnBWQbjQw3SbxEhu2NQD5Yyp6i+P33IzoyVNBZBHP30dP63oBuwCOTKoyUb8NElao= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF5B0C4CEE6; Thu, 20 Feb 2025 20:20:27 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98) (envelope-from ) id 1tlD2V-00000005fXJ-1Z5b; Thu, 20 Feb 2025 15:20:55 -0500 Message-ID: <20250220202055.226762894@goodmis.org> User-Agent: quilt/0.68 Date: Thu, 20 Feb 2025 15:20:11 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Heiko Carstens , Sven Schnelle , Vasily Gorbik , Alexander Gordeev , stable@vger.kernel.org Subject: [PATCH v3 2/5] ftrace: Do not add duplicate entries in subops manager ops References: <20250220202009.689253424@goodmis.org> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Steven Rostedt Check if a function is already in the manager ops of a subops. A manager ops contains multiple subops, and if two or more subops are tracing the same function, the manager ops only needs a single entry in its hash. Cc: stable@vger.kernel.org Fixes: 4f554e955614f ("ftrace: Add ftrace_set_filter_ips function") Tested-by: Heiko Carstens Reviewed-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ftrace.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index bec54dc27204..6b0c25761ccb 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -5718,6 +5718,9 @@ __ftrace_match_addr(struct ftrace_hash *hash, unsigned long ip, int remove) return -ENOENT; free_hash_entry(hash, entry); return 0; + } else if (__ftrace_lookup_ip(hash, ip) != NULL) { + /* Already exists */ + return 0; } entry = add_hash_entry(hash, ip);