Merge tag 'riscv-mw1-6.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/alexghiti/linux into for-next

riscv patches for 6.15-rc1

* A bunch of fixes:
  - We were missing a secondary mmu notifier call when flushing the tlb which is required for IOMMU
  - Fix ftrace panics by saving the registers as expected by ftrace
  - Fix a couple of stimecmp usage related to cpu hotplug
  - Fix a bunch of issues in the misaligned probing handling

* Perf improvements:
  - Introduce support for runtime constant improving perf of d_hash()
  - Add support for huge pfnmaps to improve tlb utilization
  - Use Zawrs to improve smp_cond_load8/16() used by the queued spinlocks

* Hwprobe additions:
  - Add support for Zicntr and Zihpm
  - Add support for Zaamo and Zalrsc
  - Add support for bfloat16 extensiosn
  - Add support for Zicbom (only enabling clean and flush, not inval for security reasons)

* Misc:
  - Add a kernel parameter to bypass the misaligned speed probing since we can't rely on Zicclsm

* tag 'riscv-mw1-6.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/alexghiti/linux: (1585 commits)
  riscv: Add runtime constant support
  riscv: Move nop definition to insn-def.h
  Documentation/kernel-parameters: Add riscv unaligned speed parameters
  riscv: Add parameter for skipping access speed tests
  riscv: Fix set up of vector cpu hotplug callback
  riscv: Fix set up of cpu hotplug callbacks
  riscv: Change check_unaligned_access_speed_all_cpus to void
  riscv: Fix check_unaligned_access_all_cpus
  riscv: Fix riscv_online_cpu_vec
  riscv: Annotate unaligned access init functions
  KVM: riscv: selftests: Add Zaamo/Zalrsc extensions to get-reg-list test
  RISC-V: KVM: Allow Zaamo/Zalrsc extensions for Guest/VM
  riscv: hwprobe: export Zaamo and Zalrsc extensions
  riscv: add parsing for Zaamo and Zalrsc extensions
  dt-bindings: riscv: add Zaamo and Zalrsc ISA extension description
  riscv: fgraph: Fix stack layout to match __arch_ftrace_regs argument of ftrace_return_to_handler
  riscv: fgraph: Select HAVE_FUNCTION_GRAPH_TRACER depends on HAVE_DYNAMIC_FTRACE_WITH_ARGS
  riscv: Fix missing __free_pages() in check_vector_unaligned_access()
  riscv: Fix the __riscv_copy_vec_words_unaligned implementation
  riscv: mm: Don't use %pK through printk
  ...

1 files changed, 2 insertions, 4 deletions

diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
index d358c9935164..df56f9b76010 100644
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -216,7 +216,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip,
 
 	parent_ip = function_get_true_parent_ip(parent_ip, fregs);
 
-	trace_ctx = tracing_gen_ctx();
+	trace_ctx = tracing_gen_ctx_dec();
 
 	data = this_cpu_ptr(tr->array_buffer.data);
 	if (!atomic_read(&data->disabled))
@@ -321,7 +321,6 @@ function_no_repeats_trace_call(unsigned long ip, unsigned long parent_ip,
 	struct trace_array *tr = op->private;
 	struct trace_array_cpu *data;
 	unsigned int trace_ctx;
-	unsigned long flags;
 	int bit;
 
 	if (unlikely(!tr->function_enabled))
@@ -347,8 +346,7 @@ function_no_repeats_trace_call(unsigned long ip, unsigned long parent_ip,
 	if (is_repeat_check(tr, last_info, ip, parent_ip))
 		goto out;
 
-	local_save_flags(flags);
-	trace_ctx = tracing_gen_ctx_flags(flags);
+	trace_ctx = tracing_gen_ctx_dec();
 	process_repeats(tr, ip, parent_ip, last_info, trace_ctx);
 
 	trace_function(tr, ip, parent_ip, trace_ctx);