On Tue, Sep 08, 2026 at 09:38:31AM +0200, David Marchand wrote:
> Caught by code review, while looking at rte_intr_instance_free() users.
>
> Even if the FD is not used, it must still be closed when uninitialising
> the alarm subsystem.
>
> Fixes: 26021a715067 ("eal/bsd: support alarm API")
> Cc: [email protected]
>
> Signed-off-by: David Marchand <[email protected]>
Acked-by: Bruce Richardson <[email protected]>
> ---
> Changes since RFC v3:
> - fixed compilation,
>
> ---
> lib/eal/freebsd/eal_alarm.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/lib/eal/freebsd/eal_alarm.c b/lib/eal/freebsd/eal_alarm.c
> index c03e281e67..8544fe8d03 100644
> --- a/lib/eal/freebsd/eal_alarm.c
> +++ b/lib/eal/freebsd/eal_alarm.c
> @@ -10,6 +10,7 @@
> #include <stdlib.h>
> #include <string.h>
> #include <time.h>
> +#include <unistd.h>
> #include <errno.h>
>
> #include <eal_export.h>
> @@ -54,6 +55,8 @@ rte_eal_alarm_cleanup(void)
> int ret = rte_intr_callback_unregister_sync(intr_handle,
> eal_alarm_callback, (void *)-1);
> if (ret >= 0) {
> + close(rte_intr_fd_get(intr_handle));
> + rte_intr_fd_set(intr_handle, -1);
> rte_intr_instance_free(intr_handle);
> intr_handle = NULL;
> }
> @@ -62,7 +65,7 @@ rte_eal_alarm_cleanup(void)
> int
> rte_eal_alarm_init(void)
> {
> - int fd;
> + int fd = -1;
>
> intr_handle = rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_PRIVATE);
> if (intr_handle == NULL) {
> @@ -88,6 +91,8 @@ rte_eal_alarm_init(void)
>
> return 0;
> error:
> + if (fd >= 0)
> + close(fd);
> rte_intr_instance_free(intr_handle);
> return -1;
> }
> --
> 2.54.0
>
