Commit c1f2c449 authored by Mykyta Yatsenko's avatar Mykyta Yatsenko Committed by Alexei Starovoitov
Browse files

bpf: Factor out timer deletion helper 



Move the timer deletion logic into a dedicated bpf_timer_delete()
helper so it can be reused by later patches.

Acked-by: default avatarEduard Zingerman <eddyz87@gmail.com>
Acked-by: default avatarKumar Kartikeya Dwivedi <memxor@gmail.com>
Signed-off-by: default avatarMykyta Yatsenko <yatsenko@meta.com>
Link: https://lore.kernel.org/r/20260120-timer_nolock-v6-1-670ffdd787b4@meta.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent dd341eac

kernel/bpf/helpers.c

+18 −11
Original line number Diff line number Diff line
@@ -1558,18 +1558,10 @@ static struct bpf_async_cb *__bpf_async_cancel_and_free(struct bpf_async_kern *a 
	return cb;

}



/* This function is called by map_delete/update_elem for individual element and

 * by ops->map_release_uref when the user space reference to a map reaches zero.

 */

void bpf_timer_cancel_and_free(void *val)

static void bpf_timer_delete(struct bpf_hrtimer *t)

{

	struct bpf_hrtimer *t;



	t = (struct bpf_hrtimer *)__bpf_async_cancel_and_free(val);



	if (!t)

		return;

	/* We check that bpf_map_delete/update_elem() was called from timer

	/*

	 * We check that bpf_map_delete/update_elem() was called from timer

	 * callback_fn. In such case we don't call hrtimer_cancel() (since it

	 * will deadlock) and don't call hrtimer_try_to_cancel() (since it will

	 * just return -1). Though callback_fn is still running on this cpu it's
@@ -1618,6 +1610,21 @@ void bpf_timer_cancel_and_free(void *val) 
	}

}



/*

 * This function is called by map_delete/update_elem for individual element and

 * by ops->map_release_uref when the user space reference to a map reaches zero.

 */

void bpf_timer_cancel_and_free(void *val)

{

	struct bpf_hrtimer *t;



	t = (struct bpf_hrtimer *)__bpf_async_cancel_and_free(val);

	if (!t)

		return;



	bpf_timer_delete(t);

}



/* This function is called by map_delete/update_elem for individual element and

 * by ops->map_release_uref when the user space reference to a map reaches zero.

 */