From nobody Sat Jan 31 18:25:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f3Lsl57Dzz6QflM; Sat, 31 Jan 2026 18:25:47 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f3Lsl1tcmz419J; Sat, 31 Jan 2026 18:25:47 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769883947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=hMR0wfsYGNvIcbWwhGg1SIBjPJw6YxIbF18gSAgFJ1M=; b=tEJ0tcS5zal0JuNfHWIUAeOubXutROlCM8BNqv9a8VqqzwFeaSs3hkc6tv4PArSYgCs2oi W9SQC2y2e/lCIUzLaDiqQjerodzHHGqf1JG+X4QTMYdoDwbapyGrqcW/80jYdIV4A0LZFQ h392H2C6gcPwdI3596AcmCzb33ysDYiVzb/2Lc12F17XZ4cJc9MUV+uX9FyB3s10JKFO5o EZWjXcU/8GiXWhlQWNIYXwfUJsXHUyP6HcsMBRuh1S+swljtsv3qVzClxeLWrPFXHb8fvg OhMODnSDYfRGY5COxCYPrKl5QbcB2IAchsuQQOjiAvqr48JoUO0LM0sqrdxnJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769883947; a=rsa-sha256; cv=none; b=dh0XlurSn4yIvqDlDbYpO+U+p8eowYfJQJSQ0VmbAxIxWrJcKL6mOsJ1+jCUSA2bb3MTGz l7Qn1pRyTna0+sHjKMulF/IehwdYFwFyfVZaxfrutsWd0RmoRB0tjn0Uz+cmsg9CzKZ6Y+ A6D6Bc/Q7SuNdUdx8azEDDJRJRff7gJIQbwUFj6MPYiLFh9msTUq9PIMAz/f9aztflgVZB 58Tu709yOlairjZRs4L0J3c+CbZLNrTq+WkseiMSbxhC8hzvXnpxuzqid3jTDo2e48EKvQ uy1F9mg6XAqEa4wmmUmL7/uU+u0dguGj0R0JMHlrU3eSWvWxrrIr19Ky47UuBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769883947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=hMR0wfsYGNvIcbWwhGg1SIBjPJw6YxIbF18gSAgFJ1M=; b=ws+AE4iKLeIsHdxpXmKpGSLXBZxL9kczTkPGqPR5lu2IWPMZ4OGZlELlMxcq2MuNlCWJuh 9lHVTfXt73OitcUXKJSQY73K3aIpH6ioC+Nl3Yvvarryy3hoW/rJ9nfAn6ROxv1tf6cFz3 Gz9SLg+yVyyDQwFxqp0QNNqOE7TkyLjvjG4ygwT6QiW1ZEgOk/WacCJIEVPZWn6ncStd9V Q7BQsK492IhA4nxDi2/ivqP7saTh9vgMhS1iNgTkwc/Cdlopmp+MxiUQ51PUuwRFkxcPGA ytCmeZMiPsOEwNAKzrESl6ZVucQCOoRAWGLs6dv6qP84eLs1U4F0v85+6ce4ew== Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E8" (verified OK)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f3Lsk6gWFzQ4f; Sat, 31 Jan 2026 18:25:46 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id A3242A64806; Sat, 31 Jan 2026 18:25:27 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id E31062D029E7; Sat, 31 Jan 2026 18:25:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id HTrhPOxrb6ww; Sat, 31 Jan 2026 18:25:43 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 9D7E42D029D8; Sat, 31 Jan 2026 18:25:43 +0000 (UTC) Date: Sat, 31 Jan 2026 18:25:43 +0000 (UTC) From: "Bjoern A. Zeeb" To: Yoshihiro Takahashi cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: c84bfaa25318 - stable/14 - LinuxKPI: timer KPI *_timer -> timer_* In-Reply-To: <20260131.141953.969219623432820896.nyan@FreeBSD.org> Message-ID: <58q66pqr-6641-r5rs-70oo-9r1260n85o5@SerrOFQ.bet> References: <696a9448.c84c.3cbc39d4@gitrepo.freebsd.org> <20260131.141953.969219623432820896.nyan@FreeBSD.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed On Sat, 31 Jan 2026, Yoshihiro Takahashi wrote: > This broke binary compatibility for the drm module. > > kernel: link_elf_obj: symbol del_timer_sync undefined > kernel: linker_load_file: /boot/modules/drm.ko - unsupported file type > kernel: KLD i915kms.ko: depends on drmn - not available or version mismatch > kernel: linker_load_file: /boot/modules/i915kms.ko - unsupported file type Sorry about that. I'll go and fix it, restoring the symbols rather than having them be inline functions, which was fine for 15-pre-0. Did this happen with a kernel update but not updating the kmod modules? > In article <696a9448.c84c.3cbc39d4@gitrepo.freebsd.org> > "Bjoern A. Zeeb" writes: > >> The branch stable/14 has been updated by bz: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=c84bfaa2531870a023fa9b267a765b9518ed3350 >> >> commit c84bfaa2531870a023fa9b267a765b9518ed3350 >> Author: Bjoern A. Zeeb >> AuthorDate: 2025-09-04 20:24:26 +0000 >> Commit: Bjoern A. Zeeb >> CommitDate: 2026-01-16 19:37:48 +0000 >> >> LinuxKPI: timer KPI *_timer -> timer_* >> >> del_timer() got renamed to timer_delete() approximately in Linux 6.2 >> (similar for *_sync and likely others). >> Keep the old functions as compat; unclear when we can gc them. >> We should also re-define them with a linuxkpi_ prefix to avoid possible >> conflicts in the future if we do a full pass over this at some point. >> >> Sponsored by: The FreeBSD Foundation (intiially) >> Reviewed by: dumbbell >> Differential Revision: https://reviews.freebsd.org/D52074 >> >> (cherry picked from commit 5cb64a1d3fe75526fb879ef4dce5860bbb4e4aea) >> (cherry picked from commit 88198564dbd82a97d655e73459c03eccf7031331) >> --- >> sys/compat/linuxkpi/common/include/linux/timer.h | 16 ++++++++++++++-- >> sys/compat/linuxkpi/common/src/linux_compat.c | 11 ++--------- >> 2 files changed, 16 insertions(+), 11 deletions(-) >> >> diff --git a/sys/compat/linuxkpi/common/include/linux/timer.h b/sys/compat/linuxkpi/common/include/linux/timer.h >> index fe0e084cb790..9ab30f3003ac 100644 >> --- a/sys/compat/linuxkpi/common/include/linux/timer.h >> +++ b/sys/compat/linuxkpi/common/include/linux/timer.h >> @@ -84,11 +84,23 @@ extern unsigned long linux_timer_hz_mask; >> extern int mod_timer(struct timer_list *, int); >> extern void add_timer(struct timer_list *); >> extern void add_timer_on(struct timer_list *, int cpu); >> -extern int del_timer(struct timer_list *); >> -extern int del_timer_sync(struct timer_list *); >> + >> +extern int timer_delete(struct timer_list *); >> extern int timer_delete_sync(struct timer_list *); >> extern int timer_shutdown_sync(struct timer_list *); >> >> +static inline int >> +del_timer(struct timer_list *tl) >> +{ >> + return (timer_delete(tl)); >> +} >> + >> +static inline int >> +del_timer_sync(struct timer_list *tl) >> +{ >> + return (timer_delete_sync(tl)); >> +} >> + >> #define timer_pending(timer) callout_pending(&(timer)->callout) >> #define round_jiffies(j) \ >> ((int)(((j) + linux_timer_hz_mask) & ~linux_timer_hz_mask)) >> diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c >> index a2c2d18c8185..e5e3d7929759 100644 >> --- a/sys/compat/linuxkpi/common/src/linux_compat.c >> +++ b/sys/compat/linuxkpi/common/src/linux_compat.c >> @@ -2052,7 +2052,7 @@ add_timer_on(struct timer_list *timer, int cpu) >> } >> >> int >> -del_timer(struct timer_list *timer) >> +timer_delete(struct timer_list *timer) >> { >> >> if (callout_stop(&(timer)->callout) == -1) >> @@ -2061,7 +2061,7 @@ del_timer(struct timer_list *timer) >> } >> >> int >> -del_timer_sync(struct timer_list *timer) >> +timer_delete_sync(struct timer_list *timer) >> { >> >> if (callout_drain(&(timer)->callout) == -1) >> @@ -2069,13 +2069,6 @@ del_timer_sync(struct timer_list *timer) >> return (1); >> } >> >> -int >> -timer_delete_sync(struct timer_list *timer) >> -{ >> - >> - return (del_timer_sync(timer)); >> -} >> - >> int >> timer_shutdown_sync(struct timer_list *timer) >> { >> > > -- Bjoern A. Zeeb r15:7