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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 90ED9CFA446 for ; Thu, 20 Nov 2025 21:24:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=L3n7VgvFCLSz8JV7XPuzRdpY4FKOAm8fRWH1je80ytA=; b=SFpF9uBERehpLU1VyBsleSjXwc TPcCUDnmn+bCfnkIBEHvptwbpvjMbpSm+pCvFs544lv0VJytJHQwqih/+SKtr+Nf1QhcyyhgnRC/e zAiIt+/lgma033webrKGPfkxLCmi53S8NKSZjRLjYmjNc0ItCO4rnG83GYUoYVeg5b0BMxBIGlJ8/ Nw6AspS+jgwRJWAx8PRBv/GV1qxtJTprESmSPJ97OqEwcf/DPLlm45Xv0hbF0XCVd6ZniKoeY57HU SiG3w26qsXvViyjSYipLvTQTiePKlQBZ6epaAZXe08MQwK4lVttH66OowbBIK1hOniVUh8gyxGUcs SmsP9xQw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vMC8e-00000007RZ8-1wXz; Thu, 20 Nov 2025 21:24:24 +0000 Received: from tor.source.kernel.org ([172.105.4.254]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vMC8e-00000007RZ1-0hEj for linux-arm-kernel@lists.infradead.org; Thu, 20 Nov 2025 21:24:24 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 994D46016E; Thu, 20 Nov 2025 21:24:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 368F1C116B1; Thu, 20 Nov 2025 21:24:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763673863; bh=YnnW7zN+aKxuUBmWBuWqRRKoptp3OePRxKnEM6fAzmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mJiID6FzDqCsD96MzGN7HnAhWBymD9bFoqZ3uvJ03Iikha8ymsq+M3bqkPa8q11Jf rE6bGC3VFHdgZT7GcIrhRmCK4XYjh7ADIdjRmoOVmINk0cSxtXJiigG5OT2bPXv1Z9 LeKJLqR7nE21vmZCtB/vpKEWZe0JxaPCUj+taClupYABypOSMUTWdOKUH2vWzAt52y lMeeAnEzZIujCfouxYnmlZjGszEQTNnY61kfqdFKwbftrg57VRR8U2Ntmpzpycpql9 6c+mmxa8d+2HeREjY6284t7c58cH8gLEnK3Czs9IRsZBm5WFkxHD5eI0unHcR/HCjs RVnQuREpk3S2w== 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: [PATCHv3 bpf-next 1/8] ftrace: Make alloc_and_copy_ftrace_hash direct friendly Date: Thu, 20 Nov 2025 22:23:55 +0100 Message-ID: <20251120212402.466524-2-jolsa@kernel.org> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251120212402.466524-1-jolsa@kernel.org> References: <20251120212402.466524-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 59cfacb8a5bb..0e3714b796d9 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -1186,7 +1186,7 @@ static void __add_hash_entry(struct ftrace_hash *hash, } 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; @@ -1195,11 +1195,18 @@ add_hash_entry(struct ftrace_hash *hash, unsigned long ip) return NULL; entry->ip = ip; + entry->direct = direct; __add_hash_entry(hash, entry); return entry; } +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 ftrace_hash *hash) size = 1 << hash->size_bits; for (i = 0; i < size; i++) { hlist_for_each_entry(entry, &hash->buckets[i], hlist) { - if (add_hash_entry(new_hash, entry->ip) == NULL) + if (add_hash_entry_direct(new_hash, entry->ip, entry->direct) == NULL) goto free_hash; } } -- 2.51.1