From nobody Thu Dec 18 00:47:20 2025 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 10B412144AE; Fri, 21 Feb 2025 15:52:22 +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=1740153143; cv=none; b=ZIgJb2N18ZJASGTHOX1BxFfuYxXLeIGE0yMGbcKfLoUVkifEeOCtrb7GIt1gZHCs7UiFl++rHZV+N72G4O28DL/ayDYp97QdUmJh3pd7NaNHh6MGbd+Fzx9MT6L+acIOdEh4AphdibiKL6l7tFGdvzyhAe1YttljM6cS7n/CpLM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740153143; c=relaxed/simple; bh=zPKJQ5fAFJRUUd0qE9VwmKify5eh2Gt6ZPaKe4qGi+Q=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=mbQkF8wIUePH6vAdbzBbPISoWnwY4jXfEYZoE3QY7gQSP06g/09ubH0Lghrc2MkJLNdk5PnGMs73JFz1lr8Mnvl1Zu9xS1oyVss1Ozu0fZgcxs4rHP7AltOqdJZXfSFQUffG3uA5ESqhjjgpX+bH6wPgK5P1wJXREb96D/5WPa4= 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 AABBDC4CED6; Fri, 21 Feb 2025 15:52:22 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98) (envelope-from ) id 1tlVKd-00000006KS9-4AdV; Fri, 21 Feb 2025 10:52:51 -0500 Message-ID: <20250221155251.843883775@goodmis.org> User-Agent: quilt/0.68 Date: Fri, 21 Feb 2025 10:52:12 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , stable@vger.kernel.org, Sven Schnelle , Vasily Gorbik , Alexander Gordeev , Heiko Carstens Subject: [for-linus][PATCH 2/7] ftrace: Do not add duplicate entries in subops manager ops References: <20250221155210.755295517@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Cc: Mark Rutland Cc: Mathieu Desnoyers Cc: Andrew Morton Cc: Sven Schnelle Cc: Vasily Gorbik Cc: Alexander Gordeev Link: https://lore.kernel.org/20250220202055.226762894@goodmis.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, unsigne= d long ip, int remove) return -ENOENT; free_hash_entry(hash, entry); return 0; + } else if (__ftrace_lookup_ip(hash, ip) !=3D NULL) { + /* Already exists */ + return 0; } =20 entry =3D add_hash_entry(hash, ip); --=20 2.47.2