From mboxrd@z Thu Jan 1 00:00:00 1970 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 B2BD164A; Mon, 26 Aug 2024 17:28:37 +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=1724693317; cv=none; b=kW0KnR2yGbattM2zbt/D7lrKbmyHY8FKUvUxmEqicafr0YYvqDQCg9D414VzArW5UAoLgcB85yjsB2YIhMBQ9pj5kxMpYsPt5fEWuo2jLrW8xIt6EgAUCDbnx/nhLM6uMzclxBa08s1WtOo7xkusS2z0qgAtqBJpktgAoZiOaWQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724693317; c=relaxed/simple; bh=Ah1MYcJfpVaPDZCj/MgYPfBVJo43ln+VDcKQfM/BWW0=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=F0vJuB4enMf3kzX5w92GGjgpsS14IY3U78m1dP1LqdjuRTbkrmE7/1p6+62IWa4VSSS9IXuOm/ij9PxvLfDGCDYIOreZRpO9VqbJ8l7adlo09mkcJdQ+bEByMEFVsKuXzHUdV5LrCmwNVmGObV8zg6akptUVLJ+lZkfWB04lDGk= 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 B0E6AC8B7B5; Mon, 26 Aug 2024 17:28:29 +0000 (UTC) Date: Mon, 26 Aug 2024 13:29:09 -0400 From: Steven Rostedt To: Mike Rapoport Cc: Andrew Morton , Andreas Larsson , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Brian Cain , Catalin Marinas , Christoph Hellwig , Christophe Leroy , Dave Hansen , Dinh Nguyen , Geert Uytterhoeven , Guo Ren , Helge Deller , Huacai Chen , Ingo Molnar , Johannes Berg , John Paul Adrian Glaubitz , Kent Overstreet , "Liam R. Howlett" , Luis Chamberlain , Mark Rutland , Masami Hiramatsu , Matt Turner , Max Filippov , Michael Ellerman , Michal Simek , Oleg Nesterov , Palmer Dabbelt , Peter Zijlstra , Richard Weinberger , Russell King , Song Liu , Stafford Horne , Thomas Bogendoerfer , Thomas Gleixner , Uladzislau Rezki , Vineet Gupta , Will Deacon , bpf@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-trace-kernel@vger.kernel.org, linux-um@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev, sparclinux@vger.kernel.org, x86@kernel.org Subject: Re: [PATCH v2 5/8] ftrace: Add swap_func to ftrace_process_locs() Message-ID: <20240826132909.306b08fc@gandalf.local.home> In-Reply-To: <20240826065532.2618273-6-rppt@kernel.org> References: <20240826065532.2618273-1-rppt@kernel.org> <20240826065532.2618273-6-rppt@kernel.org> X-Mailer: Claws Mail 3.20.0git84 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-csky@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Mon, 26 Aug 2024 09:55:29 +0300 Mike Rapoport wrote: > From: Song Liu > > ftrace_process_locs sorts module mcount, which is inside RO memory. Add a > ftrace_swap_func so that archs can use RO-memory-poke function to do the > sorting. Can you add the above as a comment above the ftrace_swap_func() function? Thanks, -- Steve > > Signed-off-by: Song Liu > Signed-off-by: Mike Rapoport (Microsoft) > --- > include/linux/ftrace.h | 2 ++ > kernel/trace/ftrace.c | 13 ++++++++++++- > 2 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h > index fd5e84d0ec47..b794dcb7cae8 100644 > --- a/include/linux/ftrace.h > +++ b/include/linux/ftrace.h > @@ -1188,4 +1188,6 @@ unsigned long arch_syscall_addr(int nr); > > #endif /* CONFIG_FTRACE_SYSCALLS */ > > +void ftrace_swap_func(void *a, void *b, int n); > + > #endif /* _LINUX_FTRACE_H */ > diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c > index 4c28dd177ca6..9829979f3a46 100644 > --- a/kernel/trace/ftrace.c > +++ b/kernel/trace/ftrace.c > @@ -6989,6 +6989,17 @@ static void test_is_sorted(unsigned long *start, > unsigned long count) } > #endif > > +void __weak ftrace_swap_func(void *a, void *b, int n) > +{ > + unsigned long t; > + > + WARN_ON_ONCE(n != sizeof(t)); > + > + t = *((unsigned long *)a); > + *(unsigned long *)a = *(unsigned long *)b; > + *(unsigned long *)b = t; > +} > + > static int ftrace_process_locs(struct module *mod, > unsigned long *start, > unsigned long *end) > @@ -7016,7 +7027,7 @@ static int ftrace_process_locs(struct module *mod, > */ > if (!IS_ENABLED(CONFIG_BUILDTIME_MCOUNT_SORT) || mod) { > sort(start, count, sizeof(*start), > - ftrace_cmp_ips, NULL); > + ftrace_cmp_ips, ftrace_swap_func); > } else { > test_is_sorted(start, count); > }