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

Merge tag 'timers-cleanups-2025-03-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer cleanups from Thomas Gleixner:
 "A treewide hrtimer timer cleanup

  hrtimers are initialized with hrtimer_init() and a subsequent store to
  the callback pointer. This turned out to be suboptimal for the
  upcoming Rust integration and is obviously a silly implementation to
  begin with.

  This cleanup replaces the hrtimer_init(T); T->function = cb; sequence
  with hrtimer_setup(T, cb);

  The conversion was done with Coccinelle and a few manual fixups.

  Once the conversion has completely landed in mainline, hrtimer_init()
  will be removed and the hrtimer::function becomes a private member"

* tag 'timers-cleanups-2025-03-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (100 commits)
  wifi: rt2x00: Switch to use hrtimer_update_function()
  io_uring: Use helper function hrtimer_update_function()
  serial: xilinx_uartps: Use helper function hrtimer_update_function()
  ASoC: fsl: imx-pcm-fiq: Switch to use hrtimer_setup()
  RDMA: Switch to use hrtimer_setup()
  virtio: mem: Switch to use hrtimer_setup()
  drm/vmwgfx: Switch to use hrtimer_setup()
  drm/xe/oa: Switch to use hrtimer_setup()
  drm/vkms: Switch to use hrtimer_setup()
  drm/msm: Switch to use hrtimer_setup()
  drm/i915/request: Switch to use hrtimer_setup()
  drm/i915/uncore: Switch to use hrtimer_setup()
  drm/i915/pmu: Switch to use hrtimer_setup()
  drm/i915/perf: Switch to use hrtimer_setup()
  drm/i915/gvt: Switch to use hrtimer_setup()
  drm/i915/huc: Switch to use hrtimer_setup()
  drm/amdgpu: Switch to use hrtimer_setup()
  stm class: heartbeat: Switch to use hrtimer_setup()
  i2c: Switch to use hrtimer_setup()
  iio: Switch to use hrtimer_setup()
  ...
parents d5048d11 86a578e7

arch/arm/mach-imx/mmdc.c

+2 −3
Original line number Diff line number Diff line
@@ -509,9 +509,8 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b 
	pmu_mmdc->mmdc_ipg_clk = mmdc_ipg_clk;

	pmu_mmdc->devtype_data = device_get_match_data(&pdev->dev);



	hrtimer_init(&pmu_mmdc->hrtimer, CLOCK_MONOTONIC,

	hrtimer_setup(&pmu_mmdc->hrtimer, mmdc_pmu_timer_handler, CLOCK_MONOTONIC,

		      HRTIMER_MODE_REL);

	pmu_mmdc->hrtimer.function = mmdc_pmu_timer_handler;



	cpumask_set_cpu(raw_smp_processor_id(), &pmu_mmdc->cpu);

arch/arm/mm/cache-l2x0-pmu.c

+1 −2
Original line number Diff line number Diff line
@@ -539,8 +539,7 @@ static __init int l2x0_pmu_init(void) 
	 * at higher frequencies.

	 */

	l2x0_pmu_poll_period = ms_to_ktime(1000);

	hrtimer_init(&l2x0_pmu_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);

	l2x0_pmu_hrtimer.function = l2x0_pmu_poll;

	hrtimer_setup(&l2x0_pmu_hrtimer, l2x0_pmu_poll, CLOCK_MONOTONIC, HRTIMER_MODE_REL);



	cpumask_set_cpu(0, &pmu_cpu);

	ret = cpuhp_setup_state_nocalls(CPUHP_AP_PERF_ARM_L2X0_ONLINE,

arch/arm64/kvm/arch_timer.c

+3 −4
Original line number Diff line number Diff line
@@ -1070,8 +1070,7 @@ static void timer_context_init(struct kvm_vcpu *vcpu, int timerid) 
	else

		ctxt->offset.vm_offset = &kvm->arch.timer_data.poffset;



	hrtimer_init(&ctxt->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);

	ctxt->hrtimer.function = kvm_hrtimer_expire;

	hrtimer_setup(&ctxt->hrtimer, kvm_hrtimer_expire, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);



	switch (timerid) {

	case TIMER_PTIMER:
@@ -1098,8 +1097,8 @@ void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) 
		timer_set_offset(vcpu_ptimer(vcpu), 0);

	}



	hrtimer_init(&timer->bg_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);

	timer->bg_timer.function = kvm_bg_timer_expire;

	hrtimer_setup(&timer->bg_timer, kvm_bg_timer_expire, CLOCK_MONOTONIC,

		      HRTIMER_MODE_ABS_HARD);

}



void kvm_timer_init_vm(struct kvm *kvm)

arch/loongarch/kvm/vcpu.c

+2 −2
Original line number Diff line number Diff line
@@ -1459,8 +1459,8 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) 
	vcpu->arch.vpid = 0;

	vcpu->arch.flush_gpa = INVALID_GPA;



	hrtimer_init(&vcpu->arch.swtimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED_HARD);

	vcpu->arch.swtimer.function = kvm_swtimer_wakeup;

	hrtimer_setup(&vcpu->arch.swtimer, kvm_swtimer_wakeup, CLOCK_MONOTONIC,

		      HRTIMER_MODE_ABS_PINNED_HARD);



	vcpu->arch.handle_exit = kvm_handle_exit;

	vcpu->arch.guest_eentry = (unsigned long)kvm_loongarch_ops->exc_entry;

arch/mips/kvm/mips.c

+2 −3
Original line number Diff line number Diff line
@@ -288,9 +288,8 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) 
	if (err)

		return err;



	hrtimer_init(&vcpu->arch.comparecount_timer, CLOCK_MONOTONIC,

	hrtimer_setup(&vcpu->arch.comparecount_timer, kvm_mips_comparecount_wakeup, CLOCK_MONOTONIC,

		      HRTIMER_MODE_REL);

	vcpu->arch.comparecount_timer.function = kvm_mips_comparecount_wakeup;



	/*

	 * Allocate space for host mode exception handlers that handle