From nobody Wed Dec 17 16:10:14 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 EDAE02DA768; Mon, 15 Dec 2025 21:14:36 +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=1765833277; cv=none; b=gCXl/IquHdS0bIDBxXQJLmTlNUThytSdZGgipg9+kHHOmOzzh333Yr8gAxsIcTllj2wd3k5C/c5OvkRcw/04Bt9SFjYbder5aE0PBd8Q5nLWBGpq0d5wpFTvbyCpKACnxjanm00v37z09RnFwzVhXaWmKG9HzUGl48CbYUIKx3Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765833277; c=relaxed/simple; bh=wjKeRmILuEv3XhFbvkHTofLX7c9w7rQEYLqUWe4Qoek=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Boen4ALvw9YONxhPqF91wFp9IcrVAMa+U7rWRH4xqrKljRgcwTP3zmSSiqtvE4vawL46+ebHdUorAaQwU712Iw5OGnRkT9HlCrFEBnlQQtJGbyqKx8s1HPGbxlZ3v/jyCmqYGt+eQqizpi2p+qCb+cO+gt9tZCi+9ZImvMdyYZQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bzP+bVkc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bzP+bVkc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5CBFDC116B1; Mon, 15 Dec 2025 21:14:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765833276; bh=wjKeRmILuEv3XhFbvkHTofLX7c9w7rQEYLqUWe4Qoek=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bzP+bVkc5hChjLfE0u0Bavhc2el37Kp8ZedRsgxpESdHwM5Sky+TjEpAyC4QuGl4G jhNsj2Cx4FtIFPj4h7q9ClqNz5j1FgCxc76dT/XJC6IsuHIS22xLqzcSL2WKKHlK0Q HI70cBeZDPqfsiD9fPEA9m/pm/bheSDg8AD/OBcbb9+an/EZunqzXt1CPDad5QFE6t CHnQLpSAo+IhWFHClAo5tK9vqpq383MHqzHix+aVBIvDBUS3uQyNtCUnkjyNPbXTgV bvGIqW43x75CwddIwZ2cKvg/6pch9yjFK/izB8lBqzlkN7gurj9M4QviS7M1XoLPIn hpFZeYaMk2sSA== From: Jiri Olsa To: Steven Rostedt , Florent Revest , Mark Rutland Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Menglong Dong , Song Liu Subject: [PATCHv5 bpf-next 2/9] ftrace: Make alloc_and_copy_ftrace_hash direct friendly Date: Mon, 15 Dec 2025 22:13:55 +0100 Message-ID: <20251215211402.353056-3-jolsa@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251215211402.353056-1-jolsa@kernel.org> References: <20251215211402.353056-1-jolsa@kernel.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" Make alloc_and_copy_ftrace_hash to copy also direct address for each hash entry. Signed-off-by: Jiri Olsa --- kernel/trace/ftrace.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index b0dc911411f1..7e3a81bd6f1e 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -1186,7 +1186,7 @@ static void __add_hash_entry(struct ftrace_hash *hash, } =20 static struct ftrace_func_entry * -add_hash_entry(struct ftrace_hash *hash, unsigned long ip) +add_hash_entry_direct(struct ftrace_hash *hash, unsigned long ip, unsigned= long direct) { struct ftrace_func_entry *entry; =20 @@ -1195,11 +1195,18 @@ add_hash_entry(struct ftrace_hash *hash, unsigned l= ong ip) return NULL; =20 entry->ip =3D ip; + entry->direct =3D direct; __add_hash_entry(hash, entry); =20 return entry; } =20 +static struct ftrace_func_entry * +add_hash_entry(struct ftrace_hash *hash, unsigned long ip) +{ + return add_hash_entry_direct(hash, ip, 0); +} + static void free_hash_entry(struct ftrace_hash *hash, struct ftrace_func_entry *entry) @@ -1372,7 +1379,7 @@ alloc_and_copy_ftrace_hash(int size_bits, struct ftra= ce_hash *hash) size =3D 1 << hash->size_bits; for (i =3D 0; i < size; i++) { hlist_for_each_entry(entry, &hash->buckets[i], hlist) { - if (add_hash_entry(new_hash, entry->ip) =3D=3D NULL) + if (add_hash_entry_direct(new_hash, entry->ip, entry->direct) =3D=3D NU= LL) goto free_hash; } } --=20 2.52.0