Commit b673f2bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-6.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux 

Pull RISC-V fixes from Palmer Dabbelt:

 - A fix for the CMODX example in the recently added icache flushing
   prctl()

 - A fix to the perf driver to avoid corrupting event data on counter
   overflows when external overflow handlers are in use

 - A fix to clear all hardware performance monitor events on boot, to
   avoid dangling events firmware or previously booted kernels from
   triggering spuriously

 - A fix to the perf event probing logic to avoid erroneously reporting
   the presence of unimplemented counters. This also prevents some
   implemented counters from being reported

 - A build fix for the vector sigreturn selftest on clang

 - A fix to ftrace, which now requires the previously optional index
   argument to ftrace_graph_ret_addr()

 - A fix to avoid deadlocking if kexec crash handling triggers in an
   interrupt context

* tag 'riscv-for-linus-6.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: kexec: Avoid deadlock in kexec crash path
  riscv: stacktrace: fix usage of ftrace_graph_ret_addr()
  riscv: selftests: Fix vsetivli args for clang
  perf: RISC-V: Check standard event availability
  drivers/perf: riscv: Reset the counter to hpmevent mapping while starting cpus
  drivers/perf: riscv: Do not update the event data if uptodate
  documentation: Fix riscv cmodx example
parents dd9d7390 c562ba71

Documentation/arch/riscv/cmodx.rst

+2 −2
Original line number Diff line number Diff line
@@ -62,10 +62,10 @@ cmodx.c:: 
		printf("Value before cmodx: %d\n", value);



		// Call prctl before first fence.i is called inside modify_instruction

		prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX_ON, PR_RISCV_CTX_SW_FENCEI, PR_RISCV_SCOPE_PER_PROCESS);

		prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX, PR_RISCV_CTX_SW_FENCEI_ON, PR_RISCV_SCOPE_PER_PROCESS);

		modify_instruction();

		// Call prctl after final fence.i is called in process

		prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX_OFF, PR_RISCV_CTX_SW_FENCEI, PR_RISCV_SCOPE_PER_PROCESS);

		prctl(PR_RISCV_SET_ICACHE_FLUSH_CTX, PR_RISCV_CTX_SW_FENCEI_OFF, PR_RISCV_SCOPE_PER_PROCESS);



		value = get_value();

		printf("Value after cmodx: %d\n", value);

arch/riscv/kernel/machine_kexec.c

+1 −9
Original line number Diff line number Diff line
@@ -121,20 +121,12 @@ static void machine_kexec_mask_interrupts(void) 


	for_each_irq_desc(i, desc) {

		struct irq_chip *chip;

		int ret;



		chip = irq_desc_get_chip(desc);

		if (!chip)

			continue;



		/*

		 * First try to remove the active state. If this

		 * fails, try to EOI the interrupt.

		 */

		ret = irq_set_irqchip_state(i, IRQCHIP_STATE_ACTIVE, false);



		if (ret && irqd_irq_inprogress(&desc->irq_data) &&

		    chip->irq_eoi)

		if (chip->irq_eoi && irqd_irq_inprogress(&desc->irq_data))

			chip->irq_eoi(&desc->irq_data);



		if (chip->irq_mask)

arch/riscv/kernel/stacktrace.c

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ void notrace walk_stackframe(struct task_struct *task, struct pt_regs *regs, 
			     bool (*fn)(void *, unsigned long), void *arg)

{

	unsigned long fp, sp, pc;

	int graph_idx = 0;

	int level = 0;



	if (regs) {
@@ -68,7 +69,7 @@ void notrace walk_stackframe(struct task_struct *task, struct pt_regs *regs, 
			pc = regs->ra;

		} else {

			fp = frame->fp;

			pc = ftrace_graph_ret_addr(current, NULL, frame->ra,

			pc = ftrace_graph_ret_addr(current, &graph_idx, frame->ra,

						   &frame->ra);

			if (pc == (unsigned long)ret_from_exception) {

				if (unlikely(!__kernel_text_address(pc) || !fn(arg, pc)))

arch/riscv/kvm/vcpu_pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static long kvm_pmu_create_perf_event(struct kvm_pmc *pmc, struct perf_event_att 


	event = perf_event_create_kernel_counter(attr, -1, current, kvm_riscv_pmu_overflow, pmc);

	if (IS_ERR(event)) {

		pr_err("kvm pmu event creation failed for eidx %lx: %ld\n", eidx, PTR_ERR(event));

		pr_debug("kvm pmu event creation failed for eidx %lx: %ld\n", eidx, PTR_ERR(event));

		return PTR_ERR(event);

	}

drivers/perf/riscv_pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ u64 riscv_pmu_event_update(struct perf_event *event) 
	unsigned long cmask;

	u64 oldval, delta;



	if (!rvpmu->ctr_read)

	if (!rvpmu->ctr_read || (hwc->state & PERF_HES_UPTODATE))

		return 0;



	cmask = riscv_pmu_ctr_get_width_mask(event);